diff --git a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java b/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java index 4de21ce..9fc3115 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java @@ -28,9 +28,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemRiftBlade extends ItemSword { - private static DDProperties properties = null; + private final DDProperties properties; - public ItemRiftBlade(int itemID, EnumToolMaterial material) + public ItemRiftBlade(int itemID, EnumToolMaterial material, DDProperties properties) { super(itemID, material); @@ -38,10 +38,10 @@ public class ItemRiftBlade extends ItemSword this.setMaxStackSize(1); this.setMaxDamage(500); this.hasSubtypes = false; - if (properties == null) - properties = DDProperties.instance(); + this.properties = properties; } + @Override @SideOnly(Side.CLIENT) public boolean isFull3D() { @@ -272,9 +272,9 @@ public class ItemRiftBlade extends ItemSword @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, - int z, int par7, float par8, float par9, float par10) + int z, int side, float hitX, float hitY, float hitZ) { - if (BaseItemDoor.tryItemUse(mod_pocketDim.transientDoor, stack, player, world, x, y, z, par7, true, false)) + if (BaseItemDoor.tryItemUse(mod_pocketDim.transientDoor, stack, player, world, x, y, z, side, true, false)) { world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftDoor", 0.6f, 1); return true; diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index 4ab5058..c395c11 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -185,7 +185,7 @@ public class mod_pocketDim itemRiftRemover = (new itemRiftRemover(properties.RiftRemoverItemID, Material.wood)).setUnlocalizedName("itemRiftRemover"); itemStableFabric = (new ItemStableFabric(properties.StableFabricItemID, 0)).setUnlocalizedName("itemStableFabric"); itemChaosDoor = (new ItemUnstableDoor(properties.UnstableDoorItemID, Material.iron)).setUnlocalizedName("itemChaosDoor"); - itemRiftBlade = (new ItemRiftBlade(properties.RiftBladeItemID, EnumToolMaterial.GOLD)).setUnlocalizedName("ItemRiftBlade"); + itemRiftBlade = (new ItemRiftBlade(properties.RiftBladeItemID, EnumToolMaterial.GOLD, properties)).setUnlocalizedName("ItemRiftBlade"); itemStabilizedLinkSignature = (new ItemStabilizedRiftSignature(properties.StabilizedRiftSignatureItemID)).setUnlocalizedName("itemStabilizedRiftSig"); mod_pocketDim.limboBiome= (new BiomeGenLimbo(properties.LimboBiomeID));