Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-25 10:07:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3740 from CatMoe/v3.0

Browse Source 
Implement sign marker for fabric 1.16
This commit is contained in:
mikeprimm 2022-06-05 16:53:21 -05:00 committed by GitHub
commit 61a377a3ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/FabricServer.java
View File

@ -27,6 +27,7 @@ import org.dynmap.common.DynmapListenerManager;
import org.dynmap.common.DynmapPlayer;
import org.dynmap.common.DynmapServerInterface;
import org.dynmap.fabric_1_16_4.event.ServerChatEvents;
import org.dynmap.fabric_1_16_4.event.BlockEvents;
import org.dynmap.utils.MapChunkCache;
import org.dynmap.utils.VisibilityLimit;
@ -283,6 +284,10 @@ public class FabricServer extends DynmapServerInterface {
}
}, DynmapPlugin.this);
*/
BlockEvents.SIGN_CHANGE_EVENT.register((world, pos, lines, material, player) -> {
plugin.core.processSignChange("fabric", FabricWorld.getWorldName(plugin, world),
pos.getX(), pos.getY(), pos.getZ(), lines, player.getName().asString());
});
break;
default:

17
fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/event/BlockEvents.java
View File

@ -5,6 +5,11 @@ import net.fabricmc.fabric.api.event.EventFactory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.minecraft.block.Material;
import net.minecraft.server.network.ServerPlayerEntity;
public class BlockEvents {
private BlockEvents() {
}
@ -17,7 +22,19 @@ public class BlockEvents {
}
);
public static Event<SignChangeCallback> SIGN_CHANGE_EVENT = EventFactory.createArrayBacked(SignChangeCallback.class,
(listeners) -> (world, pos, lines, material, player) -> {
for (SignChangeCallback callback : listeners) {
callback.onSignChange(world, pos, lines, material, player);
}
}
);
public interface BlockCallback {
void onBlockEvent(World world, BlockPos pos);
}
public interface SignChangeCallback {
void onSignChange(ServerWorld world, BlockPos pos, String[] lines, Material material, ServerPlayerEntity player);
}
}

36
fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/mixin/ServerPlayNetworkHandlerMixin.java
View File

@ -2,12 +2,23 @@ package org.dynmap.fabric_1_16_4.mixin;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.entity.SignBlockEntity;
import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket;
import net.minecraft.text.LiteralText;
import org.dynmap.fabric_1_16_4.event.ServerChatEvents;
import org.dynmap.fabric_1_16_4.event.BlockEvents;
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.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import java.util.List;
@Mixin(ServerPlayNetworkHandler.class)
public abstract class ServerPlayNetworkHandlerMixin {
@ -25,4 +36,29 @@ public abstract class ServerPlayNetworkHandlerMixin {
public void onGameMessage(String string, CallbackInfo info) {
ServerChatEvents.EVENT.invoker().onChatMessage(player, string);
}
@Inject(
method = "method_31282",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/block/entity/SignBlockEntity;markDirty()V",
shift = At.Shift.BEFORE
),
locals = LocalCapture.CAPTURE_FAILHARD
)
public void onSignUpdate(UpdateSignC2SPacket packet, List<String> signText, CallbackInfo info,
ServerWorld serverWorld, BlockPos blockPos, BlockState blockState, BlockEntity blockEntity, SignBlockEntity signBlockEntity)
{
// Pull the raw text from the input.
String[] rawTexts = new String[4];
for (int i=0; i<signText.size(); i++)
rawTexts[i] = signText.get(i);
// Fire the event.
BlockEvents.SIGN_CHANGE_EVENT.invoker().onSignChange(serverWorld, blockPos, rawTexts, blockState.getMaterial(), player);
// Put the (possibly updated) texts in the sign. Ignore filtering (is this OK?).
for (int i=0; i<signText.size(); i++)
signBlockEntity.setTextOnRow(i, new LiteralText(rawTexts[i]));
}
}