From d9a60fc7f20994e84a80c82d5921af535d52b356 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Fri, 20 Nov 2020 15:51:35 +0300 Subject: [PATCH] Item model patterns --- .../java/ru/betterend/blocks/basis/BlockDoor.java | 2 +- .../java/ru/betterend/blocks/basis/BlockSign.java | 3 +-- src/main/java/ru/betterend/item/EndAxe.java | 9 ++++++++- src/main/java/ru/betterend/item/EndHammer.java | 9 ++++++++- src/main/java/ru/betterend/item/EndHoe.java | 9 ++++++++- src/main/java/ru/betterend/item/EndPickaxe.java | 9 ++++++++- src/main/java/ru/betterend/patterns/Patterns.java | 3 ++- .../assets/betterend/models/item/aeternium_axe.json | 6 ------ .../assets/betterend/models/item/aeternium_hoe.json | 6 ------ .../betterend/models/item/aeternium_pickaxe.json | 6 ------ .../assets/betterend/models/item/terminite_axe.json | 6 ------ .../assets/betterend/models/item/terminite_hoe.json | 6 ------ .../betterend/models/item/terminite_pickaxe.json | 6 ------ ...pattern_item.json => pattern_item_generated.json} | 12 ++++++------ .../patterns/item/pattern_item_handheld.json | 6 ++++++ 15 files changed, 48 insertions(+), 50 deletions(-) delete mode 100644 src/main/resources/assets/betterend/models/item/aeternium_axe.json delete mode 100644 src/main/resources/assets/betterend/models/item/aeternium_hoe.json delete mode 100644 src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json delete mode 100644 src/main/resources/assets/betterend/models/item/terminite_axe.json delete mode 100644 src/main/resources/assets/betterend/models/item/terminite_hoe.json delete mode 100644 src/main/resources/assets/betterend/models/item/terminite_pickaxe.json rename src/main/resources/assets/betterend/patterns/item/{pattern_item.json => pattern_item_generated.json} (53%) create mode 100644 src/main/resources/assets/betterend/patterns/item/pattern_item_handheld.json diff --git a/src/main/java/ru/betterend/blocks/basis/BlockDoor.java b/src/main/java/ru/betterend/blocks/basis/BlockDoor.java index 1d63ef8b..f41ae172 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockDoor.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockDoor.java @@ -46,7 +46,7 @@ public class BlockDoor extends DoorBlock implements IRenderTypeable, BlockPatter public String getModelPattern(String block) { String blockId = Registry.BLOCK.getId(this).getPath(); if (block.contains("item")) { - return Patterns.createJson(Patterns.ITEM_MODEL, blockId); + return Patterns.createJson(Patterns.ITEM_GENERATED, block); } if (block.contains("top_hinge")) { return Patterns.createJson(Patterns.BLOCK_DOOR_TOP_HINGE, blockId, blockId); diff --git a/src/main/java/ru/betterend/blocks/basis/BlockSign.java b/src/main/java/ru/betterend/blocks/basis/BlockSign.java index 76184de7..659b94ac 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockSign.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockSign.java @@ -160,10 +160,9 @@ public class BlockSign extends AbstractSignBlock implements BlockPatterned { @Override public String getModelPattern(String path) { - Identifier blockId = Registry.BLOCK.getId(this); Identifier parentId = Registry.BLOCK.getId(parent); if (path.contains("item")) { - return Patterns.createJson(Patterns.ITEM_MODEL, blockId.getPath()); + return Patterns.createJson(Patterns.ITEM_GENERATED, path); } return Patterns.createJson(Patterns.BLOCK_EMPTY, parentId.getPath()); } diff --git a/src/main/java/ru/betterend/item/EndAxe.java b/src/main/java/ru/betterend/item/EndAxe.java index cfc36b61..7667dadd 100644 --- a/src/main/java/ru/betterend/item/EndAxe.java +++ b/src/main/java/ru/betterend/item/EndAxe.java @@ -9,8 +9,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ToolMaterial; import net.minecraft.tag.Tag; +import ru.betterend.patterns.Patterned; +import ru.betterend.patterns.Patterns; -public class EndAxe extends AxeItem implements DynamicAttributeTool { +public class EndAxe extends AxeItem implements DynamicAttributeTool, Patterned { public EndAxe(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { super(material, attackDamage, attackSpeed, settings); @@ -23,4 +25,9 @@ public class EndAxe extends AxeItem implements DynamicAttributeTool { } return 0; } + + @Override + public String getModelPattern(String name) { + return Patterns.createJson(Patterns.ITEM_HANDHELD, name); + } } diff --git a/src/main/java/ru/betterend/item/EndHammer.java b/src/main/java/ru/betterend/item/EndHammer.java index 077ff219..ff92a6bd 100644 --- a/src/main/java/ru/betterend/item/EndHammer.java +++ b/src/main/java/ru/betterend/item/EndHammer.java @@ -26,9 +26,11 @@ import net.minecraft.tag.Tag; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import ru.betterend.patterns.Patterned; +import ru.betterend.patterns.Patterns; import ru.betterend.registry.EndTags; -public class EndHammer extends MiningToolItem implements DynamicAttributeTool { +public class EndHammer extends MiningToolItem implements DynamicAttributeTool, Patterned { public final static UUID ATTACK_KNOCKBACK_MODIFIER_ID = MathHelper.randomUuid(ThreadLocalRandom.current()); @@ -132,4 +134,9 @@ public class EndHammer extends MiningToolItem implements DynamicAttributeTool { public Multimap getAttributeModifiers(EquipmentSlot slot) { return slot == EquipmentSlot.MAINHAND ? this.attributeModifiers : super.getAttributeModifiers(slot); } + + @Override + public String getModelPattern(String name) { + return Patterns.createJson(Patterns.ITEM_HANDHELD, name); + } } diff --git a/src/main/java/ru/betterend/item/EndHoe.java b/src/main/java/ru/betterend/item/EndHoe.java index 6497503f..c9a75032 100644 --- a/src/main/java/ru/betterend/item/EndHoe.java +++ b/src/main/java/ru/betterend/item/EndHoe.java @@ -2,10 +2,17 @@ package ru.betterend.item; import net.minecraft.item.HoeItem; import net.minecraft.item.ToolMaterial; +import ru.betterend.patterns.Patterned; +import ru.betterend.patterns.Patterns; -public class EndHoe extends HoeItem { +public class EndHoe extends HoeItem implements Patterned { public EndHoe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { super(material, attackDamage, attackSpeed, settings); } + + @Override + public String getModelPattern(String name) { + return Patterns.createJson(Patterns.ITEM_HANDHELD, name); + } } diff --git a/src/main/java/ru/betterend/item/EndPickaxe.java b/src/main/java/ru/betterend/item/EndPickaxe.java index 27cebcd7..750acb42 100644 --- a/src/main/java/ru/betterend/item/EndPickaxe.java +++ b/src/main/java/ru/betterend/item/EndPickaxe.java @@ -9,8 +9,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.PickaxeItem; import net.minecraft.item.ToolMaterial; import net.minecraft.tag.Tag; +import ru.betterend.patterns.Patterned; +import ru.betterend.patterns.Patterns; -public class EndPickaxe extends PickaxeItem implements DynamicAttributeTool { +public class EndPickaxe extends PickaxeItem implements DynamicAttributeTool, Patterned { public EndPickaxe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { super(material, attackDamage, attackSpeed, settings); @@ -23,4 +25,9 @@ public class EndPickaxe extends PickaxeItem implements DynamicAttributeTool { } return 0; } + + @Override + public String getModelPattern(String name) { + return Patterns.createJson(Patterns.ITEM_HANDHELD, name); + } } diff --git a/src/main/java/ru/betterend/patterns/Patterns.java b/src/main/java/ru/betterend/patterns/Patterns.java index e3f036d7..b4ce2357 100644 --- a/src/main/java/ru/betterend/patterns/Patterns.java +++ b/src/main/java/ru/betterend/patterns/Patterns.java @@ -81,7 +81,8 @@ public class Patterns { public final static Identifier ITEM_BUTTON = BetterEnd.makeID("patterns/item/pattern_button.json"); public final static Identifier ITEM_CHEST = BetterEnd.makeID("patterns/item/pattern_chest.json"); public final static Identifier ITEM_BLOCK = BetterEnd.makeID("patterns/item/pattern_block_item.json"); - public final static Identifier ITEM_MODEL = BetterEnd.makeID("patterns/item/pattern_item.json"); + public final static Identifier ITEM_GENERATED = BetterEnd.makeID("patterns/item/pattern_item_generated.json"); + public final static Identifier ITEM_HANDHELD = BetterEnd.makeID("patterns/item/pattern_item_handheld.json"); public static String createJson(Reader data, String parent, String block) { try (BufferedReader buffer = new BufferedReader(data)) { diff --git a/src/main/resources/assets/betterend/models/item/aeternium_axe.json b/src/main/resources/assets/betterend/models/item/aeternium_axe.json deleted file mode 100644 index c167f8ce..00000000 --- a/src/main/resources/assets/betterend/models/item/aeternium_axe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/aeternium_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_hoe.json b/src/main/resources/assets/betterend/models/item/aeternium_hoe.json deleted file mode 100644 index 9cee4fcd..00000000 --- a/src/main/resources/assets/betterend/models/item/aeternium_hoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/aeternium_hoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json b/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json deleted file mode 100644 index a9df5dc1..00000000 --- a/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/aeternium_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_axe.json b/src/main/resources/assets/betterend/models/item/terminite_axe.json deleted file mode 100644 index 8a6216b8..00000000 --- a/src/main/resources/assets/betterend/models/item/terminite_axe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/terminite_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_hoe.json b/src/main/resources/assets/betterend/models/item/terminite_hoe.json deleted file mode 100644 index 1cacc313..00000000 --- a/src/main/resources/assets/betterend/models/item/terminite_hoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/terminite_hoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json b/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json deleted file mode 100644 index e35f9635..00000000 --- a/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/terminite_pickaxe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_item.json b/src/main/resources/assets/betterend/patterns/item/pattern_item_generated.json similarity index 53% rename from src/main/resources/assets/betterend/patterns/item/pattern_item.json rename to src/main/resources/assets/betterend/patterns/item/pattern_item_generated.json index 9d72ad4a..6de9fd24 100644 --- a/src/main/resources/assets/betterend/patterns/item/pattern_item.json +++ b/src/main/resources/assets/betterend/patterns/item/pattern_item_generated.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "betterend:item/%texture%" - } -} +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:%texture%" + } +} diff --git a/src/main/resources/assets/betterend/patterns/item/pattern_item_handheld.json b/src/main/resources/assets/betterend/patterns/item/pattern_item_handheld.json new file mode 100644 index 00000000..c3c6d92f --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/item/pattern_item_handheld.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "betterend:%texture%" + } +}