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

Various Updates #128

Merged
SenseiKiwi merged 10 commits from master into master 2014-01-20 06:32:34 +00:00
Conversation 0 Commits 10 Files Changed 15 +5 -5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 30a9dcf2c7 - Show all commits

2
src/main/java/StevenDimDoors/mod_pocketDim/CraftingManager.java
View File

@@ -59,7 +59,7 @@ public class CraftingManager
{ {
GameRegistry.addRecipe(new ItemStack(itemRiftBlade, 1), new Object[] GameRegistry.addRecipe(new ItemStack(itemRiftBlade, 1), new Object[]
{ {
" x ", " x ", " y ", 'x', mod_pocketDim.itemStableFabric, 'y', mod_pocketDim.itemRiftRemover " x ", " x ", " y ", 'x', mod_pocketDim.itemStableFabric, 'y', Item.blazeRod
}); });
} }

6
src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
View File

@@ -31,9 +31,9 @@ public class ItemRiftBlade extends ItemSword
{ {
private final DDProperties properties; private final DDProperties properties;
public ItemRiftBlade(int itemID, EnumToolMaterial material, DDProperties properties) public ItemRiftBlade(int itemID, DDProperties properties)
{ {
super(itemID, material); super(itemID, EnumToolMaterial.EMERALD);
this.setCreativeTab(mod_pocketDim.dimDoorsCreativeTab); this.setCreativeTab(mod_pocketDim.dimDoorsCreativeTab);
this.setMaxStackSize(1); this.setMaxStackSize(1);
@@ -211,7 +211,7 @@ public class ItemRiftBlade extends ItemSword
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
{ {
//Don't include a call to super.getIsRepairable()! //Don't include a call to super.getIsRepairable()!
//That would cause this sword to accept gold as a repair material (since we set material = Gold). //That would cause this sword to accept diamonds as a repair material (since we set material = Diamond).
return mod_pocketDim.itemStableFabric.itemID == par2ItemStack.itemID ? true : false; return mod_pocketDim.itemStableFabric.itemID == par2ItemStack.itemID ? true : false;
} }

2
src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
View File

@@ -212,7 +212,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");
itemUnstableDoor = (new ItemUnstableDoor(properties.UnstableDoorItemID, Material.iron)).setUnlocalizedName("itemChaosDoor"); itemUnstableDoor = (new ItemUnstableDoor(properties.UnstableDoorItemID, Material.iron)).setUnlocalizedName("itemChaosDoor");
itemRiftBlade = (new ItemRiftBlade(properties.RiftBladeItemID, EnumToolMaterial.GOLD, properties)).setUnlocalizedName("ItemRiftBlade"); itemRiftBlade = (new ItemRiftBlade(properties.RiftBladeItemID, properties)).setUnlocalizedName("ItemRiftBlade");
itemStabilizedLinkSignature = (new ItemStabilizedRiftSignature(properties.StabilizedRiftSignatureItemID)).setUnlocalizedName("itemStabilizedRiftSig"); itemStabilizedLinkSignature = (new ItemStabilizedRiftSignature(properties.StabilizedRiftSignatureItemID)).setUnlocalizedName("itemStabilizedRiftSig");
itemWorldThread = (new ItemWorldThread(properties.WorldThreadItemID)).setUnlocalizedName("itemWorldThread"); itemWorldThread = (new ItemWorldThread(properties.WorldThreadItemID)).setUnlocalizedName("itemWorldThread");