diff --git a/build.gradle b/build.gradle index 9aaa050..a7dd63f 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,17 @@ 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. + exclusiveContent { + forRepository { + maven { + name = "Modrinth" + url = "https://api.modrinth.com/maven" + } + } + filter { + includeGroup "maven.modrinth" + } + } } loom { @@ -44,7 +55,8 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" - + + modImplementation "maven.modrinth:backport-copper-age:1.21.1-0.1.4" } processResources { diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/MCRebalance.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/MCRebalance.java index 3ba1165..82b6e78 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/MCRebalance.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/MCRebalance.java @@ -17,7 +17,6 @@ public class MCRebalance implements ModInitializer { ModItems.init(); // Initialise: load all static values ModBlocks.init(); - ModArmourMats.init(); LOGGER.info("Hello Fabric world!"); } } \ No newline at end of file diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModArmourMats.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModArmourMats.java deleted file mode 100644 index 7151176..0000000 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModArmourMats.java +++ /dev/null @@ -1,60 +0,0 @@ -package xyz.nearmisses.patience.mc_rebalance; - -import net.minecraft.core.Holder; -import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.ArmorMaterial; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.crafting.Ingredient; - -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; - -public class ModArmourMats { - public static void init(){} - - // Speeds up the process of making new armour. - public static Holder registerMaterial( - String id, - Map defensePoints, - int enchantability, - Holder equipSound, - Supplier repairIngredientSupplier, - float toughness, - float knockbackResistance, - boolean dyeable - ) { - // Get the supported layers for the armor material - List layers = List.of( - new ArmorMaterial.Layer(ResourceLocation.fromNamespaceAndPath(MCRebalance.MOD_ID, id), "", dyeable) // ID, suffix(?), dyeable - ); - - ArmorMaterial material = new ArmorMaterial(defensePoints, enchantability, equipSound, repairIngredientSupplier, layers, toughness, knockbackResistance); - - // Check why/if this is necessary later. - material = Registry.register(BuiltInRegistries.ARMOR_MATERIAL, ResourceLocation.fromNamespaceAndPath(MCRebalance.MOD_ID, id), material); - return Holder.direct(material); - } - - public static final Holder Copper = registerMaterial("copper", - Map.of( // Armour values - ArmorItem.Type.HELMET, 2, - ArmorItem.Type.CHESTPLATE, 4, - ArmorItem.Type.LEGGINGS, 3, - ArmorItem.Type.BOOTS, 1 - ), - 9, // Enchantability - SoundEvents.ARMOR_EQUIP_IRON, - () -> Ingredient.of(Items.COPPER_INGOT), - 0.0F, // Toughness - 0.0F, // Knockback resistance - false - ); - - // Armor items defined in ModItems. -} diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModItems.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModItems.java index 762a3ac..c866f6e 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModItems.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModItems.java @@ -6,7 +6,6 @@ import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; @@ -15,18 +14,13 @@ public class ModItems { public static void init(){ // Add items to creative tabs ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.WOODEN_HOE, ModItems.Paxel_Wood)); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.STONE_HOE, ModItems.Paxel_Copper)); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.STONE_HOE, ModItems.Paxel_Stone)); + // Ugly, but java has no import aliasing and the mod uses the exact same class name + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(com.github.smallinger.copperagebackport.registry.ModItems.COPPER_HOE.get(), ModItems.Paxel_Copper)); ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.IRON_HOE, ModItems.Paxel_Iron)); ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.GOLDEN_HOE, ModItems.Paxel_Gold)); ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.DIAMOND_HOE, ModItems.Paxel_Diamond)); ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.NETHERITE_HOE, ModItems.Paxel_Dendrite)); - - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COMBAT).register((itemGroup) -> itemGroup.addAfter(Items.LEATHER_BOOTS, ModItems.Armour_Copper_Helm)); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COMBAT).register((itemGroup) -> itemGroup.addAfter(ModItems.Armour_Copper_Helm, ModItems.Armour_Copper_Chest)); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COMBAT).register((itemGroup) -> itemGroup.addAfter(ModItems.Armour_Copper_Chest, ModItems.Armour_Copper_Legs)); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COMBAT).register((itemGroup) -> itemGroup.addAfter(ModItems.Armour_Copper_Legs, ModItems.Armour_Copper_Boots)); - - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.INGREDIENTS).register((itemGroup) -> itemGroup.addAfter(Items.COPPER_INGOT, ModItems.Copper_Nugget)); } public static Item register(String id, Item.Properties item) { @@ -40,16 +34,10 @@ public class ModItems { // Paxel stats are supplied solely with data, this is just to give them an ID so they're nice and easy to meddle with public static final Item Paxel_Wood = register("wooden_paxel", new Item.Properties() ); - public static final Item Paxel_Copper = register("stone_paxel", new Item.Properties() ); // Not strictly right in this pack but we're keeping up with naming conventions + public static final Item Paxel_Stone = register("stone_paxel", new Item.Properties() ); + public static final Item Paxel_Copper = register("copper_paxel", new Item.Properties() ); public static final Item Paxel_Iron = register("iron_paxel", new Item.Properties() ); public static final Item Paxel_Gold = register("golden_paxel", new Item.Properties() ); public static final Item Paxel_Diamond = register("diamond_paxel", new Item.Properties() ); - public static final Item Paxel_Dendrite = register("netherite_paxel", new Item.Properties() ); // As with copper - - public static final Item Armour_Copper_Helm = register("copper_helmet", new ArmorItem(ModArmourMats.Copper, ArmorItem.Type.HELMET, new Item.Properties().durability(ArmorItem.Type.HELMET.getDurability(10))) ); - public static final Item Armour_Copper_Chest = register("copper_chestplate", new ArmorItem(ModArmourMats.Copper, ArmorItem.Type.CHESTPLATE, new Item.Properties().durability(ArmorItem.Type.CHESTPLATE.getDurability(10))) ); - public static final Item Armour_Copper_Legs = register("copper_leggings", new ArmorItem(ModArmourMats.Copper, ArmorItem.Type.LEGGINGS, new Item.Properties().durability(ArmorItem.Type.LEGGINGS.getDurability(10))) ); - public static final Item Armour_Copper_Boots = register("copper_boots", new ArmorItem(ModArmourMats.Copper, ArmorItem.Type.BOOTS, new Item.Properties().durability(ArmorItem.Type.BOOTS.getDurability(10))) ); - - public static final Item Copper_Nugget = register("copper_nugget", new Item.Properties()); -} \ No newline at end of file + public static final Item Paxel_Dendrite = register("netherite_paxel", new Item.Properties() ); // Not strictly right in this pack but we're keeping up with naming conventions +} diff --git a/src/main/resources/assets/mc_rebalance/lang/en_us.json b/src/main/resources/assets/mc_rebalance/lang/en_us.json index 5b1503e..d6decd6 100644 --- a/src/main/resources/assets/mc_rebalance/lang/en_us.json +++ b/src/main/resources/assets/mc_rebalance/lang/en_us.json @@ -8,14 +8,10 @@ "advancements.nether.thanks_emerald.title":"Thank You and Farewell", "advancements.nether.thanks_emerald.description":"Kill the Wither and earn a developer item", "item.mc_rebalance.wooden_paxel": "Wooden Paxel", - "item.mc_rebalance.stone_paxel": "Copper Paxel", + "item.mc_rebalance.stone_paxel": "Stone Paxel", + "item.mc_rebalance.copper_paxel": "Copper Paxel", "item.mc_rebalance.iron_paxel": "Iron Paxel", "item.mc_rebalance.golden_paxel": "Golden Paxel", "item.mc_rebalance.diamond_paxel": "Diamond Paxel", - "item.mc_rebalance.netherite_paxel": "Dendrite Paxel", - "item.mc_rebalance.copper_nugget": "Copper Nugget", - "item.mc_rebalance.copper_helmet": "Copper Helmet", - "item.mc_rebalance.copper_chestplate": "Copper Chestplate", - "item.mc_rebalance.copper_leggings": "Copper Leggings", - "item.mc_rebalance.copper_boots": "Copper Boots" + "item.mc_rebalance.netherite_paxel": "Dendrite Paxel" } diff --git a/src/main/resources/assets/mc_rebalance/models/item/copper_boots.json b/src/main/resources/assets/mc_rebalance/models/item/copper_boots.json deleted file mode 100644 index b3efa1d..0000000 --- a/src/main/resources/assets/mc_rebalance/models/item/copper_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "mc_rebalance:item/copper_boots" - } -} diff --git a/src/main/resources/assets/mc_rebalance/models/item/copper_chestplate.json b/src/main/resources/assets/mc_rebalance/models/item/copper_chestplate.json deleted file mode 100644 index a315cc7..0000000 --- a/src/main/resources/assets/mc_rebalance/models/item/copper_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "mc_rebalance:item/copper_chestplate" - } -} diff --git a/src/main/resources/assets/mc_rebalance/models/item/copper_helmet.json b/src/main/resources/assets/mc_rebalance/models/item/copper_helmet.json deleted file mode 100644 index d05ba4e..0000000 --- a/src/main/resources/assets/mc_rebalance/models/item/copper_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "mc_rebalance:item/copper_helmet" - } -} diff --git a/src/main/resources/assets/mc_rebalance/models/item/copper_leggings.json b/src/main/resources/assets/mc_rebalance/models/item/copper_leggings.json deleted file mode 100644 index ba40554..0000000 --- a/src/main/resources/assets/mc_rebalance/models/item/copper_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "mc_rebalance:item/copper_leggings" - } -} diff --git a/src/main/resources/assets/mc_rebalance/models/item/copper_nugget.json b/src/main/resources/assets/mc_rebalance/models/item/copper_nugget.json deleted file mode 100644 index 81996ba..0000000 --- a/src/main/resources/assets/mc_rebalance/models/item/copper_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "mc_rebalance:item/copper_nugget" - } -} diff --git a/src/main/resources/assets/mc_rebalance/models/item/copper_paxel.json b/src/main/resources/assets/mc_rebalance/models/item/copper_paxel.json new file mode 100644 index 0000000..ca44da8 --- /dev/null +++ b/src/main/resources/assets/mc_rebalance/models/item/copper_paxel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "mc_rebalance:item/copper_paxel" + } +} diff --git a/src/main/resources/assets/mc_rebalance/textures/item/copper_boots.png b/src/main/resources/assets/mc_rebalance/textures/item/copper_boots.png deleted file mode 100644 index 11c0cb4..0000000 Binary files a/src/main/resources/assets/mc_rebalance/textures/item/copper_boots.png and /dev/null differ diff --git a/src/main/resources/assets/mc_rebalance/textures/item/copper_chestplate.png b/src/main/resources/assets/mc_rebalance/textures/item/copper_chestplate.png deleted file mode 100644 index d7507b0..0000000 Binary files a/src/main/resources/assets/mc_rebalance/textures/item/copper_chestplate.png and /dev/null differ diff --git a/src/main/resources/assets/mc_rebalance/textures/item/copper_helmet.png b/src/main/resources/assets/mc_rebalance/textures/item/copper_helmet.png deleted file mode 100644 index fde1812..0000000 Binary files a/src/main/resources/assets/mc_rebalance/textures/item/copper_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/mc_rebalance/textures/item/copper_leggings.png b/src/main/resources/assets/mc_rebalance/textures/item/copper_leggings.png deleted file mode 100644 index 66f1f38..0000000 Binary files a/src/main/resources/assets/mc_rebalance/textures/item/copper_leggings.png and /dev/null differ diff --git a/src/main/resources/assets/mc_rebalance/textures/item/copper_nugget.png b/src/main/resources/assets/mc_rebalance/textures/item/copper_nugget.png deleted file mode 100644 index a23070c..0000000 Binary files a/src/main/resources/assets/mc_rebalance/textures/item/copper_nugget.png and /dev/null differ diff --git a/src/main/resources/assets/mc_rebalance/textures/item/copper_paxel.png b/src/main/resources/assets/mc_rebalance/textures/item/copper_paxel.png new file mode 100644 index 0000000..dca2829 Binary files /dev/null and b/src/main/resources/assets/mc_rebalance/textures/item/copper_paxel.png differ diff --git a/src/main/resources/assets/mc_rebalance/textures/item/stone_paxel.png b/src/main/resources/assets/mc_rebalance/textures/item/stone_paxel.png index dca2829..4cf2249 100644 Binary files a/src/main/resources/assets/mc_rebalance/textures/item/stone_paxel.png and b/src/main/resources/assets/mc_rebalance/textures/item/stone_paxel.png differ diff --git a/src/main/resources/assets/mc_rebalance/textures/models/armor/copper_layer_1.png b/src/main/resources/assets/mc_rebalance/textures/models/armor/copper_layer_1.png deleted file mode 100644 index eccf785..0000000 Binary files a/src/main/resources/assets/mc_rebalance/textures/models/armor/copper_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/mc_rebalance/textures/models/armor/copper_layer_2.png b/src/main/resources/assets/mc_rebalance/textures/models/armor/copper_layer_2.png deleted file mode 100644 index fc15738..0000000 Binary files a/src/main/resources/assets/mc_rebalance/textures/models/armor/copper_layer_2.png and /dev/null differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7b94868..8747b61 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -36,6 +36,7 @@ "fabricloader": ">=0.18.4", "minecraft": "~1.21.1", "java": ">=21", - "fabric-api": "*" + "fabric-api": "*", + "copperagebackport": "*" } }