pietru/CR_CookieServerUtils_Mod
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

pre9 update
All checks were successful
/ Auto-Build-App (push) Successful in 1m46s
Details

Browse source
This commit is contained in:
pietru 2024-10-23 15:05:45 +02:00
parent 011ae16ac5
commit 44003f57c2
11 changed files with 32 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -24,7 +24,7 @@ repositories {
name "Cosmic Reach" name "Cosmic Reach"
url "https://github.com/CRModders/CosmicArchive/raw/main/versions" url "https://github.com/CRModders/CosmicArchive/raw/main/versions"
patternLayout { 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 // This is required in Gradle 6.0+ as metadata file (ivy.xml) is mandatory
metadataSources { metadataSources {

4
gradle.properties
View file

@ -9,9 +9,9 @@ group=net.pietru
id=cookie_utils id=cookie_utils
# Dependency Versions # Dependency Versions
cosmic_reach_version=0.3.2-pre5 cosmic_reach_version=0.3.2-pre9
# If unspecified, will use the version above # 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 cosmic_quilt_version=2.3.0
#2.2.0 #2.2.0

4
src/main/java/net/pietru/cookie_utils/api/TextCommands.java
View file

@ -3,11 +3,11 @@ package net.pietru.cookie_utils.api;
import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.Vector3;
import finalforeach.cosmicreach.accounts.Account; import finalforeach.cosmicreach.accounts.Account;
import finalforeach.cosmicreach.entities.player.Player; 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.networking.server.ServerSingletons;
import finalforeach.cosmicreach.savelib.utils.TriConsumer; import finalforeach.cosmicreach.savelib.utils.TriConsumer;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import finalforeach.cosmicreach.networking.common.NetworkIdentity;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

7
src/main/java/net/pietru/cookie_utils/mixins/BlockActionExplodeMixin.java
View file

@ -2,6 +2,7 @@ package net.pietru.cookie_utils.mixins;
import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.Vector3;
import com.llamalad7.mixinextras.sugar.Local; import com.llamalad7.mixinextras.sugar.Local;
import finalforeach.cosmicreach.blockevents.BlockEventArgs;
import finalforeach.cosmicreach.blockevents.actions.BlockActionExplode; import finalforeach.cosmicreach.blockevents.actions.BlockActionExplode;
import finalforeach.cosmicreach.blocks.BlockPosition; import finalforeach.cosmicreach.blocks.BlockPosition;
import finalforeach.cosmicreach.world.Zone; import finalforeach.cosmicreach.world.Zone;
@ -24,8 +25,10 @@ public class BlockActionExplodeMixin {
@Shadow @Shadow
public float radius; 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) @Inject(method = "act", at = @At("HEAD"), cancellable = true)
private void event_block_action_explode(CallbackInfo ci, @Local Zone zone, @Local BlockPosition sourcePos){ private void event_block_action_explode(CallbackInfo ci, @Local BlockEventArgs args){
Zone zone = args.zone;
BlockPosition sourcePos = args.blockPos;
float radiusSq = radius * radius; float radiusSq = radius * radius;
boolean cancel = false; boolean cancel = false;

8
src/main/java/net/pietru/cookie_utils/mixins/BlockBreakMixin.java
View file

@ -4,10 +4,10 @@ import com.llamalad7.mixinextras.sugar.Local;
import finalforeach.cosmicreach.accounts.Account; import finalforeach.cosmicreach.accounts.Account;
import finalforeach.cosmicreach.blocks.BlockPosition; import finalforeach.cosmicreach.blocks.BlockPosition;
import finalforeach.cosmicreach.blocks.BlockState; import finalforeach.cosmicreach.blocks.BlockState;
import finalforeach.cosmicreach.networking.common.NetworkIdentity; import finalforeach.cosmicreach.networking.NetworkIdentity;
import finalforeach.cosmicreach.networking.common.NetworkSide; import finalforeach.cosmicreach.networking.NetworkSide;
import finalforeach.cosmicreach.networking.netty.packets.MessagePacket; import finalforeach.cosmicreach.networking.packets.MessagePacket;
import finalforeach.cosmicreach.networking.netty.packets.blocks.BreakBlockPacket; import finalforeach.cosmicreach.networking.packets.blocks.BreakBlockPacket;
import finalforeach.cosmicreach.networking.server.ServerSingletons; import finalforeach.cosmicreach.networking.server.ServerSingletons;
import finalforeach.cosmicreach.world.Zone; import finalforeach.cosmicreach.world.Zone;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;

9
src/main/java/net/pietru/cookie_utils/mixins/BlockPlaceMixin.java
View file

@ -4,11 +4,10 @@ import com.llamalad7.mixinextras.sugar.Local;
import finalforeach.cosmicreach.accounts.Account; import finalforeach.cosmicreach.accounts.Account;
import finalforeach.cosmicreach.blocks.BlockPosition; import finalforeach.cosmicreach.blocks.BlockPosition;
import finalforeach.cosmicreach.blocks.BlockState; import finalforeach.cosmicreach.blocks.BlockState;
import finalforeach.cosmicreach.entities.player.Player; import finalforeach.cosmicreach.networking.NetworkIdentity;
import finalforeach.cosmicreach.networking.common.NetworkIdentity; import finalforeach.cosmicreach.networking.NetworkSide;
import finalforeach.cosmicreach.networking.common.NetworkSide; import finalforeach.cosmicreach.networking.packets.MessagePacket;
import finalforeach.cosmicreach.networking.netty.packets.MessagePacket; import finalforeach.cosmicreach.networking.packets.blocks.PlaceBlockPacket;
import finalforeach.cosmicreach.networking.netty.packets.blocks.PlaceBlockPacket;
import finalforeach.cosmicreach.networking.server.ServerSingletons; import finalforeach.cosmicreach.networking.server.ServerSingletons;
import finalforeach.cosmicreach.world.Zone; import finalforeach.cosmicreach.world.Zone;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;

8
src/main/java/net/pietru/cookie_utils/mixins/InteractBlockMixin.java
View file

@ -4,10 +4,10 @@ import com.llamalad7.mixinextras.sugar.Local;
import finalforeach.cosmicreach.accounts.Account; import finalforeach.cosmicreach.accounts.Account;
import finalforeach.cosmicreach.blocks.BlockPosition; import finalforeach.cosmicreach.blocks.BlockPosition;
import finalforeach.cosmicreach.blocks.BlockState; import finalforeach.cosmicreach.blocks.BlockState;
import finalforeach.cosmicreach.networking.common.NetworkIdentity; import finalforeach.cosmicreach.networking.NetworkIdentity;
import finalforeach.cosmicreach.networking.common.NetworkSide; import finalforeach.cosmicreach.networking.NetworkSide;
import finalforeach.cosmicreach.networking.netty.packets.MessagePacket; import finalforeach.cosmicreach.networking.packets.MessagePacket;
import finalforeach.cosmicreach.networking.netty.packets.blocks.InteractBlockPacket; import finalforeach.cosmicreach.networking.packets.blocks.InteractBlockPacket;
import finalforeach.cosmicreach.networking.server.ServerSingletons; import finalforeach.cosmicreach.networking.server.ServerSingletons;
import finalforeach.cosmicreach.world.Zone; import finalforeach.cosmicreach.world.Zone;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;

12
src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java
View file

@ -1,13 +1,9 @@
package net.pietru.cookie_utils.mixins; package net.pietru.cookie_utils.mixins;
import com.badlogic.gdx.utils.Array;
import com.llamalad7.mixinextras.sugar.Local; import com.llamalad7.mixinextras.sugar.Local;
import finalforeach.cosmicreach.blocks.BlockPosition; import finalforeach.cosmicreach.networking.NetworkIdentity;
import finalforeach.cosmicreach.blocks.BlockState; import finalforeach.cosmicreach.networking.NetworkSide;
import finalforeach.cosmicreach.networking.common.NetworkIdentity; import finalforeach.cosmicreach.networking.packets.MessagePacket;
import finalforeach.cosmicreach.networking.common.NetworkSide;
import finalforeach.cosmicreach.networking.netty.packets.MessagePacket;
import finalforeach.cosmicreach.world.Zone;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import net.pietru.cookie_utils.api.TextCommands; import net.pietru.cookie_utils.api.TextCommands;
import org.spongepowered.asm.mixin.Mixin; 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.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import static net.pietru.cookie_utils.api.Region.can_edit_block;
@Mixin(MessagePacket.class) @Mixin(MessagePacket.class)
public class MessagePacketMixin { public class MessagePacketMixin {
@Shadow @Shadow

14
src/main/java/net/pietru/cookie_utils/mixins/PlayerPositionMixin.java
View file

@ -3,17 +3,13 @@ package net.pietru.cookie_utils.mixins;
import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.Vector3;
import com.llamalad7.mixinextras.sugar.Local; import com.llamalad7.mixinextras.sugar.Local;
import finalforeach.cosmicreach.accounts.Account; import finalforeach.cosmicreach.accounts.Account;
import finalforeach.cosmicreach.blocks.BlockPosition;
import finalforeach.cosmicreach.blocks.BlockState;
import finalforeach.cosmicreach.entities.Entity; import finalforeach.cosmicreach.entities.Entity;
import finalforeach.cosmicreach.entities.player.Player; import finalforeach.cosmicreach.entities.player.Player;
import finalforeach.cosmicreach.networking.common.NetworkIdentity; import finalforeach.cosmicreach.networking.NetworkIdentity;
import finalforeach.cosmicreach.networking.common.NetworkSide; import finalforeach.cosmicreach.networking.NetworkSide;
import finalforeach.cosmicreach.networking.netty.packets.MessagePacket; import finalforeach.cosmicreach.networking.packets.MessagePacket;
import finalforeach.cosmicreach.networking.netty.packets.PlayerPositionPacket; import finalforeach.cosmicreach.networking.packets.entities.PlayerPositionPacket;
import finalforeach.cosmicreach.networking.netty.packets.blocks.PlaceBlockPacket;
import finalforeach.cosmicreach.networking.server.ServerSingletons; import finalforeach.cosmicreach.networking.server.ServerSingletons;
import finalforeach.cosmicreach.world.Zone;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import net.pietru.cookie_utils.api.Permissions; import net.pietru.cookie_utils.api.Permissions;
import org.spongepowered.asm.mixin.Mixin; 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.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.ConcurrentModificationException;
import static net.pietru.cookie_utils.api.Region.*; import static net.pietru.cookie_utils.api.Region.*;
@Mixin(PlayerPositionPacket.class) @Mixin(PlayerPositionPacket.class)

1
src/main/java/net/pietru/cookie_utils/mixins/ServerSingletonsMixin.java
View file

@ -1,6 +1,5 @@
package net.pietru.cookie_utils.mixins; package net.pietru.cookie_utils.mixins;
import com.llamalad7.mixinextras.sugar.Local;
import finalforeach.cosmicreach.networking.server.ServerSingletons; import finalforeach.cosmicreach.networking.server.ServerSingletons;
import net.pietru.cookie_utils.api.Region; import net.pietru.cookie_utils.api.Region;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;

5
src/main/resources/cookie_utils.mixins.json
View file

@ -4,12 +4,13 @@
"package": "net.pietru.cookie_utils.mixins", "package": "net.pietru.cookie_utils.mixins",
"compatibilityLevel": "JAVA_17", "compatibilityLevel": "JAVA_17",
"mixins": [ "mixins": [
"BlockActionExplodeMixin",
"BlockBreakMixin", "BlockBreakMixin",
"BlockPlaceMixin", "BlockPlaceMixin",
"InteractBlockMixin", "InteractBlockMixin",
"MessagePacketMixin", "MessagePacketMixin",
"ServerSingletonsMixin", "PlayerPositionMixin",
"PlayerPositionMixin" "ServerSingletonsMixin"
], ],
"client": [], "client": [],
"injectors": { "injectors": {