Merge pull request #505 from CivMC/tabfix

add netherite upgrade
CivMC · May 11, 2024 · 0b5a6e2 · 0b5a6e2
2 parents a54f9c8 + 5d0080f
commit 0b5a6e2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 37 deletions.
diff --git a/ansible/files/paper-config/plugins/CraftEnhance/server-recipes.yml b/ansible/files/paper-config/plugins/CraftEnhance/server-recipes.yml
@@ -2,3 +2,4 @@ disabled:
   - minecraft:netherite_scrap
   - minecraft:netherite_scrap_from_blasting
   - minecraft:netherite_ingot
+  - minecraft:netherite_upgrade_smithing_template
diff --git a/ansible/files/paper-config/plugins/FactoryMod/config.yml b/ansible/files/paper-config/plugins/FactoryMod/config.yml
@@ -974,7 +974,8 @@ factories:
     recipes:
       - wordbank_item
       - crack_easter_egg
-      - repair_station          
+      - fabricate_netherite_upgrade
+      - repair_station
   concrete_mixer:
     type: FCC
     name: Concrete Mixer
@@ -6733,6 +6734,24 @@ recipes:
       plate:
         material: OAK_TRAPDOOR
         amount: 1
+  fabricate_netherite_upgrade:
+    type: PRODUCTION
+    name: Fabricate Netherite Upgrade
+    production_time: 4s
+    input:
+      netherrack:
+        material: NETHERRACK
+        amount: 42
+      torchflower:
+        material: TORCHFLOWER
+        amount: 6
+      diamond:
+        material: DIAMOND
+        amount: 7
+    output:
+      netherite_upgrade_smithing_template:
+        material: NETHERITE_UPGRADE_SMITHING_TEMPLATE
+        amount: 1
   wordbank_item:
     type: WORDBANK
     name: Generate item name

diff --git a/containers/paper/Dockerfile b/containers/paper/Dockerfile
diff --git a/containers/waterfall/Dockerfile b/containers/waterfall/Dockerfile