From 1589bf33c03ac78420629cb358887d3fce8db310 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 30 Jan 2021 21:51:44 +0300 Subject: [PATCH] Metal textures & recipes --- .../blocks/complex/MetalMaterial.java | 27 +++++++++------ .../java/ru/betterend/item/EndArmorItem.java | 19 +++++++++++ .../ru/betterend/recipe/CraftingRecipes.java | 1 - .../recipe/builders/AnvilRecipe.java | 4 +-- .../java/ru/betterend/registry/EndBlocks.java | 2 -- .../java/ru/betterend/registry/EndItems.java | 32 ++++++++++++------ .../models/item/aeternium_boots.json | 6 ---- .../models/item/aeternium_chestplate.json | 6 ---- .../models/item/aeternium_hammer.json | 6 ---- .../models/item/aeternium_helmet.json | 6 ---- .../models/item/aeternium_ingot.json | 6 ---- .../models/item/aeternium_leggings.json | 6 ---- .../models/item/crystalite_boots.json | 6 ---- .../models/item/crystalite_chestplate.json | 6 ---- .../models/item/crystalite_hammer.json | 6 ---- .../models/item/crystalite_helmet.json | 6 ---- .../models/item/crystalite_leggings.json | 6 ---- .../betterend/models/item/diamond_hammer.json | 6 ---- .../betterend/models/item/golden_hammer.json | 6 ---- .../betterend/models/item/iron_hammer.json | 6 ---- .../models/item/netherite_hammer.json | 6 ---- .../models/item/terminite_block.json | 3 -- .../models/item/terminite_boots.json | 6 ---- .../models/item/terminite_chestplate.json | 6 ---- .../models/item/terminite_hammer.json | 6 ---- .../models/item/terminite_helmet.json | 6 ---- .../models/item/terminite_ingot.json | 6 ---- .../models/item/terminite_leggings.json | 6 ---- .../block/gold_bulb_vine_lantern_metal.png | Bin 420 -> 0 bytes .../textures/item/aeternium_hammer.png | Bin 426 -> 517 bytes .../textures/item/aeternium_hammer_head.png | Bin 373 -> 447 bytes .../textures/item/diamond_hammer.png | Bin 279 -> 0 bytes .../betterend/textures/item/golden_hammer.png | Bin 316 -> 0 bytes .../betterend/textures/item/iron_hammer.png | Bin 225 -> 0 bytes .../textures/item/netherite_hammer.png | Bin 230 -> 0 bytes .../textures/item/terminite_hammer.png | Bin 273 -> 492 bytes .../textures/item/terminite_nugget.png | Bin 0 -> 248 bytes .../textures/item/thallasium_boots.png | Bin 0 -> 255 bytes .../textures/item/thallasium_chestplate.png | Bin 0 -> 335 bytes .../textures/item/thallasium_hammer.png | Bin 0 -> 474 bytes .../textures/item/thallasium_helmet.png | Bin 0 -> 284 bytes .../textures/item/thallasium_leggings.png | Bin 0 -> 277 bytes 42 files changed, 58 insertions(+), 156 deletions(-) create mode 100644 src/main/java/ru/betterend/item/EndArmorItem.java delete mode 100644 src/main/resources/assets/betterend/models/item/aeternium_boots.json delete mode 100644 src/main/resources/assets/betterend/models/item/aeternium_chestplate.json delete mode 100644 src/main/resources/assets/betterend/models/item/aeternium_hammer.json delete mode 100644 src/main/resources/assets/betterend/models/item/aeternium_helmet.json delete mode 100644 src/main/resources/assets/betterend/models/item/aeternium_ingot.json delete mode 100644 src/main/resources/assets/betterend/models/item/aeternium_leggings.json delete mode 100644 src/main/resources/assets/betterend/models/item/crystalite_boots.json delete mode 100644 src/main/resources/assets/betterend/models/item/crystalite_chestplate.json delete mode 100644 src/main/resources/assets/betterend/models/item/crystalite_hammer.json delete mode 100644 src/main/resources/assets/betterend/models/item/crystalite_helmet.json delete mode 100644 src/main/resources/assets/betterend/models/item/crystalite_leggings.json delete mode 100644 src/main/resources/assets/betterend/models/item/diamond_hammer.json delete mode 100644 src/main/resources/assets/betterend/models/item/golden_hammer.json delete mode 100644 src/main/resources/assets/betterend/models/item/iron_hammer.json delete mode 100644 src/main/resources/assets/betterend/models/item/netherite_hammer.json delete mode 100644 src/main/resources/assets/betterend/models/item/terminite_block.json delete mode 100644 src/main/resources/assets/betterend/models/item/terminite_boots.json delete mode 100644 src/main/resources/assets/betterend/models/item/terminite_chestplate.json delete mode 100644 src/main/resources/assets/betterend/models/item/terminite_hammer.json delete mode 100644 src/main/resources/assets/betterend/models/item/terminite_helmet.json delete mode 100644 src/main/resources/assets/betterend/models/item/terminite_ingot.json delete mode 100644 src/main/resources/assets/betterend/models/item/terminite_leggings.json delete mode 100644 src/main/resources/assets/betterend/textures/block/gold_bulb_vine_lantern_metal.png delete mode 100644 src/main/resources/assets/betterend/textures/item/diamond_hammer.png delete mode 100644 src/main/resources/assets/betterend/textures/item/golden_hammer.png delete mode 100644 src/main/resources/assets/betterend/textures/item/iron_hammer.png delete mode 100644 src/main/resources/assets/betterend/textures/item/netherite_hammer.png create mode 100644 src/main/resources/assets/betterend/textures/item/terminite_nugget.png create mode 100644 src/main/resources/assets/betterend/textures/item/thallasium_boots.png create mode 100644 src/main/resources/assets/betterend/textures/item/thallasium_chestplate.png create mode 100644 src/main/resources/assets/betterend/textures/item/thallasium_hammer.png create mode 100644 src/main/resources/assets/betterend/textures/item/thallasium_helmet.png create mode 100644 src/main/resources/assets/betterend/textures/item/thallasium_leggings.png diff --git a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java index 7471a144..a2acc88c 100644 --- a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java @@ -5,7 +5,6 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.MaterialColor; import net.minecraft.entity.EquipmentSlot; -import net.minecraft.item.ArmorItem; import net.minecraft.item.ArmorMaterial; import net.minecraft.item.Item; import net.minecraft.item.Item.Settings; @@ -25,6 +24,7 @@ import ru.betterend.blocks.basis.EndSlabBlock; import ru.betterend.blocks.basis.EndStairsBlock; import ru.betterend.blocks.basis.EndTrapdoorBlock; import ru.betterend.blocks.basis.EndWoodenPlateBlock; +import ru.betterend.item.EndArmorItem; import ru.betterend.item.EndAxeItem; import ru.betterend.item.EndHammerItem; import ru.betterend.item.EndHoeItem; @@ -114,14 +114,14 @@ public class MetalMaterial { hoe = EndItems.registerTool(name + "_hoe", new EndHoeItem(material, -3, 0.0F, itemSettings)); hammer = EndItems.registerTool(name + "_hammer", new EndHammerItem(material, 5.0F, -3.2F, 0.3D, itemSettings)); - helmet = EndItems.registerItem(name + "_helmet", new ArmorItem(armor, EquipmentSlot.HEAD, itemSettings)); - chestplate = EndItems.registerItem(name + "_chestplate", new ArmorItem(armor, EquipmentSlot.CHEST, itemSettings)); - leggings = EndItems.registerItem(name + "_leggings", new ArmorItem(armor, EquipmentSlot.LEGS, itemSettings)); - boots = EndItems.registerItem(name + "_boots", new ArmorItem(armor, EquipmentSlot.FEET, itemSettings)); + helmet = EndItems.registerItem(name + "_helmet", new EndArmorItem(armor, EquipmentSlot.HEAD, itemSettings)); + chestplate = EndItems.registerItem(name + "_chestplate", new EndArmorItem(armor, EquipmentSlot.CHEST, itemSettings)); + leggings = EndItems.registerItem(name + "_leggings", new EndArmorItem(armor, EquipmentSlot.LEGS, itemSettings)); + boots = EndItems.registerItem(name + "_boots", new EndArmorItem(armor, EquipmentSlot.FEET, itemSettings)); if (hasOre) { - FurnaceRecipe.make("thallasium_ingot_furnace", ore, ingot).build(true); - AlloyingRecipe.Builder.create("thallasium_ingot").setInput(ore, ore).setOutput(ingot, 3).setExpiriense(2.1F).build(); + FurnaceRecipe.make(name + "_ingot_furnace", ore, ingot).setGroup("end_ingot").build(true); + AlloyingRecipe.Builder.create(name + "_ingot_alloy").setInput(ore, ore).setOutput(ingot, 3).setExpiriense(2.1F).build(); } GridRecipe.make(name + "_ingot_from_nuggets", ingot).setShape("###", "###", "###").addMaterial('#', nugget).setGroup("end_metal_ingots_nug").build(); @@ -147,10 +147,15 @@ public class MetalMaterial { GridRecipe.make(name + "_chandelier", chandelier).setShape("I#I", " # ").addMaterial('#', ingot).addMaterial('I', EndItems.LUMECORN_ROD).setGroup("end_metal_chandelier").build(); GridRecipe.make(name + "_hammer", hammer).setShape("III", "ISI", " S ").addMaterial('I', ingot).addMaterial('S', Items.STICK).setGroup("end_metal_hammers").build(); - FurnaceRecipe.make(name + "_axe_ingot", axe, nugget).build(true); - FurnaceRecipe.make(name + "_hoe_ingot", hoe, nugget).build(true); - FurnaceRecipe.make(name + "_pickaxe_ingot", pickaxe, nugget).build(true); - FurnaceRecipe.make(name + "_sword_ingot", sword, nugget).build(true); + FurnaceRecipe.make(name + "_axe_nugget", axe, nugget).setGroup("end_nugget").build(true); + FurnaceRecipe.make(name + "_hoe_nugget", hoe, nugget).setGroup("end_nugget").build(true); + FurnaceRecipe.make(name + "_pickaxe_nugget", pickaxe, nugget).setGroup("end_nugget").build(true); + FurnaceRecipe.make(name + "_sword_nugget", sword, nugget).setGroup("end_nugget").build(true); + FurnaceRecipe.make(name + "_hammer_nugget", hammer, nugget).setGroup("end_nugget").build(true); + FurnaceRecipe.make(name + "_helmet_nugget", helmet, nugget).setGroup("end_nugget").build(true); + FurnaceRecipe.make(name + "_chestplate_nugget", chestplate, nugget).setGroup("end_nugget").build(true); + FurnaceRecipe.make(name + "_leggings_nugget", leggings, nugget).setGroup("end_nugget").build(true); + FurnaceRecipe.make(name + "_boots_nugget", boots, nugget).setGroup("end_nugget").build(true); TagHelper.addTag(BlockTags.ANVIL, anvil); } diff --git a/src/main/java/ru/betterend/item/EndArmorItem.java b/src/main/java/ru/betterend/item/EndArmorItem.java new file mode 100644 index 00000000..67bf3031 --- /dev/null +++ b/src/main/java/ru/betterend/item/EndArmorItem.java @@ -0,0 +1,19 @@ +package ru.betterend.item; + +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.item.ArmorItem; +import net.minecraft.item.ArmorMaterial; +import net.minecraft.item.Item; +import ru.betterend.patterns.Patterned; +import ru.betterend.patterns.Patterns; + +public class EndArmorItem extends ArmorItem implements Patterned { + public EndArmorItem(ArmorMaterial material, EquipmentSlot slot, Item.Settings settings) { + super(material, slot, settings); + } + + @Override + public String getModelPattern(String name) { + return Patterns.createJson(Patterns.ITEM_GENERATED, name); + } +} diff --git a/src/main/java/ru/betterend/recipe/CraftingRecipes.java b/src/main/java/ru/betterend/recipe/CraftingRecipes.java index 6a204a57..972b817a 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -90,7 +90,6 @@ public class CraftingRecipes { GridRecipe.make("amber_gem", EndItems.AMBER_GEM).setShape("##", "##").addMaterial('#', EndItems.RAW_AMBER).build(); GridRecipe.make("amber_block", EndBlocks.AMBER_BLOCK).setShape("###", "###", "###").addMaterial('#', EndItems.AMBER_GEM).build(); GridRecipe.make("iron_bulb_lantern", EndBlocks.IRON_BULB_LANTERN).setShape("C", "I", "#").addMaterial('C', Items.CHAIN).addMaterial('I', Items.IRON_INGOT).addMaterial('#', EndItems.GLOWING_BULB).build(); - GridRecipe.make("gold_bulb_lantern", EndBlocks.GOLD_BULB_LANTERN).setShape("C", "I", "#").addMaterial('C', Items.CHAIN).addMaterial('I', Items.GOLD_INGOT).addMaterial('#', EndItems.GLOWING_BULB).build(); GridRecipe.make("twisted_moss_dye", Items.PINK_DYE).setList("#").addMaterial('#', EndBlocks.TWISTED_MOSS).build(); GridRecipe.make("byshy_grass_dye", Items.MAGENTA_DYE).setList("#").addMaterial('#', EndBlocks.BUSHY_GRASS).build(); GridRecipe.make("tail_moss_dye", Items.GRAY_DYE).setList("#").addMaterial('#', EndBlocks.TAIL_MOSS).build(); diff --git a/src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java b/src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java index eef5ce40..602ad83e 100644 --- a/src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java @@ -1,5 +1,7 @@ package ru.betterend.recipe.builders; +import java.util.Objects; + import com.google.gson.JsonObject; import net.fabricmc.api.EnvType; @@ -28,8 +30,6 @@ import ru.betterend.registry.EndTags; import ru.betterend.util.ItemUtil; import ru.betterend.util.RecipeHelper; -import java.util.Objects; - public class AnvilRecipe implements Recipe, BetterEndRecipe { public final static String GROUP = "smithing"; diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 7abeb9b3..322357a2 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -308,8 +308,6 @@ public class EndBlocks { public static final Block IRON_BULB_LANTERN = registerBlock("iron_bulb_lantern", new BulbVineLanternBlock()); public static final ColoredMaterial IRON_BULB_LANTERN_COLORED = new ColoredMaterial(BulbVineLanternColoredBlock::new, IRON_BULB_LANTERN, false); - public static final Block GOLD_BULB_LANTERN = registerBlock("gold_bulb_lantern", new BulbVineLanternBlock()); - public static final ColoredMaterial GOLD_BULB_LANTERN_COLORED = new ColoredMaterial(BulbVineLanternColoredBlock::new, GOLD_BULB_LANTERN, false); public static final Block IRON_CHANDELIER = EndBlocks.registerBlock("iron_chandelier", new ChandelierBlock(Blocks.GOLD_BLOCK)); public static final Block GOLD_CHANDELIER = EndBlocks.registerBlock("gold_chandelier", new ChandelierBlock(Blocks.GOLD_BLOCK)); diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index c5b6859f..8d6cebea 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -35,6 +35,7 @@ import ru.betterend.BetterEnd; import ru.betterend.config.Configs; import ru.betterend.item.DrinkItem; import ru.betterend.item.EnchantedPetalItem; +import ru.betterend.item.EndArmorItem; import ru.betterend.item.EndAxeItem; import ru.betterend.item.EndHammerItem; import ru.betterend.item.EndHoeItem; @@ -74,14 +75,14 @@ public class EndItems { public final static Item LUMECORN_ROD = registerItem("lumecorn_rod"); // Armor // - public static final Item AETERNIUM_HELMET = registerItem("aeternium_helmet", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.HEAD, makeItemSettings().fireproof())); - public static final Item AETERNIUM_CHESTPLATE = registerItem("aeternium_chestplate", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.CHEST, makeItemSettings().fireproof())); - public static final Item AETERNIUM_LEGGINGS = registerItem("aeternium_leggings", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.LEGS, makeItemSettings().fireproof())); - public static final Item AETERNIUM_BOOTS = registerItem("aeternium_boots", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.FEET, makeItemSettings().fireproof())); - public static final Item CRYSTALITE_HELMET = registerItem("crystalite_helmet", new ArmorItem(EndArmorMaterial.CRYSTALITE, EquipmentSlot.HEAD, makeItemSettings().rarity(Rarity.UNCOMMON))); - public static final Item CRYSTALITE_CHESTPLATE = registerItem("crystalite_chestplate", new ArmorItem(EndArmorMaterial.CRYSTALITE, EquipmentSlot.CHEST, makeItemSettings().rarity(Rarity.UNCOMMON))); - public static final Item CRYSTALITE_LEGGINGS = registerItem("crystalite_leggings", new ArmorItem(EndArmorMaterial.CRYSTALITE, EquipmentSlot.LEGS, makeItemSettings().rarity(Rarity.UNCOMMON))); - public static final Item CRYSTALITE_BOOTS = registerItem("crystalite_boots", new ArmorItem(EndArmorMaterial.CRYSTALITE, EquipmentSlot.FEET, makeItemSettings().rarity(Rarity.UNCOMMON))); + public static final Item AETERNIUM_HELMET = registerItem("aeternium_helmet", new EndArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.HEAD, makeItemSettings().fireproof())); + public static final Item AETERNIUM_CHESTPLATE = registerItem("aeternium_chestplate", new EndArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.CHEST, makeItemSettings().fireproof())); + public static final Item AETERNIUM_LEGGINGS = registerItem("aeternium_leggings", new EndArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.LEGS, makeItemSettings().fireproof())); + public static final Item AETERNIUM_BOOTS = registerItem("aeternium_boots", new EndArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.FEET, makeItemSettings().fireproof())); + public static final Item CRYSTALITE_HELMET = registerItem("crystalite_helmet", new EndArmorItem(EndArmorMaterial.CRYSTALITE, EquipmentSlot.HEAD, makeItemSettings().rarity(Rarity.UNCOMMON))); + public static final Item CRYSTALITE_CHESTPLATE = registerItem("crystalite_chestplate", new EndArmorItem(EndArmorMaterial.CRYSTALITE, EquipmentSlot.CHEST, makeItemSettings().rarity(Rarity.UNCOMMON))); + public static final Item CRYSTALITE_LEGGINGS = registerItem("crystalite_leggings", new EndArmorItem(EndArmorMaterial.CRYSTALITE, EquipmentSlot.LEGS, makeItemSettings().rarity(Rarity.UNCOMMON))); + public static final Item CRYSTALITE_BOOTS = registerItem("crystalite_boots", new EndArmorItem(EndArmorMaterial.CRYSTALITE, EquipmentSlot.FEET, makeItemSettings().rarity(Rarity.UNCOMMON))); // Tools // public static final ToolItem AETERNIUM_SHOVEL = registerTool("aeternium_shovel", new EndShovelItem(EndToolMaterial.AETERNIUM, 1.5F, -3.0F, makeItemSettings().fireproof())); @@ -106,12 +107,12 @@ public class EndItems { public final static Item END_FISH_RAW = registerFood("end_fish_raw", FoodComponents.SALMON); public final static Item END_FISH_COOKED = registerFood("end_fish_cooked", FoodComponents.COOKED_SALMON); public final static Item BUCKET_END_FISH = registerItem("bucket_end_fish", new FishBucketItem(EndEntities.END_FISH, Fluids.WATER, makeItemSettings().maxCount(1))); - public final static Item SWEET_BERRY_JELLY = registerFood("sweet_berry_jelly", 3, 0.75F); - public final static Item SHADOW_BERRY_JELLY = registerFood("shadow_berry_jelly", 4, 0.75F, new StatusEffectInstance(StatusEffects.NIGHT_VISION, 400)); + public final static Item SWEET_BERRY_JELLY = registerFood("sweet_berry_jelly", 6, 0.75F); + public final static Item SHADOW_BERRY_JELLY = registerFood("shadow_berry_jelly", 7, 0.75F, new StatusEffectInstance(StatusEffects.NIGHT_VISION, 400)); public final static Item BLOSSOM_BERRY = registerFood("blossom_berry", FoodComponents.APPLE); // Drinks // - public final static Item UMBRELLA_CLUSTER_JUICE = registerDrink("umbrella_cluster_juice"); + public final static Item UMBRELLA_CLUSTER_JUICE = registerDrink("umbrella_cluster_juice", 5, 0.7F); public static Item registerItem(String name) { return registerItem(BetterEnd.makeID(name), new PatternedItem(makeItemSettings())); @@ -206,6 +207,15 @@ public class EndItems { public static Item registerDrink(String name) { return registerItem(name, new DrinkItem(makeItemSettings().maxCount(1))); } + + public static Item registerDrink(String name, FoodComponent foodComponent) { + return registerItem(name, new DrinkItem(makeItemSettings().maxCount(1).food(foodComponent))); + } + + public static Item registerDrink(String name, int hunger, float saturation) { + FoodComponent.Builder builder = new FoodComponent.Builder().hunger(hunger).saturationModifier(saturation); + return registerDrink(name, builder.build()); + } public static Settings makeItemSettings() { return new Item.Settings().group(CreativeTabs.TAB_ITEMS); diff --git a/src/main/resources/assets/betterend/models/item/aeternium_boots.json b/src/main/resources/assets/betterend/models/item/aeternium_boots.json deleted file mode 100644 index f6caae83..00000000 --- a/src/main/resources/assets/betterend/models/item/aeternium_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/aeternium_boots" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_chestplate.json b/src/main/resources/assets/betterend/models/item/aeternium_chestplate.json deleted file mode 100644 index 6f9a2c71..00000000 --- a/src/main/resources/assets/betterend/models/item/aeternium_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/aeternium_chestplate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_hammer.json b/src/main/resources/assets/betterend/models/item/aeternium_hammer.json deleted file mode 100644 index 97f80b2e..00000000 --- a/src/main/resources/assets/betterend/models/item/aeternium_hammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/aeternium_hammer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_helmet.json b/src/main/resources/assets/betterend/models/item/aeternium_helmet.json deleted file mode 100644 index 791cb597..00000000 --- a/src/main/resources/assets/betterend/models/item/aeternium_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/aeternium_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_ingot.json b/src/main/resources/assets/betterend/models/item/aeternium_ingot.json deleted file mode 100644 index 6f365de5..00000000 --- a/src/main/resources/assets/betterend/models/item/aeternium_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "betterend:item/aeternium_ingot" - } -} diff --git a/src/main/resources/assets/betterend/models/item/aeternium_leggings.json b/src/main/resources/assets/betterend/models/item/aeternium_leggings.json deleted file mode 100644 index b21c3b7b..00000000 --- a/src/main/resources/assets/betterend/models/item/aeternium_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/aeternium_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/crystalite_boots.json b/src/main/resources/assets/betterend/models/item/crystalite_boots.json deleted file mode 100644 index 1a96c392..00000000 --- a/src/main/resources/assets/betterend/models/item/crystalite_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/crystalite_boots" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/crystalite_chestplate.json b/src/main/resources/assets/betterend/models/item/crystalite_chestplate.json deleted file mode 100644 index 8fcf0ae2..00000000 --- a/src/main/resources/assets/betterend/models/item/crystalite_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/crystalite_chestplate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/crystalite_hammer.json b/src/main/resources/assets/betterend/models/item/crystalite_hammer.json deleted file mode 100644 index b1428237..00000000 --- a/src/main/resources/assets/betterend/models/item/crystalite_hammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/crystalite_hammer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/crystalite_helmet.json b/src/main/resources/assets/betterend/models/item/crystalite_helmet.json deleted file mode 100644 index c6377a56..00000000 --- a/src/main/resources/assets/betterend/models/item/crystalite_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/crystalite_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/crystalite_leggings.json b/src/main/resources/assets/betterend/models/item/crystalite_leggings.json deleted file mode 100644 index 4457aef3..00000000 --- a/src/main/resources/assets/betterend/models/item/crystalite_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/crystalite_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/diamond_hammer.json b/src/main/resources/assets/betterend/models/item/diamond_hammer.json deleted file mode 100644 index 767d96df..00000000 --- a/src/main/resources/assets/betterend/models/item/diamond_hammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/diamond_hammer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/golden_hammer.json b/src/main/resources/assets/betterend/models/item/golden_hammer.json deleted file mode 100644 index 91d0fbde..00000000 --- a/src/main/resources/assets/betterend/models/item/golden_hammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/golden_hammer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/iron_hammer.json b/src/main/resources/assets/betterend/models/item/iron_hammer.json deleted file mode 100644 index 37c4f957..00000000 --- a/src/main/resources/assets/betterend/models/item/iron_hammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/iron_hammer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/netherite_hammer.json b/src/main/resources/assets/betterend/models/item/netherite_hammer.json deleted file mode 100644 index 0040a0f7..00000000 --- a/src/main/resources/assets/betterend/models/item/netherite_hammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/netherite_hammer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_block.json b/src/main/resources/assets/betterend/models/item/terminite_block.json deleted file mode 100644 index 43510386..00000000 --- a/src/main/resources/assets/betterend/models/item/terminite_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/terminite_block" -} diff --git a/src/main/resources/assets/betterend/models/item/terminite_boots.json b/src/main/resources/assets/betterend/models/item/terminite_boots.json deleted file mode 100644 index 8e7f7ffe..00000000 --- a/src/main/resources/assets/betterend/models/item/terminite_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/terminite_boots" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_chestplate.json b/src/main/resources/assets/betterend/models/item/terminite_chestplate.json deleted file mode 100644 index 1b0e7442..00000000 --- a/src/main/resources/assets/betterend/models/item/terminite_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/terminite_chestplate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_hammer.json b/src/main/resources/assets/betterend/models/item/terminite_hammer.json deleted file mode 100644 index f579c92d..00000000 --- a/src/main/resources/assets/betterend/models/item/terminite_hammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "betterend:item/terminite_hammer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_helmet.json b/src/main/resources/assets/betterend/models/item/terminite_helmet.json deleted file mode 100644 index 7fbdb8a6..00000000 --- a/src/main/resources/assets/betterend/models/item/terminite_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/terminite_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_ingot.json b/src/main/resources/assets/betterend/models/item/terminite_ingot.json deleted file mode 100644 index 219b282f..00000000 --- a/src/main/resources/assets/betterend/models/item/terminite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "betterend:item/terminite_ingot" - } -} diff --git a/src/main/resources/assets/betterend/models/item/terminite_leggings.json b/src/main/resources/assets/betterend/models/item/terminite_leggings.json deleted file mode 100644 index 191cd4d8..00000000 --- a/src/main/resources/assets/betterend/models/item/terminite_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/terminite_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/gold_bulb_vine_lantern_metal.png b/src/main/resources/assets/betterend/textures/block/gold_bulb_vine_lantern_metal.png deleted file mode 100644 index c16377fbfb9ba54973436185d95a6a59a408229d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmV;V0bBlwP)Px$UP(kjR5*>LlRs<1P!z>~FFdNmz%vkta|;G%cMF{h>FVl-=;+{7`XOAM^8q@v zU!n?K9Rev5h`~tUb@4s_w3wl1d2lZG-gD34iR$f6*Gl4gA*U#d6q(lmT&p{^l9t%7 z*X-A8$|ALmwUW5Qr6BN$pSyzST@d(;XOXCtM7mx`S)_b^K&!0)sCHWhBaU0YpL9IY z!fcNxS|oF!$wC|enb)-19je`yYPY4;?pXPzfeRSUxhz~mk|bxZ9Z)N2Hyb6!8-Qdk z^siwD&M}4!M$nIP`cckcbac8bQhRe8$7i0DMT+=$j7@hxzT66TxD-aIX&%oaar5vc zoTi)&TrY&chrq}6LTjXSz3^(zO>j)ZWx;U0UeC%V+d#JA^qeyf{>nMe^JWFta#l*6 z@y0+qpebhq*9(cCyW%oVDf61ebfw8cl2TBYyw^b5ch_0Itp)=>Px$zez+vR5*>LlTS!gQ5eO4_daLP=S-s1 z@HRC?KA$v+QB1Zhj6f+{6d2M{BX><$=2S$BX!^4YT)1mpxNH;Hs=$;Y8KXfN5Vb)a zv?fPqGxN15UQNA`!n3+uzH{z5=iUq3g!0-H5qI6#+9KM}lz)mPN+K#fmHb6k3cZ#3 zp5|s5xPFZ@r@Qd`{iLUo>~C!;o2jZq-W@q0H*d$;Q5(c|Y@n0Qwve3KTT|xTGs3>6 zCJ7&ma5xgdc5D)f1OYR^m-Tgut7~L385O9jBcIE8M-ZPuA-}=9>1iH4c*ycV7qd|d zpMsvgUd&)n39KNTo&|33&_=($zRzK2vIyiTsn`4XbC2ZBOv%Ve>q9@y#NzIVUe^-nTH=7G)Nvp_UivEYChIDS&FzL}@Jm zgExkh0o=WRkK)GW-{dzJqjKH}$)CcN;5zvI itbevGB4rhz0eWbTn zP|SES6|id9)_YwXmrKYMPv8xQ5HNuCQxP7I#{>|Tu?7U?5YmObDc+37!M|5Af0Tk> zmeB5Y!SFn6ENg8c5RDLF(Fxw^fYapyTQ0!19|I={I9FBZoer3ZfQU?z`2#|GrnV`F zv)d6%Cb5^zLVwjXEKCBFZm-GNj?Wwz?U{Et5KB>U2KRc)Y@t%Eju$5q2~+%WxP_eP zMpRiMoB`N1s^9645R7$Q)5uL#wHEi&k|`cu7b^&a;dn3{hl1;0BYyw^b5ch_0Itp)=>Px$c}YY;R5*>*lD$h?VHC!H?|XC8a82s! zQbqI{F-kzm=Fn0nQ5Oe0)lPz&7OOUX;UGrsQiN^}PWm4xqER=$aFAFKMF`SDTZ9sG z)l%*~4nh>;$LyI7hx28gcRikg;WMav^IEx=|JYbbiaEQA z)|xNhrgNESb>lqmg4TC!Y%eXdv$hV10wLD$mcxTXGR_&@9i4m}8O$j>`Uhs<1*XrG zXnj3_0*j4>MdI-Rb*enR4h}yp01&V&l-2^!*Z)}=z#r)N81DJSUG%xu6^?Fz?#aER Q3jhEB07*qoM6N<$f;36Vp8x;= delta 347 zcmV-h0i^!F1N8!sBYy!rNkle;XjccpMF*=8Td74GMI=!i6sm6eCqC~o2oABCd+@mLzT^GgaoiEodjr6)#!Ukg zQzpcmDd>Opx&lV?d3c>SynlZ|o0*2_WlbX*U}RE5+j~UqrhkRT!#z42^78pX(wf#C zkjdrHe)eJQ@4>3&VS`DqC*o-Aq*0tcno-do&gqMAU`vx$eH~ivh7!$GHG-y?_7!002ovPDHLkV1h92aJ>Kk diff --git a/src/main/resources/assets/betterend/textures/item/golden_hammer.png b/src/main/resources/assets/betterend/textures/item/golden_hammer.png deleted file mode 100644 index aed9697c55808d757b3279e8bbcc320083fdec6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmV-C0mJ@@P)gsC O0000_KpK5BJPfwHiZzR zs2>1h&RJ4QJERLhGd@Dz%R|1eQA_~LF~;3gLw=v9%+mnb6?pGe2>!9Q$pn}X6M&vk zwgxc)JTUb9Uy0cQlX+keAvB)?>SUS=z}03Ipe1u;wGldu@hn-H%<(2(B{w~$V(c}1|M>sko>_H0fg^K)6w@PZZjMGEQ^JAkqok7tkAy=Vo2B$@MHb!$R*4hmU+5{mV4ZPx0|Rs7 z3`K*p7Q7DIB$r8MF)(jRTf>&HSyC+Zgp{L%vQ**Co;7Td#$Aj*a@4ep9Ze@Knfc;Q c2R}1|z)L&c_BD4t0UgfZ>FVdQ&MBb@0B8hJQ2+n{ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_hammer.png b/src/main/resources/assets/betterend/textures/item/terminite_hammer.png index 06738ec9468ef98a3f292baed0361ff8a6202bb0..ca25e71effffa9bbbd074f0d635f83c7385bcf7c 100644 GIT binary patch delta 466 zcmV;@0WJQK0_+2jB!2;OQb$4nuFf3k0004|NklHZg-S z1fkH-76%9!=ec<=_NIQKQb; zT)|GdUQq`tWfxXD&#m6L!!=R;#ub4#ub;`)KkY$qt-zz>Kc6bcL1OxMbpQYW07*qo IM6N<$g3^NBZU6uP delta 245 zcmVi@ym0E|g90Hmqx@s0oarw;)& ztNq960(5|^dGY&aa6|lzx&9aW3jHT&0LV7Cc~ilfkPVrdF8yCkmLFsg0|O^39s~5$ z{)=S9Vl@Qp9iTiI<2FE*fk8(6KM3PB1g8PIsvuV|fcy+{Hf}aU@ETy;)xZD?Fp!@a zq{UDSfqDUV7{F`>X$E2jkO81DNtitap&6F}$TovC!!SJHV4ATRfNnFAW(vVKu#6MAn+nihK z^Yej^2 vwtnyCJ&)gt-tb$n(qPj43om}n%>2Q0RNtygh?7Sb=z0cES3j3^P6yH6Y&q&-U_v<3ByRR_}U#$N!cik`fXUGcNG%{PmAL z?C|=1{||on@;aZVkcSy4zCr7VTH95I7_LIbHF`gO{FHymHpBePA9<1N=3vD$7fyT& zVtdk%;&lDb$Itd{(fs!kBnn<1ly2*v|KIS#XQPD@OyviUpa1`0*7@-?kSET!5Zn@O1TaS?83{1ORe| BZdCvP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_chestplate.png b/src/main/resources/assets/betterend/textures/item/thallasium_chestplate.png new file mode 100644 index 0000000000000000000000000000000000000000..6e4fc44a6b7288121231d0727db85c73e485601f GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D%zIXzt*Lo9le z6C^SYoH%gcK*BwP&-S~HoNOy`OR>{4)iF5NtW{tc_ER zb8-R@6!2|u+IVqK;Px$lu1NER5*>LlRqqEQ5431*S~!Rky~vtbh9BcXy%E@W*bpVWr#u}ip@3@YSkuQ zC{%=~W=n-eAri9PlFbSle-a5Vn~?Ad34>q_lW`PygoKjWh5QNCObohNrb)gh*d6@zP@n1q~*buJhu2|2oQnv!;9_v?MnqW@=`B z-vOxOqgyx5)Zmy4b8?oy#&{$kp`gLyRt8?JIo;SPKo$nrvAqKENI+tyW^(D;1Kavz z{xfawqm;@v`8nH1mrsZ0Iu8tF1$>=f;9U3TzvBu->#HRBujs$vT!DAjBQ=AwqM<@H Qa{vGU07*qoM6N<$f*m-|hyVZp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_helmet.png b/src/main/resources/assets/betterend/textures/item/thallasium_helmet.png new file mode 100644 index 0000000000000000000000000000000000000000..452e6e8ab129ce61786e9457fbc548e68a4f461c GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|u6epRhFJ6_ zCrEs15S+cB^6;7eH;(w5ElFOHesI}M%L84F^QUvV{`vAWoM*kw@8dWskd`xR ztI7>YoufM?>;C*b|KaC%do~b|)AM616D@6fFaO`XW=HWx!DZ}MrP$bZoDIMKKcV8+ zS94|{IDGuPfb$g*7lS>m4_Sel+Lp)H8?TA3VLA7Fs!+0kfUv^7hSKhSgF833$+?~} zP@UV@7{R=u@%;HX!#h<94T^n&Z1VR1lPgL;X|y@zBtc!oA)t*5*0ThYX&selF{r5}E)k!*rei literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_leggings.png b/src/main/resources/assets/betterend/textures/item/thallasium_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..ef9a6f99c08978b90b3b8bf3ac7733e74582e06e GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|&U?BzhFJ6_ zCrD%*=+H~JXYkox@926zxzru|YX!UH#7fTYl16Va~i039Gc-<}ey8*I)m}jc>#MWx=O5N;O=~J#j7_XoZ0B_G2%-?#xpbN|0#C zvu0*i`M0t2amm58?D-qCj;Zw}9auft-Sg6!0}ZNT=g!UP4^`Cr*vQUM)9oeob=sS$ QK(8@)y85}Sb4q9e0I{ZU;{X5v literal 0 HcmV?d00001