apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite Continued #84

Merged
SenseiKiwi merged 11 commits from rewrite into DevBranch 2013-09-06 02:57:33 +00:00
Conversation 0 Commits 11 Files Changed 19 +7 -7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a82c7ce4c2 - Show all commits

12
StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
View File

@@ -28,9 +28,9 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemRiftBlade extends ItemSword 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); super(itemID, material);
@@ -38,10 +38,10 @@ public class ItemRiftBlade extends ItemSword
this.setMaxStackSize(1); this.setMaxStackSize(1);
this.setMaxDamage(500); this.setMaxDamage(500);
this.hasSubtypes = false; this.hasSubtypes = false;
if (properties == null) this.properties = properties;
properties = DDProperties.instance();
} }
@Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public boolean isFull3D() public boolean isFull3D()
{ {
@@ -272,9 +272,9 @@ public class ItemRiftBlade extends ItemSword
@Override @Override
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, 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); world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftDoor", 0.6f, 1);
return true; return true;

2
StevenDimDoors/mod_pocketDim/mod_pocketDim.java
View File

@@ -185,7 +185,7 @@ public class mod_pocketDim
itemRiftRemover = (new itemRiftRemover(properties.RiftRemoverItemID, Material.wood)).setUnlocalizedName("itemRiftRemover"); itemRiftRemover = (new itemRiftRemover(properties.RiftRemoverItemID, Material.wood)).setUnlocalizedName("itemRiftRemover");
itemStableFabric = (new ItemStableFabric(properties.StableFabricItemID, 0)).setUnlocalizedName("itemStableFabric"); itemStableFabric = (new ItemStableFabric(properties.StableFabricItemID, 0)).setUnlocalizedName("itemStableFabric");
itemChaosDoor = (new ItemUnstableDoor(properties.UnstableDoorItemID, Material.iron)).setUnlocalizedName("itemChaosDoor"); 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"); itemStabilizedLinkSignature = (new ItemStabilizedRiftSignature(properties.StabilizedRiftSignatureItemID)).setUnlocalizedName("itemStabilizedRiftSig");
mod_pocketDim.limboBiome= (new BiomeGenLimbo(properties.LimboBiomeID)); mod_pocketDim.limboBiome= (new BiomeGenLimbo(properties.LimboBiomeID));