From b9ae4bcd5208d3f85086a05b10226d7f37ac5c61 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Wed, 18 Jun 2025 22:58:37 +0200 Subject: [PATCH] switched to 1.21.6 --- gradle.properties | 10 ++++----- .../jottyfan/quickiemod/QuickiemodClient.java | 8 +++---- .../blockentity/BlockStackerEntity.java | 16 +++++++------- .../blockentity/ItemHoarderBlockEntity.java | 22 +++++++++---------- src/main/resources/fabric.mod.json | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2731ec6..07bdf26 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.5 -yarn_mappings=1.21.5+build.1 -loader_version=0.16.10 +minecraft_version=1.21.6 +yarn_mappings=1.21.6+build.1 +loader_version=0.16.14 # Mod Properties -mod_version=1.21.5.1 +mod_version=1.21.6.0 maven_group=de.jottyfan.quickiemod archives_base_name=quickiemod # Dependencies -fabric_version=0.119.6+1.21.5 +fabric_version=0.127.1+1.21.6 diff --git a/src/main/java/de/jottyfan/quickiemod/QuickiemodClient.java b/src/main/java/de/jottyfan/quickiemod/QuickiemodClient.java index 6ceb67f..2ec265f 100644 --- a/src/main/java/de/jottyfan/quickiemod/QuickiemodClient.java +++ b/src/main/java/de/jottyfan/quickiemod/QuickiemodClient.java @@ -2,8 +2,8 @@ package de.jottyfan.quickiemod; import de.jottyfan.quickiemod.block.ModBlocks; import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; -import net.minecraft.client.render.RenderLayer; +import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap; +import net.minecraft.client.render.BlockRenderLayer; /** * @@ -14,7 +14,7 @@ public class QuickiemodClient implements ClientModInitializer { @Override public void onInitializeClient() { - BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.BLOCK_COTTONPLANT, RenderLayer.getCutout()); - BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.BLOCK_CANOLAPLANT, RenderLayer.getCutout()); + BlockRenderLayerMap.putBlock(ModBlocks.BLOCK_COTTONPLANT, BlockRenderLayer.CUTOUT); + BlockRenderLayerMap.putBlock(ModBlocks.BLOCK_CANOLAPLANT, BlockRenderLayer.CUTOUT); } } diff --git a/src/main/java/de/jottyfan/quickiemod/blockentity/BlockStackerEntity.java b/src/main/java/de/jottyfan/quickiemod/blockentity/BlockStackerEntity.java index e08f396..fe42d49 100644 --- a/src/main/java/de/jottyfan/quickiemod/blockentity/BlockStackerEntity.java +++ b/src/main/java/de/jottyfan/quickiemod/blockentity/BlockStackerEntity.java @@ -16,10 +16,10 @@ import net.minecraft.inventory.Inventories; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.registry.RegistryWrapper.WrapperLookup; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; +import net.minecraft.storage.ReadView; +import net.minecraft.storage.WriteView; import net.minecraft.text.Text; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; @@ -78,15 +78,15 @@ public class BlockStackerEntity extends BlockEntity implements NamedScreenHandle } @Override - protected void readNbt(NbtCompound nbt, WrapperLookup registryLookup) { - super.readNbt(nbt, registryLookup); - Inventories.readNbt(nbt, inventory, registryLookup); + protected void readData(ReadView view) { + super.readData(view); + Inventories.readData(view, inventory); } @Override - protected void writeNbt(NbtCompound nbt, WrapperLookup registryLookup) { - Inventories.writeNbt(nbt, inventory, registryLookup); - super.writeNbt(nbt, registryLookup); + protected void writeData(WriteView view) { + Inventories.writeData(view, inventory); + super.writeData(view); } /** diff --git a/src/main/java/de/jottyfan/quickiemod/blockentity/ItemHoarderBlockEntity.java b/src/main/java/de/jottyfan/quickiemod/blockentity/ItemHoarderBlockEntity.java index a9a7b13..165ccd2 100644 --- a/src/main/java/de/jottyfan/quickiemod/blockentity/ItemHoarderBlockEntity.java +++ b/src/main/java/de/jottyfan/quickiemod/blockentity/ItemHoarderBlockEntity.java @@ -14,9 +14,9 @@ import net.minecraft.inventory.Inventories; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.registry.RegistryWrapper.WrapperLookup; import net.minecraft.screen.ScreenHandler; +import net.minecraft.storage.ReadView; +import net.minecraft.storage.WriteView; import net.minecraft.text.Text; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; @@ -88,19 +88,19 @@ public class ItemHoarderBlockEntity extends LootableContainerBlockEntity { } @Override - protected void writeNbt(NbtCompound nbt, WrapperLookup registryLookup) { - super.writeNbt(nbt, registryLookup); - if (!this.writeLootTable(nbt)) { - Inventories.writeNbt(nbt, this.stacks, registryLookup); - } + protected void writeData(WriteView view) { + super.writeData(view); + if (!this.writeLootTable(view)) { + Inventories.writeData(view, this.stacks); + } } @Override - protected void readNbt(NbtCompound nbt, WrapperLookup registryLookup) { - super.readNbt(nbt, registryLookup); + protected void readData(ReadView view) { + super.readData(view); this.stacks = DefaultedList.ofSize(this.size(), ItemStack.EMPTY); - if (!this.readLootTable(nbt)) { - Inventories.readNbt(nbt, this.stacks, registryLookup); + if (!this.readLootTable(view)){ + Inventories.readData(view, this.stacks); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 007d15c..6f787b3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -28,8 +28,8 @@ "mixins": [ ], "depends": { - "fabricloader": ">=0.16.10", - "minecraft": "~1.21.5", + "fabricloader": ">=0.16.14", + "minecraft": "~1.21.6", "java": ">=21", "fabric-api": "*" },