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 c16377fb..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/gold_bulb_vine_lantern_metal.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_hammer.png b/src/main/resources/assets/betterend/textures/item/aeternium_hammer.png index 39a69799..b7d92f4c 100644 Binary files a/src/main/resources/assets/betterend/textures/item/aeternium_hammer.png and b/src/main/resources/assets/betterend/textures/item/aeternium_hammer.png differ diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_hammer_head.png b/src/main/resources/assets/betterend/textures/item/aeternium_hammer_head.png index e44b8b47..7148c738 100644 Binary files a/src/main/resources/assets/betterend/textures/item/aeternium_hammer_head.png and b/src/main/resources/assets/betterend/textures/item/aeternium_hammer_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/diamond_hammer.png b/src/main/resources/assets/betterend/textures/item/diamond_hammer.png deleted file mode 100644 index d89f5c0c..00000000 Binary files a/src/main/resources/assets/betterend/textures/item/diamond_hammer.png and /dev/null differ 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 aed9697c..00000000 Binary files a/src/main/resources/assets/betterend/textures/item/golden_hammer.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/item/iron_hammer.png b/src/main/resources/assets/betterend/textures/item/iron_hammer.png deleted file mode 100644 index 118a9d1a..00000000 Binary files a/src/main/resources/assets/betterend/textures/item/iron_hammer.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/item/netherite_hammer.png b/src/main/resources/assets/betterend/textures/item/netherite_hammer.png deleted file mode 100644 index b3dd3071..00000000 Binary files a/src/main/resources/assets/betterend/textures/item/netherite_hammer.png and /dev/null differ 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 06738ec9..ca25e71e 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_hammer.png and b/src/main/resources/assets/betterend/textures/item/terminite_hammer.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_nugget.png b/src/main/resources/assets/betterend/textures/item/terminite_nugget.png new file mode 100644 index 00000000..90b29a76 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/terminite_nugget.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_boots.png b/src/main/resources/assets/betterend/textures/item/thallasium_boots.png new file mode 100644 index 00000000..626b3d4a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/thallasium_boots.png differ 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 00000000..6e4fc44a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/thallasium_chestplate.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_hammer.png b/src/main/resources/assets/betterend/textures/item/thallasium_hammer.png new file mode 100644 index 00000000..f99d629e Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/thallasium_hammer.png differ 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 00000000..452e6e8a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/thallasium_helmet.png differ 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 00000000..ef9a6f99 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/thallasium_leggings.png differ