1.20.1

3.4
Adds support for Botania, Cinderscapes & Desolation
Adds missing RegionsUnexplored Bioshroom barrels
Adds custom creative tab graphic
Add compat recipe for Extended Drawers
Gradle update to 8.5
Fix recipe datagen

.github/workflows/build.yml

@@ -13,17 +13,18 @@ jobs:
  # Use these Java versions
  java: [
  17, # Current Java LTS & minimum supported by Minecraft
+ 21, # Current Java LTS
  ]
  # and run on both Linux and Windows
  os: [ubuntu-22.04, windows-2022]
  runs-on: ${{ matrix.os }}
  steps:
  - name: checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: validate gradle wrapper
  uses: gradle/wrapper-validation-action@v1
  - name: setup jdk ${{ matrix.java }}
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
  with:
  java-version: ${{ matrix.java }}
  distribution: 'microsoft'
@@ -33,8 +34,8 @@ jobs:
  - name: build
  run: ./gradlew build
  - name: capture build artifacts
- if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
+ if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
  uses: actions/upload-artifact@v3
  with:
  name: Artifacts
- path: build/libs/
+ path: build/libs/

.gitignore

@@ -5,6 +5,7 @@ build/
 out/
 classes/
 
+
 # eclipse
 
 *.launch
@@ -32,3 +33,4 @@ bin/
 
 run/
 /src/main/generated/.cache/
+secrets/

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 Xanthian
+Copyright (c) Xanthian
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build.gradle

