Merge pull request #505 from CivMC/tabfix

add netherite upgrade

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

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

containers/paper/Dockerfile

@@ -1,24 +0,0 @@
-# Pin to java17
-FROM itzg/minecraft-server@sha256:491e37fa63ffef22c9ac1f6ec2fb4cc793735799cd91bafa1e5790aa39e9b313
-
-# https://github.com/itzg/docker-minecraft-server/blob/master/README.md#versions
-ENV VERSION=1.20.4
-
-# https://github.com/itzg/docker-minecraft-server#optional-plugins-mods-and-config-attach-points
-COPY plugins /plugins
-ENV REMOVE_OLD_MODS=TRUE
-
-# https://github.com/itzg/docker-minecraft-server#optional-plugins-mods-and-config-attach-points
-COPY config /config
-ENV COPY_CONFIG_DEST=/data
-ENV SYNC_SKIP_NEWER_IN_DESTINATION=false
-
-# https://github.com/itzg/docker-minecraft-server#running-a-paper-server
-ENV TYPE=PAPER
-ENV EULA=TRUE
-ENV USE_AIKAR_FLAGS=TRUE
-# https://github.com/itzg/docker-minecraft-server#replacing-variables-inside-configs
-ENV REPLACE_ENV_DURING_SYNC=TRUE
-ENV REPLACE_ENV_VARIABLE_PREFIX=CIV
-
-ENV CIV_WHITELIST=false

containers/waterfall/Dockerfile

@@ -1,12 +0,0 @@
-# Pin to java17
-FROM itzg/bungeecord@sha256:7e7eeb9023cc213de2ca7ecbcf2cccc506fd46a31346f7250d2fcc5637cf5bb7
-
-ENV WATERFALL_VERSION=1.20
-
-COPY config /config
-COPY plugins /plugins
-
-ENV TYPE=WATERFALL
-
-ENV REPLACE_ENV_VARIABLES=true
-ENV REPLACE_ENV_VARIABLE_PREFIX=CIV