From 80417b99e10a462fd72b8f8fcd3b226c862534e4 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Fri, 1 May 2015 21:37:34 +0100 Subject: - Fixed villages crashing on a server - Fixed item duplication glitch --- .../java/darkknight/jewelrycraft/util/JewelrycraftUtil.java | 11 +++++------ src/main/java/darkknight/jewelrycraft/util/Variables.java | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/util') diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java index a9d0a13..430673c 100644 --- a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java +++ b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java @@ -5,19 +5,18 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Random; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameData; +import cpw.mods.fml.relauncher.Side; import darkknight.jewelrycraft.JewelrycraftMod; -import darkknight.jewelrycraft.events.EntityEventHandler; import darkknight.jewelrycraft.item.ItemList; -import darkknight.jewelrycraft.network.PacketRequestPlayerInfo; public class JewelrycraftUtil { @@ -52,10 +51,10 @@ public class JewelrycraftUtil jewelry.add(new ItemStack(ItemList.bracelet)); jewelry.add(new ItemStack(ItemList.earrings)); for(Object item: GameData.getItemRegistry()){ - if (Loader.isModLoaded("Mantle") && ((Item)item).getUnlocalizedName().equals("Mantle:item.mantle.manual")) continue; + if (Loader.isModLoaded("Mantle") && ((Item)item).getUnlocalizedName().equals("Mantle:item.mantle.manual")) continue; try{ - if (item != null && (Item)item != null && ((Item)item).getHasSubtypes()){ - ((Item)item).getSubItems((Item)item, ((Item)item).getCreativeTab(), items); + if (item != null && (Item)item != null && ((Item)item).getHasSubtypes() && FMLCommonHandler.instance().getSide() == Side.CLIENT){ + ((Item)item).getSubItems((Item)item, null, items); }else objects.add(new ItemStack((Item)item)); if (!items.isEmpty()) objects.addAll(items); items.removeAll(items); diff --git a/src/main/java/darkknight/jewelrycraft/util/Variables.java b/src/main/java/darkknight/jewelrycraft/util/Variables.java index a019409..ca00e13 100644 --- a/src/main/java/darkknight/jewelrycraft/util/Variables.java +++ b/src/main/java/darkknight/jewelrycraft/util/Variables.java @@ -6,7 +6,7 @@ public class Variables { public static final String MODID = "jewelrycraft2"; public static final String MODNAME = "Jewelrycraft 2"; - public static final String VERSION = "1.0.6"; + public static final String VERSION = "1.0.7"; public static final String PACKET_CHANNEL = "jewelrycraft2"; public static final String CONFIG_GUI = "darkknight.jewelrycraft.config.ConfigGuiFactory"; -- cgit v1.2.3