Working changes, start to support nested machine theory

Author: robotgryphon

src/generated/resources/.cache/cache

@@ -13,8 +13,8 @@ bb446af024870e7a07d31a3c78cab75797392cd5 assets/compactmachines/models/tunnels/n
 2781d8f8d22db668495872f1bb39e2dd1290ab66 assets/compactmachines/models/tunnels/south.json
 955410e7497ca2252d75eac53d02fb96992d94c7 assets/compactmachines/models/tunnels/up.json
 f8748baf2b48a44db2cf8d3872bd09b54a822560 assets/compactmachines/models/tunnels/west.json
-95bb11d93b0dee59240d959bc881caea0115970f data/compactmachines/advancements/recipes/compactmachines/personal_shrinking_device.json
-b86297267feb2e7d28cb68a830a0d7ffd6b6539a data/compactmachines/advancements/recipes/compactmachines/wall.json
+e012e4b65799a56d195a6324c82e2cdf7a5a91be data/compactmachines/advancements/recipes/compactmachines/personal_shrinking_device.json
+fd7ccf69e4445ba0a2d7b2cd405ebe2ae85be240 data/compactmachines/advancements/recipes/compactmachines/wall.json
 fb5c7560898ae604661d0655c2a39e923eb1d4b4 data/compactmachines/loot_tables/blocks/machine_giant.json
 056d363f46ab1cc37c16f08428a3d2a9e0dd66d2 data/compactmachines/loot_tables/blocks/machine_large.json
 38a7648eb331daf18f5076126f31f31b6021ac51 data/compactmachines/loot_tables/blocks/machine_maximum.json

src/generated/resources/data/compactmachines/advancements/recipes/compactmachines/personal_shrinking_device.json

@@ -6,7 +6,7 @@
     ]
   },
   "criteria": {
-    "has_recipe": {
+    "picked_up_ender_eye": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_recipe",
+      "picked_up_ender_eye",
       "has_the_recipe"
     ]
   ]

src/generated/resources/data/compactmachines/advancements/recipes/compactmachines/wall.json

@@ -6,7 +6,7 @@
     ]
   },
   "criteria": {
-    "has_recipe": {
+    "picked_up_iron": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_recipe",
+      "picked_up_iron",
       "has_the_recipe"
     ]
   ]

src/main/java/com/robotgryphon/compactmachines/CompactMachines.java

@@ -6,15 +6,18 @@
 import com.robotgryphon.compactmachines.config.ServerConfig;
 import com.robotgryphon.compactmachines.core.Registration;
 import com.robotgryphon.compactmachines.network.NetworkHandler;
+import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.crafting.CraftingHelper;
+import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
@@ -24,8 +27,8 @@
 import org.apache.logging.log4j.Logger;
 
 @Mod(CompactMachines.MOD_ID)
