From a1a521adbbe34a952f21b3208ea1c79fdf877d68 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Fri, 22 Sep 2023 21:42:29 +0200 Subject: [PATCH] version 1.20.2.0 --- gradle.properties | 10 +++++----- .../minecraft/quickiefabric/blocks/BlockSpreader.java | 2 +- .../quickiefabric/blocks/BlockStackerDown.java | 2 +- .../quickiefabric/blocks/BlockStackerEast.java | 2 +- .../quickiefabric/blocks/BlockStackerNorth.java | 2 +- .../quickiefabric/blocks/BlockStackerSouth.java | 2 +- .../minecraft/quickiefabric/blocks/BlockStackerUp.java | 2 +- .../quickiefabric/blocks/BlockStackerWest.java | 2 +- .../quickiefabric/container/BackpackScreen.java | 2 +- .../quickiefabric/container/BlockStackerScreen.java | 4 ++-- src/main/resources/fabric.mod.json | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2e47505..808684c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,17 @@ # Fabric Properties # check these on https://fabricmc.net/versions.html - minecraft_version=1.20.1 - yarn_mappings=1.20.1+build.9 - loader_version=0.14.21 + minecraft_version=1.20.2 + yarn_mappings=1.20.2+build.1 + loader_version=0.14.22 # Mod Properties - mod_version = 1.20.1.5 + mod_version = 1.20.2.0 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric # Dependencies - fabric_version=0.84.0+1.20.1 + fabric_version=0.89.1+1.20.2 # for ExtendedLeavesBlock terraform_wood_api_version=7.0.1 diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpreader.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpreader.java index 9e6b4eb..eac5d48 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpreader.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpreader.java @@ -40,7 +40,7 @@ public class BlockSpreader extends BlockWithEntity { @Override public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return checkType(type, QuickieFabricBlockEntity.BLOCKSPREADER_ENTITY, + return validateTicker(type, QuickieFabricBlockEntity.BLOCKSPREADER_ENTITY, (world1, pos, state1, be) -> BlockSpreaderEntity.tick(world1, pos, state1, be)); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerDown.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerDown.java index 792bcd1..748efc9 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerDown.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerDown.java @@ -64,7 +64,7 @@ public class BlockStackerDown extends BlockWithEntity implements BlockStacker { @Override public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return checkType(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, + return validateTicker(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, (world1, pos, state1, be) -> BlockStackerEntity.tick(world1, pos, state1, be)); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerEast.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerEast.java index cc8f7db..415a03c 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerEast.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerEast.java @@ -64,7 +64,7 @@ public class BlockStackerEast extends BlockWithEntity implements BlockStacker { @Override public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return checkType(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, + return validateTicker(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, (world1, pos, state1, be) -> BlockStackerEntity.tick(world1, pos, state1, be)); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerNorth.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerNorth.java index 23f451e..079e2f2 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerNorth.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerNorth.java @@ -64,7 +64,7 @@ public class BlockStackerNorth extends BlockWithEntity implements BlockStacker { @Override public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return checkType(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, + return validateTicker(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, (world1, pos, state1, be) -> BlockStackerEntity.tick(world1, pos, state1, be)); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerSouth.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerSouth.java index c08eb1f..7baba75 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerSouth.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerSouth.java @@ -64,7 +64,7 @@ public class BlockStackerSouth extends BlockWithEntity implements BlockStacker { @Override public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return checkType(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, + return validateTicker(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, (world1, pos, state1, be) -> BlockStackerEntity.tick(world1, pos, state1, be)); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerUp.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerUp.java index 029b827..9b68340 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerUp.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerUp.java @@ -64,7 +64,7 @@ public class BlockStackerUp extends BlockWithEntity implements BlockStacker { @Override public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return checkType(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, + return validateTicker(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, (world1, pos, state1, be) -> BlockStackerEntity.tick(world1, pos, state1, be)); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerWest.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerWest.java index ce8e9ac..fd804c4 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerWest.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerWest.java @@ -64,7 +64,7 @@ public class BlockStackerWest extends BlockWithEntity implements BlockStacker { @Override public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return checkType(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, + return validateTicker(type, QuickieFabricBlockEntity.BLOCKSTACKER_ENTITY, (world1, pos, state1, be) -> BlockStackerEntity.tick(world1, pos, state1, be)); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreen.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreen.java index c6f02e8..4a16eed 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreen.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreen.java @@ -45,7 +45,7 @@ public class BackpackScreen extends HandledScreen @Override public void render(DrawContext drawContext, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(drawContext); + this.renderInGameBackground(drawContext); super.render(drawContext, mouseX, mouseY, partialTicks); this.drawMouseoverTooltip(drawContext, mouseX, mouseY); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreen.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreen.java index 5a2cb42..c02f020 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreen.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreen.java @@ -33,7 +33,7 @@ public class BlockStackerScreen extends HandledScreen @Override public void render(DrawContext drawContext, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(drawContext); + this.renderInGameBackground(drawContext); super.render(drawContext, mouseX, mouseY, partialTicks); this.drawMouseoverTooltip(drawContext, mouseX, mouseY); } @@ -43,7 +43,7 @@ public class BlockStackerScreen extends HandledScreen // context.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); int guiX = (this.width - this.containerWidth) / 2; int guiY = (this.height - this.containerHeight) / 2; - super.renderBackground(context); + super.renderInGameBackground(context); context.drawTexture(TEXTURE, guiX, guiY, 0, 0, containerWidth, containerHeight); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 50b2777..1ae6387 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,9 +26,9 @@ "quickiefabric.mixins.json" ], "depends": { - "fabricloader": ">=0.14.21", + "fabricloader": ">=0.14.22", "fabric": "*", - "minecraft": "1.20.1", + "minecraft": "1.20.2", "java": ">=17" }, "suggests": {