diff --git a/build.gradle b/build.gradle index 3baae4d..887ce35 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ repositories { name "Cosmic Reach" url "https://github.com/CRModders/CosmicArchive/raw/main/versions" patternLayout { - artifact "[classifier]/[revision]/server/Cosmic Reach-Server-[revision].jar" + artifact "[classifier]/[revision]/server/Cosmic-Reach-Server-[revision].jar" } // This is required in Gradle 6.0+ as metadata file (ivy.xml) is mandatory metadataSources { diff --git a/gradle.properties b/gradle.properties index 83dd504..96c7182 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,9 +9,9 @@ group=net.pietru id=cookie_utils # Dependency Versions -cosmic_reach_version=0.3.2-pre5 +cosmic_reach_version=0.3.2-pre9 # If unspecified, will use the version above -cosmic_reach_server_version=0.3.2-pre5 +cosmic_reach_server_version=0.3.2-pre9 cosmic_quilt_version=2.3.0 #2.2.0 diff --git a/src/main/java/net/pietru/cookie_utils/api/TextCommands.java b/src/main/java/net/pietru/cookie_utils/api/TextCommands.java index ed1b5b9..c56188c 100644 --- a/src/main/java/net/pietru/cookie_utils/api/TextCommands.java +++ b/src/main/java/net/pietru/cookie_utils/api/TextCommands.java @@ -3,11 +3,11 @@ package net.pietru.cookie_utils.api; import com.badlogic.gdx.math.Vector3; import finalforeach.cosmicreach.accounts.Account; import finalforeach.cosmicreach.entities.player.Player; -import finalforeach.cosmicreach.networking.netty.packets.MessagePacket; +import finalforeach.cosmicreach.networking.NetworkIdentity; +import finalforeach.cosmicreach.networking.packets.MessagePacket; import finalforeach.cosmicreach.networking.server.ServerSingletons; import finalforeach.cosmicreach.savelib.utils.TriConsumer; import io.netty.channel.ChannelHandlerContext; -import finalforeach.cosmicreach.networking.common.NetworkIdentity; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/net/pietru/cookie_utils/mixins/BlockActionExplodeMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/BlockActionExplodeMixin.java index 61dbd0e..6da637d 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/BlockActionExplodeMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/BlockActionExplodeMixin.java @@ -2,6 +2,7 @@ package net.pietru.cookie_utils.mixins; import com.badlogic.gdx.math.Vector3; import com.llamalad7.mixinextras.sugar.Local; +import finalforeach.cosmicreach.blockevents.BlockEventArgs; import finalforeach.cosmicreach.blockevents.actions.BlockActionExplode; import finalforeach.cosmicreach.blocks.BlockPosition; import finalforeach.cosmicreach.world.Zone; @@ -24,8 +25,10 @@ public class BlockActionExplodeMixin { @Shadow public float radius; - @Inject(method = "Lfinalforeach/cosmicreach/blockevents/actions/BlockActionExplode;act(Lfinalforeach/cosmicreach/blocks/BlockState;Lfinalforeach/cosmicreach/blockevents/BlockEventTrigger;Lfinalforeach/cosmicreach/world/Zone;Lfinalforeach/cosmicreach/blocks/BlockPosition;)V", at = @At("HEAD"), cancellable = true) - private void event_block_action_explode(CallbackInfo ci, @Local Zone zone, @Local BlockPosition sourcePos){ + @Inject(method = "act", at = @At("HEAD"), cancellable = true) + private void event_block_action_explode(CallbackInfo ci, @Local BlockEventArgs args){ + Zone zone = args.zone; + BlockPosition sourcePos = args.blockPos; float radiusSq = radius * radius; boolean cancel = false; diff --git a/src/main/java/net/pietru/cookie_utils/mixins/BlockBreakMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/BlockBreakMixin.java index 3e3ba17..6fb9bee 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/BlockBreakMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/BlockBreakMixin.java @@ -4,10 +4,10 @@ import com.llamalad7.mixinextras.sugar.Local; import finalforeach.cosmicreach.accounts.Account; import finalforeach.cosmicreach.blocks.BlockPosition; import finalforeach.cosmicreach.blocks.BlockState; -import finalforeach.cosmicreach.networking.common.NetworkIdentity; -import finalforeach.cosmicreach.networking.common.NetworkSide; -import finalforeach.cosmicreach.networking.netty.packets.MessagePacket; -import finalforeach.cosmicreach.networking.netty.packets.blocks.BreakBlockPacket; +import finalforeach.cosmicreach.networking.NetworkIdentity; +import finalforeach.cosmicreach.networking.NetworkSide; +import finalforeach.cosmicreach.networking.packets.MessagePacket; +import finalforeach.cosmicreach.networking.packets.blocks.BreakBlockPacket; import finalforeach.cosmicreach.networking.server.ServerSingletons; import finalforeach.cosmicreach.world.Zone; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/net/pietru/cookie_utils/mixins/BlockPlaceMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/BlockPlaceMixin.java index 2dd25f3..dc215d0 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/BlockPlaceMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/BlockPlaceMixin.java @@ -4,11 +4,10 @@ import com.llamalad7.mixinextras.sugar.Local; import finalforeach.cosmicreach.accounts.Account; import finalforeach.cosmicreach.blocks.BlockPosition; import finalforeach.cosmicreach.blocks.BlockState; -import finalforeach.cosmicreach.entities.player.Player; -import finalforeach.cosmicreach.networking.common.NetworkIdentity; -import finalforeach.cosmicreach.networking.common.NetworkSide; -import finalforeach.cosmicreach.networking.netty.packets.MessagePacket; -import finalforeach.cosmicreach.networking.netty.packets.blocks.PlaceBlockPacket; +import finalforeach.cosmicreach.networking.NetworkIdentity; +import finalforeach.cosmicreach.networking.NetworkSide; +import finalforeach.cosmicreach.networking.packets.MessagePacket; +import finalforeach.cosmicreach.networking.packets.blocks.PlaceBlockPacket; import finalforeach.cosmicreach.networking.server.ServerSingletons; import finalforeach.cosmicreach.world.Zone; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/net/pietru/cookie_utils/mixins/InteractBlockMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/InteractBlockMixin.java index a3e59ea..7aac944 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/InteractBlockMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/InteractBlockMixin.java @@ -4,10 +4,10 @@ import com.llamalad7.mixinextras.sugar.Local; import finalforeach.cosmicreach.accounts.Account; import finalforeach.cosmicreach.blocks.BlockPosition; import finalforeach.cosmicreach.blocks.BlockState; -import finalforeach.cosmicreach.networking.common.NetworkIdentity; -import finalforeach.cosmicreach.networking.common.NetworkSide; -import finalforeach.cosmicreach.networking.netty.packets.MessagePacket; -import finalforeach.cosmicreach.networking.netty.packets.blocks.InteractBlockPacket; +import finalforeach.cosmicreach.networking.NetworkIdentity; +import finalforeach.cosmicreach.networking.NetworkSide; +import finalforeach.cosmicreach.networking.packets.MessagePacket; +import finalforeach.cosmicreach.networking.packets.blocks.InteractBlockPacket; import finalforeach.cosmicreach.networking.server.ServerSingletons; import finalforeach.cosmicreach.world.Zone; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java index 678783b..8072407 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java @@ -1,13 +1,9 @@ package net.pietru.cookie_utils.mixins; -import com.badlogic.gdx.utils.Array; import com.llamalad7.mixinextras.sugar.Local; -import finalforeach.cosmicreach.blocks.BlockPosition; -import finalforeach.cosmicreach.blocks.BlockState; -import finalforeach.cosmicreach.networking.common.NetworkIdentity; -import finalforeach.cosmicreach.networking.common.NetworkSide; -import finalforeach.cosmicreach.networking.netty.packets.MessagePacket; -import finalforeach.cosmicreach.world.Zone; +import finalforeach.cosmicreach.networking.NetworkIdentity; +import finalforeach.cosmicreach.networking.NetworkSide; +import finalforeach.cosmicreach.networking.packets.MessagePacket; import io.netty.channel.ChannelHandlerContext; import net.pietru.cookie_utils.api.TextCommands; import org.spongepowered.asm.mixin.Mixin; @@ -16,8 +12,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static net.pietru.cookie_utils.api.Region.can_edit_block; - @Mixin(MessagePacket.class) public class MessagePacketMixin { @Shadow diff --git a/src/main/java/net/pietru/cookie_utils/mixins/PlayerPositionMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/PlayerPositionMixin.java index 05c5735..1069f7b 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/PlayerPositionMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/PlayerPositionMixin.java @@ -3,17 +3,13 @@ package net.pietru.cookie_utils.mixins; import com.badlogic.gdx.math.Vector3; import com.llamalad7.mixinextras.sugar.Local; import finalforeach.cosmicreach.accounts.Account; -import finalforeach.cosmicreach.blocks.BlockPosition; -import finalforeach.cosmicreach.blocks.BlockState; import finalforeach.cosmicreach.entities.Entity; import finalforeach.cosmicreach.entities.player.Player; -import finalforeach.cosmicreach.networking.common.NetworkIdentity; -import finalforeach.cosmicreach.networking.common.NetworkSide; -import finalforeach.cosmicreach.networking.netty.packets.MessagePacket; -import finalforeach.cosmicreach.networking.netty.packets.PlayerPositionPacket; -import finalforeach.cosmicreach.networking.netty.packets.blocks.PlaceBlockPacket; +import finalforeach.cosmicreach.networking.NetworkIdentity; +import finalforeach.cosmicreach.networking.NetworkSide; +import finalforeach.cosmicreach.networking.packets.MessagePacket; +import finalforeach.cosmicreach.networking.packets.entities.PlayerPositionPacket; import finalforeach.cosmicreach.networking.server.ServerSingletons; -import finalforeach.cosmicreach.world.Zone; import io.netty.channel.ChannelHandlerContext; import net.pietru.cookie_utils.api.Permissions; import org.spongepowered.asm.mixin.Mixin; @@ -22,8 +18,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.util.ConcurrentModificationException; - import static net.pietru.cookie_utils.api.Region.*; @Mixin(PlayerPositionPacket.class) diff --git a/src/main/java/net/pietru/cookie_utils/mixins/ServerSingletonsMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/ServerSingletonsMixin.java index dd8264f..b8ca4b5 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/ServerSingletonsMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/ServerSingletonsMixin.java @@ -1,6 +1,5 @@ package net.pietru.cookie_utils.mixins; -import com.llamalad7.mixinextras.sugar.Local; import finalforeach.cosmicreach.networking.server.ServerSingletons; import net.pietru.cookie_utils.api.Region; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/resources/cookie_utils.mixins.json b/src/main/resources/cookie_utils.mixins.json index c8c005a..8b26cac 100644 --- a/src/main/resources/cookie_utils.mixins.json +++ b/src/main/resources/cookie_utils.mixins.json @@ -4,12 +4,13 @@ "package": "net.pietru.cookie_utils.mixins", "compatibilityLevel": "JAVA_17", "mixins": [ + "BlockActionExplodeMixin", "BlockBreakMixin", "BlockPlaceMixin", "InteractBlockMixin", "MessagePacketMixin", - "ServerSingletonsMixin", - "PlayerPositionMixin" + "PlayerPositionMixin", + "ServerSingletonsMixin" ], "client": [], "injectors": {