From 3c163a5e95c57b68a4531107cac4b71907188c88 Mon Sep 17 00:00:00 2001 From: minemobs Date: Wed, 10 Apr 2024 10:10:00 +0000 Subject: [PATCH] Fixed #4 --- build.gradle | 2 +- gradle.properties | 10 +++++----- .../common/ConstructsArmoryModifiers.java | 3 --- .../data/ArmorMaterialTraitsDataProvider.java | 14 ++++---------- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index ea24d76b..cd582fde 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ archivesBaseName = "${mod_id}-forge" java.toolchain.languageVersion = JavaLanguageVersion.of(17) minecraft { - mappings channel: 'parchment', version: "2022.09.04-1.18.2" + mappings channel: 'parchment', version: "2022.11.06-1.18.2" accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') diff --git a/gradle.properties b/gradle.properties index 24d78356..3dee52fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,20 +3,20 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Mod -mod_version=2.0.0-alpha.2+1.18.2 +mod_version=2.0.0-alpha.3+1.18.2 mod_group=top.theillusivec4.constructsarmory mod_id=constructsarmory mod_name=Construct's Armory mod_url=https://www.curseforge.com/minecraft/mc-mods/constructs-armory -mod_author=C4 +mod_author=C4, minemobs mod_description=A Tinkers' Construct add-on to make armor out of materials and modifiers. mod_icon=constructsarmory_icon.png # Dependencies version_minecraft=1.18.2 -version_forge=1.18.2-40.1.80 -version_mantle=1.18.2-1.9.28 -version_tic=1.18.2-3.5.2.39 +version_forge=1.18.2-40.2.0 +version_mantle=1.18.2-1.9.50 +version_tic=1.18.2-3.7.1.155 version_jei=9.7.1.255 # Curse diff --git a/src/main/java/com/illusivesoulworks/constructsarmory/common/ConstructsArmoryModifiers.java b/src/main/java/com/illusivesoulworks/constructsarmory/common/ConstructsArmoryModifiers.java index 8a2a7f78..470c8eef 100644 --- a/src/main/java/com/illusivesoulworks/constructsarmory/common/ConstructsArmoryModifiers.java +++ b/src/main/java/com/illusivesoulworks/constructsarmory/common/ConstructsArmoryModifiers.java @@ -21,7 +21,6 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import slimeknights.tconstruct.library.modifiers.util.ModifierDeferredRegister; import slimeknights.tconstruct.library.modifiers.util.StaticModifier; -import slimeknights.tconstruct.tools.modifiers.traits.general.CultivatedModifier; import slimeknights.tconstruct.tools.modifiers.traits.general.DenseModifier; import slimeknights.tconstruct.tools.modifiers.traits.general.OvercastModifier; import slimeknights.tconstruct.tools.modifiers.traits.general.OvergrowthModifier; @@ -65,8 +64,6 @@ public class ConstructsArmoryModifiers { private static final ModifierDeferredRegister MODIFIERS = ModifierDeferredRegister.create(ConstructsArmoryMod.MOD_ID); // Tier 1 - public static final StaticModifier CULTIVATED = - MODIFIERS.register("cultivated", CultivatedModifier::new); public static final StaticModifier WOVEN = MODIFIERS.register("woven", WovenModifier::new); public static final StaticModifier PETROUS = diff --git a/src/main/java/com/illusivesoulworks/constructsarmory/data/ArmorMaterialTraitsDataProvider.java b/src/main/java/com/illusivesoulworks/constructsarmory/data/ArmorMaterialTraitsDataProvider.java index b1360994..4c169d45 100644 --- a/src/main/java/com/illusivesoulworks/constructsarmory/data/ArmorMaterialTraitsDataProvider.java +++ b/src/main/java/com/illusivesoulworks/constructsarmory/data/ArmorMaterialTraitsDataProvider.java @@ -17,23 +17,18 @@ package com.illusivesoulworks.constructsarmory.data; -import javax.annotation.Nonnull; - -import com.illusivesoulworks.constructsarmory.ConstructsArmoryMod; +import com.illusivesoulworks.constructsarmory.common.ConstructsArmoryModifiers; +import com.illusivesoulworks.constructsarmory.common.stat.impl.MailMaterialStats; +import com.illusivesoulworks.constructsarmory.common.stat.impl.PlateMaterialStats; import net.minecraft.data.DataGenerator; -import org.apache.commons.lang3.reflect.FieldUtils; import slimeknights.tconstruct.library.data.material.AbstractMaterialDataProvider; import slimeknights.tconstruct.library.data.material.AbstractMaterialTraitDataProvider; import slimeknights.tconstruct.library.materials.definition.MaterialId; import slimeknights.tconstruct.library.modifiers.Modifier; -import slimeknights.tconstruct.library.modifiers.ModifierManager; import slimeknights.tconstruct.library.modifiers.util.StaticModifier; import slimeknights.tconstruct.tools.data.material.MaterialIds; -import com.illusivesoulworks.constructsarmory.common.ConstructsArmoryModifiers; -import com.illusivesoulworks.constructsarmory.common.stat.impl.MailMaterialStats; -import com.illusivesoulworks.constructsarmory.common.stat.impl.PlateMaterialStats; -import java.lang.reflect.Field; +import javax.annotation.Nonnull; public class ArmorMaterialTraitsDataProvider extends AbstractMaterialTraitDataProvider { @@ -45,7 +40,6 @@ public ArmorMaterialTraitsDataProvider(DataGenerator gen, @Override protected void addMaterialTraits() { // Tier 1 - addArmorTraits(MaterialIds.wood, ConstructsArmoryModifiers.CULTIVATED); addArmorTraits(MaterialIds.rock, ConstructsArmoryModifiers.PETROUS); addArmorTraits(MaterialIds.leather, ConstructsArmoryModifiers.WOVEN); addArmorTraits(MaterialIds.bone, ConstructsArmoryModifiers.SPLINTERED);