From f1586b380948bf25699849418660c36d40343802 Mon Sep 17 00:00:00 2001 From: gnembon <41132274+gnembon@users.noreply.github.com> Date: Wed, 22 Mar 2023 18:27:44 +0100 Subject: [PATCH] 23w12a --- gradle.properties | 8 ++--- .../carpet/helpers/QuasiConnectivity.java | 4 +-- .../mixins/PistonBaseBlock_qcMixin.java | 4 +-- .../PistonBaseBlock_rotatorBlockMixin.java | 3 +- ...VibrationConfig_sculkSensorRangeMixin.java | 21 +++++++++++++ .../mixins/SculkSensorBlock_rangeMixin.java | 30 ------------------- .../java/carpet/script/value/ScreenValue.java | 2 -- src/main/resources/carpet.mixins.json | 2 +- src/main/resources/fabric.mod.json | 2 +- 9 files changed, 33 insertions(+), 43 deletions(-) create mode 100644 src/main/java/carpet/mixins/SculkSensorBlockEntityVibrationConfig_sculkSensorRangeMixin.java delete mode 100644 src/main/java/carpet/mixins/SculkSensorBlock_rangeMixin.java diff --git a/gradle.properties b/gradle.properties index 44c86879..b80d507e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check https://fabricmc.net/develop/ - minecraft_version=1.19.4 - loader_version=0.14.17 + minecraft_version=23w12a + loader_version=0.14.18 jsr305_version=3.0.2 - fabric_version=0.75.3+1.19.4 + fabric_version=0.76.0+1.19.4 # Mod Properties mod_version = 1.4.101 @@ -17,7 +17,7 @@ org.gradle.jvmargs=-Xmx1G # The Curseforge versions "names" or ids for the main branch (comma separated: 1.16.4,1.16.5) # This is needed because CF uses too vague names for prereleases and release candidates # Can also be the version ID directly coming from https://minecraft.curseforge.com/api/game/versions?token=[API_TOKEN] - release-curse-versions = Minecraft 1.19:1.19.4 + release-curse-versions = Minecraft 1.20:1.20-Snapshot # Whether or not to build another branch on release release-extra-branch = false # The name of the second branch to release diff --git a/src/main/java/carpet/helpers/QuasiConnectivity.java b/src/main/java/carpet/helpers/QuasiConnectivity.java index 0f8d221e..5bc411ac 100644 --- a/src/main/java/carpet/helpers/QuasiConnectivity.java +++ b/src/main/java/carpet/helpers/QuasiConnectivity.java @@ -3,11 +3,11 @@ package carpet.helpers; import carpet.CarpetSettings; import net.minecraft.core.BlockPos; -import net.minecraft.world.level.Level; +import net.minecraft.world.level.SignalGetter; public class QuasiConnectivity { - public static boolean hasQuasiSignal(Level level, BlockPos pos) { + public static boolean hasQuasiSignal(SignalGetter level, BlockPos pos) { for (int i = 1; i <= CarpetSettings.quasiConnectivity; i++) { BlockPos above = pos.above(i); diff --git a/src/main/java/carpet/mixins/PistonBaseBlock_qcMixin.java b/src/main/java/carpet/mixins/PistonBaseBlock_qcMixin.java index 87ee3b4f..f0b3d1a8 100644 --- a/src/main/java/carpet/mixins/PistonBaseBlock_qcMixin.java +++ b/src/main/java/carpet/mixins/PistonBaseBlock_qcMixin.java @@ -1,5 +1,6 @@ package carpet.mixins; +import net.minecraft.world.level.SignalGetter; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -9,7 +10,6 @@ import carpet.helpers.QuasiConnectivity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.piston.PistonBaseBlock; @Mixin(PistonBaseBlock.class) @@ -23,7 +23,7 @@ public class PistonBaseBlock_qcMixin { target = "Lnet/minecraft/core/BlockPos;above()Lnet/minecraft/core/BlockPos;" ) ) - private void carpet_checkQuasiSignal(Level level, BlockPos pos, Direction facing, CallbackInfoReturnable cir) { + private void carpet_checkQuasiSignal(SignalGetter level, BlockPos pos, Direction facing, CallbackInfoReturnable cir) { cir.setReturnValue(QuasiConnectivity.hasQuasiSignal(level, pos)); } } diff --git a/src/main/java/carpet/mixins/PistonBaseBlock_rotatorBlockMixin.java b/src/main/java/carpet/mixins/PistonBaseBlock_rotatorBlockMixin.java index d857d6b0..225a7eb4 100644 --- a/src/main/java/carpet/mixins/PistonBaseBlock_rotatorBlockMixin.java +++ b/src/main/java/carpet/mixins/PistonBaseBlock_rotatorBlockMixin.java @@ -4,6 +4,7 @@ import carpet.fakes.PistonBlockInterface; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.Level; +import net.minecraft.world.level.SignalGetter; import net.minecraft.world.level.block.piston.PistonBaseBlock; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -11,7 +12,7 @@ import org.spongepowered.asm.mixin.Shadow; @Mixin(PistonBaseBlock.class) public abstract class PistonBaseBlock_rotatorBlockMixin implements PistonBlockInterface { - @Shadow protected abstract boolean getNeighborSignal(Level world_1, BlockPos blockPos_1, Direction direction_1); + @Shadow protected abstract boolean getNeighborSignal(SignalGetter world_1, BlockPos blockPos_1, Direction direction_1); @Override public boolean publicShouldExtend(Level world_1, BlockPos blockPos_1, Direction direction_1) diff --git a/src/main/java/carpet/mixins/SculkSensorBlockEntityVibrationConfig_sculkSensorRangeMixin.java b/src/main/java/carpet/mixins/SculkSensorBlockEntityVibrationConfig_sculkSensorRangeMixin.java new file mode 100644 index 00000000..8d317454 --- /dev/null +++ b/src/main/java/carpet/mixins/SculkSensorBlockEntityVibrationConfig_sculkSensorRangeMixin.java @@ -0,0 +1,21 @@ +package carpet.mixins; + + +import carpet.CarpetSettings; +import net.minecraft.world.level.block.entity.SculkSensorBlockEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(SculkSensorBlockEntity.VibrationConfig.class) +public class SculkSensorBlockEntityVibrationConfig_sculkSensorRangeMixin +{ + @Inject(method = "getListenerRadius", at = @At("HEAD"), cancellable = true) + private void sculkSensorRange(CallbackInfoReturnable cir) + { + if (CarpetSettings.sculkSensorRange != SculkSensorBlockEntity.VibrationConfig.LISTENER_RANGE) { + cir.setReturnValue(CarpetSettings.sculkSensorRange); + } + } +} diff --git a/src/main/java/carpet/mixins/SculkSensorBlock_rangeMixin.java b/src/main/java/carpet/mixins/SculkSensorBlock_rangeMixin.java deleted file mode 100644 index 3e0a2077..00000000 --- a/src/main/java/carpet/mixins/SculkSensorBlock_rangeMixin.java +++ /dev/null @@ -1,30 +0,0 @@ -package carpet.mixins; - -import carpet.CarpetSettings; -import net.minecraft.world.level.block.SculkSensorBlock; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(SculkSensorBlock.class) -public class SculkSensorBlock_rangeMixin { - - @Shadow - @Final - private int listenerRange; - - - @Inject( - method = "getListenerRange()I", - at = @At("HEAD"), - cancellable = true - ) - public void getListenerRange(CallbackInfoReturnable cir) { - if (CarpetSettings.sculkSensorRange != this.listenerRange) { - cir.setReturnValue(CarpetSettings.sculkSensorRange); - } - } -} diff --git a/src/main/java/carpet/script/value/ScreenValue.java b/src/main/java/carpet/script/value/ScreenValue.java index 9eb2702f..366738e7 100644 --- a/src/main/java/carpet/script/value/ScreenValue.java +++ b/src/main/java/carpet/script/value/ScreenValue.java @@ -45,7 +45,6 @@ import net.minecraft.world.inventory.FurnaceMenu; import net.minecraft.world.inventory.GrindstoneMenu; import net.minecraft.world.inventory.HopperMenu; import net.minecraft.world.inventory.LecternMenu; -import net.minecraft.world.inventory.LegacySmithingMenu; import net.minecraft.world.inventory.LoomMenu; import net.minecraft.world.inventory.MerchantMenu; import net.minecraft.world.inventory.ShulkerBoxMenu; @@ -99,7 +98,6 @@ public class ScreenValue extends Value screenHandlerFactories.put("loom", LoomMenu::new); screenHandlerFactories.put("merchant", MerchantMenu::new); screenHandlerFactories.put("shulker_box", (syncId, playerInventory) -> new ShulkerBoxMenu(syncId, playerInventory, new SimpleContainer(9 * 3))); - screenHandlerFactories.put("smithing_legacy", LegacySmithingMenu::new); screenHandlerFactories.put("smithing", SmithingMenu::new); screenHandlerFactories.put("smoker", SmokerMenu::new); screenHandlerFactories.put("stonecutter", StonecutterMenu::new); diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index fab1e6d2..3d822689 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -179,7 +179,7 @@ "TheEndGatewayBlockEntity_creativeNoClipMixin", "LivingEntity_creativeFlyMixin", "ChunkMap_creativePlayersLoadChunksMixin", - "SculkSensorBlock_rangeMixin", + "SculkSensorBlockEntityVibrationConfig_sculkSensorRangeMixin", "CollectingNeighborUpdaterAccessor", "BlockBehaviour_customStickyMixin", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 99cf3df7..944cd5c8 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -33,7 +33,7 @@ "accessWidener" : "carpet.accesswidener", "depends": { - "minecraft": "1.19.4", + "minecraft": ">1.19.4", "fabricloader": ">=0.14.6", "java": ">=17" }