Moved to exclusively use the minecraft:is_beach tag

TeamMetallurgy · Sep 15, 2022 · 6dfdb30 · 6dfdb30
1 parent eedf5de
commit 6dfdb30
Show file tree

Hide file tree

Showing 24 changed files with 38 additions and 30 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 minecraft_version=1.19.2
-forge_version=43.1.2
-mod_version=2.4.6
-jei_version=11.2.0.256
+forge_version=43.1.25
+mod_version=2.4.7
+jei_version=11.3.0.262
 ct_version=9.0.81
 
 org.gradle.jvmargs=-Xmx4G

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/atlantic_cod_spawn_beach.json b/src/main/resources/data/aquaculture/forge/biome_modifier/atlantic_cod_spawn_beach.json
@@ -6,7 +6,7 @@
     "minCount": 1,
     "maxCount": 1
   },
-  "includeBiomes": ["#forge:is_cold", "#forge:is_beach"],
+  "includeBiomes": ["#forge:is_cold", "#minecraft:is_beach"],
   "excludeBiomes": ["#aquaculture:empty"],
   "and": true
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/atlantic_halibut_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/atlantic_halibut_spawn.json
@@ -6,7 +6,7 @@
     "minCount": 1,
     "maxCount": 1
   },
-  "includeBiomes": ["#minecraft:is_ocean", "#forge:is_beach"],
+  "includeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach"],
   "excludeBiomes": ["#forge:is_hot"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/atlantic_herring_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/atlantic_herring_spawn.json
@@ -6,7 +6,7 @@
     "minCount": 1,
     "maxCount": 6
   },
-  "includeBiomes": ["#minecraft:is_ocean", "#forge:is_beach"],
+  "includeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach"],
   "excludeBiomes": ["#forge:is_hot"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/blackfish_spawn_beach.json b/src/main/resources/data/aquaculture/forge/biome_modifier/blackfish_spawn_beach.json
@@ -6,7 +6,7 @@
     "minCount": 1,
     "maxCount": 4
   },
-  "includeBiomes": ["#forge:is_cold", "#forge:is_beach"],
+  "includeBiomes": ["#forge:is_cold", "#minecraft:is_beach"],
   "excludeBiomes": ["#aquaculture:empty"],
   "and": true
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/bluegill_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/bluegill_spawn.json
@@ -7,6 +7,6 @@
     "maxCount": 6
   },
   "includeBiomes": ["#aquaculture:empty"],
-  "excludeBiomes": ["#minecraft:is_ocean", "#forge:is_beach", "#forge:is_dry", "#minecraft:is_jungle"],
+  "excludeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach", "#forge:is_dry", "#minecraft:is_jungle"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/brown_trout_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/brown_trout_spawn.json
@@ -7,6 +7,6 @@
     "maxCount": 3
   },
   "includeBiomes": ["#aquaculture:empty"],
-  "excludeBiomes": ["#minecraft:is_ocean", "#forge:is_beach", "#forge:is_hot", "#forge:is_dry", "#minecraft:is_jungle"],
+  "excludeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach", "#forge:is_hot", "#forge:is_dry", "#minecraft:is_jungle"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/carp_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/carp_spawn.json
@@ -7,6 +7,6 @@
     "maxCount": 3
   },
   "includeBiomes": ["#aquaculture:empty"],
-  "excludeBiomes": ["#minecraft:is_ocean", "#forge:is_beach", "#forge:is_dry", "#minecraft:is_jungle"],
+  "excludeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach", "#forge:is_dry", "#minecraft:is_jungle"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/catfish_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/catfish_spawn.json
@@ -7,6 +7,6 @@
     "maxCount": 1
   },
   "includeBiomes": ["#aquaculture:empty"],
-  "excludeBiomes": ["#minecraft:is_ocean", "#forge:is_beach", "#forge:is_dry", "#forge:is_snowy", "#minecraft:is_jungle"],
+  "excludeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach", "#forge:is_dry", "#forge:is_snowy", "#minecraft:is_jungle"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/gar_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/gar_spawn.json
@@ -7,6 +7,6 @@
     "maxCount": 2
   },
   "includeBiomes": ["#aquaculture:empty"],
-  "excludeBiomes": ["#minecraft:is_ocean", "#forge:is_beach", "#forge:is_dry", "#forge:is_snowy", "#minecraft:is_jungle"],
+  "excludeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach", "#forge:is_dry", "#forge:is_snowy", "#minecraft:is_jungle"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/jellyfish_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/jellyfish_spawn.json
@@ -7,6 +7,6 @@
     "maxCount": 3
   },
   "includeBiomes": ["#aquaculture:empty"],
