From fcddb56254ef74eaa576d5a341ac68830813b29f Mon Sep 17 00:00:00 2001 From: Lyfts <127234178+Lyfts@users.noreply.github.com> Date: Fri, 10 May 2024 09:36:17 +0200 Subject: [PATCH] Fix client-side crash on servers (#52) * update deps * fix client crash on servers * spotlessApply (#53) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- dependencies.gradle | 10 ++--- .../api/soulNetwork/SoulNetworkHandler.java | 38 +++++++++++-------- .../common/AlchemicalWizardryFuelHandler.java | 6 ++- .../common/items/LavaCrystal.java | 4 +- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 01e6a10e..229b2ada 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -24,16 +24,16 @@ dependencies { api("com.github.GTNewHorizons:waila:1.7.3:dev") - api("com.github.GTNewHorizons:NotEnoughItems:2.5.27-GTNH:dev") + api("com.github.GTNewHorizons:NotEnoughItems:2.6.0-GTNH:dev") - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.46.02:dev") {transitive = false } + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.46.05:dev") {transitive = false } - compileOnly("com.github.GTNewHorizons:Botania:1.10.12-GTNH:api") {transitive = false } - compileOnly("com.github.GTNewHorizons:ForestryMC:4.8.9:api") {transitive = false } + compileOnly("com.github.GTNewHorizons:Botania:1.11.0-GTNH:api") {transitive = false } + compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.0:api") {transitive = false } compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.4.8:dev") {transitive = false } compileOnly("com.github.GTNewHorizons:Chisel:2.14.1-GTNH:api") {transitive = false } - + compileOnly("com.github.GTNewHorizons:ZenScript:1.0.0-GTNH") {transitive = false } compileOnly("com.github.GTNewHorizons:CraftTweaker:3.3.1:dev") {transitive = false } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java b/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java index fbc2d29a..c99a8958 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java @@ -14,6 +14,7 @@ import WayofTime.alchemicalWizardry.api.event.AddToNetworkEvent; import WayofTime.alchemicalWizardry.api.event.ItemBindEvent; import WayofTime.alchemicalWizardry.api.event.ItemDrainInContainerEvent; import WayofTime.alchemicalWizardry.api.event.ItemDrainNetworkEvent; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.Event.Result; @@ -35,11 +36,12 @@ public class SoulNetworkHandler { } public static int getCurrentMaxOrb(String ownerName) { - if (MinecraftServer.getServer() == null) { + MinecraftServer mcServer = FMLCommonHandler.instance().getMinecraftServerInstance(); + if (mcServer == null) { return 0; } - World world = MinecraftServer.getServer().worldServers[0]; + World world = mcServer.worldServers[0]; LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); if (data == null) { @@ -51,11 +53,12 @@ public class SoulNetworkHandler { } public static void setMaxOrbToMax(String ownerName, int maxOrb) { - if (MinecraftServer.getServer() == null) { + MinecraftServer mcServer = FMLCommonHandler.instance().getMinecraftServerInstance(); + if (mcServer == null) { return; } - World world = MinecraftServer.getServer().worldServers[0]; + World world = mcServer.worldServers[0]; LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); if (data == null) { @@ -96,7 +99,7 @@ public class SoulNetworkHandler { } public static int syphonFromNetwork(String ownerName, int damageToBeDone) { - MinecraftServer mcServer = MinecraftServer.getServer(); + MinecraftServer mcServer = FMLCommonHandler.instance().getMinecraftServerInstance(); if (mcServer == null || mcServer.worldServers.length == 0) { return 0; } @@ -192,11 +195,12 @@ public class SoulNetworkHandler { } public static boolean canSyphonFromOnlyNetwork(String ownerName, int damageToBeDone) { - if (MinecraftServer.getServer() == null) { + MinecraftServer mcServer = FMLCommonHandler.instance().getMinecraftServerInstance(); + if (mcServer == null) { return false; } - World world = MinecraftServer.getServer().worldServers[0]; + World world = mcServer.worldServers[0]; LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); if (data == null) { @@ -208,11 +212,12 @@ public class SoulNetworkHandler { } public static int getCurrentEssence(String ownerName) { - if (MinecraftServer.getServer() == null) { + MinecraftServer mcServer = FMLCommonHandler.instance().getMinecraftServerInstance(); + if (mcServer == null) { return 0; } - World world = MinecraftServer.getServer().worldServers[0]; + World world = mcServer.worldServers[0]; LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); if (data == null) { @@ -224,11 +229,12 @@ public class SoulNetworkHandler { } public static void setCurrentEssence(String ownerName, int essence) { - if (MinecraftServer.getServer() == null) { + MinecraftServer mcServer = FMLCommonHandler.instance().getMinecraftServerInstance(); + if (mcServer == null) { return; } - World world = MinecraftServer.getServer().worldServers[0]; + World world = mcServer.worldServers[0]; LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); if (data == null) { @@ -255,11 +261,12 @@ public class SoulNetworkHandler { return 0; } - if (MinecraftServer.getServer() == null) { + MinecraftServer mcServer = FMLCommonHandler.instance().getMinecraftServerInstance(); + if (mcServer == null) { return 0; } - World world = MinecraftServer.getServer().worldServers[0]; + World world = mcServer.worldServers[0]; LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, event.ownerNetwork); if (data == null) { @@ -348,10 +355,11 @@ public class SoulNetworkHandler { } public static EntityPlayer getPlayerForUsername(String str) { - if (MinecraftServer.getServer() == null) { + MinecraftServer mcServer = FMLCommonHandler.instance().getMinecraftServerInstance(); + if (mcServer == null) { return null; } - return MinecraftServer.getServer().getConfigurationManager().func_152612_a(str); + return mcServer.getConfigurationManager().func_152612_a(str); } public static void causeNauseaToPlayer(ItemStack stack) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryFuelHandler.java b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryFuelHandler.java index e747fb51..dcf6e479 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryFuelHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryFuelHandler.java @@ -11,6 +11,7 @@ import net.minecraft.server.MinecraftServer; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.common.items.LavaCrystal; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.IFuelHandler; public class AlchemicalWizardryFuelHandler implements IFuelHandler { @@ -35,11 +36,12 @@ public class AlchemicalWizardryFuelHandler implements IFuelHandler { return 0; } - if (MinecraftServer.getServer() == null) { + MinecraftServer mcServer = FMLCommonHandler.instance().getMinecraftServerInstance(); + if (mcServer == null) { return 0; } - if (MinecraftServer.getServer().getConfigurationManager() == null) { + if (mcServer.getConfigurationManager() == null) { return 0; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java index 920d3831..d9c02955 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java @@ -5,7 +5,6 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraft.world.WorldProvider; @@ -13,6 +12,7 @@ import net.minecraftforge.common.DimensionManager; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -72,7 +72,7 @@ public class LavaCrystal extends EnergyItems { if (itemStack.getTagCompound() != null && !(itemStack.getTagCompound().getString("ownerName").equals(""))) { String ownerName = itemStack.getTagCompound().getString("ownerName"); - if (MinecraftServer.getServer() == null) { + if (FMLCommonHandler.instance().getMinecraftServerInstance() == null) { return false; }