Improve bow recipes

Now have layout and recipe for crossbow Now have better locations in layout for longbow
SlimeKnights · Dec 24, 2022 · 6797892 · 6797892
1 parent f80b536
commit 6797892
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 13 deletions.
diff --git a/src/generated/resources/data/tconstruct/recipes/tools/building/crossbow.json b/src/generated/resources/data/tconstruct/recipes/tools/building/crossbow.json
@@ -0,0 +1,4 @@
+{
+  "type": "tconstruct:tool_building",
+  "result": "tconstruct:crossbow"
+}
diff --git a/src/generated/resources/data/tconstruct/tinkering/station_layouts/crossbow.json b/src/generated/resources/data/tconstruct/tinkering/station_layouts/crossbow.json
@@ -0,0 +1,37 @@
+{
+  "translation_key": "item.tconstruct.crossbow",
+  "icon": {
+    "item": "tconstruct:crossbow",
+    "nbt": "{Damage:0,tic_broken:0b,tic_display:1b,tic_materials:[\"tconstruct:ui_render#head\",\"tconstruct:ui_render#handle\",\"tconstruct:ui_render#extra\",\"tconstruct:ui_render#large\",\"tconstruct:ui_render#extra_large\"]}"
+  },
+  "sortIndex": 8,
+  "input_slots": [
+    {
+      "icon": "tconstruct:bow_limb",
+      "translation_key": "item.tconstruct.bow_limb",
+      "x": 10,
+      "y": 20,
+      "filter": {
+        "item": "tconstruct:bow_limb"
+      }
+    },
+    {
+      "icon": "tconstruct:bow_grip",
+      "translation_key": "item.tconstruct.bow_grip",
+      "x": 46,
+      "y": 56,
+      "filter": {
+        "item": "tconstruct:bow_grip"
+      }
+    },
+    {
+      "icon": "tconstruct:bowstring",
+      "translation_key": "item.tconstruct.bowstring",
+      "x": 28,
+      "y": 38,
+      "filter": {
+        "item": "tconstruct:bowstring"
+      }
+    }
+  ]
+}
diff --git a/src/generated/resources/data/tconstruct/tinkering/station_layouts/longbow.json b/src/generated/resources/data/tconstruct/tinkering/station_layouts/longbow.json
@@ -9,35 +9,35 @@
     {
       "icon": "tconstruct:bow_limb",
       "translation_key": "item.tconstruct.bow_limb",
-      "x": 50,
-      "y": 48,
+      "x": 20,
+      "y": 55,
       "filter": {
         "item": "tconstruct:bow_limb"
       }
     },
     {
       "icon": "tconstruct:bow_limb",
       "translation_key": "item.tconstruct.bow_limb",
-      "x": 25,
-      "y": 20,
+      "x": 45,
+      "y": 30,
       "filter": {
         "item": "tconstruct:bow_limb"
       }
     },
     {
       "icon": "tconstruct:bow_grip",
       "translation_key": "item.tconstruct.bow_grip",
-      "x": 44,
-      "y": 29,
+      "x": 25,
+      "y": 35,
       "filter": {
         "item": "tconstruct:bow_grip"
       }
     },
     {
       "icon": "tconstruct:bowstring",
       "translation_key": "item.tconstruct.bowstring",
-      "x": 21,
-      "y": 52,
+      "x": 45,
+      "y": 55,
       "filter": {
         "item": "tconstruct:bowstring"
       }

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/StationSlotLayoutProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/StationSlotLayoutProvider.java
@@ -137,12 +137,18 @@ protected void addLayouts() {
       .addInputItem(TinkerToolParts.toughHandle, 25, 46)
       .addInputItem(TinkerToolParts.largePlate,  45, 46)
       .build();
+    defineModifiable(TinkerTools.crossbow)
+      .sortIndex(SORT_RANGED)
+      .addInputItem(TinkerToolParts.bowLimb,   10, 20)
+      .addInputItem(TinkerToolParts.bowGrip,   46, 56)
+      .addInputItem(TinkerToolParts.bowstring, 28, 38)
+      .build();
     defineModifiable(TinkerTools.longbow)
-      .sortIndex(SORT_RANGED + SORT_LARGE) // TODO: rotate
-      .addInputItem(TinkerToolParts.bowLimb,  50, 48)
-      .addInputItem(TinkerToolParts.bowLimb,  25, 20)
-      .addInputItem(TinkerToolParts.bowGrip,  44, 29)
-      .addInputItem(TinkerToolParts.bowstring, 21, 52)
+      .sortIndex(SORT_RANGED + SORT_LARGE)
+      .addInputItem(TinkerToolParts.bowLimb,   20, 55)
+      .addInputItem(TinkerToolParts.bowLimb,   45, 30)
+      .addInputItem(TinkerToolParts.bowGrip,   25, 35)
+      .addInputItem(TinkerToolParts.bowstring, 45, 55)
       .build();
   }
 

diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ToolsRecipeProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ToolsRecipeProvider.java
@@ -73,6 +73,7 @@ private void addToolBuildingRecipes(Consumer<FinishedRecipe> consumer) {
     toolBuilding(consumer, TinkerTools.sword, folder);
     toolBuilding(consumer, TinkerTools.cleaver, folder);
     // bow
+    toolBuilding(consumer, TinkerTools.crossbow, folder);
     toolBuilding(consumer, TinkerTools.longbow, folder);
 
     // specialized