From be8ed218a85e987f3ff69cc58fce6828531ab7ea Mon Sep 17 00:00:00 2001 From: vodofrede Date: Tue, 5 Oct 2021 16:21:20 +0200 Subject: [PATCH] mod works !!! --- build.gradle | 4 ++ gradle.properties | 1 + .../palmoe/immersivetools/ImmersiveTools.java | 25 +++++++ .../java/dk/palmoe/immersivetools/Util.java | 11 +++ .../palmoe/immersivetools/init/ItemInit.java | 65 +++++++++++++++++ .../immersivetools/item/CopperArmor.java | 13 ++++ .../item/CopperArmorMaterial.java | 67 ++++++++++++++++++ .../immersivetools/item/CopperAxeItem.java | 9 +++ .../immersivetools/item/CopperHoeItem.java | 9 +++ .../item/CopperPickaxeItem.java | 9 +++ .../immersivetools/item/CopperShovelItem.java | 9 +++ .../immersivetools/item/CopperSwordItem.java | 9 +++ .../item/CopperToolMaterial.java | 59 +++++++++++++++ .../immersivetools/item/FlintAxeItem.java | 9 +++ .../immersivetools/item/FlintHoeItem.java | 9 +++ .../immersivetools/item/FlintPickaxeItem.java | 9 +++ .../immersivetools/item/FlintShovelItem.java | 9 +++ .../immersivetools/item/FlintSwordItem.java | 9 +++ .../item/FlintToolMaterial.java | 59 +++++++++++++++ .../mixin/ImmersiveToolsMixin.java} | 15 ++-- .../java/net/fabricmc/example/ExampleMod.java | 21 ------ .../assets/{modid => immersivetools}/icon.png | Bin .../assets/immersivetools/lang/en_us.json | 13 ++++ .../models/item/copper_axe.json | 6 ++ .../models/item/copper_boots.json | 6 ++ .../models/item/copper_chestplate.json | 6 ++ .../models/item/copper_helmet.json | 6 ++ .../models/item/copper_hoe.json | 6 ++ .../models/item/copper_leggings.json | 6 ++ .../models/item/copper_pickaxe.json | 6 ++ .../models/item/copper_shovel.json | 6 ++ .../models/item/copper_sword.json | 6 ++ .../immersivetools/models/item/flint_axe.json | 6 ++ .../immersivetools/models/item/flint_hoe.json | 6 ++ .../models/item/flint_pickaxe.json | 6 ++ .../models/item/flint_shovel.json | 6 ++ .../models/item/flint_sword.json | 6 ++ .../textures/item/copper_axe.png | Bin 0 -> 292 bytes .../textures/item/copper_boots.png | Bin 0 -> 264 bytes .../textures/item/copper_chestplate.png | Bin 0 -> 334 bytes .../textures/item/copper_helmet.png | Bin 0 -> 247 bytes .../textures/item/copper_hoe.png | Bin 0 -> 254 bytes .../textures/item/copper_leggings.png | Bin 0 -> 269 bytes .../textures/item/copper_pickaxe.png | Bin 0 -> 298 bytes .../textures/item/copper_shovel.png | Bin 0 -> 260 bytes .../textures/item/copper_sword.png | Bin 0 -> 336 bytes .../textures/item/flint_axe.png | Bin 0 -> 282 bytes .../textures/item/flint_hoe.png | Bin 0 -> 259 bytes .../textures/item/flint_pickaxe.png | Bin 0 -> 332 bytes .../textures/item/flint_shovel.png | Bin 0 -> 241 bytes .../textures/item/flint_sword.png | Bin 0 -> 293 bytes .../textures/models/armor/copper_layer_1.png | Bin 0 -> 1114 bytes .../textures/models/armor/copper_layer_2.png | Bin 0 -> 572 bytes .../data/fabric/tags/items/axes.json | 4 ++ .../data/fabric/tags/items/hoes.json | 4 ++ .../data/fabric/tags/items/pickaxes.json | 4 ++ .../data/fabric/tags/items/shovels.json | 4 ++ .../data/fabric/tags/items/swords.json | 4 ++ .../immersivetools/recipes/copper_axe.json | 16 +++++ .../immersivetools/recipes/copper_boots.json | 16 +++++ .../recipes/copper_chestplate.json | 16 +++++ .../immersivetools/recipes/copper_helmet.json | 16 +++++ .../immersivetools/recipes/copper_hoe.json | 16 +++++ .../recipes/copper_leggings.json | 16 +++++ .../recipes/copper_pickaxe.json | 16 +++++ .../immersivetools/recipes/copper_shovel.json | 16 +++++ .../immersivetools/recipes/copper_sword.json | 16 +++++ .../immersivetools/recipes/flint_axe.json | 16 +++++ .../immersivetools/recipes/flint_hoe.json | 16 +++++ .../immersivetools/recipes/flint_pickaxe.json | 16 +++++ .../immersivetools/recipes/flint_shovel.json | 16 +++++ .../immersivetools/recipes/flint_sword.json | 16 +++++ .../data/levelz/item/copper_armor.json | 7 ++ .../data/levelz/item/copper_axe.json | 7 ++ .../data/levelz/item/copper_hoe.json | 7 ++ .../data/levelz/item/copper_pickaxe.json | 7 ++ .../data/levelz/item/copper_sword.json | 7 ++ .../resources/data/levelz/item/flint_axe.json | 7 ++ .../resources/data/levelz/item/flint_hoe.json | 7 ++ .../data/levelz/item/flint_pickaxe.json | 7 ++ .../data/levelz/item/flint_sword.json | 7 ++ src/main/resources/fabric.mod.json | 58 +++++++-------- src/main/resources/immersivetools.mixins.json | 11 +++ src/main/resources/modid.mixins.json | 14 ---- 84 files changed, 842 insertions(+), 75 deletions(-) create mode 100644 src/main/java/dk/palmoe/immersivetools/ImmersiveTools.java create mode 100644 src/main/java/dk/palmoe/immersivetools/Util.java create mode 100644 src/main/java/dk/palmoe/immersivetools/init/ItemInit.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/CopperArmor.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/CopperArmorMaterial.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/CopperAxeItem.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/CopperHoeItem.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/CopperPickaxeItem.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/CopperShovelItem.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/CopperSwordItem.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/CopperToolMaterial.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/FlintAxeItem.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/FlintHoeItem.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/FlintPickaxeItem.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/FlintShovelItem.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/FlintSwordItem.java create mode 100644 src/main/java/dk/palmoe/immersivetools/item/FlintToolMaterial.java rename src/main/java/{net/fabricmc/example/mixin/ExampleMixin.java => dk/palmoe/immersivetools/mixin/ImmersiveToolsMixin.java} (51%) delete mode 100644 src/main/java/net/fabricmc/example/ExampleMod.java rename src/main/resources/assets/{modid => immersivetools}/icon.png (100%) create mode 100644 src/main/resources/assets/immersivetools/lang/en_us.json create mode 100644 src/main/resources/assets/immersivetools/models/item/copper_axe.json create mode 100644 src/main/resources/assets/immersivetools/models/item/copper_boots.json create mode 100644 src/main/resources/assets/immersivetools/models/item/copper_chestplate.json create mode 100644 src/main/resources/assets/immersivetools/models/item/copper_helmet.json create mode 100644 src/main/resources/assets/immersivetools/models/item/copper_hoe.json create mode 100644 src/main/resources/assets/immersivetools/models/item/copper_leggings.json create mode 100644 src/main/resources/assets/immersivetools/models/item/copper_pickaxe.json create mode 100644 src/main/resources/assets/immersivetools/models/item/copper_shovel.json create mode 100644 src/main/resources/assets/immersivetools/models/item/copper_sword.json create mode 100644 src/main/resources/assets/immersivetools/models/item/flint_axe.json create mode 100644 src/main/resources/assets/immersivetools/models/item/flint_hoe.json create mode 100644 src/main/resources/assets/immersivetools/models/item/flint_pickaxe.json create mode 100644 src/main/resources/assets/immersivetools/models/item/flint_shovel.json create mode 100644 src/main/resources/assets/immersivetools/models/item/flint_sword.json create mode 100644 src/main/resources/assets/immersivetools/textures/item/copper_axe.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/copper_boots.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/copper_chestplate.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/copper_helmet.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/copper_hoe.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/copper_leggings.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/copper_pickaxe.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/copper_shovel.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/copper_sword.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/flint_axe.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/flint_hoe.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/flint_pickaxe.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/flint_shovel.png create mode 100644 src/main/resources/assets/immersivetools/textures/item/flint_sword.png create mode 100644 src/main/resources/assets/minecraft/textures/models/armor/copper_layer_1.png create mode 100644 src/main/resources/assets/minecraft/textures/models/armor/copper_layer_2.png create mode 100644 src/main/resources/data/fabric/tags/items/axes.json create mode 100644 src/main/resources/data/fabric/tags/items/hoes.json create mode 100644 src/main/resources/data/fabric/tags/items/pickaxes.json create mode 100644 src/main/resources/data/fabric/tags/items/shovels.json create mode 100644 src/main/resources/data/fabric/tags/items/swords.json create mode 100644 src/main/resources/data/immersivetools/recipes/copper_axe.json create mode 100644 src/main/resources/data/immersivetools/recipes/copper_boots.json create mode 100644 src/main/resources/data/immersivetools/recipes/copper_chestplate.json create mode 100644 src/main/resources/data/immersivetools/recipes/copper_helmet.json create mode 100644 src/main/resources/data/immersivetools/recipes/copper_hoe.json create mode 100644 src/main/resources/data/immersivetools/recipes/copper_leggings.json create mode 100644 src/main/resources/data/immersivetools/recipes/copper_pickaxe.json create mode 100644 src/main/resources/data/immersivetools/recipes/copper_shovel.json create mode 100644 src/main/resources/data/immersivetools/recipes/copper_sword.json create mode 100644 src/main/resources/data/immersivetools/recipes/flint_axe.json create mode 100644 src/main/resources/data/immersivetools/recipes/flint_hoe.json create mode 100644 src/main/resources/data/immersivetools/recipes/flint_pickaxe.json create mode 100644 src/main/resources/data/immersivetools/recipes/flint_shovel.json create mode 100644 src/main/resources/data/immersivetools/recipes/flint_sword.json create mode 100644 src/main/resources/data/levelz/item/copper_armor.json create mode 100644 src/main/resources/data/levelz/item/copper_axe.json create mode 100644 src/main/resources/data/levelz/item/copper_hoe.json create mode 100644 src/main/resources/data/levelz/item/copper_pickaxe.json create mode 100644 src/main/resources/data/levelz/item/copper_sword.json create mode 100644 src/main/resources/data/levelz/item/flint_axe.json create mode 100644 src/main/resources/data/levelz/item/flint_hoe.json create mode 100644 src/main/resources/data/levelz/item/flint_pickaxe.json create mode 100644 src/main/resources/data/levelz/item/flint_sword.json create mode 100644 src/main/resources/immersivetools.mixins.json delete mode 100644 src/main/resources/modid.mixins.json diff --git a/build.gradle b/build.gradle index e841ac1..dca5c8b 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,7 @@ repositories { // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. // See https://docs.gradle.org/current/userguide/declaring_repositories.html // for more information about repositories. + maven { url "https://maven.shedaniel.me" } } dependencies { @@ -29,6 +30,9 @@ dependencies { // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. // You may need to force-disable transitiveness on them. + modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}") { + exclude(group: "net.fabricmc.fabric-api") + } } processResources { diff --git a/gradle.properties b/gradle.properties index 10d32f5..c593110 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,3 +14,4 @@ org.gradle.jvmargs=-Xmx1G # Dependencies fabric_version=0.39.2+1.17 + cloth_config_version=5.0.38 \ No newline at end of file diff --git a/src/main/java/dk/palmoe/immersivetools/ImmersiveTools.java b/src/main/java/dk/palmoe/immersivetools/ImmersiveTools.java new file mode 100644 index 0000000..28f9e50 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/ImmersiveTools.java @@ -0,0 +1,25 @@ +package dk.palmoe.immersivetools; + +import net.fabricmc.api.ModInitializer; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import dk.palmoe.immersivetools.init.ItemInit; + +public class ImmersiveTools implements ModInitializer { + // This logger is used to write text to the console and the log file. + // It is considered best practice to use your mod id as the logger's name. + // That way, it's clear which mod wrote info, warnings, and errors. + public static final Logger LOGGER = LogManager.getLogger("immersivetools"); + + @Override + public void onInitialize() { + // This code runs as soon as Minecraft is in a mod-load-ready state. + // However, some things (like resources) may still be uninitialized. + // Proceed with mild caution. + + ItemInit.init(); + + // TODO: remove when mod is done + LOGGER.info("Initialized Immersive Tools"); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/Util.java b/src/main/java/dk/palmoe/immersivetools/Util.java new file mode 100644 index 0000000..2b597c3 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/Util.java @@ -0,0 +1,11 @@ +package dk.palmoe.immersivetools; + +import net.minecraft.util.Identifier; + +public class Util { + private static final String MOD_ID = "immersivetools"; + + public static Identifier ID(String path) { + return new Identifier(MOD_ID, path); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/init/ItemInit.java b/src/main/java/dk/palmoe/immersivetools/init/ItemInit.java new file mode 100644 index 0000000..26e1b83 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/init/ItemInit.java @@ -0,0 +1,65 @@ +package dk.palmoe.immersivetools.init; + +import dk.palmoe.immersivetools.Util; +import dk.palmoe.immersivetools.item.*; +import net.minecraft.util.registry.Registry; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.item.ArmorMaterial; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; + +public class ItemInit { + + // Copper + public static final CopperPickaxeItem COPPER_PICKAXE_ITEM = new CopperPickaxeItem( + new Item.Settings().group(ItemGroup.TOOLS)); + public static final CopperAxeItem COPPER_AXE_ITEM = new CopperAxeItem( + new Item.Settings().group(ItemGroup.TOOLS)); + public static final CopperShovelItem COPPER_SHOVEL_ITEM = new CopperShovelItem( + new Item.Settings().group(ItemGroup.TOOLS)); + public static final CopperHoeItem COPPER_HOE_ITEM = new CopperHoeItem( + new Item.Settings().group(ItemGroup.TOOLS)); + public static final CopperSwordItem COPPER_SWORD_ITEM = new CopperSwordItem( + new Item.Settings().group(ItemGroup.COMBAT)); + + public static final ArmorMaterial COPPER_ARMOR_MATERIAL = CopperArmorMaterial.getInstance(); + public static final Item COPPER_HELMET = new CopperArmor(COPPER_ARMOR_MATERIAL, EquipmentSlot.HEAD, + new Item.Settings().group(ItemGroup.COMBAT)); + public static final Item COPPER_CHESTPLATE = new CopperArmor(COPPER_ARMOR_MATERIAL, EquipmentSlot.CHEST, + new Item.Settings().group(ItemGroup.COMBAT)); + public static final Item COPPER_LEGGINGS = new CopperArmor(COPPER_ARMOR_MATERIAL, EquipmentSlot.LEGS, + new Item.Settings().group(ItemGroup.COMBAT)); + public static final Item COPPER_BOOTS = new CopperArmor(COPPER_ARMOR_MATERIAL, EquipmentSlot.FEET, + new Item.Settings().group(ItemGroup.COMBAT)); + + // Flint + public static final FlintPickaxeItem FLINT_PICKAXE_ITEM = new FlintPickaxeItem( + new Item.Settings().group(ItemGroup.TOOLS)); + public static final FlintAxeItem FLINT_AXE_ITEM = new FlintAxeItem(new Item.Settings().group(ItemGroup.TOOLS)); + public static final FlintShovelItem FLINT_SHOVEL_ITEM = new FlintShovelItem( + new Item.Settings().group(ItemGroup.TOOLS)); + public static final FlintHoeItem FLINT_HOE_ITEM = new FlintHoeItem(new Item.Settings().group(ItemGroup.TOOLS)); + public static final FlintSwordItem FLINT_SWORD_ITEM = new FlintSwordItem( + new Item.Settings().group(ItemGroup.COMBAT)); + + public static void init() { + // Copper + Registry.register(Registry.ITEM, Util.ID("copper_pickaxe"), COPPER_PICKAXE_ITEM); + Registry.register(Registry.ITEM, Util.ID("copper_axe"), COPPER_AXE_ITEM); + Registry.register(Registry.ITEM, Util.ID("copper_shovel"), COPPER_SHOVEL_ITEM); + Registry.register(Registry.ITEM, Util.ID("copper_hoe"), COPPER_HOE_ITEM); + Registry.register(Registry.ITEM, Util.ID("copper_sword"), COPPER_SWORD_ITEM); + + Registry.register(Registry.ITEM, Util.ID("copper_helmet"), COPPER_HELMET); + Registry.register(Registry.ITEM, Util.ID("copper_chestplate"), COPPER_CHESTPLATE); + Registry.register(Registry.ITEM, Util.ID("copper_leggings"), COPPER_LEGGINGS); + Registry.register(Registry.ITEM, Util.ID("copper_boots"), COPPER_BOOTS); + + // Flint + Registry.register(Registry.ITEM, Util.ID("flint_pickaxe"), FLINT_PICKAXE_ITEM); + Registry.register(Registry.ITEM, Util.ID("flint_axe"), FLINT_AXE_ITEM); + Registry.register(Registry.ITEM, Util.ID("flint_shovel"), FLINT_SHOVEL_ITEM); + Registry.register(Registry.ITEM, Util.ID("flint_hoe"), FLINT_HOE_ITEM); + Registry.register(Registry.ITEM, Util.ID("flint_sword"), FLINT_SWORD_ITEM); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/CopperArmor.java b/src/main/java/dk/palmoe/immersivetools/item/CopperArmor.java new file mode 100644 index 0000000..d43a09f --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/CopperArmor.java @@ -0,0 +1,13 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.item.ArmorItem; +import net.minecraft.item.ArmorMaterial; + +public class CopperArmor extends ArmorItem { + + public CopperArmor(ArmorMaterial material, EquipmentSlot slot, Settings settings) { + super(material, slot, settings); + } + +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/CopperArmorMaterial.java b/src/main/java/dk/palmoe/immersivetools/item/CopperArmorMaterial.java new file mode 100644 index 0000000..bb5fd9d --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/CopperArmorMaterial.java @@ -0,0 +1,67 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.item.ArmorMaterial; +import net.minecraft.recipe.Ingredient; +import net.minecraft.sound.SoundEvent; +import net.minecraft.sound.SoundEvents; + +public class CopperArmorMaterial implements ArmorMaterial { + private static final int[] BASE_DURABILITY = new int[] { 13, 15, 16, 11 }; + private static final int[] PROTECTION_VALUES = new int[] { 2, 5, 4, 1 }; + + private static CopperArmorMaterial INSTANCE = null; + + private CopperArmorMaterial() { + } + + public static CopperArmorMaterial getInstance() { + if (INSTANCE == null) { + INSTANCE = new CopperArmorMaterial(); + } + return INSTANCE; + } + + // TODO: Make copper armor properties configurable + @Override + public int getDurability(EquipmentSlot slot) { + return BASE_DURABILITY[slot.getEntitySlotId()] * 10; + } + + @Override + public int getProtectionAmount(EquipmentSlot slot) { + return PROTECTION_VALUES[slot.getEntitySlotId()]; + } + + @Override + public int getEnchantability() { + return 18; + } + + @Override + public SoundEvent getEquipSound() { + return SoundEvents.ITEM_ARMOR_EQUIP_IRON; + } + + @Override + public Ingredient getRepairIngredient() { + // TODO: Make copper armor repairable + return null; + } + + @Override + public String getName() { + return "copper"; + } + + @Override + public float getToughness() { + return 0; + } + + @Override + public float getKnockbackResistance() { + return 0; + } + +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/CopperAxeItem.java b/src/main/java/dk/palmoe/immersivetools/item/CopperAxeItem.java new file mode 100644 index 0000000..1a34865 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/CopperAxeItem.java @@ -0,0 +1,9 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.item.AxeItem; + +public class CopperAxeItem extends AxeItem { + public CopperAxeItem(Settings settings) { + super(CopperToolMaterial.getInstance(), 7, -3.2f, settings); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/CopperHoeItem.java b/src/main/java/dk/palmoe/immersivetools/item/CopperHoeItem.java new file mode 100644 index 0000000..f9aad01 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/CopperHoeItem.java @@ -0,0 +1,9 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.item.HoeItem; + +public class CopperHoeItem extends HoeItem { + public CopperHoeItem(Settings settings) { + super(CopperToolMaterial.getInstance(), -2, -1f, settings); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/CopperPickaxeItem.java b/src/main/java/dk/palmoe/immersivetools/item/CopperPickaxeItem.java new file mode 100644 index 0000000..d0107b5 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/CopperPickaxeItem.java @@ -0,0 +1,9 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.item.PickaxeItem; + +public class CopperPickaxeItem extends PickaxeItem { + public CopperPickaxeItem(Settings settings) { + super(CopperToolMaterial.getInstance(), 1, -2.8f, settings); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/CopperShovelItem.java b/src/main/java/dk/palmoe/immersivetools/item/CopperShovelItem.java new file mode 100644 index 0000000..8e44c18 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/CopperShovelItem.java @@ -0,0 +1,9 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.item.ShovelItem; + +public class CopperShovelItem extends ShovelItem { + public CopperShovelItem(Settings settings) { + super(CopperToolMaterial.getInstance(), 1.5F, -3.0f, settings); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/CopperSwordItem.java b/src/main/java/dk/palmoe/immersivetools/item/CopperSwordItem.java new file mode 100644 index 0000000..f39f812 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/CopperSwordItem.java @@ -0,0 +1,9 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.item.SwordItem; + +public class CopperSwordItem extends SwordItem { + public CopperSwordItem(Settings settings) { + super(CopperToolMaterial.getInstance(), 3, -2.4f, settings); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/CopperToolMaterial.java b/src/main/java/dk/palmoe/immersivetools/item/CopperToolMaterial.java new file mode 100644 index 0000000..5738d30 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/CopperToolMaterial.java @@ -0,0 +1,59 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.item.ToolMaterial; +import net.minecraft.recipe.Ingredient; + +public class CopperToolMaterial implements ToolMaterial { + private static CopperToolMaterial INSTANCE = null; + + private CopperToolMaterial() { + } + + public static CopperToolMaterial getInstance() { + if (INSTANCE == null) { + INSTANCE = new CopperToolMaterial(); + } + return INSTANCE; + } + + // TODO: Make tool properties configurable + @Override + public float getAttackDamage() { + // Dmg for sword is +3 of value below + return 2; + } + + @Override + public int getDurability() { + // iron = 250, diamond = 1561, stone = 131 + return 185; + } + + @Override + public int getEnchantability() { + return 19; + } + + @Override + public int getMiningLevel() { + return 2; + } + + @Override + public float getMiningSpeedMultiplier() { + // 6 = iron, 8 = diamond + return 7; + } + + @Override + public Ingredient getRepairIngredient() { + // TODO: set repair item + return null; + } + + // LevelZ Compatibility + @Override + public String toString() { + return "COPPER"; + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/FlintAxeItem.java b/src/main/java/dk/palmoe/immersivetools/item/FlintAxeItem.java new file mode 100644 index 0000000..ff3bb9a --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/FlintAxeItem.java @@ -0,0 +1,9 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.item.AxeItem; + +public class FlintAxeItem extends AxeItem { + public FlintAxeItem(Settings settings) { + super(FlintToolMaterial.getInstance(), 6, -3.2f, settings); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/FlintHoeItem.java b/src/main/java/dk/palmoe/immersivetools/item/FlintHoeItem.java new file mode 100644 index 0000000..4a7dd11 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/FlintHoeItem.java @@ -0,0 +1,9 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.item.HoeItem; + +public class FlintHoeItem extends HoeItem { + public FlintHoeItem(Settings settings) { + super(FlintToolMaterial.getInstance(), -2, -1f, settings); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/FlintPickaxeItem.java b/src/main/java/dk/palmoe/immersivetools/item/FlintPickaxeItem.java new file mode 100644 index 0000000..b7d68dc --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/FlintPickaxeItem.java @@ -0,0 +1,9 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.item.PickaxeItem; + +public class FlintPickaxeItem extends PickaxeItem { + public FlintPickaxeItem(Settings settings) { + super(FlintToolMaterial.getInstance(), 1, -2.8f, settings); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/FlintShovelItem.java b/src/main/java/dk/palmoe/immersivetools/item/FlintShovelItem.java new file mode 100644 index 0000000..b42b583 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/FlintShovelItem.java @@ -0,0 +1,9 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.item.ShovelItem; + +public class FlintShovelItem extends ShovelItem { + public FlintShovelItem(Settings settings) { + super(FlintToolMaterial.getInstance(), 1.5F, -3.0f, settings); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/FlintSwordItem.java b/src/main/java/dk/palmoe/immersivetools/item/FlintSwordItem.java new file mode 100644 index 0000000..c8c7033 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/FlintSwordItem.java @@ -0,0 +1,9 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.item.SwordItem; + +public class FlintSwordItem extends SwordItem { + public FlintSwordItem(Settings settings) { + super(FlintToolMaterial.getInstance(), 3, -2.4f, settings); + } +} diff --git a/src/main/java/dk/palmoe/immersivetools/item/FlintToolMaterial.java b/src/main/java/dk/palmoe/immersivetools/item/FlintToolMaterial.java new file mode 100644 index 0000000..a68c763 --- /dev/null +++ b/src/main/java/dk/palmoe/immersivetools/item/FlintToolMaterial.java @@ -0,0 +1,59 @@ +package dk.palmoe.immersivetools.item; + +import net.minecraft.item.ToolMaterial; +import net.minecraft.recipe.Ingredient; + +public class FlintToolMaterial implements ToolMaterial { + private static FlintToolMaterial INSTANCE = null; + + private FlintToolMaterial() { + } + + public static FlintToolMaterial getInstance() { + if (INSTANCE == null) { + INSTANCE = new FlintToolMaterial(); + } + return INSTANCE; + } + + // TODO: Make tool properties configurable + @Override + public float getAttackDamage() { + // Dmg for sword is +3 of value below + return 1; + } + + @Override + public int getDurability() { + // iron = 250, diamond = 1561, stone = 131 + return 131; + } + + @Override + public int getEnchantability() { + return 5; + } + + @Override + public int getMiningLevel() { + return 1; + } + + @Override + public float getMiningSpeedMultiplier() { + // 6 = iron, 8 = diamond + return 4; + } + + @Override + public Ingredient getRepairIngredient() { + // TODO: set repair item + return null; + } + + // LevelZ Compatibility + @Override + public String toString() { + return "FLINT"; + } +} diff --git a/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java b/src/main/java/dk/palmoe/immersivetools/mixin/ImmersiveToolsMixin.java similarity index 51% rename from src/main/java/net/fabricmc/example/mixin/ExampleMixin.java rename to src/main/java/dk/palmoe/immersivetools/mixin/ImmersiveToolsMixin.java index 356cb38..b676d56 100644 --- a/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java +++ b/src/main/java/dk/palmoe/immersivetools/mixin/ImmersiveToolsMixin.java @@ -1,6 +1,5 @@ -package net.fabricmc.example.mixin; +package dk.palmoe.immersivetools.mixin; -import net.fabricmc.example.ExampleMod; import net.minecraft.client.gui.screen.TitleScreen; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -8,9 +7,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(TitleScreen.class) -public class ExampleMixin { - @Inject(at = @At("HEAD"), method = "init()V") - private void init(CallbackInfo info) { - ExampleMod.LOGGER.info("This line is printed by an example mod mixin!"); - } -} +public class ImmersiveToolsMixin { + @Inject(at = @At("HEAD"), method = "init()V") + private void init(CallbackInfo info) { + // TODO: Remove mixing if unused + } +} \ No newline at end of file diff --git a/src/main/java/net/fabricmc/example/ExampleMod.java b/src/main/java/net/fabricmc/example/ExampleMod.java deleted file mode 100644 index ad43b69..0000000 --- a/src/main/java/net/fabricmc/example/ExampleMod.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.fabricmc.example; - -import net.fabricmc.api.ModInitializer; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class ExampleMod implements ModInitializer { - // This logger is used to write text to the console and the log file. - // It is considered best practice to use your mod id as the logger's name. - // That way, it's clear which mod wrote info, warnings, and errors. - public static final Logger LOGGER = LogManager.getLogger("modid"); - - @Override - public void onInitialize() { - // This code runs as soon as Minecraft is in a mod-load-ready state. - // However, some things (like resources) may still be uninitialized. - // Proceed with mild caution. - - LOGGER.info("Hello Fabric world!"); - } -} diff --git a/src/main/resources/assets/modid/icon.png b/src/main/resources/assets/immersivetools/icon.png similarity index 100% rename from src/main/resources/assets/modid/icon.png rename to src/main/resources/assets/immersivetools/icon.png diff --git a/src/main/resources/assets/immersivetools/lang/en_us.json b/src/main/resources/assets/immersivetools/lang/en_us.json new file mode 100644 index 0000000..931d000 --- /dev/null +++ b/src/main/resources/assets/immersivetools/lang/en_us.json @@ -0,0 +1,13 @@ +{ + "item.immersivetools.copper_pickaxe": "Copper Pickaxe", + "item.immersivetools.copper_axe": "Copper Axe", + "item.immersivetools.copper_shovel": "Copper Shovel", + "item.immersivetools.copper_hoe": "Copper Hoe", + "item.immersivetools.copper_sword": "Copper Sword", + + "item.immersivetools.flint_pickaxe": "Flint Pickaxe", + "item.immersivetools.flint_axe": "Flint Axe", + "item.immersivetools.flint_shovel": "Flint Shovel", + "item.immersivetools.flint_hoe": "Flint Hoe", + "item.immersivetools.flint_sword": "Flint Sword" +} diff --git a/src/main/resources/assets/immersivetools/models/item/copper_axe.json b/src/main/resources/assets/immersivetools/models/item/copper_axe.json new file mode 100644 index 0000000..e57a90c --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/copper_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "immersivetools:item/copper_axe" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/copper_boots.json b/src/main/resources/assets/immersivetools/models/item/copper_boots.json new file mode 100644 index 0000000..25b094f --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/copper_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "immersivetools:item/copper_boots" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/copper_chestplate.json b/src/main/resources/assets/immersivetools/models/item/copper_chestplate.json new file mode 100644 index 0000000..f22ee72 --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/copper_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "immersivetools:item/copper_chestplate" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/copper_helmet.json b/src/main/resources/assets/immersivetools/models/item/copper_helmet.json new file mode 100644 index 0000000..2437d18 --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/copper_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "immersivetools:item/copper_helmet" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/copper_hoe.json b/src/main/resources/assets/immersivetools/models/item/copper_hoe.json new file mode 100644 index 0000000..ea5139f --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/copper_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "immersivetools:item/copper_hoe" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/copper_leggings.json b/src/main/resources/assets/immersivetools/models/item/copper_leggings.json new file mode 100644 index 0000000..90f4db0 --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/copper_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "immersivetools:item/copper_leggings" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/copper_pickaxe.json b/src/main/resources/assets/immersivetools/models/item/copper_pickaxe.json new file mode 100644 index 0000000..5b3076b --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/copper_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "immersivetools:item/copper_pickaxe" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/copper_shovel.json b/src/main/resources/assets/immersivetools/models/item/copper_shovel.json new file mode 100644 index 0000000..a7b5b27 --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/copper_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "immersivetools:item/copper_shovel" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/copper_sword.json b/src/main/resources/assets/immersivetools/models/item/copper_sword.json new file mode 100644 index 0000000..99a0409 --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/copper_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "immersivetools:item/copper_sword" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/flint_axe.json b/src/main/resources/assets/immersivetools/models/item/flint_axe.json new file mode 100644 index 0000000..b101df5 --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/flint_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "immersivetools:item/flint_axe" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/flint_hoe.json b/src/main/resources/assets/immersivetools/models/item/flint_hoe.json new file mode 100644 index 0000000..b5bfeef --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/flint_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "immersivetools:item/flint_hoe" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/flint_pickaxe.json b/src/main/resources/assets/immersivetools/models/item/flint_pickaxe.json new file mode 100644 index 0000000..bbd1d1d --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/flint_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "immersivetools:item/flint_pickaxe" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/flint_shovel.json b/src/main/resources/assets/immersivetools/models/item/flint_shovel.json new file mode 100644 index 0000000..0b816a8 --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/flint_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "immersivetools:item/flint_shovel" + } +} diff --git a/src/main/resources/assets/immersivetools/models/item/flint_sword.json b/src/main/resources/assets/immersivetools/models/item/flint_sword.json new file mode 100644 index 0000000..f390665 --- /dev/null +++ b/src/main/resources/assets/immersivetools/models/item/flint_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "immersivetools:item/flint_sword" + } +} diff --git a/src/main/resources/assets/immersivetools/textures/item/copper_axe.png b/src/main/resources/assets/immersivetools/textures/item/copper_axe.png new file mode 100644 index 0000000000000000000000000000000000000000..a20dd49fb576e77d1a23360b32d7e3caedb9ffb9 GIT binary patch literal 292 zcmV+<0o(qGP)o;`ao)DtuSq7z#1W-~I&bY?zB+w&QgHvdzeTMo%|by+EvHtS&%zHldV?;sR1^h8YYufK;0? q4A79{2FE$R0K?`Tg6V)z7ytljTy+uCU=Z^F0000U!hKT)-QNngNSgT>}7pET$1Pkt{F( O0000M$HVxCLwo2!J%JDJh`% z62pL4kv|OPlDuGrBJK%b@4x`eWiZ#BeEykX@f#Mf3&Adsl#~PqVxfirLs3K|R*f*h z#YZnQ^xyaZ=01P^9AW?rfDC%vkO}4@+ls8lXzpRKMwl3e0q2r!89-rx%>Yo~M(lq~ z*Z^FKizowDILcy#I4tl$G(i`D0umG(*Z?T>K>>&}3}7*W%@AywLF%z)CRnthy8_u} gtg(PA@bHNP0D3s45yK%m`2YX_07*qoM6N<$f(6rsGXMYp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/immersivetools/textures/item/copper_helmet.png b/src/main/resources/assets/immersivetools/textures/item/copper_helmet.png new file mode 100644 index 0000000000000000000000000000000000000000..cc368295509dae1f8950444c2d0cf18e5f99bfda GIT binary patch literal 247 zcmVSFB%a<=>ScoA2(mX|%lR-^M0mY2PM=vw<-}u1r{P}YfJt!QQ zW@~#NhW}b742;*#FuZ{52UwWp%)skTt`c6S4m>iYu@h z08;F>@jBcKZ{ECNDAW*OFqhQq@*gI@XU`t2YH=C>(!9OCh=K9i8L$~1s}C_?GX$>-BqSujE;yfJ#~>=J z12%;9(?te(2~LI?n;wDn;xz!~e2_sPLqK5B>x&Hi8$U97yUbpQYW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/immersivetools/textures/item/copper_leggings.png b/src/main/resources/assets/immersivetools/textures/item/copper_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..59e544f4535b1b86571ef372763b54e8c98c9044 GIT binary patch literal 269 zcmV+o0rLKdP)@Z119tgq zf;AbE8-VUqP~d_LCdv!g6q01X6kSfR7m!06-AI T_xL0a00000NkvXXu0mjf)jnz8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/immersivetools/textures/item/copper_pickaxe.png b/src/main/resources/assets/immersivetools/textures/item/copper_pickaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..17c97df9fc1b5c11acfbe55817ad9d3e12915893 GIT binary patch literal 298 zcmV+_0oDGAP)lXDr49^AqZ zzV8vkix)45Hvps=|%-ZIRz(FS`*rhXdO5Q4D)((GU;1b4QCgv5W4cVMo-YXGv% zFh3J*0J_bvFaa5GKE;l~aLyszUchEEvH_1*&ts4cO~P&fE}M~K1>_2>v4GEJTuB}t wh{V{8%@DW&8gks=v=0kyVlx@RbU?@;0M25F5%wDAB>(^b07*qoM6N<$f{O}#@&Et; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/immersivetools/textures/item/copper_shovel.png b/src/main/resources/assets/immersivetools/textures/item/copper_shovel.png new file mode 100644 index 0000000000000000000000000000000000000000..3f9764e85b0680567aee92e7b6cb611f4cd8937d GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`r#)R9LoEE0Qx*sq1g)6gsKOi* z6Z5ZGXHU^nuEX8p`Uk2y%@~$cR@VyNIGA6imtZibm?MWHknMnpah&zx55GQ&vI%}? zVY_)jE!=k6JN$5N z+fliD1`gM19$yT1n8@cl(9cC3S6<;It!tAkkjs%-PwsD)d zgOp>_28P4Wb5g_)#yWIu-YCT&bY;S0w%tt;w>!PqTZ*(97Cp`ryt}AwF3?*Hp00i_ I>zopr06lJF!yr>X4eo5@m_zXbNK>uYCx-BSj~JdbW-;`wSk6!s5s6bXMi{^h07jyG0flo zgyF`cuZ$8B65#X>G6cHUJcTtDk%)=wECZ i5AIZuBraR<W0000#H>3E!|KVTLE=!($yZ4E}qVp{eERMCh#n{eKQLn!(f6 K&t;ucLK6U6C1)Z4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/immersivetools/textures/item/flint_hoe.png b/src/main/resources/assets/immersivetools/textures/item/flint_hoe.png new file mode 100644 index 0000000000000000000000000000000000000000..ec845b90fa244cb8a55871f44ff5868a82af02da GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fXMsm#F#`j) zFbFd;%$g$s6toQR32_C|s>;f$N=l85jS&$MLPA1XLJBH3zr1>1vC7|0Cx6wbb-S_bHdL*bMCCs`1InHW#G?0Oe{|>e&v2N gJzc=*@nS}XM~#e!nI7~`1)9g;>FVdQ&MBb@0EM(zEdT%j literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/immersivetools/textures/item/flint_pickaxe.png b/src/main/resources/assets/immersivetools/textures/item/flint_pickaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..5af7c535ad62b75592c55846b898af758331ffe2 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fXMsm#F#`j) zFbFd;%$g$s6bujW32_C|>Z+<5YHDgKDossIQBhHj4h~L^j?vN4{x&kX!Kxx6BF;`u zy*YaNszQF&(xRfGIl(G=DndQky5i#EzSh#Z%7WQ}O3ls9-C5c`R+2hO0@{lFdl!^0 z2O2F~666=m@E;F&d{pc_P+_X4i(^Q|oZjA(d<_abF5G$x7UVEB{rg|OYNA3x5ub0o zu|De$$rgcQtmS_Vgu0gh%r-d25r54~c*=>csn53T;8^VVNq2LoRKv$R8;;!#PCNRm t-SM60#)EskwOr~${wJ@HJl8fm=CC63J*xzzT|f&NJYD@<);T3K0RZ7ac;^5B literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/immersivetools/textures/item/flint_shovel.png b/src/main/resources/assets/immersivetools/textures/item/flint_shovel.png new file mode 100644 index 0000000000000000000000000000000000000000..d65cbeace74d8f44eabc1c766fd744c451bdca69 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF?M5L*y$PZ!6KiaE&%2lymf7w{wsvvxGBEM{_1 zP?0(Gpg^}t<7Es_;330qPNfTb8Js?!X_6|E(kgf+7V_W?vqm%ju?8lFQ`dOrUEn>~ Q1vHJp)78&qol`;+0K}_JZ2$lO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/immersivetools/textures/item/flint_sword.png b/src/main/resources/assets/immersivetools/textures/item/flint_sword.png new file mode 100644 index 0000000000000000000000000000000000000000..91e2adccc5f742de1fed27972673551882b796e8 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fXMsm#F#`j) zFbFd;%$g$s6toZU32_B!P*YP^RgI30Zfa^05fO=sifV3d78MnBa&$B?HgPx(6iGxuRA@uxnafMmQ547TENs*=ABbfGk){v@h0?;PMXSP11g&b>qIG{t>lQ6* z6+|1URSP2*p%fW{rV>o1h>srX}05Cjw(d+O%x9Weso6GL*H@4ipXJgSj>H>h# zsSoaO;~x+Bxt04r0C+GwuybwjteaU_b||d{7++V`>)!)H05a`I@*s@QW?kKL000b~ z>vu~l>)rzdz@esQ_kQMc{d)i;cqY^7t-iLo?b@0e9LlrCCa3G)0{{SJ3#Gz;J_HIW zh{87SEAR^eA=#vJn+EN@$2(fxjYlu4nnqK~^W^w%x$XR0e{F8KsqC`1{H;rueGRa@ zww^yH9A+1mJV-6gjjrcJSN`m1y1})i+ug|cTmLs(N03bjBNq2pyN*bS zMAzBY>Ryh2^!wiKF0ZV}P>Rdiq)Cb+)d`U0g`SN6JOBZ}#Qe0sOR1FqQ8NIb7|K)G zCAqq+^yJRf9b5eYp5$$~;MypH$xkKM5m9AGedKf&xxU%}sBYmcaSdBUWWmw41EzbMjDTl9|JMHDQ0At`(zkB-Tb-tA5e#syo_8Oeq(p&qA z0}xJ(h)V&YUV>(dUO?8=h>fNQ03@$wi#~*=Nj(P&3tX%VKz-evd4)BvU_!;YNV}Mk zU0FPU2eC9LwH9W0!Ze8`h4zw1j!skFf{Pz(-@PAjllFL*z~r3XhE>eKrfdMH%j1z) zAY6bTrDU<}>JP6J7RKUQ$kAd;VXUfH7sp7p5C;_dy+z3YD88)+$ig8A0zloOtO_82 z5w3EixfqH2d4NS#k56(z2u{|pOpA-s=_v%bLrsq!AP>MYgS{E==2l*E@+9sfWMU*1 zQ!sY^*F*@G6$4w=wWOv2hh^OmG=+d-UtkcEA~9lCA%MGU*`dmTcmVmC2WtezL$tT7 znsg3>+gP+ik&p*yfA?B8EEF32taR_;LjV_MrY8$2CPhNHtiA^j3nO3XdjSV!Z07*qoM6N<$g8q089RL6T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/models/armor/copper_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/copper_layer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..a28c6e3c19c84ab06de21810324ae70cf9e626c8 GIT binary patch literal 572 zcmV-C0>k}@P)Px$_DMuRRA@u(SItU7K^Pr3Sq9ybutI2IwMht)7A{-|?s|&WJxc4|A!sMGE^-kD zfe}EgH6S2Y0U`uhG+@8f-=)ls#l#^eJ4&1Y6p8UPkp$gb%^&#DhP4d4kFFhvZkU;TkT zKj|r<8NeGyK`1z%-5ALL2?zj+1OU8o+%P2oia)nH0p-(kDOIXm25US-f&o$j)I2>w zGQtFe>qszwriL4*1b$+`@x{4jh&0Veq=57QP#Xne5D?QO&6M~pCe27?i;Y=Eu8dv2 z3nON=3Gzpo+5eZqaE7fjOp$BMXs3}D984M6Y6Bpwc^)%A6Nbl(-RHA)W-Kx#Sj2n3 zr;BU%2fA-S!7yF4+PC#)5VPj_shLD5COb9&GDcPFd*Rg*Td4nr-#f=$Ac&}&q#Uke7E=0.11.3", - "fabric": "*", - "minecraft": "1.17.x", - "java": ">=16" - }, - "suggests": { - "another-mod": "*" - } + "depends": { + "fabricloader": ">=0.11.3", + "fabric": "*", + "minecraft": "1.17.x", + "java": ">=16" + }, + "suggests": { + "another-mod": "*" + } } diff --git a/src/main/resources/immersivetools.mixins.json b/src/main/resources/immersivetools.mixins.json new file mode 100644 index 0000000..bad5af5 --- /dev/null +++ b/src/main/resources/immersivetools.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "dk.palmoe.immersivetools.mixin", + "compatibilityLevel": "JAVA_16", + "mixins": [], + "client": ["ImmersiveToolsMixin"], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/modid.mixins.json b/src/main/resources/modid.mixins.json deleted file mode 100644 index 9cf7e06..0000000 --- a/src/main/resources/modid.mixins.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.fabricmc.example.mixin", - "compatibilityLevel": "JAVA_16", - "mixins": [ - ], - "client": [ - "ExampleMixin" - ], - "injectors": { - "defaultRequire": 1 - } -}