-
-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cleaned settings and finished V3 TODO list
- Loading branch information
1 parent
c5191b5
commit 6778434
Showing
19 changed files
with
336 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
.../java/de/florianmichael/viafabricplus/injection/mixin/vialegacy/MixinViaLegacyConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus | ||
| * Copyright (C) 2021-2023 FlorianMichael/EnZaXD | ||
| * Copyright (C) 2023 RK_01/RaphiMC and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package de.florianmichael.viafabricplus.injection.mixin.vialegacy; | ||
|
|
||
| import de.florianmichael.viafabricplus.settings.impl.GeneralSettings; | ||
| import net.raphimc.vialegacy.ViaLegacyConfig; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; | ||
|
|
||
| @Mixin(value = ViaLegacyConfig.class, remap = false) | ||
| public class MixinViaLegacyConfig { | ||
|
|
||
| @Inject(method = { "isLegacySkullLoading", "isLegacySkinLoading" }, at = @At("HEAD"), cancellable = true) | ||
| public void replaceWithVFPSetting(CallbackInfoReturnable<Boolean> cir) { | ||
| cir.setReturnValue(GeneralSettings.global().loadSkinsAndSkullsInLegacyVersions.getValue()); | ||
| } | ||
|
|
||
| } |
42 changes: 42 additions & 0 deletions
42
src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus | ||
| * Copyright (C) 2021-2023 FlorianMichael/EnZaXD | ||
| * Copyright (C) 2023 RK_01/RaphiMC and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package de.florianmichael.viafabricplus.injection.mixin.viaversion; | ||
|
|
||
| import com.viaversion.viaversion.util.Config; | ||
| import de.florianmichael.viafabricplus.protocolhack.util.ConfigPatcher; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Redirect; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| @Mixin(value = Config.class, remap = false) | ||
| public abstract class MixinConfig { | ||
|
|
||
| @Redirect(method = "loadConfig(Ljava/io/File;Ljava/net/URL;)Ljava/util/Map;", at = @At(value = "INVOKE", target = "Ljava/util/Map;containsKey(Ljava/lang/Object;)Z")) | ||
| private boolean allowConfigPatching(final Map<String, Object> map, final Object key) { | ||
| if (((Object) this) instanceof ConfigPatcher) { | ||
| return true; | ||
| } | ||
|
|
||
| return map.containsKey(key); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
...main/java/de/florianmichael/viafabricplus/protocolhack/impl/ViaFabricPlusVLViaConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus | ||
| * Copyright (C) 2021-2023 FlorianMichael/EnZaXD | ||
| * Copyright (C) 2023 RK_01/RaphiMC and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package de.florianmichael.viafabricplus.protocolhack.impl; | ||
|
|
||
| import net.raphimc.vialoader.impl.viaversion.VLViaConfig; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| public class ViaFabricPlusVLViaConfig extends VLViaConfig { | ||
|
|
||
| public ViaFabricPlusVLViaConfig(File configFile) { | ||
| super(configFile); | ||
|
|
||
| UNSUPPORTED.add("simulate-pt"); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isSimulatePlayerTick() { | ||
| return false; | ||
| } | ||
|
|
||
| } |
41 changes: 41 additions & 0 deletions
41
...michael/viafabricplus/protocolhack/impl/platform/ViaFabricPlusViaVersionPlatformImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus | ||
| * Copyright (C) 2021-2023 FlorianMichael/EnZaXD | ||
| * Copyright (C) 2023 RK_01/RaphiMC and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package de.florianmichael.viafabricplus.protocolhack.impl.platform; | ||
|
|
||
| import com.viaversion.viaversion.configuration.AbstractViaConfig; | ||
| import de.florianmichael.viafabricplus.protocolhack.impl.ViaFabricPlusVLViaConfig; | ||
| import net.raphimc.vialoader.impl.platform.ViaVersionPlatformImpl; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| public class ViaFabricPlusViaVersionPlatformImpl extends ViaVersionPlatformImpl { | ||
|
|
||
| public ViaFabricPlusViaVersionPlatformImpl(File rootFolder) { | ||
| super(rootFolder); | ||
| } | ||
|
|
||
| @Override | ||
| protected AbstractViaConfig createConfig() { | ||
| final AbstractViaConfig config = new ViaFabricPlusVLViaConfig(new File(this.getDataFolder(), "viaversion.yml")); | ||
| config.reload(); | ||
| return config; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.