From 0d00d7d427f35db05efb9447acd9d286036a8c7f Mon Sep 17 00:00:00 2001 From: pluto7073 <20planetpluto05@gmail.com> Date: Wed, 9 Oct 2024 16:57:18 -0600 Subject: [PATCH] Update to 1.20.4 --- build.gradle | 7 ++++--- gradle.properties | 17 +++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../plutoscoffee/blocks/CoffeeBrewerBlock.java | 8 ++++++++ .../plutoscoffee/blocks/CoffeeGrindrBlock.java | 7 +++++++ .../blocks/EspressoMachineBlock.java | 7 +++++++ .../drink_additions/blonde_espresso_shot.json | 4 +++- .../drink_additions/decaf_espresso_shot.json | 4 +++- .../drink_additions/espresso_shot.json | 4 +++- .../specialty_drinks/caffe_latte.json | 4 +++- .../plutoscoffee/specialty_drinks/mocha.json | 4 +++- .../plutoscoffee/specialty_drinks/red_eye.json | 4 +++- .../specialty_drinks/sweet_caramel_latte.json | 4 +++- src/main/resources/fabric.mod.json | 7 +++---- .../resourcepacks/dark_gui/pack.mcmeta | 2 +- 15 files changed, 61 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index 32f3629..0e174e8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.5-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' id 'maven-publish' } @@ -17,6 +17,7 @@ repositories { maven { url "https://pluto-mod-maven.web.app/maven" } maven { url = "https://maven.parchmentmc.org" } maven { url = "https://maven.quiltmc.org/repository/release" } + maven { url "https://maven.nucleoid.xyz/" } } loom { @@ -40,7 +41,7 @@ dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings(loom.layered { it.mappings "org.quiltmc:quilt-mappings:${minecraft_version}+build.${quilt_mappings}:intermediary-v2" - it.parchment "org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip" + //it.parchment "org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip" it.officialMojangMappings { nameSyntheticMembers = false } }) modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" @@ -56,7 +57,7 @@ dependencies { modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" - modApi "dev.architectury:architectury-fabric:10.1.20" // For REI + modApi "dev.architectury:architectury-fabric:$architectury_version" // For REI } processResources { diff --git a/gradle.properties b/gradle.properties index 03918ec..db5d8d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,20 +3,21 @@ org.gradle.jvmargs=-Xmx1G # Minecraft Stuff # check these on https://fabricmc.net/develop -minecraft_version=1.20.2 +minecraft_version=1.20.4 loader_version=0.16.5 quilt_mappings=3 -parchment_version = 2023.12.10 +parchment_version=2024.04.14 # Mod Thingies -mod_version = 1.20.2+3.0 +mod_version = 1.20.4+3.0 maven_group = ml.pluto7073 archives_base_name = PlutosCoffeeMod-Fabric # Things I might be dependent on # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -fabric_version=0.91.6+1.20.2 -cloth_version=12.0.119 -modmenu_version=8.0.1 -pdapi_version=0.2.20 -rei_version=13.1.773 \ No newline at end of file +fabric_version=0.97.2+1.20.4 +cloth_version=13.0.138 +modmenu_version=9.2.0 +rei_version=14.1.774 +architectury_version=11.1.17 +pdapi_version=1.0.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db9a6b8..0d18421 100644 --- 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-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/ml/pluto7073/plutoscoffee/blocks/CoffeeBrewerBlock.java b/src/main/java/ml/pluto7073/plutoscoffee/blocks/CoffeeBrewerBlock.java index 67fbce4..1bde455 100644 --- a/src/main/java/ml/pluto7073/plutoscoffee/blocks/CoffeeBrewerBlock.java +++ b/src/main/java/ml/pluto7073/plutoscoffee/blocks/CoffeeBrewerBlock.java @@ -1,5 +1,7 @@ package ml.pluto7073.plutoscoffee.blocks; +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import ml.pluto7073.plutoscoffee.registry.ModBlocks; import ml.pluto7073.plutoscoffee.registry.ModStats; import net.minecraft.MethodsReturnNonnullByDefault; @@ -40,6 +42,7 @@ public class CoffeeBrewerBlock extends BaseEntityBlock { * 2 - Filled Bottle */ public static final IntegerProperty BOTTLE_PROPERTY; + public static final MapCodec CODEC = simpleCodec(CoffeeBrewerBlock::new); protected static final VoxelShape SHAPE; public CoffeeBrewerBlock(Properties settings) { @@ -47,6 +50,11 @@ public CoffeeBrewerBlock(Properties settings) { this.registerDefaultState(this.stateDefinition.any().setValue(BOTTLE_PROPERTY, 0)); } + @Override + protected MapCodec codec() { + return CODEC; + } + public RenderShape getRenderShape(BlockState state) { return RenderShape.MODEL; } diff --git a/src/main/java/ml/pluto7073/plutoscoffee/blocks/CoffeeGrindrBlock.java b/src/main/java/ml/pluto7073/plutoscoffee/blocks/CoffeeGrindrBlock.java index cfb858e..bf28faa 100644 --- a/src/main/java/ml/pluto7073/plutoscoffee/blocks/CoffeeGrindrBlock.java +++ b/src/main/java/ml/pluto7073/plutoscoffee/blocks/CoffeeGrindrBlock.java @@ -1,5 +1,6 @@ package ml.pluto7073.plutoscoffee.blocks; +import com.mojang.serialization.MapCodec; import ml.pluto7073.plutoscoffee.registry.ModBlocks; import ml.pluto7073.plutoscoffee.registry.ModStats; import net.minecraft.MethodsReturnNonnullByDefault; @@ -36,6 +37,7 @@ public class CoffeeGrindrBlock extends BaseEntityBlock { public static final BooleanProperty FULL_PROPERTY; public static final DirectionProperty FACING_PROPERTY; + public static final MapCodec CODEC = simpleCodec(CoffeeGrindrBlock::new); protected static final VoxelShape SHAPE; public CoffeeGrindrBlock(Properties properties) { @@ -45,6 +47,11 @@ public CoffeeGrindrBlock(Properties properties) { .setValue(FACING_PROPERTY, Direction.NORTH)); } + @Override + protected MapCodec codec() { + return CODEC; + } + @Override public RenderShape getRenderShape(BlockState state) { return RenderShape.MODEL; diff --git a/src/main/java/ml/pluto7073/plutoscoffee/blocks/EspressoMachineBlock.java b/src/main/java/ml/pluto7073/plutoscoffee/blocks/EspressoMachineBlock.java index 37106d2..1b384d1 100644 --- a/src/main/java/ml/pluto7073/plutoscoffee/blocks/EspressoMachineBlock.java +++ b/src/main/java/ml/pluto7073/plutoscoffee/blocks/EspressoMachineBlock.java @@ -1,5 +1,6 @@ package ml.pluto7073.plutoscoffee.blocks; +import com.mojang.serialization.MapCodec; import ml.pluto7073.plutoscoffee.registry.ModBlocks; import ml.pluto7073.plutoscoffee.registry.ModItems; import ml.pluto7073.plutoscoffee.registry.ModStats; @@ -42,6 +43,7 @@ public class EspressoMachineBlock extends BaseEntityBlock { public static final BooleanProperty PULLING; public static final BooleanProperty HAS_MILK; public static final DirectionProperty FACING; + public static final MapCodec CODEC = simpleCodec(EspressoMachineBlock::new); protected static VoxelShape SHAPE; @@ -54,6 +56,11 @@ public EspressoMachineBlock(Properties settings) { .setValue(FACING, Direction.NORTH)); } + @Override + protected MapCodec codec() { + return CODEC; + } + public RenderShape getRenderShape(BlockState state) { return RenderShape.MODEL; } diff --git a/src/main/resources/data/plutoscoffee/drink_additions/blonde_espresso_shot.json b/src/main/resources/data/plutoscoffee/drink_additions/blonde_espresso_shot.json index 570f981..5210bef 100644 --- a/src/main/resources/data/plutoscoffee/drink_additions/blonde_espresso_shot.json +++ b/src/main/resources/data/plutoscoffee/drink_additions/blonde_espresso_shot.json @@ -1,5 +1,7 @@ { "changesColor": true, "color": 1444354, - "caffeine": 85 + "chemicals": { + "caffeine": 85 + } } \ No newline at end of file diff --git a/src/main/resources/data/plutoscoffee/drink_additions/decaf_espresso_shot.json b/src/main/resources/data/plutoscoffee/drink_additions/decaf_espresso_shot.json index 7a50a81..ae74865 100644 --- a/src/main/resources/data/plutoscoffee/drink_additions/decaf_espresso_shot.json +++ b/src/main/resources/data/plutoscoffee/drink_additions/decaf_espresso_shot.json @@ -1,5 +1,7 @@ { "changesColor": true, "color": 1444354, - "caffeine": 2 + "chemicals": { + "caffeine": 2 + } } \ No newline at end of file diff --git a/src/main/resources/data/plutoscoffee/drink_additions/espresso_shot.json b/src/main/resources/data/plutoscoffee/drink_additions/espresso_shot.json index 3b1ac25..1b75eb0 100644 --- a/src/main/resources/data/plutoscoffee/drink_additions/espresso_shot.json +++ b/src/main/resources/data/plutoscoffee/drink_additions/espresso_shot.json @@ -1,5 +1,7 @@ { "changesColor": true, "color": 1444354, - "caffeine": 75 + "chemicals": { + "caffeine": 75 + } } \ No newline at end of file diff --git a/src/main/resources/data/plutoscoffee/specialty_drinks/caffe_latte.json b/src/main/resources/data/plutoscoffee/specialty_drinks/caffe_latte.json index 4e00233..801e4b6 100644 --- a/src/main/resources/data/plutoscoffee/specialty_drinks/caffe_latte.json +++ b/src/main/resources/data/plutoscoffee/specialty_drinks/caffe_latte.json @@ -5,7 +5,9 @@ "plutoscoffee:espresso_shot", "plutoscoffee:espresso_shot" ], - "caffeine": 150, + "chemicals": { + "caffeine": 150 + }, "color": 8935223, "onDrinkActions": [ { diff --git a/src/main/resources/data/plutoscoffee/specialty_drinks/mocha.json b/src/main/resources/data/plutoscoffee/specialty_drinks/mocha.json index 88c6f00..96ab033 100644 --- a/src/main/resources/data/plutoscoffee/specialty_drinks/mocha.json +++ b/src/main/resources/data/plutoscoffee/specialty_drinks/mocha.json @@ -7,7 +7,9 @@ "plutoscoffee:espresso_shot", "plutoscoffee:espresso_shot" ], - "caffeine": 150, + "chemicals": { + "caffeine": 150 + }, "color": 1839885, "onDrinkActions": [ { diff --git a/src/main/resources/data/plutoscoffee/specialty_drinks/red_eye.json b/src/main/resources/data/plutoscoffee/specialty_drinks/red_eye.json index 7501e4f..4350a64 100644 --- a/src/main/resources/data/plutoscoffee/specialty_drinks/red_eye.json +++ b/src/main/resources/data/plutoscoffee/specialty_drinks/red_eye.json @@ -6,7 +6,9 @@ "plutoscoffee:espresso_shot", "plutoscoffee:espresso_shot" ], - "caffeine": 350, + "chemicals": { + "caffeine": 350 + }, "color": 985088, "onDrinkActions": [ { diff --git a/src/main/resources/data/plutoscoffee/specialty_drinks/sweet_caramel_latte.json b/src/main/resources/data/plutoscoffee/specialty_drinks/sweet_caramel_latte.json index a744295..fe73596 100644 --- a/src/main/resources/data/plutoscoffee/specialty_drinks/sweet_caramel_latte.json +++ b/src/main/resources/data/plutoscoffee/specialty_drinks/sweet_caramel_latte.json @@ -8,7 +8,9 @@ "plutoscoffee:espresso_shot", "plutoscoffee:espresso_shot" ], - "caffeine": 150, + "chemicals": { + "caffeine": 150 + }, "color": 8872502, "onDrinkActions": [ { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 509b38e..ec6fd03 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -53,12 +53,11 @@ "accessWidener": "plutoscoffee.accesswidener", "depends": { - "fabricloader": ">=0.15.7", + "fabricloader": ">=0.16.5", "fabric-api": "*", - "minecraft": "~1.20.1", + "minecraft": "~1.20.3", "java": ">=17", - "cloth-config": ">=11.1.118", - "pdapi": ">=0.1.4" + "pdapi": ">=1.0.1" }, "suggests": { "flamingo": "*", diff --git a/src/main/resources/resourcepacks/dark_gui/pack.mcmeta b/src/main/resources/resourcepacks/dark_gui/pack.mcmeta index 09886f3..e1fbd96 100644 --- a/src/main/resources/resourcepacks/dark_gui/pack.mcmeta +++ b/src/main/resources/resourcepacks/dark_gui/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 15, + "pack_format": 22, "description": "Makes the GUI for Pluto's Coffee Mod be in Dark Mode, similar to Vanilla Tweaks Dark Mode" } } \ No newline at end of file