Fixed #5 and #6

illusivesoulworks · May 5, 2024 · 8d9e4f0 · 8d9e4f0
1 parent 3c163a5
commit 8d9e4f0
Show file tree

Hide file tree

Showing 30 changed files with 12 additions and 23 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Mod
-mod_version=2.0.0-alpha.3+1.18.2
+mod_version=2.0.0-alpha.4+1.18.2
 mod_group=top.theillusivec4.constructsarmory
 mod_id=constructsarmory
 mod_name=Construct's Armory

diff --git a/gradlew b/gradlew
diff --git a/...ken_feet_plate_tconstruct_wood_bamboo.png → ...s/broken_feet_plate_tconstruct_bamboo.png b/...ken_feet_plate_tconstruct_wood_bamboo.png → ...s/broken_feet_plate_tconstruct_bamboo.png
diff --git a/...ots/feet_plate_tconstruct_wood_bamboo.png → ...ol/boots/feet_plate_tconstruct_bamboo.png b/...ots/feet_plate_tconstruct_wood_bamboo.png → ...ol/boots/feet_plate_tconstruct_bamboo.png
diff --git a/...ool/boots/mail_tconstruct_wood_bamboo.png → ...tem/tool/boots/mail_tconstruct_bamboo.png b/...ool/boots/mail_tconstruct_wood_bamboo.png → ...tem/tool/boots/mail_tconstruct_bamboo.png
diff --git a/...ate/body_plate_tconstruct_wood_bamboo.png → ...estplate/body_plate_tconstruct_bamboo.png b/...ate/body_plate_tconstruct_wood_bamboo.png → ...estplate/body_plate_tconstruct_bamboo.png
diff --git a/...ken_body_plate_tconstruct_wood_bamboo.png → ...e/broken_body_plate_tconstruct_bamboo.png b/...ken_body_plate_tconstruct_wood_bamboo.png → ...e/broken_body_plate_tconstruct_bamboo.png
diff --git a/...hestplate/mail_tconstruct_wood_bamboo.png → ...ool/chestplate/mail_tconstruct_bamboo.png b/...hestplate/mail_tconstruct_wood_bamboo.png → ...ool/chestplate/mail_tconstruct_bamboo.png
diff --git a/...ken_head_plate_tconstruct_wood_bamboo.png → ...t/broken_head_plate_tconstruct_bamboo.png b/...ken_head_plate_tconstruct_wood_bamboo.png → ...t/broken_head_plate_tconstruct_bamboo.png
diff --git a/...met/head_plate_tconstruct_wood_bamboo.png → ...l/helmet/head_plate_tconstruct_bamboo.png b/...met/head_plate_tconstruct_wood_bamboo.png → ...l/helmet/head_plate_tconstruct_bamboo.png
diff --git a/...ol/helmet/mail_tconstruct_wood_bamboo.png → ...em/tool/helmet/mail_tconstruct_bamboo.png b/...ol/helmet/mail_tconstruct_wood_bamboo.png → ...em/tool/helmet/mail_tconstruct_bamboo.png
diff --git a/...ken_legs_plate_tconstruct_wood_bamboo.png → ...s/broken_legs_plate_tconstruct_bamboo.png b/...ken_legs_plate_tconstruct_wood_bamboo.png → ...s/broken_legs_plate_tconstruct_bamboo.png
diff --git a/...ngs/legs_plate_tconstruct_wood_bamboo.png → ...leggings/legs_plate_tconstruct_bamboo.png b/...ngs/legs_plate_tconstruct_wood_bamboo.png → ...leggings/legs_plate_tconstruct_bamboo.png
diff --git a/.../leggings/mail_tconstruct_wood_bamboo.png → .../tool/leggings/mail_tconstruct_bamboo.png b/.../leggings/mail_tconstruct_wood_bamboo.png → .../tool/leggings/mail_tconstruct_bamboo.png
diff --git a/...rts/body_plate_tconstruct_wood_bamboo.png → ...ol/parts/body_plate_tconstruct_bamboo.png b/...rts/body_plate_tconstruct_wood_bamboo.png → ...ol/parts/body_plate_tconstruct_bamboo.png
diff --git a/...rts/feet_plate_tconstruct_wood_bamboo.png → ...ol/parts/feet_plate_tconstruct_bamboo.png b/...rts/feet_plate_tconstruct_wood_bamboo.png → ...ol/parts/feet_plate_tconstruct_bamboo.png
diff --git a/...rts/head_plate_tconstruct_wood_bamboo.png → ...ol/parts/head_plate_tconstruct_bamboo.png b/...rts/head_plate_tconstruct_wood_bamboo.png → ...ol/parts/head_plate_tconstruct_bamboo.png
diff --git a/...rts/legs_plate_tconstruct_wood_bamboo.png → ...ol/parts/legs_plate_tconstruct_bamboo.png b/...rts/legs_plate_tconstruct_wood_bamboo.png → ...ol/parts/legs_plate_tconstruct_bamboo.png
diff --git a/...ool/parts/mail_tconstruct_wood_bamboo.png → ...tem/tool/parts/mail_tconstruct_bamboo.png b/...ool/parts/mail_tconstruct_wood_bamboo.png → ...tem/tool/parts/mail_tconstruct_bamboo.png
diff --git a/...r_mail_layer_1_tconstruct_wood_bamboo.png → ..._armor_mail_layer_1_tconstruct_bamboo.png b/...r_mail_layer_1_tconstruct_wood_bamboo.png → ..._armor_mail_layer_1_tconstruct_bamboo.png
diff --git a/...r_mail_layer_2_tconstruct_wood_bamboo.png → ..._armor_mail_layer_2_tconstruct_bamboo.png b/...r_mail_layer_2_tconstruct_wood_bamboo.png → ..._armor_mail_layer_2_tconstruct_bamboo.png
diff --git a/..._plate_layer_1_tconstruct_wood_bamboo.png → ...armor_plate_layer_1_tconstruct_bamboo.png b/..._plate_layer_1_tconstruct_wood_bamboo.png → ...armor_plate_layer_1_tconstruct_bamboo.png
diff --git a/..._plate_layer_2_tconstruct_wood_bamboo.png → ...armor_plate_layer_2_tconstruct_bamboo.png b/..._plate_layer_2_tconstruct_wood_bamboo.png → ...armor_plate_layer_2_tconstruct_bamboo.png
diff --git a/...enerated/resources/data/constructsarmory/recipes/tools/building/material_armor_boots.json b/...enerated/resources/data/constructsarmory/recipes/tools/building/material_armor_boots.json
@@ -1,4 +1,5 @@
 {
   "type": "tconstruct:tool_building",
-  "result": "constructsarmory:material_armor_boots"
+  "result": "constructsarmory:material_armor_boots",
+  "result_count": 1
 }
