3.1

Add support for : AdAstra BeachParty BetterArcheology Bewitchment DeeperAndDarker Promenade RegionsUnexplored SnifferPlus TechReborn Vinery add c tags gradle update loom update tidy up some code separated creative tab
xanthian · Sep 3, 2023 · 457791c · 457791c
1 parent 0b5988e
commit 457791c
Show file tree

Hide file tree

Showing 580 changed files with 11,289 additions and 185 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.2-SNAPSHOT'
+	id 'fabric-loom' version '1.3-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -11,20 +11,78 @@ version = project.mod_version
 group = project.maven_group
 
 repositories {
-	// Add repositories to retrieve artifacts from in here.
-	// You should only use this when depending on other mods because
-	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
-	// for more information about repositories.
+	maven { url 'https://jitpack.io' }                // Required for Dawn API
+	maven { url 'https://maven.terraformersmc.com/' } // Required for Mod Menu and Terraform APIs
+	maven { url 'https://maven.shedaniel.me/' }       // Required for Cloth Config
+	maven { url 'https://maven.ryanliptak.com/' }     // Required for AppleSkin
+	maven { url 'https://maven.minecraftforge.net/' } // Required for TerraBlender
+	maven { url "https://maven.resourcefulbees.com/repository/maven-public/" } // Required for Ad Astra
+	maven { url "https://cursemaven.com/" }
+	maven { url "https://api.modrinth.com/maven" }
+	maven { url "https://maven.ladysnake.org/releases"} // Trinkets (for Bewitchment)
+	maven { url "https://oss.sonatype.org/content/repositories/snapshots"}
+	maven { url "https://maven.jamieswhiteshirt.com/libs-release"}
+	maven { url "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/"} // Forge Config Api
 }
 dependencies {
-	// To change the versions see the gradle.properties file
+	implementation 'org.jetbrains:annotations:24.0.0'
+
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+	// Ad Astra  - (issues with Botania - cursed Arch crap - https://legacy.curseforge.com/minecraft/mc-mods/ad-astra)
+	//modRuntimeOnly("curse.maven:adastra-635042:4643678") {transitive false}
+	//modApi ("curse.maven:botarium-704113:4672474")
+	//modApi ("com.teamresourceful.resourcefullib:resourcefullib-fabric-1.20.1:2.1.3")
+	//modApi ("curse.maven:resourcefulconfig-714059:4576456")
+
+	// Beach Party (Lets Do)
+	modRuntimeOnly("curse.maven:beachparty-858691:4696068")
+
+	// BetterArcheology
+	modRuntimeOnly("curse.maven:betterarcheology-835687:4600694") {transitive false}
+
+	// Bewitchment
+	modRuntimeOnly("curse.maven:bewitchment-394915:4673611") {transitive false}
+	modApi("me.lucko:fabric-permissions-api:0.1-SNAPSHOT")
+	modApi("maven.modrinth:impersonate:2.10.0")
+	modApi("maven.modrinth:midnightlib:1.4.1-fabric")
+	modApi("io.github.ladysnake:PlayerAbilityLib:1.8.0")
+	modApi("com.jamieswhiteshirt:reach-entity-attributes:2.4.0")
+	modApi("com.github.emilyploszaj:step-height-entity-attribute:25dabcdad7")
+	modApi("com.terraformersmc.terraform-api:terraform-wood-api-v1:7.0.1")
+	modRuntimeOnly ("vazkii.patchouli:Patchouli:1.20.1-80-FABRIC")
+	modRuntimeOnly("com.github.Virtuoel:Pehkui:3.7.6") {transitive false}
+	modApi("com.github.Virtuoel:KanosConfig:0.4.1")
+	modRuntimeOnly("curse.maven:trinkets-341284:4657534") {transitive false}
+	modApi "dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.2.1"
+	modApi "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.2.1"
+
+	// Deeper & Darker - (some sht about CustomPortalBlocks - https://legacy.curseforge.com/minecraft/mc-mods/deeperdarker)
+	//modRuntimeOnly("curse.maven:deeperdarker-659011:4715721") {transitive false}
+
+	// Promenade
+	modRuntimeOnly("curse.maven:promenade-399648:4611967") {transitive false}
+	modRuntimeOnly("com.github.DawnTeamMC:DawnAPI:5.0.0")
+	modRuntimeOnly("com.terraformersmc:biolith:1.0.0-alpha.7")
+
+	// Regions Unexplored
+	modRuntimeOnly("curse.maven:regions_unexplored-659110:4583966") {transitive false}
+	modApi "fuzs.forgeconfigapiport:forgeconfigapiport-fabric:8.0.0"
+
+	// Snifferplus - (Datagen issues - ResourceKey[minecraft:worldgen/biome / snifferplus:timeless_grotto - https://legacy.curseforge.com/minecraft/mc-mods/hellions-sniffer)
+	//modRuntimeOnly("curse.maven:hellionssiffer-871962:4591532")
+
+	// Tech Reborn
+	modRuntimeOnly("TechReborn:TechReborn-1.20:5.8.3") {transitive false }
+	modRuntimeOnly("RebornCore:RebornCore-1.20:5.8.3")
+
+	// Vinery
+	modRuntimeOnly("curse.maven:vinery-704465:4643442") {transitive false}
+	modRuntimeOnly "maven.modrinth:do-api:1.2.4-fabric"
+	modApi( "curse.maven:arch-419699:4633047") { exclude group: 'net.fabricmc', module: 'fabric-loader' }
 }
 loom {
 	accessWidenerPath = file("src/main/resources/variantbarrels.accesswidener")

diff --git a/gradle.properties b/gradle.properties
@@ -4,13 +4,13 @@ org.gradle.parallel=true
 
 # Fabric Properties
 minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.9
-loader_version=0.14.21
+yarn_mappings=1.20.1+build.10
+loader_version=0.14.22
 
 #Fabric api
-fabric_version=0.85.0+1.20.1
+fabric_version=0.87.0+1.20.1
 
 # Mod Properties
-mod_version = 3.0
+mod_version = 3.1
 maven_group = xanthian
 archives_base_name = variantbarrels
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,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,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,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 +76,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/generated/assets/variantbarrels/blockstates/aa_aeronos_barrel.json b/src/main/generated/assets/variantbarrels/blockstates/aa_aeronos_barrel.json
@@ -0,0 +1,56 @@
+{
+  "variants": {
+    "facing=down,open=false": {
+      "model": "variantbarrels:block/aa_aeronos_barrel",
+      "x": 180
+    },
+    "facing=down,open=true": {
+      "model": "variantbarrels:block/aa_aeronos_barrel_open",
+      "x": 180
+    },
+    "facing=east,open=false": {
+      "model": "variantbarrels:block/aa_aeronos_barrel",
+      "x": 90,
+      "y": 90
+    },
+    "facing=east,open=true": {
+      "model": "variantbarrels:block/aa_aeronos_barrel_open",
+      "x": 90,
+      "y": 90
+    },
+    "facing=north,open=false": {
+      "model": "variantbarrels:block/aa_aeronos_barrel",
+      "x": 90
+    },
+    "facing=north,open=true": {
+      "model": "variantbarrels:block/aa_aeronos_barrel_open",
+      "x": 90
+    },
+    "facing=south,open=false": {
+      "model": "variantbarrels:block/aa_aeronos_barrel",
+      "x": 90,
+      "y": 180
+    },
+    "facing=south,open=true": {
+      "model": "variantbarrels:block/aa_aeronos_barrel_open",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up,open=false": {
+      "model": "variantbarrels:block/aa_aeronos_barrel"
+    },
+    "facing=up,open=true": {
+      "model": "variantbarrels:block/aa_aeronos_barrel_open"
+    },
+    "facing=west,open=false": {
+      "model": "variantbarrels:block/aa_aeronos_barrel",
+      "x": 90,
+      "y": 270
+    },
+    "facing=west,open=true": {
+      "model": "variantbarrels:block/aa_aeronos_barrel_open",
+      "x": 90,
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/blockstates/aa_glacian_barrel.json b/src/main/generated/assets/variantbarrels/blockstates/aa_glacian_barrel.json
@@ -0,0 +1,56 @@
+{
+  "variants": {
+    "facing=down,open=false": {
+      "model": "variantbarrels:block/aa_glacian_barrel",
+      "x": 180
+    },
+    "facing=down,open=true": {
+      "model": "variantbarrels:block/aa_glacian_barrel_open",
+      "x": 180
+    },
+    "facing=east,open=false": {
+      "model": "variantbarrels:block/aa_glacian_barrel",
+      "x": 90,
+      "y": 90
+    },
+    "facing=east,open=true": {
+      "model": "variantbarrels:block/aa_glacian_barrel_open",
+      "x": 90,
+      "y": 90
+    },
+    "facing=north,open=false": {
+      "model": "variantbarrels:block/aa_glacian_barrel",
+      "x": 90
+    },
+    "facing=north,open=true": {
+      "model": "variantbarrels:block/aa_glacian_barrel_open",
+      "x": 90
+    },
+    "facing=south,open=false": {
+      "model": "variantbarrels:block/aa_glacian_barrel",
+      "x": 90,
+      "y": 180
+    },
+    "facing=south,open=true": {
+      "model": "variantbarrels:block/aa_glacian_barrel_open",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up,open=false": {
+      "model": "variantbarrels:block/aa_glacian_barrel"
+    },
+    "facing=up,open=true": {
+      "model": "variantbarrels:block/aa_glacian_barrel_open"
+    },
+    "facing=west,open=false": {
+      "model": "variantbarrels:block/aa_glacian_barrel",
+      "x": 90,
+      "y": 270
+    },
+    "facing=west,open=true": {
+      "model": "variantbarrels:block/aa_glacian_barrel_open",
+      "x": 90,
+      "y": 270
+    }
+  }
+}