1.20.2 Fabric

1.4.5

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020-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

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.4-SNAPSHOT'
+	id 'fabric-loom' version '1.5-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -10,15 +10,16 @@ archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
-//def apikeyPropertiesFile = rootProject.file("secrets/secrets.properties");
+def apikeyPropertiesFile = rootProject.file("secrets/secrets.properties");
 def apikeyProperties = new Properties()
-//apikeyProperties.load(new FileInputStream(apikeyPropertiesFile))
+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
 	maven { url "https://maven.minecraftforge.net/" } // Required for TerraBlender
+	maven { url "https://maven.modmuss50.me/" } // Fiber
 	maven { url "https://maven.resourcefulbees.com/repository/maven-public/" } // Required for Ad Astra
 	maven { url "https://oss.sonatype.org/content/repositories/snapshots" } // Completecomfig for RegionsUnexplored
 	maven { url "https://maven.isxander.dev/releases" }
@@ -32,14 +33,13 @@ repositories {
 	maven { url "https://maven.jamieswhiteshirt.com/libs-release" }
 	maven { url "https://maven.parchmentmc.org" }
 	maven { url "https://jitpack.io" }
-	maven { url "https://maven.blamejared.com"}
-	//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")
-	 //}
-	//}
+	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 {
@@ -77,77 +77,98 @@ dependencies {
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
 	// 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
+	modRuntimeOnly("maven.modrinth:ad-astra:QzjRLT8e") // 1.15.5
+	modApi("maven.modrinth:botarium:a6dUCytc") //botarium 2.3.1
+	modApi("maven.modrinth:resourceful-config:PlEObkl9") //resourcefulconfig 2.1.2
+	modApi("maven.modrinth:resourceful-lib:HGTwQLNx") //resourcefullib 2.1.20
 
-	// Beach Party (Lets Do)
-	modRuntimeOnly("curse.maven:beachparty-858691:4696068") { transitive false }
+	// Beach Party (Let's Do)
+	modRuntimeOnly("maven.modrinth:lets-do-beachparty:X0aF5oob") //1.1.3
+	modApi("maven.modrinth:do-api:wKMcbCEl") // Do Api 1.2.8
+	modApi("maven.modrinth:architectury-api:Sbew3kXe") { exclude group: 'net.fabricmc', module: 'fabric-loader' }
+	// Architectury 9.1.12
 
 	// BetterArcheology
-	modRuntimeOnly("curse.maven:betterarcheology-835687:4600694") { transitive false }
+	modRuntimeOnly("maven.modrinth:better-archeology:EJHNTdmP") // 1.1.0
+
+	// Bewitchment
+	//modRuntimeOnly("maven.modrinth:bewitchment:riuujyHL") // 1.20-7
+	//modApi("me.lucko:fabric-permissions-api:0.1-SNAPSHOT")
+	//modApi("maven.modrinth:impersonate:6ZK2ddbg") // Impersonate 2.10.2
+	//modApi("maven.modrinth:midnightlib:YXz8kIQl") // Midnight Lib 1.4.1
+	//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("maven.modrinth:patchouli:Y6tuH1cn") //Patchouli 1.20.1-84
+	//modApi("me.zeroeightsix:fiber:0.23.0-2")
+	//modRuntimeOnly("maven.modrinth:pehkui:NXT21hP9") // Pehkui 3.7.12
+	//modApi("com.github.Virtuoel:KanosConfig:0.4.1")
+	modRuntimeOnly("maven.modrinth:trinkets:e563ycts") // Trinkets 3.7.1
+	modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.2.2")
+	modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.2.2")
 
 	// BiomeMakeover
-	//modRuntimeOnly("maven.modrinth:jG8Q2YwT:rsoZ2Iqo")
-	//modApi("party.lemons:taniwha-fabric:1.20.0-5.4.9" )
+	modRuntimeOnly("maven.modrinth:jG8Q2YwT:rsoZ2Iqo") // 1.11.4
+	modApi("party.lemons:taniwha-fabric:1.20.0-5.4.9")
 
 	// Blockus
-	//modRuntimeOnly("curse.maven:blockus-312289:4745041") { transitive false }
+	modRuntimeOnly("maven.modrinth:blockus:TsvrmUbJ") { transitive false }
 
 	// Botania
-	//modRuntimeOnly "vazkii.botania:Botania-xplat:1.20.1-441"
-	//modRuntimeOnly("maven.modrinth:pfjLUfGv:XiOSfzIW")
+	modRuntimeOnly "vazkii.botania:Botania-xplat:1.20.1-443"
 
 	// 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
+	modApi("maven.modrinth:modmenu: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
+	modRuntimeOnly("maven.modrinth:desolation:HqakjlKA") // 1.3.2
+	modApi("maven.modrinth:geckolib:oPgOSBzN") // Geckolib
+
+	// Ecologics
+	modRuntimeOnly("curse.maven:ecologics-570463:4857271")
 
 	// Eldritch End
-	//modRuntimeOnly("curse.maven:eldritch_end-877553:4846136") { transitive false }
-	//modApi("curse.maven:azure_lib-817423:4829197")
-	//modApi("curse.maven:necronomicon-586157:4834773")
+	modRuntimeOnly("maven.modrinth:eldritch-end:hjijvYrR") { transitive false } // 0.2.30
+	modApi("maven.modrinth:azurelib:qmNj5M34") // 2.0.18
+	modApi("maven.modrinth:necronomicon:edD42FPx") // 1.3.0
+
+	// Meadow (Let's Do)
+	modRuntimeOnly("maven.modrinth:lets-do-meadow:QHqnFZCQ") // 1.3.4
 
 	// MineCells
-	modRuntimeOnly("curse.maven:minecells-618790:4745169") { transitive false }
-	modApi("io.wispforest:owo-lib:0.11.2+1.20")
+	modRuntimeOnly("maven.modrinth:minecells:MPeoUkHE")
+	modApi("maven.modrinth:owo-lib:zyOBB7J4") // owo lib 0.11.2
 	modApi("dev.draylar.omega-config:omega-config-base:1.4.0+1.20.1")
 
-	// Natures Spirit 1.3
-	modRuntimeOnly("maven.modrinth:WBvnqHfV:wLpIDkQv")
+	// Natures Spirit
+	modRuntimeOnly("maven.modrinth:natures-spirit:aW6QjIpy") // 1.4.2
 
 	// Promenade
-	//modRuntimeOnly("curse.maven:promenade-399648:4611967") { transitive false }
-	//modApi("com.github.DawnTeamMC:DawnAPI:5.0.0")
-	//modApi("com.terraformersmc:biolith:1.0.0-alpha.9")
+	modRuntimeOnly("maven.modrinth:promenade:A5YD9uS3") { transitive false } // 4.1.1
+	modApi("com.github.DawnTeamMC:DawnAPI:5.0.0")
+	modApi("com.terraformersmc:biolith:1.0.0-beta.1")
 
 	// Regions Unexplored 0.5
-	modRuntimeOnly("curse.maven:regions_unexplored-659110:4721079")
-	modApi("com.github.glitchfiend:TerraBlender-fabric:1.20.1-3.0.0.169")
+	modRuntimeOnly("maven.modrinth:regions-unexplored:P5G5b4aO")
+	modApi("com.github.glitchfiend:TerraBlender-fabric:1.20.1-3.0.1.2")
 	modApi("com.github.Lortseam.completeconfig:base:2.5.0")
 
 	// Snifferplus
 	//modRuntimeOnly("maven.modrinth:BVgHoKxg:DLjYM0KE")
 
 	// Tech Reborn
-	modRuntimeOnly("TechReborn:TechReborn-1.20:5.8.3") { transitive false }
-	modRuntimeOnly("RebornCore:RebornCore-1.20:5.8.3")
+	modRuntimeOnly("TechReborn:TechReborn-1.20:5.8.7")
 
 	// 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' }
 
 	// Mixin Extras
 	include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.2.0")))

gradle.properties

@@ -1,14 +1,12 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
-
 # Fabric Properties
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.10
-loader_version=0.14.25
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.4
+loader_version=0.15.6
 #Fabric api
-fabric_version=0.91.0+1.20.1
-
+fabric_version=0.91.4+1.20.2
 # Mod Properties
 mod_version = 1.4.5
 maven_group = xanthian.variantchests

mappings/mappings-fix.tiny

@@ -4,4 +4,6 @@ c	earth/terrarium/botarium/common/fluid/impl/SimpleFluidContainer	earth/terrariu
 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
+	m	()V	chooseRandomAngerTime	chooseRandomAngerTime$fixConflict
+c	samebutdifferent/ecologics/entity/Squirrel	samebutdifferent/ecologics/entity/Squirrel
+	m	()Z	isClimbing	isClimbing$fixConflict

src/main/java/net/xanthian/variantchests/block/VariantChestBlock.java

@@ -28,7 +28,7 @@ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
     @Nullable
     @Override
     public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
-        return world.isClient ? checkType(type, this.getExpectedEntityType(), VariantChestBlockEntity::clientTick) : null;
+        return world.isClient ? validateTicker(type, this.getExpectedEntityType(), VariantChestBlockEntity::clientTick) : null;
     }
 
     public VariantChests getType() {

src/main/java/net/xanthian/variantchests/datagen/RecipeGenerator.java

@@ -21,30 +21,29 @@
 import net.xanthian.variantchests.util.ModItemTags;
 
 import java.util.Map;
-import java.util.function.Consumer;
 
 public class RecipeGenerator extends FabricRecipeProvider {
     public RecipeGenerator(FabricDataOutput output) {
         super(output);
     }
 
-    public static void offerChestRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible chest, ItemConvertible plank) {
+    public static void offerChestRecipe(RecipeExporter exporter, ItemConvertible chest, ItemConvertible plank) {
         ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, chest, 1)
                 .input('P', plank)
                 .pattern("PPP").pattern("P P").pattern("PPP")
                 .criterion("has_planks", FabricRecipeProvider.conditionsFromItem(plank))
                 .offerTo(exporter);
     }
 
-    public static void offerCustomChestBoatRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible chestboat, ItemConvertible boat, TagKey<Item> chest) {
+    public static void offerCustomChestBoatRecipe(RecipeExporter exporter, ItemConvertible chestboat, ItemConvertible boat, TagKey<Item> chest) {
         ShapelessRecipeJsonBuilder.create(RecipeCategory.TRANSPORTATION, chestboat)
                 .input(chest).input(boat).group("chest_boat")
                 .criterion("has_boat", RecipeProvider.conditionsFromTag(ItemTags.BOATS))
                 .offerTo(exporter, new Identifier(FabricRecipeProvider.getRecipeName(chestboat)));
     }
 
     @Override
-    public void generate(Consumer<RecipeJsonProvider> exporter) {
+    public void generate(RecipeExporter exporter) {
 
         offerChestRecipe(exporter, Vanilla.ACACIA_CHEST, Items.ACACIA_PLANKS);
         offerChestRecipe(exporter, Vanilla.BAMBOO_CHEST, Items.BAMBOO_PLANKS);
@@ -111,11 +110,11 @@ public void generate(Consumer<RecipeJsonProvider> exporter) {
                 .offerTo(exporter, new Identifier("variantchests", "chest"));
     }
 
-    public void registerChestRecipe(Consumer<RecipeJsonProvider> exporter, Map<Identifier, Block> chests, String modId) {
+    public void registerChestRecipe(RecipeExporter exporter, Map<Identifier, Block> chests, String modId) {
         registerChestRecipe(exporter, chests, modId, "_planks");
     }
 
-    public void registerChestRecipe(Consumer<RecipeJsonProvider> exporter, Map<Identifier, Block> chests, String modId, String plankSuffix) {
+    public void registerChestRecipe(RecipeExporter exporter, Map<Identifier, Block> chests, String modId, String plankSuffix) {
         for (Map.Entry<Identifier, Block> entry : chests.entrySet()) {
             Identifier chestId = entry.getKey();
             Block chest = entry.getValue();

src/main/resources/fabric.mod.json

@@ -16,7 +16,7 @@
   "depends": {
     "fabricloader": ">=0.14.20",
     "fabric": "*",
-    "minecraft": ">=1.20.0- <1.20.2-",
+    "minecraft": "1.20.2",
     "java": ">=17"
   }
 }