aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-01-31 18:08:14 +0100
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-01-31 18:08:14 +0100
commit2d3981ea0fe5c1d38e2f431e45860bb8c530eb90 (patch)
treefc28b1fb39a089cd995b6a4cbf3946f3aef90496 /src/main
parent568783052da2bdf04f99bdfce31463e4bf943068 (diff)
downloadGT5-Unofficial-2d3981ea0fe5c1d38e2f431e45860bb8c530eb90.tar.gz
GT5-Unofficial-2d3981ea0fe5c1d38e2f431e45860bb8c530eb90.tar.bz2
GT5-Unofficial-2d3981ea0fe5c1d38e2f431e45860bb8c530eb90.zip
+quickfix for servers
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 725142b695afbf12293813449a26d1e45d45813f
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java3
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java7
2 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java
index 4b10f1dc9a..893afa625f 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java
@@ -23,6 +23,7 @@
package com.github.bartimaeusnek.bartworks.common.blocks;
import com.github.bartimaeusnek.bartworks.client.renderer.RendererGlasBlock;
+import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
@@ -180,7 +181,7 @@ public class BW_GlasBlocks extends BW_Blocks {
@Override
public int getRenderType() {
- if (!fake)
+ if (!fake && FMLCommonHandler.instance().getSide().isClient())
return RendererGlasBlock.RID;
else
return 0;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java
index 1f41d225a9..879578d24d 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java
@@ -29,6 +29,7 @@ import com.github.bartimaeusnek.bartworks.common.tileentities.classic.BWTileEnti
import com.github.bartimaeusnek.bartworks.util.BW_Util;
import com.github.bartimaeusnek.bartworks.util.BioCulture;
import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.objects.GT_Fluid;
import ic2.core.item.ItemFluidCell;
@@ -81,7 +82,9 @@ public class FluidLoader implements Runnable {
bioFluidBlock = new BioFluidBlock();
GameRegistry.registerBlock(bioFluidBlock, "coloredFluidBlock");
GameRegistry.registerTileEntity(BWTileEntityDimIDBridge.class, "bwTEDimIDBridge");
- RenderingRegistry.registerBlockHandler(RendererSwitchingColorFluid.instance);
- RenderingRegistry.registerBlockHandler(RendererGlasBlock.instance);
+ if (FMLCommonHandler.instance().getSide().isClient()) {
+ RenderingRegistry.registerBlockHandler(RendererSwitchingColorFluid.instance);
+ RenderingRegistry.registerBlockHandler(RendererGlasBlock.instance);
+ }
}
}