Release/4.0 (#20)

merged by PR Scheduler
Nincodedo · Nov 30, 2021 · 27837e2 · 27837e2
1 parent e96d3ca
commit 27837e2
Show file tree

Hide file tree

Showing 15 changed files with 330 additions and 416 deletions.
diff --git a/.github/workflows/push-main.yml → .github/workflows/build.yml b/.github/workflows/push-main.yml → .github/workflows/build.yml
@@ -3,6 +3,10 @@ on:
     branches:
       - main
       - dev
+  pull_request:
+    branches:
+      - main
+      - dev
 name: Main Build
 jobs:
   build:
@@ -23,5 +27,4 @@ jobs:
           tag: |
             latest
             ${{ github.sha }}
-            ${{ steps.extract_branch.outputs.branch }}
           containerRegistry: true
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,6 @@ RUN apt-get update \
 RUN mkdir /datapacks
 COPY scripts/downloadVanillaTweaksPack.sh .
 RUN dos2unix /downloadVanillaTweaksPack.sh /downloadVanillaTweaksPack.sh
-RUN wget -P /datapacks https://launcher.mojang.com/v1/objects/622bf0fd298e1e164ecd05d866045ed5941283cf/CavesAndCliffsPreview.zip
 RUN /downloadVanillaTweaksPack.sh /datapacks/
 
 FROM docker/compose
@@ -24,25 +23,9 @@ COPY scripts/resetWorld.sh /app/resetWorld.sh
 RUN dos2unix /app/resetWorld.sh /app/resetWorld.sh
 COPY config/* /config/
 RUN apk --no-cache add curl
-RUN wget -P /app/mods https://media.forgecdn.net/files/3377/591/fabric-api-0.36.1%2B1.17.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3380/166/lithium-fabric-mc1.17.1-0.7.3.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3344/527/fabric-chunkpregen-0.3.4.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3378/747/FastDecay-1.0.0.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3344/514/crowmap-1.17-1.0.1.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3343/650/bettersafebed-fabric-1.17-1.4.jar \
-  && wget -P /app/mods https://edge.forgecdn.net/files/3366/380/rightclickharvest-1.3.0.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3344/942/KeepHeadNames-1.3.jar \
-  && wget -P /app/mods https://github.com/Nincodedo/mc-server-description/releases/download/1.0.1/mc-server-description-1.0.1.jar \
-  && wget -P /app/mods https://cdn.modrinth.com/data/HygVekKN/versions/1.0.2/easy-painter-1.0.2.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3343/950/servertick-mc1.17-1.5.jar \
-  && wget -P /app/mods https://cdn.modrinth.com/data/jrDKjZP7/versions/1.4.3/InvView-1.4.3-1.17+.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3344/455/villagernames-1.17-2.0.0.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3357/510/textile_backup-2.1.0-1.17.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3373/459/fabrilous-updater-2.3.jar \
-  && wget -P /app/mods https://github.com/TheEpicBlock/PolyMc/releases/download/3.2.0/polymc-3.2.0+1.17.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3388/328/stonevaults-1.0.0.jar \
-  && wget -P /app/mods https://github.com/TheEpicBlock/baila/releases/download/1.1.1/baila-1.1.1+1.17.1.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3358/363/taterzens-1.2.0-fabric.jar \
-  && wget -P /app/mods https://media.forgecdn.net/files/3388/817/pitch-dark-2.0.0-fabric.jar
+RUN wget -P /app/mods https://media.forgecdn.net/files/3530/684/fabric-api-0.42.8%2B1.18.jar \
+  && wget -P /app/mods https://github.com/Nincodedo/mc-server-description/releases/download/2.0.0/mc-server-description-2.0.0.jar \
+  && wget -P /app/mods https://media.forgecdn.net/files/3536/188/deathlog-0.2.2%2B1.18.jar \
+  && wget -P /app/mods https://media.forgecdn.net/files/3521/707/mcf-reap-1.7.0-21w44a.jar
 LABEL org.opencontainers.image.source = "https://github.com/Nincodedo/rhc-ocw"
 ENTRYPOINT ["sh", "/app/resetWorld.sh"]
diff --git a/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/abandoned_mineshaft.json b/datapacks/ocw-stuff/data/minecraft/loot_tables/chests/abandoned_mineshaft.json
@@ -3,6 +3,7 @@
   "pools": [
     {
       "rolls": 1,
+      "bonus_rolls": 0,
       "entries": [
         {
           "type": "minecraft:item",
@@ -46,9 +47,11 @@
     },
     {
       "rolls": {
+        "type": "minecraft:uniform",
         "min": 2,
         "max": 4
       },
+      "bonus_rolls": 0,
       "entries": [
         {
           "type": "minecraft:item",
@@ -58,9 +61,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 1,
                 "max": 5
-              }
+              },
+              "add": false
             }
           ]
         },
@@ -72,9 +77,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 1,
                 "max": 3
-              }
+              },
+              "add": false
             }
           ]
         },
@@ -86,9 +93,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 4,
                 "max": 9
-              }
+              },
+              "add": false
             }
           ]
         },
@@ -100,9 +109,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 4,
                 "max": 9
-              }
+              },
+              "add": false
             }
           ]
         },
@@ -114,9 +125,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 1,
                 "max": 2
-              }
+              },
+              "add": false
             }
           ]
         },
@@ -128,9 +141,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 3,
                 "max": 8
-              }
+              },
+              "add": false
             }
           ]
         },
@@ -142,9 +157,27 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 1,
                 "max": 3
-              }
+              },
+              "add": false
+            }
+          ]
+        },
+        {
+          "type": "minecraft:item",
+          "weight": 15,
+          "name": "minecraft:glow_berries",
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "type": "minecraft:uniform",
+                "min": 3,
+                "max": 6
+              },
+              "add": false
             }
           ]
         },
@@ -156,9 +189,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 2,
                 "max": 4
-              }
+              },
+              "add": false
             }
           ]
         },
@@ -170,9 +205,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 2,
                 "max": 4
-              }
+              },
+              "add": false
             }
           ]
         },
@@ -184,16 +221,19 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 2,
                 "max": 4
-              }
+              },
+              "add": false
             }
           ]
         }
       ]
     },
     {
       "rolls": 3,
+      "bonus_rolls": 0,
       "entries": [
         {
           "type": "minecraft:item",
@@ -203,9 +243,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 4,
                 "max": 8
-              }
+              },
+              "add": false
             }
           ]
         },
@@ -217,9 +259,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 1,
                 "max": 4
-              }
+              },
+              "add": false
             }
           ]
         },
@@ -231,9 +275,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 1,
                 "max": 4
-              }
+              },
+              "add": false
             }
           ]
         },
@@ -245,9 +291,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 1,
                 "max": 4
-              }
+              },
+              "add": false
             }
           ]
         },
@@ -259,9 +307,11 @@
             {
               "function": "minecraft:set_count",
               "count": {
+                "type": "minecraft:uniform",
                 "min": 1,
                 "max": 16
-              }
+              },
+              "add": false
             }
           ]
         }