Merge pull request #29 from JR1811/1.21

Refactored 1.21 networking

src/main/java/dev/hephaestus/glowcase/Glowcase.java

@@ -14,7 +14,8 @@
 import dev.hephaestus.glowcase.block.entity.MailboxBlockEntity;
 import dev.hephaestus.glowcase.block.entity.TextBlockEntity;
 import dev.hephaestus.glowcase.compat.PolydexCompatibility;
-import dev.hephaestus.glowcase.networking.GlowcaseCommonNetworking;
+import dev.hephaestus.glowcase.networking.NetworkPayloads;
+import dev.hephaestus.glowcase.networking.RegisterC2SNetworking;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
@@ -96,7 +97,8 @@ public static <T extends BlockEntity> Supplier<BlockEntityType<T>> registerBlock
 
 	@Override
 	public void onInitialize() {
-		GlowcaseCommonNetworking.onInitialize();
+		NetworkPayloads.initialize();
+		RegisterC2SNetworking.initialize();
 
 		CommandRegistrationCallback.EVENT.register((dispatcher, access, environment) -> {
 			dispatcher.register(

src/main/java/dev/hephaestus/glowcase/GlowcaseClient.java

@@ -6,6 +6,7 @@
 import dev.hephaestus.glowcase.client.render.block.entity.HyperlinkBlockEntityRenderer;
 import dev.hephaestus.glowcase.client.render.block.entity.ItemDisplayBlockEntityRenderer;
 import dev.hephaestus.glowcase.client.render.block.entity.TextBlockEntityRenderer;
+import dev.hephaestus.glowcase.networking.RegisterS2CNetworking;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.fabricmc.fabric.api.client.rendering.v1.InvalidateRenderStateCallback;
@@ -33,6 +34,8 @@ public void onInitializeClient() {
 		WorldRenderEvents.AFTER_TRANSLUCENT.register(BakedBlockEntityRenderer.Manager::render);
 		InvalidateRenderStateCallback.EVENT.register(BakedBlockEntityRenderer.Manager::reset);
 
+		RegisterS2CNetworking.initialize();
+
 		HudRenderCallback.EVENT.register((context, tickDelta) -> {
 			MinecraftClient client = MinecraftClient.getInstance();
 

src/main/java/dev/hephaestus/glowcase/block/entity/HyperlinkBlockEntity.java

@@ -1,6 +1,7 @@
 package dev.hephaestus.glowcase.block.entity;
 
 import dev.hephaestus.glowcase.Glowcase;
+import dev.hephaestus.glowcase.networking.packet.EditHyperlinkBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.nbt.NbtCompound;
@@ -60,6 +61,10 @@ public void readNbt(NbtCompound tag, RegistryWrapper.WrapperLookup registryLooku
 		this.url = tag.getString("url");
 	}
 
+	public EditHyperlinkBlock createEditPacket() {
+		return new EditHyperlinkBlock(pos, url);
+	}
+
 	// standard blockentity boilerplate
 
 	public void dispatch() {

src/main/java/dev/hephaestus/glowcase/block/entity/ItemDisplayBlockEntity.java

@@ -1,6 +1,7 @@
 package dev.hephaestus.glowcase.block.entity;
 
 import dev.hephaestus.glowcase.Glowcase;
+import dev.hephaestus.glowcase.networking.packet.EditItemDisplayBlockSettings;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.entity.Entity;
@@ -112,6 +113,12 @@ public void readNbt(NbtCompound tag, RegistryWrapper.WrapperLookup registryLooku
 		}
 	}
 
+	public EditItemDisplayBlockSettings createEditPacket() {
+		var itemValues = new EditItemDisplayBlockSettings.ItemDisplayBlockValues(
+			getCachedState().get(Properties.ROTATION), showName, pitch, yaw);
+		return new EditItemDisplayBlockSettings(pos, rotationType, givesItem, offset, itemValues);
+	}
+
 	public boolean hasItem() {
 		return this.stack != null && !this.stack.isEmpty();
 	}
@@ -200,13 +207,13 @@ public void giveTo(PlayerEntity player) {
 			itemStack.capCount(itemStack.getMaxCount());
 			player.setStackInHand(Hand.MAIN_HAND, itemStack);
 		}
-
 		if (!player.isCreative()) {
 			givenTo.add(player.getUuid());
 			markDirty();
 		}
 	}
 
+
 	public static Vec2f getPitchAndYaw(Entity camera, BlockPos pos, float delta) {
 		double d = pos.getX() - camera.getLerpedPos(delta).x + 0.5;
 		double e = pos.getY() - camera.getEyeY() + 0.5;

src/main/java/dev/hephaestus/glowcase/block/entity/TextBlockEntity.java

@@ -2,6 +2,7 @@
 
 import dev.hephaestus.glowcase.Glowcase;
 import dev.hephaestus.glowcase.client.render.block.entity.BakedBlockEntityRenderer;
+import dev.hephaestus.glowcase.networking.packet.EditTextBlock;
 import eu.pb4.placeholders.api.ParserContext;
 import eu.pb4.placeholders.api.parsers.NodeParser;
 import eu.pb4.placeholders.api.parsers.TagParser;
@@ -80,6 +81,11 @@ protected void readNbt(NbtCompound tag, RegistryWrapper.WrapperLookup registryLo
 		this.renderDirty = true;
 	}
 
+	public EditTextBlock createEditPacket() {
+		var textValues = new EditTextBlock.TextBlockValues(scale, color, lines);
+		return new EditTextBlock(pos, textAlignment, zOffset, shadowType, textValues);
+	}
+
 	public String getRawLine(int i) {
 		var line = this.lines.get(i);
 

src/main/java/dev/hephaestus/glowcase/client/gui/screen/ingame/HyperlinkBlockEditScreen.java

@@ -1,7 +1,6 @@
 package dev.hephaestus.glowcase.client.gui.screen.ingame;
 
 import dev.hephaestus.glowcase.block.entity.HyperlinkBlockEntity;
-import dev.hephaestus.glowcase.networking.GlowcaseClientNetworking;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.text.Text;
 import org.lwjgl.glfw.GLFW;
@@ -52,7 +51,9 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 
 	@Override
 	public void close() {
-		GlowcaseClientNetworking.editHyperlinkBlock(hyperlinkBlockEntity.getPos(), titleEntryWidget.getText(), urlEntryWidget.getText());
+		hyperlinkBlockEntity.setUrl(urlEntryWidget.getText());
+		hyperlinkBlockEntity.setTitle(titleEntryWidget.getText());
+		hyperlinkBlockEntity.createEditPacket().send();
 		super.close();
 	}
 }

src/main/java/dev/hephaestus/glowcase/client/gui/screen/ingame/ItemDisplayBlockEditScreen.java

@@ -1,9 +1,10 @@
 package dev.hephaestus.glowcase.client.gui.screen.ingame;
 
 import dev.hephaestus.glowcase.block.entity.ItemDisplayBlockEntity;
-import dev.hephaestus.glowcase.networking.GlowcaseClientNetworking;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.text.Text;
+import net.minecraft.util.math.Vec2f;
 
 public class ItemDisplayBlockEditScreen extends GlowcaseScreen {
 	private final ItemDisplayBlockEntity displayBlock;
@@ -30,25 +31,25 @@ public void init() {
 			this.givesItemButtom = ButtonWidget.builder(Text.stringifiedTranslatable("gui.glowcase.gives_item", this.displayBlock.givesItem), (action) -> {
 				this.displayBlock.cycleGiveType();
 				this.givesItemButtom.setMessage(Text.stringifiedTranslatable("gui.glowcase.gives_item", this.displayBlock.givesItem));
-				GlowcaseClientNetworking.editItemDisplayBlock(displayBlock, true);
+				editItemDisplayBlock(true);
 			}).dimensions(centerW - 75, centerH - 40 - individualPadding, 150, 20).build();
 
 			this.rotationTypeButton = ButtonWidget.builder(Text.stringifiedTranslatable("gui.glowcase.rotation_type", this.displayBlock.rotationType), (action) -> {
 				this.displayBlock.cycleRotationType(this.client.player);
 				this.rotationTypeButton.setMessage(Text.stringifiedTranslatable("gui.glowcase.rotation_type", this.displayBlock.rotationType));
-				GlowcaseClientNetworking.editItemDisplayBlock(displayBlock, true);
+				editItemDisplayBlock(true);
 			}).dimensions(centerW - 75, centerH - 20, 150, 20).build();
 
 			this.showNameButton = ButtonWidget.builder(Text.translatable("gui.glowcase.show_name", this.displayBlock.showName), (action) -> {
 				this.displayBlock.showName = !this.displayBlock.showName;
 				this.showNameButton.setMessage(Text.translatable("gui.glowcase.show_name", this.displayBlock.showName));
-				GlowcaseClientNetworking.editItemDisplayBlock(displayBlock, false);
+				editItemDisplayBlock(false);
 			}).dimensions(centerW - 75, centerH + individualPadding, 150, 20).build();
 
 			this.offsetButton = ButtonWidget.builder(Text.stringifiedTranslatable("gui.glowcase.offset", this.displayBlock.offset), (action) -> {
 				this.displayBlock.cycleOffset();
 				this.offsetButton.setMessage(Text.stringifiedTranslatable("gui.glowcase.offset", this.displayBlock.offset));
-				GlowcaseClientNetworking.editItemDisplayBlock(displayBlock, true);
+				editItemDisplayBlock(true);
 			}).dimensions(centerW - 75, centerH + 20 + padding, 150, 20).build();
 
 			this.addDrawableChild(this.givesItemButtom);
@@ -57,4 +58,13 @@ public void init() {
 			this.addDrawableChild(this.offsetButton);
 		}
 	}
+
+	private void editItemDisplayBlock(boolean updatePitchAndYaw) {
+		if (updatePitchAndYaw && MinecraftClient.getInstance().getCameraEntity() != null) {
+			Vec2f pitchAndYaw = ItemDisplayBlockEntity.getPitchAndYaw(MinecraftClient.getInstance().getCameraEntity(), displayBlock.getPos(), 0);
+			displayBlock.pitch = pitchAndYaw.x;
+			displayBlock.yaw = pitchAndYaw.y;
+		}
+		displayBlock.createEditPacket().send();
+	}
 }

src/main/java/dev/hephaestus/glowcase/client/gui/screen/ingame/TextBlockEditScreen.java

@@ -3,7 +3,6 @@
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dev.hephaestus.glowcase.block.entity.TextBlockEntity;
-import dev.hephaestus.glowcase.networking.GlowcaseClientNetworking;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -123,7 +122,7 @@ public void tick() {
 
 	@Override
 	public void close() {
-		GlowcaseClientNetworking.editTextBlock(textBlockEntity);
+		textBlockEntity.createEditPacket().send();
 		super.close();
 	}