-public class CompactMachines
-{
+@Mod.EventBusSubscriber(modid = CompactMachines.MOD_ID)
+public class CompactMachines {
     public static final String MOD_ID = "compactmachines";
 
     public static final Logger LOGGER = LogManager.getLogger();
@@ -43,30 +46,32 @@ public CompactMachines() {
         // Register blocks and items
         Registration.init();
 
-        // Register the setup method for modloading
-        modBus.addListener(this::setup);
-
-        // Register the enqueueIMC method for modloading
-        modBus.addListener(this::enqueueIMC);
-
-        // Register ourselves for server and other game events we are interested in
-        MinecraftForge.EVENT_BUS.register(this);
-
         ModLoadingContext mlCtx = ModLoadingContext.get();
         mlCtx.registerConfig(ModConfig.Type.COMMON, CommonConfig.CONFIG);
         mlCtx.registerConfig(ModConfig.Type.SERVER, ServerConfig.CONFIG);
 
         CraftingHelper.register(EnableVanillaRecipesConfigCondition.Serializer.INSTANCE);
     }
 
-    private void setup(final FMLCommonSetupEvent event)
-    {
+    @SubscribeEvent
+    public static void setup(final FMLCommonSetupEvent event) {
         NetworkHandler.initialize();
     }
 
-    private void enqueueIMC(final InterModEnqueueEvent event)
-    {
-        if(ModList.get().isLoaded("theoneprobe"))
+    @SubscribeEvent
+    public static void enqueueIMC(final InterModEnqueueEvent event) {
+        if (ModList.get().isLoaded("theoneprobe"))
             TheOneProbeCompat.sendIMC();
     }
+
+    @SubscribeEvent
+    public static void onTick(TickEvent.RenderTickEvent e) {
+        // lol frames r good
+//        ObfuscationReflectionHelper.setPrivateValue(
+//                Minecraft.class,
+//                Minecraft.getInstance(),
+//                -100,
+//                "field_71420_M"
+//        );
+    }
 }

src/main/java/com/robotgryphon/compactmachines/block/BlockCompactMachine.java

@@ -94,7 +94,7 @@ public boolean canConnectRedstone(BlockState state, IBlockReader world, BlockPos
 
     @Override
     public int getSignal(BlockState blockState, IBlockReader blockAccess, BlockPos pos, Direction side) {
-//        TODO Tile Entity
+//        TODO Redstone out tunnels
 //        if(!(blockAccess.getTileEntity(pos) instanceof TileEntityMachine)) {
 //            return 0;
 //        }
@@ -257,32 +257,6 @@ public void setPlacedBy(World worldIn, BlockPos pos, BlockState state, @Nullable
         tile.setChanged();
     }
 
-//        // TODO: Allow storing of schemas in machines
-//        if(stack.hasTag()) {
-//            if(stack.getTag().contains("coords")) {
-//                int coords = stack.getTag().getInt("coords");
-//                if (coords != -1) {
-//                    tileEntityMachine.coords = coords;
-//                    if(!world.isRemote) {
-//                        WorldSavedDataMachines.INSTANCE.addMachinePosition(tileEntityMachine.coords, pos, world.provider.getDimension(), tileEntityMachine.getSize());
-//                        StructureTools.setBiomeForCoords(coords, world.getBiome(pos));
-//                    }
-//                }
-//            }
-//
-//            if(stack.getTag().contains("schema")) {
-//                tileEntityMachine.setSchema(stack.getTag().getString("schema"));
-//            }
-//
-
-//        }
-//
-
-//
-//        tileEntityMachine.markDirty();
-//    }
-
-
     @Override
     public ActionResultType use(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) {
         if (worldIn.isClientSide())

src/main/java/com/robotgryphon/compactmachines/block/tiles/CompactMachineTile.java

@@ -2,10 +2,11 @@
 
 import com.robotgryphon.compactmachines.config.ServerConfig;
 import com.robotgryphon.compactmachines.core.Registration;
-import com.robotgryphon.compactmachines.data.CompactMachineCommonData;
-import com.robotgryphon.compactmachines.data.SavedMachineData;
-import com.robotgryphon.compactmachines.data.machines.CompactMachinePlayerData;
-import com.robotgryphon.compactmachines.data.machines.CompactMachineRegistrationData;
+import com.robotgryphon.compactmachines.data.legacy.CompactMachineCommonData;
+import com.robotgryphon.compactmachines.data.legacy.SavedMachineData;
+import com.robotgryphon.compactmachines.data.player.CompactMachinePlayerData;
+import com.robotgryphon.compactmachines.data.legacy.CompactMachineRegistrationData;
+import com.robotgryphon.compactmachines.data.world.ExternalMachineData;
 import com.robotgryphon.compactmachines.reference.Reference;
 import com.robotgryphon.compactmachines.api.tunnels.TunnelDefinition;
 import com.robotgryphon.compactmachines.tunnels.TunnelHelper;
@@ -189,8 +190,8 @@ public CompoundNBT getUpdateTag() {
         if (level instanceof ServerWorld) {
             Optional<CompactMachinePlayerData> playerData = Optional.empty();
             try {
-                SavedMachineData machineData = SavedMachineData.getInstance(level.getServer());
-                playerData = machineData.getData().getPlayerData(machineId);
+                CompactMachinePlayerData psd = CompactMachinePlayerData.get(level.getServer());
+                // psd = psd.getPlayersInside(this.machineId);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -207,14 +208,23 @@ public CompoundNBT getUpdateTag() {
         return base;
     }
 
+    public Optional<ChunkPos> getInternalChunkPos() {
+        if(level instanceof ServerWorld) {
+            ExternalMachineData emd = ExternalMachineData.get(level.getServer());
+            return emd.getChunkLocation(this.machineId);
+        }
+
+        return Optional.empty();
+    }
+
     @Override
     public void handleUpdateTag(BlockState state, CompoundNBT tag) {
         super.handleUpdateTag(state, tag);
 
         this.machineId = tag.getInt("machine");
         if (tag.contains("players")) {
             CompoundNBT players = tag.getCompound("players");
-            playerData = CompactMachinePlayerData.fromNBT(players);
+            // playerData = CompactMachinePlayerData.fromNBT(players);
 
         }
 
@@ -265,11 +275,13 @@ public Optional<CompactMachineRegistrationData> getMachineData() {
     }
 
     public boolean hasPlayersInside() {
-        return CompactMachineCommonData
-                .getInstance()
-                .getPlayerData(machineId)
-                .map(CompactMachinePlayerData::hasPlayers)
-                .orElse(false);
+        return false;
+        // TODO
+//        return CompactMachineCommonData
+//                .getInstance()
+//                .getPlayerData(machineId)
+//                .map(CompactMachinePlayerData::hasPlayers)
+//                .orElse(false);
     }
 
     protected void doChunkload(boolean force) {
@@ -294,8 +306,9 @@ public void handlePlayerLeft(UUID playerID) {
     }
 
     public void handlePlayerEntered(UUID playerID) {
-        if(this.playerData != null)
-            this.playerData.addPlayer(playerID);
+        // TODO
+//        if(this.playerData != null)
+//            this.playerData.addPlayer(playerID);
     }
 
     /*

src/main/java/com/robotgryphon/compactmachines/block/tiles/TunnelWallTile.java

@@ -2,7 +2,7 @@
 
 import com.robotgryphon.compactmachines.block.walls.TunnelWallBlock;
 import com.robotgryphon.compactmachines.core.Registration;
-import com.robotgryphon.compactmachines.data.machines.CompactMachineRegistrationData;
+import com.robotgryphon.compactmachines.data.legacy.CompactMachineRegistrationData;
 import com.robotgryphon.compactmachines.network.NetworkHandler;
 import com.robotgryphon.compactmachines.network.TunnelAddedPacket;
 import com.robotgryphon.compactmachines.teleportation.DimensionalPosition;

src/main/java/com/robotgryphon/compactmachines/compat/theoneprobe/providers/CompactMachineProvider.java

@@ -6,7 +6,7 @@
 import com.robotgryphon.compactmachines.block.tiles.TunnelWallTile;
 import com.robotgryphon.compactmachines.compat.theoneprobe.IProbeData;
 import com.robotgryphon.compactmachines.core.Registration;
-import com.robotgryphon.compactmachines.data.machines.CompactMachineRegistrationData;
+import com.robotgryphon.compactmachines.data.legacy.CompactMachineRegistrationData;
 import com.robotgryphon.compactmachines.tunnels.TunnelHelper;
 import mcjty.theoneprobe.api.IProbeHitData;
 import mcjty.theoneprobe.api.IProbeInfo;

src/main/java/com/robotgryphon/compactmachines/core/EventHandler.java

@@ -0,0 +1,18 @@
+package com.robotgryphon.compactmachines.core;
+
+import com.robotgryphon.compactmachines.CompactMachines;
+import com.robotgryphon.compactmachines.data.legacy.SavedMachineDataMigrator;
+import net.minecraft.server.MinecraftServer;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
+
+@Mod.EventBusSubscriber(modid = CompactMachines.MOD_ID)
+public class ServerEventHandler {
+
+    @SubscribeEvent
+    public static void onServerStarting(final FMLServerStartingEvent evt) {
+        MinecraftServer server = evt.getServer();
+        SavedMachineDataMigrator.migrate(server);
+    }
+}