From 7f3fabcb967ed663d4f8d59fc20607736b48c24a Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 23 Feb 2015 00:26:42 -0500 Subject: [PATCH] Remove extra PlayerSpecials registration that crashes servers --- .../java/com/cricketcraft/chisel/Chisel.java | 4 ---- .../chisel/client/player/PlayerSpecials.java | 16 ++++++++-------- .../cricketcraft/chisel/init/ChiselBlocks.java | 1 + 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 2f2465ba..0f421eb0 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.cricketcraft.chisel.block.BlockCarvable; -import com.cricketcraft.chisel.client.player.PlayerSpecials; import com.cricketcraft.chisel.compat.Compatibility; import com.cricketcraft.chisel.compat.IMCHandler; import com.cricketcraft.chisel.config.Configurations; @@ -141,9 +140,6 @@ public class Chisel { MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance().bus().register(instance); - FMLCommonHandler.instance().bus().register(new PlayerSpecials()); - - FMLInterModComms.sendMessage("Waila", "register", "com.cricketcraft.chisel.compat.WailaCompat.register"); } diff --git a/src/main/java/com/cricketcraft/chisel/client/player/PlayerSpecials.java b/src/main/java/com/cricketcraft/chisel/client/player/PlayerSpecials.java index a5749cb2..1d95fbb0 100644 --- a/src/main/java/com/cricketcraft/chisel/client/player/PlayerSpecials.java +++ b/src/main/java/com/cricketcraft/chisel/client/player/PlayerSpecials.java @@ -1,10 +1,8 @@ package com.cricketcraft.chisel.client.player; -import com.cricketcraft.chisel.init.ChiselItems; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; @@ -16,12 +14,14 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.RenderLivingEvent; import net.minecraftforge.client.event.RenderPlayerEvent; + import org.lwjgl.opengl.GL11; -import java.util.ArrayList; -import java.util.List; +import com.cricketcraft.chisel.init.ChiselItems; + +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; -@SideOnly(Side.CLIENT) public class PlayerSpecials { private List names = new ArrayList(); diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 808de56b..10b8b3cd 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -40,6 +40,7 @@ public final class ChiselBlocks { public static final BlockCarvablePackedIce packedice = null; public static final BlockCarvablePackedIcePillar packedice_pillar = null; public static final BlockCarvable obsidian = null; + public static final BlockCarvable obsidian2 = null; public static final BlockCarvablePowered redstone_block = null; public static final BlockHolystone holystone = null; public static final BlockGrimstone grimstone = null;