Fixed server crash

Added all sieve rendering methods to @SideOnly(Side.Client) Added if(event.getSide() == Side.Client) to defaultgregilomodule to prevent guice from adding sieverenderingpackage to server via dependency injection
Quantum64 · May 4, 2019 · 12453ff · 12453ff
1 parent b57e952
commit 12453ff
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 9 deletions.
diff --git a/src/main/java/co/q64/exgregilo/DefaultGregiloModule.java b/src/main/java/co/q64/exgregilo/DefaultGregiloModule.java
@@ -72,6 +72,7 @@
 import cpw.mods.fml.common.ModMetadata;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class DefaultGregiloModule extends ExGregiloModule {
 	private ExGregilo mod;
@@ -113,11 +114,15 @@ protected void configure() {
 		blocks.addBinding().to(HeavySieveContainer.class);
 		blocks.addBinding().to(GregCrucibleContainer.class);
 
+
+
 		Multibinder<SieveRenderPackage> sieveRenderPacks = Multibinder.newSetBinder(binder(), SieveRenderPackage.class);
+		 if(event.getSide()==Side.CLIENT) {
 		sieveRenderPacks.addBinding().to(BasicSieveRenderPackage.class);
 		sieveRenderPacks.addBinding().to(AdvancedSieveRenderPackage.class);
 		sieveRenderPacks.addBinding().to(HeavySieveRenderPackage.class);
-
+		 }
+
 		Multibinder<InitLoader> loaders = Multibinder.newSetBinder(binder(), InitLoader.class);
 		loaders.addBinding().to(CompressedLoader.class);
 

diff --git a/src/main/java/co/q64/exgregilo/block/AbstractCompressed.java b/src/main/java/co/q64/exgregilo/block/AbstractCompressed.java
@@ -16,6 +16,8 @@
 import co.q64.exgregilo.api.binders.ModDataBinders.CompressedTex;
 import co.q64.exgregilo.api.binders.ModDataBinders.DomainPath;
 import co.q64.exgregilo.api.binders.ModDataBinders.ModId;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 @Singleton
 public abstract class AbstractCompressed extends Block {
@@ -45,6 +47,7 @@ public int damageDropped(int meta) {
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister reg) {
 		for (int i = 0; i < 8; i++) {
 			this.icons[i] = reg.registerIcon(domain + tex + "_" + typeName.toLowerCase() + "_" + (i + 1) + "x");

diff --git a/src/main/java/co/q64/exgregilo/block/AbstractSieve.java b/src/main/java/co/q64/exgregilo/block/AbstractSieve.java
@@ -19,7 +19,8 @@
 import co.q64.exgregilo.tile.AbstractSieveTile;
 import co.q64.exgregilo.tile.AbstractSieveTile.SieveMode;
 import co.q64.exgregilo.util.SieveRegistry;
-
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 @Singleton
 public abstract class AbstractSieve extends BlockContainer {
 	private @Inject GregTech gt;
@@ -32,6 +33,7 @@ public AbstractSieve() {
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister register) {
 		blockIcon = Blocks.planks.getIcon(0, 0);
 	}

diff --git a/src/main/java/co/q64/exgregilo/block/AdvancedSieve.java b/src/main/java/co/q64/exgregilo/block/AdvancedSieve.java
@@ -3,7 +3,6 @@
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
-
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
@@ -15,6 +14,8 @@
 import co.q64.exgregilo.link.gregtech.tools.MetaGeneratedTools;
 import co.q64.exgregilo.tile.AdvancedSieveTile;
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 @Singleton
 public class AdvancedSieve extends AbstractSieve {
@@ -25,6 +26,7 @@ public class AdvancedSieve extends AbstractSieve {
 	private IIcon meshIcon;
 
 	@Inject
+
 	public AdvancedSieve(@ModId String modId, @AdvancedSieveBlockName String name) {
 		super();
 		setBlockName(modId + "." + name);
@@ -42,6 +44,7 @@ public TileEntity createNewTileEntity(World world, int meta) {
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister register) {
 		super.registerBlockIcons(register);
 		meshIcon = register.registerIcon(domainPath + mesh);

diff --git a/src/main/java/co/q64/exgregilo/block/BasicSieve.java b/src/main/java/co/q64/exgregilo/block/BasicSieve.java
@@ -15,6 +15,8 @@
 import co.q64.exgregilo.link.gregtech.tools.MetaGeneratedTools;
 import co.q64.exgregilo.tile.BasicSieveTile;
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 @Singleton
 public class BasicSieve extends AbstractSieve {
@@ -42,6 +44,7 @@ public TileEntity createNewTileEntity(World world, int meta) {
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister register) {
 		super.registerBlockIcons(register);
 		meshIcon = register.registerIcon(domainPath + mesh);

diff --git a/src/main/java/co/q64/exgregilo/block/HeavySieve.java b/src/main/java/co/q64/exgregilo/block/HeavySieve.java
@@ -23,6 +23,8 @@
 import co.q64.exgregilo.tile.HeavySieveTile;
 import co.q64.exgregilo.util.SieveRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 @Singleton
 public class HeavySieve extends AbstractSieve {
@@ -53,6 +55,7 @@ public TileEntity createNewTileEntity(World world, int meta) {
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister register) {
 		super.registerBlockIcons(register);
 		meshIcon = register.registerIcon(domainPath + mesh);

diff --git a/src/main/java/co/q64/exgregilo/link/exnihilo/block/GregCrucible.java b/src/main/java/co/q64/exgregilo/link/exnihilo/block/GregCrucible.java
@@ -19,6 +19,9 @@
 import cpw.mods.fml.common.registry.GameRegistry;
 import exnihilo.ENBlocks;
 import exnihilo.blocks.tileentities.TileEntityCrucible;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 
 @Singleton
 public class GregCrucible extends BlockContainer {
@@ -34,6 +37,7 @@ public GregCrucible(@ModId String modId, @GregCrucibleBlockName String name) {
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister register) {
 		blockIcon = Blocks.stone.getIcon(0, 0);
 	}

diff --git a/src/main/java/co/q64/exgregilo/link/gregtech/tools/AdvancedMesh.java b/src/main/java/co/q64/exgregilo/link/gregtech/tools/AdvancedMesh.java
@@ -35,11 +35,11 @@ public void addCrafting() {
 				"WWW", 
 				"WPW", 
 				"WWW", 
-				Character.valueOf('W'), OrePrefixes.wireGt01.get(material), 
+				Character.valueOf('W'), OrePrefixes.bolt.get(material), 
 				Character.valueOf('P'), OrePrefixes.plate.get(material)});
 				//formatter:on
 				if (added) {
-					GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, material, 8), GT_OreDictUnificator.get(OrePrefixes.plate, material, 1), result, 400, 2);
+					GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, material, 8), GT_OreDictUnificator.get(OrePrefixes.plate, material, 1), result, 400, 2);
 					if (useNEI) {
 						linkManager.getLink(NEI.class).addItemVariant(linkManager.getLink(GregTech.class).getTools(), result);
 					}

diff --git a/src/main/java/co/q64/exgregilo/render/AbstractSieveRender.java b/src/main/java/co/q64/exgregilo/render/AbstractSieveRender.java
@@ -8,13 +8,14 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
-
 import org.lwjgl.opengl.GL11;
-
 import co.q64.exgregilo.tile.AbstractSieveTile;
 import co.q64.exgregilo.tile.AbstractSieveTile.SieveMode;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 @Singleton
+@SideOnly(Side.CLIENT)
 public abstract class AbstractSieveRender extends TileEntitySpecialRenderer {
 	private @Inject SieveModel model;
 	private @Inject SieveMeshModel mesh;
@@ -27,6 +28,7 @@ public void renderTileEntityAt(TileEntity tileentity, double x, double y, double
 		renderContents(tileentity, x, y, z, f);
 	}
 
+
 	private void renderTable(TileEntity tileentity, double x, double y, double z, float f) {
 		GL11.glPushMatrix();
 		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);

diff --git a/src/main/java/co/q64/exgregilo/render/AdvancedSieveRender.java b/src/main/java/co/q64/exgregilo/render/AdvancedSieveRender.java
@@ -9,8 +9,11 @@
 import co.q64.exgregilo.api.binders.ModDataBinders.BlockTexPath;
 import co.q64.exgregilo.block.AdvancedSieve;
 import co.q64.exgregilo.data.ModData;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 @Singleton
+@SideOnly(Side.CLIENT)
 public class AdvancedSieveRender extends AbstractSieveRender {
 	private @Inject @AdvancedSieveTex String tex;
 	private @Inject @BlockTexPath String blockTexPath;

diff --git a/src/main/java/co/q64/exgregilo/render/BasicSieveRender.java b/src/main/java/co/q64/exgregilo/render/BasicSieveRender.java
@@ -9,8 +9,11 @@
 import co.q64.exgregilo.api.binders.ModDataBinders.BlockTexPath;
 import co.q64.exgregilo.block.BasicSieve;
 import co.q64.exgregilo.data.ModData;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 @Singleton
+@SideOnly(Side.CLIENT)
 public class BasicSieveRender extends AbstractSieveRender {
 	private @Inject @BasicSieveTex String tex;
 	private @Inject @BlockTexPath String blockTexPath;

diff --git a/src/main/java/co/q64/exgregilo/render/BasicSieveRenderPackage.java b/src/main/java/co/q64/exgregilo/render/BasicSieveRenderPackage.java
@@ -8,8 +8,8 @@
 import co.q64.exgregilo.block.BasicSieve;
 import co.q64.exgregilo.tile.AbstractSieveTile;
 import co.q64.exgregilo.tile.BasicSieveTile;
-
 @Singleton
+
 public class BasicSieveRenderPackage implements SieveRenderPackage {
 	private @Inject BasicSieve sieve;
 	private @Inject BasicSieveRender render;

diff --git a/src/main/java/co/q64/exgregilo/render/HeavySieveRender.java b/src/main/java/co/q64/exgregilo/render/HeavySieveRender.java
@@ -9,8 +9,11 @@
 import co.q64.exgregilo.api.binders.ModDataBinders.HeavySieveTex;
 import co.q64.exgregilo.block.HeavySieve;
 import co.q64.exgregilo.data.ModData;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 @Singleton
+@SideOnly(Side.CLIENT)
 public class HeavySieveRender extends AbstractSieveRender {
 	private @Inject @HeavySieveTex String tex;
 	private @Inject @BlockTexPath String blockTexPath;

diff --git a/src/main/java/co/q64/exgregilo/render/HeavySieveRenderPackage.java b/src/main/java/co/q64/exgregilo/render/HeavySieveRenderPackage.java
@@ -8,7 +8,6 @@
 import co.q64.exgregilo.block.HeavySieve;
 import co.q64.exgregilo.tile.AbstractSieveTile;
 import co.q64.exgregilo.tile.HeavySieveTile;
-
 @Singleton
 public class HeavySieveRenderPackage implements SieveRenderPackage {
 	private @Inject HeavySieve sieve;