diff --git a/build.gradle b/build.gradle index aac442b..475ce9c 100644 --- a/build.gradle +++ b/build.gradle @@ -54,6 +54,7 @@ dependencies { //implementation "com.eloraam.redpower:redpower:2.0pr10-dirty:deobf" implementation "com.github.tox1cozZ:mixin-booter-legacy:1.1.2" implementation "dev.tilera:auracore:1.9.0:deobf" + implementation "net.anvilcraft:jalec:0.1.2" implementation "net.industrial-craft:industrialcraft-2:2.2.660-experimental:dev" implementation "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:deobf" implementation "universalelectricity:universalelectricity:5.2.2:deobf" diff --git a/src/main/java/net/anvilcraft/thaummach/ClientProxy.java b/src/main/java/net/anvilcraft/thaummach/ClientProxy.java index 0b9f430..f6e7af1 100644 --- a/src/main/java/net/anvilcraft/thaummach/ClientProxy.java +++ b/src/main/java/net/anvilcraft/thaummach/ClientProxy.java @@ -4,6 +4,7 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; +import net.anvilcraft.alec.jalec.factories.AlecUnexpectedRuntimeErrorExceptionFactory; import net.anvilcraft.thaummach.entities.EntitySingularity; import net.anvilcraft.thaummach.gui.GuiArcaneFurnace; import net.anvilcraft.thaummach.gui.GuiBore; @@ -125,7 +126,9 @@ public class ClientProxy extends CommonProxy { return new GuiVoidInterface(player.inventory, (TileVoidInterface) te); default: - throw new IllegalArgumentException("ALEC"); + throw AlecUnexpectedRuntimeErrorExceptionFactory.PLAIN.createAlecException( + "invalid GUI ID" + ); } } } diff --git a/src/main/java/net/anvilcraft/thaummach/CommonProxy.java b/src/main/java/net/anvilcraft/thaummach/CommonProxy.java index 7e3e7c0..4afce98 100644 --- a/src/main/java/net/anvilcraft/thaummach/CommonProxy.java +++ b/src/main/java/net/anvilcraft/thaummach/CommonProxy.java @@ -2,6 +2,7 @@ package net.anvilcraft.thaummach; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; +import net.anvilcraft.alec.jalec.factories.AlecUnexpectedRuntimeErrorExceptionFactory; import net.anvilcraft.thaummach.container.ContainerArcaneFurnace; import net.anvilcraft.thaummach.container.ContainerBore; import net.anvilcraft.thaummach.container.ContainerCondenser; @@ -70,9 +71,7 @@ public class CommonProxy implements IGuiHandler { TileEntity te = world.getTileEntity(x, y, z); switch (GuiID.get(id)) { case ARCANE_FURNACE: - return new ContainerArcaneFurnace( - player.inventory, (TileArcaneFurnace) te - ); + return new ContainerArcaneFurnace(player.inventory, (TileArcaneFurnace) te); case BORE: return new ContainerBore(player.inventory, (TileBore) te); @@ -96,9 +95,7 @@ public class CommonProxy implements IGuiHandler { return new ContainerVoidChest(player.inventory, (TileVoidChest) te); case VOID_INTERFACE: - return new ContainerVoidInterface( - player.inventory, (TileVoidInterface) te - ); + return new ContainerVoidInterface(player.inventory, (TileVoidInterface) te); // GUIs with no meaningful container case GENERATOR: @@ -110,7 +107,7 @@ public class CommonProxy implements IGuiHandler { }; default: - throw new IllegalArgumentException("ALEC"); + throw AlecUnexpectedRuntimeErrorExceptionFactory.PLAIN.createAlecException(); } } diff --git a/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusFragile.java b/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusFragile.java index e285004..348e887 100644 --- a/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusFragile.java +++ b/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusFragile.java @@ -5,6 +5,7 @@ import java.util.Random; import dev.tilera.auracore.api.HelperLocation; import dev.tilera.auracore.client.FXSparkle; +import net.anvilcraft.alec.jalec.factories.AlecUnexpectedRuntimeErrorExceptionFactory; import net.anvilcraft.thaummach.render.BlockApparatusRenderer; import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer; import net.anvilcraft.thaummach.render.apparatus.apparati.fragile.ConduitApparatusRenderer; @@ -124,7 +125,7 @@ public class BlockApparatusFragile extends BlockApparatus { return ConduitPumpApparatusRenderer.INSTANCE; default: - throw new IllegalArgumentException("ALEC"); + throw AlecUnexpectedRuntimeErrorExceptionFactory.PLAIN.createAlecException(); } } diff --git a/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusMetal.java b/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusMetal.java index 50831a8..c7b7bf6 100644 --- a/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusMetal.java +++ b/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusMetal.java @@ -5,6 +5,7 @@ import java.util.Random; import java.util.stream.IntStream; import dev.tilera.auracore.client.FXSparkle; +import net.anvilcraft.alec.jalec.factories.AlecUnexpectedRuntimeErrorExceptionFactory; import net.anvilcraft.thaummach.render.BlockApparatusRenderer; import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer; import net.anvilcraft.thaummach.render.apparatus.apparati.metal.ArcaneFurnaceApparatusRenderer; @@ -187,7 +188,7 @@ public class BlockApparatusMetal extends BlockApparatus { return TankApparatusRenderer.INSTANCE; default: - throw new IllegalArgumentException("ALEC"); + throw AlecUnexpectedRuntimeErrorExceptionFactory.PLAIN.createAlecException(); } } diff --git a/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusWood.java b/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusWood.java index 61a44f2..5d5a97c 100644 --- a/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusWood.java +++ b/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusWood.java @@ -7,6 +7,7 @@ import java.util.stream.IntStream; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.anvilcraft.alec.jalec.factories.AlecUnexpectedRuntimeErrorExceptionFactory; import net.anvilcraft.thaummach.particles.FXWisp; import net.anvilcraft.thaummach.render.BlockApparatusRenderer; import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer; @@ -104,8 +105,7 @@ public class BlockApparatusWood extends BlockApparatus { return DuplicatorApparatusRenderer.INSTANCE; default: - //throw new IllegalArgumentException("ALEC"); - return null; + throw AlecUnexpectedRuntimeErrorExceptionFactory.PLAIN.createAlecException(); } }