From d018c369ae8d48c32ccf0f41f341a4021a58afc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Sun, 5 May 2024 08:43:33 +0200 Subject: [PATCH] Update to 1.20.6 --- README.md | 2 +- build.gradle | 2 +- gradle.properties | 15 +++++++-------- .../brn/televator/blocks/TelevatorBlock.java | 9 ++------- .../resources/assets/televator/lang/en_us.json | 2 +- .../data/televator/recipes/televator.json | 3 ++- src/main/resources/fabric.mod.json | 12 ++++++------ 7 files changed, 20 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index d0ab39f..42bfcdc 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ based on [JumpVader](https://github.com/StimzRx/JumpVaderMod) by [StimzRx](https://github.com/StimzRx/JumpVaderMod) ## What is it -It's a mod that lets you place "Jump Vader" blocks similar to the Quark mod's elevators. +It's a mod that lets you place "Televator" blocks similar to the Quark mod's elevators. You simply place one above the other at any vertical distance, and jump/crouch on top of the block to go in between the different heights. diff --git a/build.gradle b/build.gradle index 2e118ff..ca3431b 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { diff --git a/gradle.properties b/gradle.properties index 50b3448..c003c6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 -loader_version=0.15.9 +minecraft_version=1.20.6 +yarn_mappings=1.20.6+build.1 +loader_version=0.15.11 # Mod Properties -mod_version = 1.0.9+1.20.4 +mod_version = 1.0.11+1.20.6 maven_group = systems.brn.televator archives_base_name = televator # Dependencies -fabric_version=0.96.11+1.20.4 -serverapi_version=1.0.8+1.20.1 -polymer_version=0.7.7+1.20.4 -server_translations_api_version=2.2.0+1.20.3-rc1 +fabric_version=0.97.8+1.20.6 +polymer_version=0.8.0-beta.8+1.20.6 +server_translations_api_version=2.3.0+1.20.5-rc2 diff --git a/src/main/java/systems/brn/televator/blocks/TelevatorBlock.java b/src/main/java/systems/brn/televator/blocks/TelevatorBlock.java index c182933..2fbe51a 100644 --- a/src/main/java/systems/brn/televator/blocks/TelevatorBlock.java +++ b/src/main/java/systems/brn/televator/blocks/TelevatorBlock.java @@ -1,5 +1,6 @@ package systems.brn.televator.blocks; +import net.minecraft.block.AbstractBlock; import systems.brn.televator.Televator; import systems.brn.televator.TelevatorConfig; import systems.brn.televator.items.TelevatorBlockItem; @@ -7,7 +8,6 @@ import eu.pb4.polymer.blocks.api.BlockModelType; import eu.pb4.polymer.blocks.api.PolymerBlockModel; import eu.pb4.polymer.blocks.api.PolymerTexturedBlock; import eu.pb4.polymer.blocks.api.PolymerBlockResourceUtils; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -31,11 +31,6 @@ public class TelevatorBlock extends Block implements PolymerTexturedBlock { this.polymerBlockState = PolymerBlockResourceUtils.requestBlock(type, PolymerBlockModel.of(new Identifier(Televator.MODID, modelId))); } - @Override - public Block getPolymerBlock(BlockState state) { - return this.polymerBlockState.getBlock(); - } - @Override public BlockState getPolymerBlockState(BlockState state) { return this.polymerBlockState; @@ -44,7 +39,7 @@ public class TelevatorBlock extends Block implements PolymerTexturedBlock { public static void register() { var modId = new Identifier(Televator.MODID, Televator.MODELID); var block = Registry.register(Registries.BLOCK, modId, - new TelevatorBlock(FabricBlockSettings.copy(Blocks.WHITE_WOOL), BlockModelType.FULL_BLOCK, Televator.MODELID)); + new TelevatorBlock(AbstractBlock.Settings.copy(Blocks.WHITE_WOOL), BlockModelType.FULL_BLOCK, Televator.MODELID)); Registry.register(Registries.ITEM, modId, new TelevatorBlockItem(new Item.Settings(), block, Televator.MODELID)); } diff --git a/src/main/resources/assets/televator/lang/en_us.json b/src/main/resources/assets/televator/lang/en_us.json index 09c0ebf..8648844 100644 --- a/src/main/resources/assets/televator/lang/en_us.json +++ b/src/main/resources/assets/televator/lang/en_us.json @@ -1,3 +1,3 @@ { - "block.televator.televator": "Jump Vader" + "block.televator.televator": "Televator" } \ No newline at end of file diff --git a/src/main/resources/data/televator/recipes/televator.json b/src/main/resources/data/televator/recipes/televator.json index 6acdfb6..57b12f1 100644 --- a/src/main/resources/data/televator/recipes/televator.json +++ b/src/main/resources/data/televator/recipes/televator.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "category": "redstone", "pattern": [ "#A#", "AEA", @@ -17,7 +18,7 @@ } }, "result": { - "item": "televator:televator", + "id": "televator:televator", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fbf83d0..5cdbcae 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -3,8 +3,8 @@ "id": "televator", "version": "${version}", - "name": "Jump Vader", - "description": "Televator Serverside", + "name": "Televator", + "description": "Televator Serversider", "authors": [ "VenomCodeDev", "BRNSystems" @@ -25,10 +25,10 @@ }, "depends": { - "fabricloader": ">=0.15.9", - "minecraft": "~1.20.4", + "fabricloader": ">=0.15.11", + "minecraft": "~1.20.6", "java": ">=17", - "fabric-api": "*", - "polymer-core": "0.7.7+1.20.4" + "fabric-api": ">=0.97.8+1.20.6", + "polymer-core": ">=0.8.0-beta.8+1.20.6" } }