From 8c6babbabf2ebb66a104a0236214fdf0308988be Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Sun, 26 Nov 2023 01:18:17 +0100 Subject: [PATCH] Fixed game startup --- .../MixinConnectScreen_1.java | 2 +- .../MixinMultiplayerServerListPinger.java | 2 +- .../MixinPerformanceLog.java | 2 +- .../MixinServerInfo.java | 2 +- src/main/resources/viafabricplus.mixins.json | 14 ++++---------- 5 files changed, 8 insertions(+), 14 deletions(-) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/{per_server_version => perserverversion}/MixinConnectScreen_1.java (99%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/{per_server_version => perserverversion}/MixinMultiplayerServerListPinger.java (99%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/{per_server_version => perserverversion}/MixinPerformanceLog.java (98%) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/{per_server_version => perserverversion}/MixinServerInfo.java (99%) diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/per_server_version/MixinConnectScreen_1.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinConnectScreen_1.java similarity index 99% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/per_server_version/MixinConnectScreen_1.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinConnectScreen_1.java index 78b3a51a1..fc600b89a 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/per_server_version/MixinConnectScreen_1.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinConnectScreen_1.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.base.per_server_version; +package de.florianmichael.viafabricplus.injection.mixin.base.perserverversion; import de.florianmichael.viafabricplus.injection.access.IServerInfo; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/per_server_version/MixinMultiplayerServerListPinger.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerServerListPinger.java similarity index 99% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/per_server_version/MixinMultiplayerServerListPinger.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerServerListPinger.java index 79df839ef..dbd9208b2 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/per_server_version/MixinMultiplayerServerListPinger.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinMultiplayerServerListPinger.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.base.per_server_version; +package de.florianmichael.viafabricplus.injection.mixin.base.perserverversion; import com.llamalad7.mixinextras.sugar.Local; import de.florianmichael.viafabricplus.injection.access.IPerformanceLog; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/per_server_version/MixinPerformanceLog.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinPerformanceLog.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/per_server_version/MixinPerformanceLog.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinPerformanceLog.java index 96fc537e5..3e451b80c 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/per_server_version/MixinPerformanceLog.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinPerformanceLog.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.base.per_server_version; +package de.florianmichael.viafabricplus.injection.mixin.base.perserverversion; import de.florianmichael.viafabricplus.injection.access.IPerformanceLog; import net.minecraft.util.profiler.PerformanceLog; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/per_server_version/MixinServerInfo.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinServerInfo.java similarity index 99% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/per_server_version/MixinServerInfo.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinServerInfo.java index 691b857e2..7078caf33 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/per_server_version/MixinServerInfo.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/perserverversion/MixinServerInfo.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.injection.mixin.base.per_server_version; +package de.florianmichael.viafabricplus.injection.mixin.base.perserverversion; import de.florianmichael.viafabricplus.injection.access.IServerInfo; import net.minecraft.client.network.ServerInfo; diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json index d7d3c5d53..918fcbf2e 100644 --- a/src/main/resources/viafabricplus.mixins.json +++ b/src/main/resources/viafabricplus.mixins.json @@ -16,10 +16,10 @@ "base.integration.MixinMultiplayerScreen", "base.integration.MixinMultiplayerServerListPinger_1", "base.integration.MixinMultiplayerServerListWidget_ServerEntry", - "base.per_server_version.MixinConnectScreen_1", - "base.per_server_version.MixinMultiplayerServerListPinger", - "base.per_server_version.MixinPerformanceLog", - "base.per_server_version.MixinServerInfo", + "base.perserverversion.MixinConnectScreen_1", + "base.perserverversion.MixinMultiplayerServerListPinger", + "base.perserverversion.MixinPerformanceLog", + "base.perserverversion.MixinServerInfo", "compat.classic4j.MixinCCAuthenticationResponse", "compat.classic4j.MixinTextFieldWidget", "compat.ipnext.MixinAutoRefillHandler_ItemSlotMonitor", @@ -69,7 +69,6 @@ "fixes.minecraft.block.MixinSoulSandBlock", "fixes.minecraft.block.MixinWallBlock", "fixes.minecraft.entity.MixinAbstractClientPlayerEntity", - "fixes.minecraft.entity.MixinAbstractDonkeyEntity", "fixes.minecraft.entity.MixinAnimalEntity", "fixes.minecraft.entity.MixinBipedEntityModel", "fixes.minecraft.entity.MixinCamelEntity", @@ -79,23 +78,19 @@ "fixes.minecraft.entity.MixinEntity", "fixes.minecraft.entity.MixinEntityIndex", "fixes.minecraft.entity.MixinEntityModels", - "fixes.minecraft.entity.MixinEntityPredicates", "fixes.minecraft.entity.MixinEntityRenderDispatcher", "fixes.minecraft.entity.MixinItemEntity", "fixes.minecraft.entity.MixinLivingEntity", "fixes.minecraft.entity.MixinLockableContainerBlockEntity", "fixes.minecraft.entity.MixinOtherClientPlayerEntity", - "fixes.minecraft.entity.MixinPiglinEntity", "fixes.minecraft.entity.MixinPlayerEntity", "fixes.minecraft.entity.MixinPlayerEntityRenderer", "fixes.minecraft.entity.MixinSquidEntity", - "fixes.minecraft.entity.MixinVexEntity", "fixes.minecraft.entity.MixinWolfEntity", "fixes.minecraft.input.MixinCamera", "fixes.minecraft.input.MixinKeyboardInput", "fixes.minecraft.item.MixinAxeItem", "fixes.minecraft.item.MixinBlockItem", - "fixes.minecraft.item.MixinBrushItem", "fixes.minecraft.item.MixinDrawContext", "fixes.minecraft.item.MixinEnderPearlItem", "fixes.minecraft.item.MixinEquipment", @@ -109,7 +104,6 @@ "fixes.minecraft.item.MixinItemPlacementContext", "fixes.minecraft.item.MixinItemRenderer", "fixes.minecraft.item.MixinItemStack", - "fixes.minecraft.item.MixinMiningToolItem", "fixes.minecraft.item.MixinPickaxeItem", "fixes.minecraft.item.MixinShovelItem", "fixes.minecraft.item.MixinSwordItem",