Working on gui, data upgrades

Author: robotgryphon

.gitignore

@@ -34,3 +34,5 @@ logs/
 *.dot
 
 src/generated/
+
+raw-assets/

gradle.properties

@@ -21,4 +21,4 @@ cf_release_type=release
 mixin_version = 0.8.5
 mixingradle_version = 0.7-SNAPSHOT
 
-include_test_mods = false
+include_test_mods = true

src/api/java/dev/compactmods/machines/api/core/CMCommands.java

@@ -12,7 +12,8 @@ public class CMCommands {
     /**
      * Used for displaying the number of registered machines via summary commands.
      */
-    public static final ResourceLocation MACHINE_REG_COUNT = new ResourceLocation(MOD_ID, "machine_reg_count");
+    public static final ResourceLocation MACHINE_REG_DIM = new ResourceLocation(MOD_ID, "summary.machines.dimension");
+    public static final ResourceLocation MACHINE_REG_TOTAL = new ResourceLocation(MOD_ID, "summary.machines.total");
 
     /**
      * Used for displaying the number of registered rooms via summary commands.

src/api/java/dev/compactmods/machines/api/location/IDimensionalPosition.java

@@ -13,8 +13,6 @@
 
 public interface IDimensionalPosition {
 
-    IDimensionalPosition relative(Direction direction, float amount);
-
     BlockPos getBlockPosition();
     Vec3 getExactPosition();
 

src/api/java/dev/compactmods/machines/api/room/MachineRoomConnections.java

@@ -1,25 +1,29 @@
 package dev.compactmods.machines.api.room;
 
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.Level;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.Optional;
 
 public interface MachineRoomConnections {
     @Nonnull
-    Optional<ChunkPos> getConnectedRoom(int machineId);
+    Optional<ChunkPos> getConnectedRoom(ResourceKey<Level> machineLevel, BlockPos machinePos);
 
     @Nonnull Collection<Integer> getMachinesFor(ChunkPos chunkPos);
 
-    void registerMachine(int machine);
+    void registerMachine(ResourceKey<Level> machineLevel, BlockPos machinePos);
 
     void registerRoom(ChunkPos roomChunk);
 
-    void connectMachineToRoom(int machine, ChunkPos room);
-    void changeMachineLink(int machine, ChunkPos newRoom);
+    void connectMachineToRoom(ResourceKey<Level> machineLevel, BlockPos machinePos, ChunkPos room);
+    void changeMachineLink(ResourceKey<Level> machineLevel, BlockPos machinePos, ChunkPos newRoom);
 
-    void disconnect(int machine);
+    void disconnect(ResourceKey<Level> level, BlockPos pos);
 
     void unregisterRoom(ChunkPos room);
 }

src/api/java/dev/compactmods/machines/api/room/history/IRoomHistoryItem.java

@@ -1,10 +1,11 @@
 package dev.compactmods.machines.api.room.history;
 
+import dev.compactmods.machines.api.location.IDimensionalBlockPosition;
 import dev.compactmods.machines.api.location.IDimensionalPosition;
 
 public interface IRoomHistoryItem {
 
     IDimensionalPosition getEntryLocation();
 
-    int getMachine();
+    IDimensionalBlockPosition getMachine();
 }

src/datagen/java/dev/compactmods/machines/datagen/lang/EnglishLangGenerator.java

@@ -36,7 +36,7 @@ protected void addTranslations() {
         addCommand(CMCommands.FAILED_CMD_FILE_ERROR, "Failed to execute command; there was a file error. Check logs.");
         addCommand(CMCommands.MACHINE_NOT_BOUND, "Machine at %s does not have an associated ID.");
         addCommand(CMCommands.ROOM_REG_COUNT, "Number of registered rooms: %s");
-        addCommand(CMCommands.MACHINE_REG_COUNT, "Number of registered machines: %s");
+        addCommand(CMCommands.MACHINE_REG_DIM, "Number of registered machines: %s");
         addCommand(CMCommands.LEVEL_REGISTERED, "Compact Machine dimension found.");
         addCommand(CMCommands.LEVEL_NOT_FOUND, "Compact Machine dimension could not be found.");
         addCommand(CMCommands.CMD_ROOM_NOT_REGISTERED, "");

src/main/java/dev/compactmods/machines/CompactMachines.java

@@ -6,6 +6,7 @@
 import dev.compactmods.machines.core.Registration;
 import dev.compactmods.machines.core.Tunnels;
 import dev.compactmods.machines.core.UIRegistration;
+import dev.compactmods.machines.graph.CMGraphRegistration;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.common.crafting.CraftingHelper;
@@ -15,6 +16,8 @@
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.MarkerManager;
 
 import javax.annotation.Nonnull;
 
@@ -23,6 +26,7 @@ public class CompactMachines {
     public static final String MOD_ID = "compactmachines";
 
     public static final Logger LOGGER = LogManager.getLogger();
+    public static final Marker CONN_MARKER = MarkerManager.getMarker("cm_connections");
 
     public static final CreativeModeTab COMPACT_MACHINES_ITEMS = new CreativeModeTab(MOD_ID) {
         @Override
@@ -40,6 +44,7 @@ public CompactMachines() {
         Registration.init(eb);
         UIRegistration.init(eb);
         Tunnels.init(eb);
+        CMGraphRegistration.init(eb);
 
         ModLoadingContext mlCtx = ModLoadingContext.get();
         mlCtx.registerConfig(ModConfig.Type.COMMON, CommonConfig.CONFIG);

src/main/java/dev/compactmods/machines/client/gui/widget/PSDIconButton.java

@@ -34,8 +34,10 @@ public void render(@NotNull PoseStack pose, int mouseX, int mouseY, float partia
 
     private static void onClicked(Button button) {
         if (button instanceof PSDIconButton psd && button.active) {
-            var room = psd.parent.getMenu().getRoom();
-            CompactMachinesNet.CHANNEL.sendToServer(new PlayerRequestedTeleportPacket(psd.parent.getMenu().getMachineId(), room));
+            var menu = psd.parent.getMenu();
+            var mach = psd.parent.getMachine();
+            var room = menu.getRoom();
+            CompactMachinesNet.CHANNEL.sendToServer(new PlayerRequestedTeleportPacket(mach, room));
         }
     }
 

src/main/java/dev/compactmods/machines/client/render/RenderTypes.java

@@ -25,7 +25,7 @@ public class RenderTypes extends RenderStateShard {
 
 	protected static final RenderStateShard.LightmapStateShard LIGHTMAP_DISABLED = new RenderStateShard.LightmapStateShard(false);
 
-	protected static final RenderStateShard.ShaderStateShard FULLBRIGHT_BLOCKS = new RenderStateShard.ShaderStateShard(CM4Shaders::getBlockFullbrightShader);
+	protected static final RenderStateShard.ShaderStateShard FULLBRIGHT_BLOCKS = new RenderStateShard.ShaderStateShard(CM4Shaders::fullbright);
 
     public static final RenderType TRANSLUCENT_FULLBRIGHT = RenderType.create(
 			CompactMachines.MOD_ID + ":full_bright",
@@ -40,6 +40,21 @@ public class RenderTypes extends RenderStateShard {
 						.createCompositeState(false)
 		);
 
+	protected static final RenderStateShard.ShaderStateShard WALL_BLOCKS = new RenderStateShard.ShaderStateShard(CM4Shaders::wall);
+
+	public static final RenderType WALLS = RenderType.create(
+			CompactMachines.MOD_ID + ":wall",
+			BLOCK_WITH_OVERLAY, VertexFormat.Mode.QUADS,
+			256, false, false,
+			RenderType.CompositeState.builder()
+					.setShaderState(WALL_BLOCKS)
+					.setLightmapState(LIGHTMAP_DISABLED)
+					.setOverlayState(OVERLAY)
+					.setTextureState(BLOCK_SHEET_MIPPED)
+					.setTransparencyState(TRANSLUCENT_TRANSPARENCY)
+					.createCompositeState(false)
+	);
+
 	public RenderTypes(String p_110161_, Runnable p_110162_, Runnable p_110163_) {
 		super(p_110161_, p_110162_, p_110163_);
 	}