@@ -10,7 +10,11 @@ archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
+//def apikeyPropertiesFile = rootProject.file("secrets/secrets.properties");
+def apikeyProperties = new Properties()
+//apikeyProperties.load(new FileInputStream(apikeyPropertiesFile))
 repositories {
+ mavenCentral()
  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
@@ -20,13 +24,21 @@ repositories {
  maven { url "https://maven.isxander.dev/releases" }
  maven { url "https://cursemaven.com/" }
  maven { url "https://api.modrinth.com/maven" }
- maven { url 'https://maven.wispforest.io' } // owolib for MineCells
- maven { url 'https://maven.draylar.dev/releases' } // omegaconfig for MineCells
+ maven { url "https://maven.kyrptonaught.dev" }
+ maven { url "https://maven.wispforest.io" } // owolib for MineCells
+ maven { url "https://maven.draylar.dev/releases" } // omegaconfig for MineCells
  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://maven.parchmentmc.org" }
- maven { url 'https://jitpack.io' }
+ maven { url "https://jitpack.io" }
+ //maven {
+ //url = uri("https://maven.pkg.github.com/Lemonszz/taniwha")
+ //credentials {
+ //username = apikeyProperties['gpr.user'] ?: System.getenv("USERNAME")
+ //password = apikeyProperties['gpr.key'] ?: System.getenv("TOKEN")
+ //}
+ //}
 }
 loom {
  accessWidenerPath = file("src/main/resources/variantbarrels.accesswidener")
@@ -63,84 +75,103 @@ dependencies {
  implementation 'org.jetbrains:annotations:24.0.0'
 
  minecraft "com.mojang:minecraft:${project.minecraft_version}"
- mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+ mappings loom.layered {
+ mappings file("mappings/mappings-fix.tiny")
+ mappings("net.fabricmc:yarn:${project.yarn_mappings}:v2")
+ }
  modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
  modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
- // Ad Astra - (issues with Botania - cursed Arch crap)
- //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")
+ // Ad Astra
+ modRuntimeOnly("maven.modrinth:3ufwT9JF:QzjRLT8e")
+ modRuntimeOnly("maven.modrinth:2u6LRnMa:9yTYvTAh") //botarium
+ modApi("maven.modrinth:G1hIVOrD:5coQdKPg") //resourcefullib
+ modApi("maven.modrinth:M1953qlQ:nVDWZ9N7") //resourcefulconfig
 
  // Beach Party (Lets Do)
- modRuntimeOnly("curse.maven:beachparty-858691:4696068") {transitive false}
+ modRuntimeOnly("curse.maven:beachparty-858691:4696068") { transitive false }
 
  // BetterArcheology
- modRuntimeOnly("curse.maven:betterarcheology-835687:4600694") {transitive false}
-
- // Biome Makeover
- //modRuntimeOnly("curse.maven:biome-makeover-412182:4815823")
+ modRuntimeOnly("curse.maven:betterarcheology-835687:4600694") { transitive false }
 
  // Bewitchment
- modRuntimeOnly("curse.maven:bewitchment-394915:4673611") {transitive false}
+ 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:v1.2.0")
  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}
+ 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")
+ 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")
+
+ // BiomeMakeover
+ modRuntimeOnly("maven.modrinth:jG8Q2YwT:rsoZ2Iqo") { transitive false }
+ //modRuntimeOnly("party.lemons:taniwha-fabric:1.20.0-5.4.9" )
 
  // Blockus
  modRuntimeOnly("curse.maven:blockus-312289:4745041") { transitive false }
 
- // Deeper & Darker - (some sht about CustomPortalBlocks)
- //modRuntimeOnly("curse.maven:deeperdarker-659011:4838841") {transitive false}
+ // Botania
+ modRuntimeOnly("vazkii.botania:Botania-xplat:1.20.1-441")
+
+ // Cinderscapes
+ modRuntimeOnly "com.terraformersmc:cinderscapes:4.0.9"
+ modRuntimeOnly "com.terraformersmc:cinderscapes-client:4.0.9"
+ modRuntimeOnly "com.terraformersmc:cinderscapes-common:4.0.9"
+ modRuntimeOnly "com.terraformersmc:cinderscapes-worldgen:4.0.9"
+ modApi("maven.modrinth:mOgUt4GM:lEkperf6") // ModMenu 7.2.2
+
+ // Deeper & Darker
+ modRuntimeOnly("maven.modrinth:fnAffV0n:jb78cjt3") { transitive false }
+ modApi("net.kyrptonaught:customportalapi:0.0.1-beta64-1.20")
+
+ // Desolation
+ modRuntimeOnly("maven.modrinth:oML3dQBb:rW5RXUV5") { transitive false }
+ modRuntimeOnly("maven.modrinth:8BmcQJ2H:oPgOSBzN") { transitive false } // Geckolib
 
  // Eldritch End
  modRuntimeOnly("curse.maven:eldritch_end-877553:4846136") { transitive false }
  modApi("curse.maven:azure_lib-817423:4829197")
  modApi("curse.maven:necronomicon-586157:4834773")
 
  // MineCells
- modRuntimeOnly("curse.maven:minecells-618790:4745169") {transitive false}
+ modRuntimeOnly("curse.maven:minecells-618790:4745169") { transitive false }
  modApi("io.wispforest:owo-lib:0.11.2-pre.11+1.20")
  modApi("dev.draylar.omega-config:omega-config-base:1.4.0+1.20.1")
 
- // Natures Spirit - (terrablender mess)
- //modRuntimeOnly ("maven.modrinth:natures-spirit:1.0")
- modRuntimeOnly("curse.maven:naturesspirit-907816:4733817") {transitive false}
- //modRuntimeOnly("com.github.Team-Hibiscus:NatureSpirit:v2")
+ // Natures Spirit 1.2
+ modRuntimeOnly("maven.modrinth:WBvnqHfV:M6a2Rl4r")
 
  // Promenade
- modRuntimeOnly("curse.maven:promenade-399648:4611967") {transitive false}
+ modRuntimeOnly("curse.maven:promenade-399648:4611967") { transitive false }
  modApi("com.github.DawnTeamMC:DawnAPI:5.0.0")
  modApi("com.terraformersmc:biolith:1.0.0-alpha.7")
 
- // Regions Unexplored
+ // Regions Unexplored 0.5
  modRuntimeOnly("curse.maven:regions_unexplored-659110:4721079")
  modApi("com.github.glitchfiend:TerraBlender-fabric:1.20.1-3.0.0.169")
- //modApi ("curse.maven:terrablender-565956:4573002")
- modApi ("com.github.Lortseam.completeconfig:base:2.5.0")
+ modApi("com.github.Lortseam.completeconfig:base:2.5.0")
 
- // Snifferplus - (Datagen issues - ResourceKey[minecraft:worldgen/biome / snifferplus:timeless_grotto)
- //modRuntimeOnly("curse.maven:hellionssiffer-871962:4591532")
+ // Snifferplus
+ //modRuntimeOnly("maven.modrinth:BVgHoKxg:DLjYM0KE")
 
  // Tech Reborn
- modRuntimeOnly("TechReborn:TechReborn-1.20:5.8.3") {transitive false }
+ 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") {transitive false}
- modApi( "curse.maven:arch-419699:4633047") { exclude group: 'net.fabricmc', module: 'fabric-loader' }
+ modRuntimeOnly("curse.maven:vinery-704465:4643442") { transitive false }
+ modRuntimeOnly("maven.modrinth:do-api:1.2.4-fabric") { transitive false }
+ modApi("curse.maven:arch-419699:4633047") { exclude group: 'net.fabricmc', module: 'fabric-loader' }
+
+ // Mixin Extras
+ include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.2.0")))
 }
 
 processResources {

gradle.properties

@@ -4,10 +4,10 @@ org.gradle.parallel=true
 # Fabric Properties
 minecraft_version=1.20.1
 yarn_mappings=1.20.1+build.10
-loader_version=0.14.24
+loader_version=0.14.22
 #Fabric api
-fabric_version=0.90.7+1.20.1
+fabric_version=0.91.0+1.20.1
 # Mod Properties
-mod_version=3.3.6
+mod_version=3.4
 maven_group=xanthian
 archives_base_name=variantbarrels

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,26 +131,29 @@ location of your Java installation."
  fi
 else
  JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+ fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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
+ # shellcheck disable=SC2039,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
+ # shellcheck disable=SC2039,SC3045
  ulimit -n "$MAX_FD" ||
  warn "Could not set maximum file descriptor limit to $MAX_FD"
  esac
@@ -198,11 +202,11 @@ 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
-#  double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#  treated as '${Hostname}' itself on the command line.
 
 set -- \
  "-Dorg.gradle.appname=$APP_BASE_NAME" \

mappings/mappings-fix.tiny

@@ -0,0 +1,7 @@
+tiny 2 0 intermediary named
+c earth/terrarium/botarium/common/fluid/impl/SimpleFluidContainer earth/terrarium/botarium/common/fluid/impl/SimpleFluidContainer
+ m ()V clear clear$fixConflict
+c party/lemons/biomemakeover/entity/ai/MountedCrossbowAttackGoal party/lemons/biomemakeover/entity/ai/MountedCrossbowAttackGoal
+ m ()Z canStart canStart$fixConflict
+c party/lemons/biomemakeover/entity/GhostEntity party/lemons/biomemakeover/entity/GhostEntity
+ m ()V chooseRandomAngerTime chooseRandomAngerTime$fixConflict

src/main/generated/assets/variantbarrels/blockstates/bot_dreamwood_barrel.json

@@ -0,0 +1,56 @@
+{
+ "variants": {
+ "facing=down,open=false": {
+ "model": "variantbarrels:block/bot_dreamwood_barrel",
+ "x": 180
+ },
+ "facing=down,open=true": {
+ "model": "variantbarrels:block/bot_dreamwood_barrel_open",
+ "x": 180
+ },
+ "facing=east,open=false": {
+ "model": "variantbarrels:block/bot_dreamwood_barrel",
+ "x": 90,
+ "y": 90
+ },
+ "facing=east,open=true": {
+ "model": "variantbarrels:block/bot_dreamwood_barrel_open",
+ "x": 90,
+ "y": 90
+ },
+ "facing=north,open=false": {
+ "model": "variantbarrels:block/bot_dreamwood_barrel",
+ "x": 90
+ },
+ "facing=north,open=true": {
+ "model": "variantbarrels:block/bot_dreamwood_barrel_open",
+ "x": 90
+ },
+ "facing=south,open=false": {
+ "model": "variantbarrels:block/bot_dreamwood_barrel",
+ "x": 90,
+ "y": 180
+ },
+ "facing=south,open=true": {
+ "model": "variantbarrels:block/bot_dreamwood_barrel_open",
+ "x": 90,
+ "y": 180
+ },
+ "facing=up,open=false": {
+ "model": "variantbarrels:block/bot_dreamwood_barrel"
+ },
+ "facing=up,open=true": {
+ "model": "variantbarrels:block/bot_dreamwood_barrel_open"
+ },
+ "facing=west,open=false": {
+ "model": "variantbarrels:block/bot_dreamwood_barrel",
+ "x": 90,
+ "y": 270
+ },
+ "facing=west,open=true": {
+ "model": "variantbarrels:block/bot_dreamwood_barrel_open",
+ "x": 90,
+ "y": 270
+ }
+ }
+}