From 90cce6aa8c798ca93eb9bc2d06b43472db9fa4d1 Mon Sep 17 00:00:00 2001 From: MattiDragon <61198884+MattiDragon@users.noreply.github.com> Date: Mon, 11 Dec 2023 17:16:55 +0200 Subject: [PATCH] 1.20.4 --- build.gradle | 3 --- gradle.properties | 19 +++++++++---------- .../recipes/redstone/advanced_coil.json | 3 +-- .../recipes/redstone/basic_coil.json | 3 +-- .../recipes/redstone/improved_coil.json | 3 +-- .../recipes/redstone/ultimate_coil.json | 3 +-- .../advancements/recipes/redstone/wire.json | 3 +-- .../power_networks/recipes/advanced_coil.json | 3 +-- .../power_networks/recipes/basic_coil.json | 3 +-- .../power_networks/recipes/improved_coil.json | 3 +-- .../power_networks/recipes/ultimate_coil.json | 3 +-- .../data/power_networks/recipes/wire.json | 3 +-- .../powernetworks/block/CoilBlock.java | 6 ++++++ 13 files changed, 25 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index e13e654..07021b4 100644 --- a/build.gradle +++ b/build.gradle @@ -28,9 +28,6 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:$fabric_api_version" - // Mixin Extras - include(annotationProcessor(implementation("com.github.LlamaLad7.mixinextras:mixinextras-fabric:$mixin_extras_version"))) - // Core apis for the mod modImplementation include("eu.pb4:polymer-core:$polymer_version") modImplementation include("eu.pb4:polymer-virtual-entity:$polymer_version") diff --git a/gradle.properties b/gradle.properties index 8479bbd..2e81a31 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,19 @@ org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true -minecraft_version=1.20.2 -yarn_mappings=1.20.2+build.2 -loader_version=0.14.22 +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.1 +loader_version=0.15.1 mod_version=2.0.1 maven_group=io.github.mattidragon.powernetworks archives_base_name=power-networks -fabric_api_version=0.89.3+1.20.2 -mixin_extras_version=0.2.0-rc.5 -polymer_version=0.6.0+1.20.2 -graphlib_version=1.4.0+1.20.2 -server_translation_api_version=2.1.0+1.20.2-rc2 +fabric_api_version=0.91.2+1.20.4 +polymer_version=0.7.1+1.20.4 +graphlib_version=1.4.0+1.20.4 +server_translation_api_version=2.2.0+1.20.3-rc1 energy_version=3.0.0 -yacl_version=3.2.1+1.20.2 -modmenu_version=8.0.0 +yacl_version=3.3.1+1.20.4 +modmenu_version=9.0.0-pre.1 configtoolkit_version=1.0.0 \ No newline at end of file diff --git a/src/main/generated/data/power_networks/advancements/recipes/redstone/advanced_coil.json b/src/main/generated/data/power_networks/advancements/recipes/redstone/advanced_coil.json index 3e7b9c0..4c0783c 100644 --- a/src/main/generated/data/power_networks/advancements/recipes/redstone/advanced_coil.json +++ b/src/main/generated/data/power_networks/advancements/recipes/redstone/advanced_coil.json @@ -30,6 +30,5 @@ "recipes": [ "power_networks:advanced_coil" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/power_networks/advancements/recipes/redstone/basic_coil.json b/src/main/generated/data/power_networks/advancements/recipes/redstone/basic_coil.json index 852f777..8556a2b 100644 --- a/src/main/generated/data/power_networks/advancements/recipes/redstone/basic_coil.json +++ b/src/main/generated/data/power_networks/advancements/recipes/redstone/basic_coil.json @@ -30,6 +30,5 @@ "recipes": [ "power_networks:basic_coil" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/power_networks/advancements/recipes/redstone/improved_coil.json b/src/main/generated/data/power_networks/advancements/recipes/redstone/improved_coil.json index 309c4f0..5a78feb 100644 --- a/src/main/generated/data/power_networks/advancements/recipes/redstone/improved_coil.json +++ b/src/main/generated/data/power_networks/advancements/recipes/redstone/improved_coil.json @@ -30,6 +30,5 @@ "recipes": [ "power_networks:improved_coil" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/power_networks/advancements/recipes/redstone/ultimate_coil.json b/src/main/generated/data/power_networks/advancements/recipes/redstone/ultimate_coil.json index ad9fb58..3fb1875 100644 --- a/src/main/generated/data/power_networks/advancements/recipes/redstone/ultimate_coil.json +++ b/src/main/generated/data/power_networks/advancements/recipes/redstone/ultimate_coil.json @@ -30,6 +30,5 @@ "recipes": [ "power_networks:ultimate_coil" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/power_networks/advancements/recipes/redstone/wire.json b/src/main/generated/data/power_networks/advancements/recipes/redstone/wire.json index a773a41..7b146c5 100644 --- a/src/main/generated/data/power_networks/advancements/recipes/redstone/wire.json +++ b/src/main/generated/data/power_networks/advancements/recipes/redstone/wire.json @@ -30,6 +30,5 @@ "recipes": [ "power_networks:wire" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/main/generated/data/power_networks/recipes/advanced_coil.json b/src/main/generated/data/power_networks/recipes/advanced_coil.json index f749bc7..f3755ef 100644 --- a/src/main/generated/data/power_networks/recipes/advanced_coil.json +++ b/src/main/generated/data/power_networks/recipes/advanced_coil.json @@ -17,6 +17,5 @@ "result": { "count": 2, "item": "power_networks:advanced_coil" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/power_networks/recipes/basic_coil.json b/src/main/generated/data/power_networks/recipes/basic_coil.json index 6e18c37..d66ff38 100644 --- a/src/main/generated/data/power_networks/recipes/basic_coil.json +++ b/src/main/generated/data/power_networks/recipes/basic_coil.json @@ -17,6 +17,5 @@ "result": { "count": 2, "item": "power_networks:basic_coil" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/power_networks/recipes/improved_coil.json b/src/main/generated/data/power_networks/recipes/improved_coil.json index 983a427..134fde3 100644 --- a/src/main/generated/data/power_networks/recipes/improved_coil.json +++ b/src/main/generated/data/power_networks/recipes/improved_coil.json @@ -17,6 +17,5 @@ "result": { "count": 2, "item": "power_networks:improved_coil" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/power_networks/recipes/ultimate_coil.json b/src/main/generated/data/power_networks/recipes/ultimate_coil.json index 7308726..f2d4e9b 100644 --- a/src/main/generated/data/power_networks/recipes/ultimate_coil.json +++ b/src/main/generated/data/power_networks/recipes/ultimate_coil.json @@ -17,6 +17,5 @@ "result": { "count": 2, "item": "power_networks:ultimate_coil" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/generated/data/power_networks/recipes/wire.json b/src/main/generated/data/power_networks/recipes/wire.json index 485e23d..011c711 100644 --- a/src/main/generated/data/power_networks/recipes/wire.json +++ b/src/main/generated/data/power_networks/recipes/wire.json @@ -16,6 +16,5 @@ "result": { "count": 16, "item": "power_networks:wire" - }, - "show_notification": true + } } \ No newline at end of file diff --git a/src/main/java/io/github/mattidragon/powernetworks/block/CoilBlock.java b/src/main/java/io/github/mattidragon/powernetworks/block/CoilBlock.java index e44f85d..9de7e53 100644 --- a/src/main/java/io/github/mattidragon/powernetworks/block/CoilBlock.java +++ b/src/main/java/io/github/mattidragon/powernetworks/block/CoilBlock.java @@ -1,5 +1,6 @@ package io.github.mattidragon.powernetworks.block; +import com.mojang.serialization.MapCodec; import eu.pb4.polymer.core.api.block.PolymerBlock; import eu.pb4.polymer.core.api.utils.PolymerClientDecoded; import eu.pb4.polymer.core.api.utils.PolymerKeepModel; @@ -99,6 +100,11 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt } } + @Override + protected MapCodec getCodec() { + return MapCodec.unit(this); + } + @Override public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { return VoxelShapes.union(super.getOutlineShape(state, world, pos, context), createCuboidShape(4, 4, 4, 12, 12, 12));