From 6dd1d6fc24500ea7a35773487c413a8965817cac Mon Sep 17 00:00:00 2001 From: Robijnvogel Date: Fri, 26 Jan 2018 01:26:55 +0100 Subject: [PATCH] Items and Crafting Recipes - Made Chaos Door crafting recipe cheaper (since it does not link) - Repaired Quartz Door crafting recipe (no ore dictionary, though) - Removed double Rift Blade recipe - Disabled craftability of the (creative) Rift Connection Tool - Rebalanced recipes' material costs of the Rift Remover, Rift Signature and Stable Rift Signature - Added alternate recipes for Woven World Thread Armour pieces - Weakened the Rift Blade (Diamond -> Iron) - Removed crafting-ingredient-only item-classes (World Thread and Stable Fabric --- .../org/dimdev/ddutils/schem/Schematic.java | 1 - .../dimdoors/shared/CraftingManager.java | 38 ++++++++++++------- .../dimdoors/shared/items/ItemRiftBlade.java | 2 +- .../shared/items/ItemStableFabric.java | 16 -------- .../shared/items/ItemWorldThread.java | 16 -------- .../dimdoors/shared/items/ModItems.java | 15 +++++--- 6 files changed, 34 insertions(+), 54 deletions(-) delete mode 100644 src/main/java/org/dimdev/dimdoors/shared/items/ItemStableFabric.java delete mode 100644 src/main/java/org/dimdev/dimdoors/shared/items/ItemWorldThread.java diff --git a/src/main/java/org/dimdev/ddutils/schem/Schematic.java b/src/main/java/org/dimdev/ddutils/schem/Schematic.java index 46d414e9..e7602771 100644 --- a/src/main/java/org/dimdev/ddutils/schem/Schematic.java +++ b/src/main/java/org/dimdev/ddutils/schem/Schematic.java @@ -1,6 +1,5 @@ package org.dimdev.ddutils.schem; -import com.google.common.collect.ImmutableList; import cubicchunks.world.ICubicWorld; import cubicchunks.world.cube.Cube; import net.minecraft.block.Block; diff --git a/src/main/java/org/dimdev/dimdoors/shared/CraftingManager.java b/src/main/java/org/dimdev/dimdoors/shared/CraftingManager.java index 1ef84d04..baeed313 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/CraftingManager.java +++ b/src/main/java/org/dimdev/dimdoors/shared/CraftingManager.java @@ -51,7 +51,7 @@ public final class CraftingManager { "yxy", 'x', ModItems.STABLE_FABRIC, 'y', Items.IRON_DOOR)); event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.CHAOS_DOOR, 1), - "yxy", 'x', Items.ENDER_EYE, 'y', ModItems.DIMENSIONAL_DOOR)); + "yxy", 'x', Items.ENDER_EYE, 'y', Items.IRON_DOOR)); event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.WARP_DIMENSIONAL_DOOR, 1), "yxy", 'x', Items.ENDER_PEARL, 'y', Items.OAK_DOOR)); @@ -66,34 +66,32 @@ public final class CraftingManager { "yy", "yy", "yy", 'y', Items.GOLD_INGOT)); event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.PERSONAL_DIMENSIONAL_DOOR, 1), - "yxy", 'y', ModItems.QUARTZ_DOOR, 'x', ModItems.STABLE_FABRIC)); + "yxy", 'x', ModItems.STABLE_FABRIC, 'y', ModItems.QUARTZ_DOOR)); - event.getRegistry().register(makeShapedOreRecipe(new ItemStack(ModItems.QUARTZ_DOOR, 1), - "yy", "yy", "yy", 'y', "quartz")); + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.QUARTZ_DOOR, 1), + "yy", "yy", "yy", 'y', Items.QUARTZ)); event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_BLADE), "y", "y", "x", 'y', ModItems.STABLE_FABRIC, 'x', Items.IRON_SWORD)); - event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_BLADE), - "y", "y", "x", 'y', ModItems.STABLE_FABRIC, 'x', Items.IRON_SWORD)); - - event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_CONNECTION_TOOL), - " w ", "xyx", "xzx", 'z', Items.DIAMOND_SHOVEL, 'y', ModItems.STABLE_FABRIC, 'x', ModItems.WORLD_THREAD, 'w', Items.DIAMOND)); + //should not be craftable + /*event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_CONNECTION_TOOL), + " w ", "xyx", "xzx", 'z', Items.DIAMOND_SHOVEL, 'y', ModItems.STABLE_FABRIC, 'x', ModItems.WORLD_THREAD, 'w', Items.DIAMOND));*/ event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_REMOVER), - " x ", "xyx", " x ", 'x', Items.GOLD_INGOT, 'y', Items.ENDER_PEARL)); // TODO: this uses to be 8 ingots in Steven's mod + "xxx", "xyx", "xxx", 'x', Items.GOLD_INGOT, 'y', Items.ENDER_PEARL)); event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_REMOVER), - "xxx", "xyx", "xxx", 'x', Items.GOLD_INGOT, 'y', ModItems.STABLE_FABRIC)); + " x ", "xyx", " x ", 'x', Items.GOLD_INGOT, 'y', ModItems.STABLE_FABRIC)); event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_SIGNATURE), - " x ", "xyx", " x ", 'x', Items.IRON_INGOT, 'y', Items.ENDER_PEARL)); + "xxx", "xyx", "xxx", 'x', Items.IRON_INGOT, 'y', Items.ENDER_PEARL)); event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.RIFT_SIGNATURE), - " x ", "xyx", "xxx", 'x', Items.IRON_INGOT, 'y', ModItems.STABLE_FABRIC)); + " x ", "xyx", " x ", 'x', Items.IRON_INGOT, 'y', ModItems.STABLE_FABRIC)); event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.STABILIZED_RIFT_SIGNATURE), - " x ", "xyx", "xxx", 'x', ModItems.STABLE_FABRIC, 'y', ModItems.RIFT_SIGNATURE)); + " x ", "xyx", " x ", 'x', ModItems.STABLE_FABRIC, 'y', ModItems.RIFT_SIGNATURE)); event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.HELMET_WOVEN_WORLD_THREAD), "xxx", "x x", 'x', ModItems.WORLD_THREAD)); @@ -106,5 +104,17 @@ public final class CraftingManager { event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.BOOTS_WOVEN_WORLD_THREAD), "x x", "x x", 'x', ModItems.WORLD_THREAD)); + + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.HELMET_WOVEN_WORLD_THREAD), + "xyx", "x x", 'x', ModItems.WORLD_THREAD, 'y', Items.LEATHER_HELMET)); + + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.CHESTPLATE_WOVEN_WORLD_THREAD), + "x x", "xyx", "x x", 'x', ModItems.WORLD_THREAD, 'y', Items.LEATHER_CHESTPLATE)); + + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.LEGGINGS_WOVEN_WORLD_THREAD), + "xyx", "x x", "x x", 'x', ModItems.WORLD_THREAD, 'y', Items.LEATHER_LEGGINGS)); + + event.getRegistry().register(makeShapedRecipe(new ItemStack(ModItems.BOOTS_WOVEN_WORLD_THREAD), + " y ", "x x", 'x', ModItems.WORLD_THREAD, 'y', Items.LEATHER_BOOTS)); } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java index 0e01c64c..25a31dfe 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java @@ -29,7 +29,7 @@ public class ItemRiftBlade extends ItemSword { public static final String ID = "rift_blade"; public ItemRiftBlade() { - super(ToolMaterial.DIAMOND); + super(ToolMaterial.IRON); setCreativeTab(DimDoors.DIM_DOORS_CREATIVE_TAB); setUnlocalizedName(ID); setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemStableFabric.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemStableFabric.java deleted file mode 100644 index 14e413cb..00000000 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemStableFabric.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dimdev.dimdoors.shared.items; - -import org.dimdev.dimdoors.DimDoors; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; - -public class ItemStableFabric extends Item { - - public static final String ID = "stable_fabric"; - - public ItemStableFabric() { - setCreativeTab(DimDoors.DIM_DOORS_CREATIVE_TAB); - setUnlocalizedName(ID); - setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); - } -} diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemWorldThread.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemWorldThread.java deleted file mode 100644 index 88906066..00000000 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemWorldThread.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dimdev.dimdoors.shared.items; - -import org.dimdev.dimdoors.DimDoors; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; - -public class ItemWorldThread extends Item { - - public static final String ID = "world_thread"; - - public ItemWorldThread() { - setCreativeTab(DimDoors.DIM_DOORS_CREATIVE_TAB); - setUnlocalizedName(ID); - setRegistryName(new ResourceLocation(DimDoors.MODID, ID)); - } -} diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ModItems.java b/src/main/java/org/dimdev/dimdoors/shared/items/ModItems.java index 9c586048..88e20ef3 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ModItems.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ModItems.java @@ -4,6 +4,7 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemColored; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.dimdev.dimdoors.DimDoors; @@ -22,9 +23,11 @@ public final class ModItems { public static final ItemDimensionalDoorChaos CHAOS_DOOR = new ItemDimensionalDoorChaos(); public static final ItemDimensionalDoorWarp WARP_DIMENSIONAL_DOOR = new ItemDimensionalDoorWarp(); - // Fabric - public static final ItemWorldThread WORLD_THREAD = new ItemWorldThread(); - public static final ItemStableFabric STABLE_FABRIC = new ItemStableFabric(); + // Crafting ingredients + private static final String WORLD_THREAD_ID = "world_thread"; + private static final String STABLE_FABRIC_ID = "stable_fabric"; + public static final Item WORLD_THREAD = new Item().setUnlocalizedName(WORLD_THREAD_ID).setFull3D().setCreativeTab(DimDoors.DIM_DOORS_CREATIVE_TAB).setRegistryName(new ResourceLocation(DimDoors.MODID, WORLD_THREAD_ID)); + public static final Item STABLE_FABRIC = new Item().setUnlocalizedName(STABLE_FABRIC_ID).setFull3D().setCreativeTab(DimDoors.DIM_DOORS_CREATIVE_TAB).setRegistryName(new ResourceLocation(DimDoors.MODID, STABLE_FABRIC_ID)); // Tools public static final ItemRiftConfigurationTool RIFT_CONNECTION_TOOL = new ItemRiftConfigurationTool(); @@ -33,15 +36,15 @@ public final class ModItems { public static final ItemRiftSignature RIFT_SIGNATURE = new ItemRiftSignature(); public static final ItemStabilizedRiftSignature STABILIZED_RIFT_SIGNATURE = new ItemStabilizedRiftSignature(); - // Armors + // Armours public static final ItemWovenWorldThreadArmor HELMET_WOVEN_WORLD_THREAD = new ItemWovenWorldThreadArmor("helmet_woven_world_thread", 1, EntityEquipmentSlot.HEAD); public static final ItemWovenWorldThreadArmor CHESTPLATE_WOVEN_WORLD_THREAD = new ItemWovenWorldThreadArmor("chestplate_woven_world_thread", 1, EntityEquipmentSlot.CHEST); public static final ItemWovenWorldThreadArmor LEGGINGS_WOVEN_WORLD_THREAD = new ItemWovenWorldThreadArmor("leggings_woven_world_thread", 2, EntityEquipmentSlot.LEGS); public static final ItemWovenWorldThreadArmor BOOTS_WOVEN_WORLD_THREAD = new ItemWovenWorldThreadArmor("boots_woven_world_thread", 1, EntityEquipmentSlot.FEET); // ItemBlocks - public static final Item FABRIC = new ItemColored(ModBlocks.FABRIC, true).setSubtypeNames(new String[] {"white", "orange", "magenta", "lightBlue", "yellow", "lime", "pink", "gray", "silver", "cyan", "purple", "blue", "brown", "green", "red", "black"}).setRegistryName(ModBlocks.FABRIC.getRegistryName()); - public static final Item ANCIENT_FABRIC = new ItemColored(ModBlocks.ANCIENT_FABRIC, true).setSubtypeNames(new String[] {"white", "orange", "magenta", "lightBlue", "yellow", "lime", "pink", "gray", "silver", "cyan", "purple", "blue", "brown", "green", "red", "black"}).setRegistryName(ModBlocks.ANCIENT_FABRIC.getRegistryName()); + public static final Item FABRIC = new ItemColored(ModBlocks.FABRIC, true).setSubtypeNames(new String[]{"white", "orange", "magenta", "lightBlue", "yellow", "lime", "pink", "gray", "silver", "cyan", "purple", "blue", "brown", "green", "red", "black"}).setRegistryName(ModBlocks.FABRIC.getRegistryName()); + public static final Item ANCIENT_FABRIC = new ItemColored(ModBlocks.ANCIENT_FABRIC, true).setSubtypeNames(new String[]{"white", "orange", "magenta", "lightBlue", "yellow", "lime", "pink", "gray", "silver", "cyan", "purple", "blue", "brown", "green", "red", "black"}).setRegistryName(ModBlocks.ANCIENT_FABRIC.getRegistryName()); public static final Item UNRAVELLED_FABRIC = new ItemBlock(ModBlocks.UNRAVELLED_FABRIC).setRegistryName(ModBlocks.UNRAVELLED_FABRIC.getRegistryName()); public static final Item ETERNAL_FABRIC = new ItemBlock(ModBlocks.ETERNAL_FABRIC).setRegistryName(ModBlocks.ETERNAL_FABRIC.getRegistryName()); public static final Item RIFT = new ItemBlock(ModBlocks.RIFT).setRegistryName(ModBlocks.RIFT.getRegistryName());