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

Various Fixes #166

Merged
SenseiKiwi merged 19 commits from master into master 2014-06-26 23:17:34 +00:00
Conversation 0 Commits 19 Files Changed 22 +11 -11
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0029d9dac0 - Show all commits

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

@@ -48,22 +48,22 @@ public class CraftingManager
if (properties.CraftingWarpDoorAllowed) if (properties.CraftingWarpDoorAllowed)
{ {
GameRegistry.addRecipe(new ItemStack(mod_pocketDim.itemWarpDoor, 1), GameRegistry.addRecipe(new ItemStack(mod_pocketDim.itemWarpDoor, 1),
"yxy", 'x', mod_pocketDim.itemStableFabric, 'y', Item.doorWood); "yxy", 'x', Item.enderPearl, 'y', Item.doorWood);
} }
if (properties.CraftingTransTrapdoorAllowed) if (properties.CraftingTransTrapdoorAllowed)
{ {
GameRegistry.addRecipe(new ItemStack(mod_pocketDim.transTrapdoor, 1), GameRegistry.addRecipe(new ItemStack(mod_pocketDim.transTrapdoor, 1),
"y", "x", "y", 'x', mod_pocketDim.itemStableFabric, 'y', Block.trapdoor); "y", "x", "y", 'x', Item.enderPearl, 'y', Block.trapdoor);
} }
if (properties.CraftingRiftSignatureAllowed) if (properties.CraftingRiftSignatureAllowed)
{ {
GameRegistry.addRecipe(new ItemStack(mod_pocketDim.itemRiftSignature, 1), GameRegistry.addRecipe(new ItemStack(mod_pocketDim.itemRiftSignature, 1),
" y ", "yxy", " y ", 'x', mod_pocketDim.itemStableFabric, 'y', Item.ingotIron); " y ", "yxy", " y ", 'x', Item.enderPearl, 'y', Item.ingotIron);
} }
if (properties.CraftingRiftRemoverAllowed) if (properties.CraftingRiftRemoverAllowed)
{ {
GameRegistry.addRecipe(new ItemStack(mod_pocketDim.itemRiftRemover, 1), GameRegistry.addRecipe(new ItemStack(mod_pocketDim.itemRiftRemover, 1),
"yyy", "yxy", "yyy", 'x', mod_pocketDim.itemStableFabric, 'y', Item.ingotGold); "yyy", "yxy", "yyy", 'x', Item.enderPearl, 'y', Item.ingotGold);
} }
if (properties.CraftingRiftBladeAllowed) if (properties.CraftingRiftBladeAllowed)
{ {
@@ -72,12 +72,12 @@ public class CraftingManager
} }
if (properties.CraftingStabilizedRiftSignatureAllowed) if (properties.CraftingStabilizedRiftSignatureAllowed)
{ {
GameRegistry.addRecipe(new ItemStack(mod_pocketDim.itemStabilizedLinkSignature,1), GameRegistry.addRecipe(new ItemStack(mod_pocketDim.itemStabilizedLinkSignature, 1),
" y ", "yxy", " y ", 'x', mod_pocketDim.itemRiftSignature, 'y', mod_pocketDim.itemStableFabric); " y ", "yxy", " y ", 'x', mod_pocketDim.itemStableFabric, 'y', Item.ingotIron);
} }
if (properties.CraftingGoldenDimensionalDoorAllowed) if (properties.CraftingGoldenDimensionalDoorAllowed)
{ {
GameRegistry.addRecipe(new ItemStack(mod_pocketDim.itemGoldenDimensionalDoor,1), GameRegistry.addRecipe(new ItemStack(mod_pocketDim.itemGoldenDimensionalDoor, 1),
"yxy", 'x', mod_pocketDim.itemStableFabric, 'y', mod_pocketDim.itemGoldenDoor); "yxy", 'x', mod_pocketDim.itemStableFabric, 'y', mod_pocketDim.itemGoldenDoor);
} }
if (properties.CraftingGoldenDoorAllowed) if (properties.CraftingGoldenDoorAllowed)

8
src/main/java/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
View File

@@ -54,10 +54,10 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature
if (source != null) if (source != null)
{ {
// Yes, it's initialized. Check if the player is in creative // Yes, it's initialized. Check if the player is in creative
// or if the player can pay with Stable Fabric to create a rift. // or if the player can pay with an Ender Pearl to create a rift.
if (!player.capabilities.isCreativeMode && !player.inventory.hasItem(mod_pocketDim.itemStableFabric.itemID)) if (!player.capabilities.isCreativeMode && !player.inventory.hasItem(Item.enderPearl.itemID))
{ {
mod_pocketDim.sendChat(player, "You don't have any Stable Fabric!"); mod_pocketDim.sendChat(player, "You don't have any Ender Pearls!");
// I won't do this, but this is the chance to localize chat // I won't do this, but this is the chance to localize chat
// messages sent to the player; look at ChatMessageComponent // messages sent to the player; look at ChatMessageComponent
// and how MFR does it with items like the safari net launcher // and how MFR does it with items like the safari net launcher
@@ -88,7 +88,7 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature
if (!player.capabilities.isCreativeMode) if (!player.capabilities.isCreativeMode)
{ {
player.inventory.consumeInventoryItem(mod_pocketDim.itemStableFabric.itemID); player.inventory.consumeInventoryItem(Item.enderPearl.itemID);
} }
mod_pocketDim.sendChat(player,"Rift Created"); mod_pocketDim.sendChat(player,"Rift Created");
world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftEnd", 0.6f, 1); world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftEnd", 0.6f, 1);