From 3fb708d2be0a981da85726d3ff233a9b0f96db29 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 13 Feb 2018 16:57:21 -0800 Subject: [PATCH] Fixed crafting order of decor bricks so polished is no longer a lonely boi (#1221) --- .../item/block/base/ItemBlockEnum.java | 2 +- .../demon_brick_1_brick1_corrosive.json | 2 +- .../demon_brick_1_brick1_destructive.json | 2 +- .../demon_decor/demon_brick_1_brick1_raw.json | 2 +- .../demon_brick_1_brick1_steadfast.json | 2 +- .../demon_brick_1_brick1_vengeful.json | 2 +- .../demon_extras_polished_stone_corrosive.json | 18 ++++++++++++++++++ ...emon_extras_polished_stone_destructive.json | 18 ++++++++++++++++++ .../demon_extras_polished_stone_raw.json | 18 ++++++++++++++++++ .../demon_extras_polished_stone_steadfast.json | 18 ++++++++++++++++++ .../demon_extras_polished_stone_vengeful.json | 18 ++++++++++++++++++ 11 files changed, 96 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_corrosive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_destructive.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_raw.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_steadfast.json create mode 100644 src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_vengeful.json diff --git a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java index a241c1c9..25f7375d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java @@ -23,7 +23,7 @@ public class ItemBlockEnum & IStringSerializable> extends Item @Override public String getUnlocalizedName(ItemStack stack) { - return getBlock().getUnlocalizedName() + getBlock().getTypes()[MathHelper.clamp(stack.getItemDamage(), 0, 15)].getName(); + return getBlock().getUnlocalizedName() + getBlock().getTypes()[MathHelper.clamp(stack.getItemDamage(), 0, getBlock().getTypes().length - 1)].getName(); } @Override diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json index 021815ad..90d39443 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_corrosive.json @@ -12,7 +12,7 @@ "key": { "s": { "item": "bloodmagic:demon_extras", - "data": 1 + "data": 6 } } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json index ce28a636..31546399 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_destructive.json @@ -12,7 +12,7 @@ "key": { "s": { "item": "bloodmagic:demon_extras", - "data": 2 + "data": 7 } } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json index 60a2b525..e226f9a7 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_raw.json @@ -12,7 +12,7 @@ "key": { "s": { "item": "bloodmagic:demon_extras", - "data": 0 + "data": 5 } } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json index 7aff9cee..18f5ad91 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_steadfast.json @@ -12,7 +12,7 @@ "key": { "s": { "item": "bloodmagic:demon_extras", - "data": 4 + "data": 9 } } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json index 4904ae75..8fa984f8 100644 --- a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_brick_1_brick1_vengeful.json @@ -12,7 +12,7 @@ "key": { "s": { "item": "bloodmagic:demon_extras", - "data": 3 + "data": 8 } } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_corrosive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_corrosive.json new file mode 100644 index 00000000..a66bd811 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_corrosive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 6, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 1 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_destructive.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_destructive.json new file mode 100644 index 00000000..5df3b1d9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_destructive.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 7, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 2 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_raw.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_raw.json new file mode 100644 index 00000000..49240f26 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_raw.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 5, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_steadfast.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_steadfast.json new file mode 100644 index 00000000..73845172 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_steadfast.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 9, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 4 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_vengeful.json b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_vengeful.json new file mode 100644 index 00000000..6c4cd7c5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/demon_decor/demon_extras_polished_stone_vengeful.json @@ -0,0 +1,18 @@ +{ + "result": { + "item": "bloodmagic:demon_extras", + "data": 8, + "count": 4 + }, + "pattern": [ + "ss", + "ss" + ], + "type": "minecraft:crafting_shaped", + "key": { + "s": { + "item": "bloodmagic:demon_extras", + "data": 3 + } + } +} \ No newline at end of file