-  "excludeBiomes": ["#minecraft:is_ocean", "#forge:is_beach"],
+  "excludeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/minnow_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/minnow_spawn.json
@@ -7,6 +7,6 @@
     "maxCount": 5
   },
   "includeBiomes": ["#aquaculture:empty"],
-  "excludeBiomes": ["#minecraft:is_ocean", "#forge:is_beach", "#forge:is_dry", "#minecraft:is_jungle"],
+  "excludeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach", "#forge:is_dry", "#minecraft:is_jungle"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/muskellunge_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/muskellunge_spawn.json
@@ -7,6 +7,6 @@
     "maxCount": 1
   },
   "includeBiomes": ["#aquaculture:empty"],
-  "excludeBiomes": ["#minecraft:is_ocean", "#forge:is_beach", "#forge:is_hot", "#forge:is_dry", "#minecraft:is_jungle"],
+  "excludeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach", "#forge:is_hot", "#forge:is_dry", "#minecraft:is_jungle"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/pacific_halibut_spawn_beach.json b/src/main/resources/data/aquaculture/forge/biome_modifier/pacific_halibut_spawn_beach.json
@@ -6,7 +6,7 @@
     "minCount": 1,
     "maxCount": 1
   },
-  "includeBiomes": ["#forge:is_cold", "#forge:is_beach"],
+  "includeBiomes": ["#forge:is_cold", "#minecraft:is_beach"],
   "excludeBiomes": ["#aquaculture:empty"],
   "and": true
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/perch_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/perch_spawn.json
@@ -7,6 +7,6 @@
     "maxCount": 6
   },
   "includeBiomes": ["#aquaculture:empty"],
-  "excludeBiomes": ["#minecraft:is_ocean", "#forge:is_beach", "#forge:is_hot", "#forge:is_dry", "#minecraft:is_jungle"],
+  "excludeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach", "#forge:is_hot", "#forge:is_dry", "#minecraft:is_jungle"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/pink_salmon_spawn_beach.json b/src/main/resources/data/aquaculture/forge/biome_modifier/pink_salmon_spawn_beach.json
@@ -6,7 +6,7 @@
     "minCount": 1,
     "maxCount": 2
   },
-  "includeBiomes": ["#forge:is_cold", "#forge:is_beach"],
+  "includeBiomes": ["#forge:is_cold", "#minecraft:is_beach"],
   "excludeBiomes": ["#aquaculture:empty"],
   "and": true
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/pollock_spawn_beach.json b/src/main/resources/data/aquaculture/forge/biome_modifier/pollock_spawn_beach.json
@@ -6,7 +6,7 @@
     "minCount": 1,
     "maxCount": 2
   },
-  "includeBiomes": ["#forge:is_cold", "#forge:is_beach"],
+  "includeBiomes": ["#forge:is_cold", "#minecraft:is_beach"],
   "excludeBiomes": ["#aquaculture:empty"],
   "and": true
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/rainbow_trout_spawn_beach.json b/src/main/resources/data/aquaculture/forge/biome_modifier/rainbow_trout_spawn_beach.json
@@ -6,7 +6,7 @@
     "minCount": 1,
     "maxCount": 2
   },
-  "includeBiomes": ["#forge:is_cold", "#forge:is_beach"],
+  "includeBiomes": ["#forge:is_cold", "#minecraft:is_beach"],
   "excludeBiomes": ["#aquaculture:empty"],
   "and": true
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/red_grouper_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/red_grouper_spawn.json
@@ -7,6 +7,6 @@
     "maxCount": 2
   },
   "includeBiomes": ["#aquaculture:empty"],
-  "excludeBiomes": ["#minecraft:is_ocean", "#forge:is_beach"],
+  "excludeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/smallmouth_bass_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/smallmouth_bass_spawn.json
@@ -7,6 +7,6 @@
     "maxCount": 3
   },
   "includeBiomes": ["#aquaculture:empty"],
-  "excludeBiomes": ["#minecraft:is_ocean", "#forge:is_beach", "#forge:is_hot", "#forge:is_dry", "#forge:is_snowy", "#minecraft:is_jungle"],
+  "excludeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach", "#forge:is_hot", "#forge:is_dry", "#forge:is_snowy", "#minecraft:is_jungle"],
   "and": false
 }
diff --git a/src/main/resources/data/aquaculture/forge/biome_modifier/tuna_spawn.json b/src/main/resources/data/aquaculture/forge/biome_modifier/tuna_spawn.json
@@ -7,6 +7,6 @@
     "maxCount": 1
   },
   "includeBiomes": ["#aquaculture:empty"],
-  "excludeBiomes": ["#minecraft:is_ocean", "#forge:is_beach"],
+  "excludeBiomes": ["#minecraft:is_ocean", "#minecraft:is_beach"],
   "and": false
 }