diff --git a/...ted/resources/data/constructsarmory/recipes/tools/building/material_armor_chestplate.json b/...ted/resources/data/constructsarmory/recipes/tools/building/material_armor_chestplate.json
@@ -1,4 +1,5 @@
 {
   "type": "tconstruct:tool_building",
-  "result": "constructsarmory:material_armor_chestplate"
+  "result": "constructsarmory:material_armor_chestplate",
+  "result_count": 1
 }
diff --git a/...nerated/resources/data/constructsarmory/recipes/tools/building/material_armor_helmet.json b/...nerated/resources/data/constructsarmory/recipes/tools/building/material_armor_helmet.json
@@ -1,4 +1,5 @@
 {
   "type": "tconstruct:tool_building",
-  "result": "constructsarmory:material_armor_helmet"
+  "result": "constructsarmory:material_armor_helmet",
+  "result_count": 1
 }
diff --git a/...rated/resources/data/constructsarmory/recipes/tools/building/material_armor_leggings.json b/...rated/resources/data/constructsarmory/recipes/tools/building/material_armor_leggings.json
@@ -1,4 +1,5 @@
 {
   "type": "tconstruct:tool_building",
-  "result": "constructsarmory:material_armor_leggings"
+  "result": "constructsarmory:material_armor_leggings",
+  "result_count": 1
 }
diff --git a/src/generated/resources/data/tconstruct/tinkering/materials/traits/wood.json b/src/generated/resources/data/tconstruct/tinkering/materials/traits/wood.json
diff --git a/src/main/java/com/illusivesoulworks/constructsarmory/data/ArmorRecipeProvider.java b/src/main/java/com/illusivesoulworks/constructsarmory/data/ArmorRecipeProvider.java
@@ -20,8 +20,8 @@
 import javax.annotation.Nonnull;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.recipes.FinishedRecipe;
+import net.minecraft.data.recipes.RecipeProvider;
 import org.jetbrains.annotations.NotNull;
-import slimeknights.tconstruct.common.data.BaseRecipeProvider;
 import slimeknights.tconstruct.library.data.recipe.IMaterialRecipeHelper;
 import slimeknights.tconstruct.library.data.recipe.IToolRecipeHelper;
 import slimeknights.tconstruct.library.tools.item.ModifiableArmorItem;
@@ -30,7 +30,7 @@
 
 import java.util.function.Consumer;
 
-public class ArmorRecipeProvider extends BaseRecipeProvider implements IMaterialRecipeHelper, IToolRecipeHelper {
+public class ArmorRecipeProvider extends RecipeProvider implements IMaterialRecipeHelper, IToolRecipeHelper {
 
     public ArmorRecipeProvider(DataGenerator generator) {
         super(generator);

diff --git a/src/main/resources/assets/constructsarmory/lang/en_us.json b/src/main/resources/assets/constructsarmory/lang/en_us.json
@@ -92,6 +92,7 @@
   "modifier.constructsarmory.aerial.flavor": "Take to the skies!",
   "modifier.constructsarmory.aerial.description": "Increased movement speed at high elevations",
   "modifier.constructsarmory.aerial.speed": "Aerial Speed",
+  "modifier.constructsarmory.reinforced": "Reinforced",
   "__comment": "Tier 2 Addon Traits",
   "modifier.constructsarmory.dense": "Dense",
   "modifier.constructsarmory.dense.flavor": "Barely loses its shape",