Initial work on Compact Sky worldtype

Author: davenonymous

src/main/java/org/dave/compactmachines3/CompactMachines3.java

@@ -1,35 +1,39 @@
 package org.dave.compactmachines3;
 
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.WorldServer;
+import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.ForgeChunkManager;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.SidedProxy;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
-import org.dave.compactmachines3.capability.PlayerShrinkingCapability;
+import net.minecraftforge.fml.common.event.*;
 import org.dave.compactmachines3.command.CommandCompactMachines3;
+import org.dave.compactmachines3.compat.YUNoMakeGoodMap;
 import org.dave.compactmachines3.gui.GuiHandler;
 import org.dave.compactmachines3.integration.CapabilityNullHandlerRegistry;
 import org.dave.compactmachines3.miniaturization.MultiblockRecipes;
-import org.dave.compactmachines3.misc.CapabilityEventHandler;
 import org.dave.compactmachines3.misc.ConfigurationHandler;
 import org.dave.compactmachines3.misc.PlayerEventHandler;
 import org.dave.compactmachines3.misc.RenderTickCounter;
 import org.dave.compactmachines3.network.PackageHandler;
 import org.dave.compactmachines3.proxy.CommonProxy;
 import org.dave.compactmachines3.render.BakeryHandler;
 import org.dave.compactmachines3.schema.SchemaRegistry;
+import org.dave.compactmachines3.skyworld.SkyChunkGenerator;
+import org.dave.compactmachines3.skyworld.SkyDimension;
+import org.dave.compactmachines3.skyworld.SkyWorldEvents;
+import org.dave.compactmachines3.skyworld.SkyWorldSavedData;
 import org.dave.compactmachines3.utility.AnnotatedInstanceUtil;
 import org.dave.compactmachines3.utility.Logz;
 import org.dave.compactmachines3.world.ChunkLoadingMachines;
 import org.dave.compactmachines3.world.WorldSavedDataMachines;
 import org.dave.compactmachines3.world.data.provider.ExtraTileDataProviderRegistry;
 import org.dave.compactmachines3.world.tools.DimensionTools;
 
-@Mod(modid = CompactMachines3.MODID, version = CompactMachines3.VERSION, acceptedMinecraftVersions = "[1.12,1.13)", dependencies = "after:refinedstorage")
+@Mod(modid = CompactMachines3.MODID, version = CompactMachines3.VERSION, acceptedMinecraftVersions = "[1.12,1.13)", dependencies = "after:refinedstorage;after:yunomakegoodmap")
 public class CompactMachines3
 {
     public static final String MODID = "compactmachines3";
@@ -49,10 +53,11 @@ public void preInit(FMLPreInitializationEvent event) {
         MinecraftForge.EVENT_BUS.register(new ConfigurationHandler());
 
         MinecraftForge.EVENT_BUS.register(PlayerEventHandler.class);
+        MinecraftForge.EVENT_BUS.register(SkyWorldSavedData.class);
         MinecraftForge.EVENT_BUS.register(WorldSavedDataMachines.class);
         MinecraftForge.EVENT_BUS.register(RenderTickCounter.class);
         MinecraftForge.EVENT_BUS.register(BakeryHandler.class);
-        MinecraftForge.EVENT_BUS.register(CapabilityEventHandler.class);
+        MinecraftForge.EVENT_BUS.register(SkyWorldEvents.class);
 
         // Insist on keeping an already registered dimension by registering in pre-registerDimension.
         DimensionTools.registerDimension();
@@ -70,13 +75,18 @@ public void init(FMLInitializationEvent event) {
 
         proxy.init(event);
 
+        SkyDimension.init();
+
         MultiblockRecipes.init();
         SchemaRegistry.init();
+
+        if(Loader.isModLoaded("yunomakegoodmap")) {
+            YUNoMakeGoodMap.init();
+        }
     }
 
     @EventHandler
     public void postInit(FMLPostInitializationEvent event) {
-        PlayerShrinkingCapability.init();
         CapabilityNullHandlerRegistry.registerNullHandlers();
         ExtraTileDataProviderRegistry.registerExtraTileDataProviders();
 
@@ -85,6 +95,15 @@ public void postInit(FMLPostInitializationEvent event) {
         proxy.postInit(event);
     }
 
+    @EventHandler
+    public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
+        for(WorldServer world : event.getServer().worlds) {
+            if(world.getChunkProvider().chunkGenerator instanceof SkyChunkGenerator) {
+                world.setSpawnPoint(new BlockPos(0,0,0));
+            }
+        }
+    }
+
     @Mod.EventHandler
     public void onServerStarting(FMLServerStartingEvent event) {
         event.registerServerCommand(new CommandCompactMachines3());

src/main/java/org/dave/compactmachines3/api/IPlayerShrinkingCapability.java

@@ -33,7 +33,6 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import org.dave.compactmachines3.CompactMachines3;
-import org.dave.compactmachines3.capability.PlayerShrinkingCapability;
 import org.dave.compactmachines3.compat.ITopInfoProvider;
 import org.dave.compactmachines3.init.Blockss;
 import org.dave.compactmachines3.misc.CreativeTabCompactMachines3;
@@ -44,6 +43,7 @@
 import org.dave.compactmachines3.tile.TileEntityMachine;
 import org.dave.compactmachines3.tile.TileEntityRedstoneTunnel;
 import org.dave.compactmachines3.tile.TileEntityTunnel;
+import org.dave.compactmachines3.utility.ShrinkingDeviceUtils;
 import org.dave.compactmachines3.world.ChunkLoadingMachines;
 import org.dave.compactmachines3.world.WorldSavedDataMachines;
 import org.dave.compactmachines3.world.data.RedstoneTunnelData;
@@ -267,6 +267,7 @@ public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, Entity
             return;
         }
 
+        // TODO: Allow storing of schemas in machines
         if(stack.hasTagCompound()) {
             if(stack.getTagCompound().hasKey("coords")) {
                 int coords = stack.getTagCompound().getInteger("coords");
@@ -313,7 +314,7 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En
 
         TileEntityMachine machine = (TileEntityMachine)world.getTileEntity(pos);
         ItemStack playerStack = player.getHeldItemMainhand();
-        if(PlayerShrinkingCapability.isShrinkingDevice(playerStack)) {
+        if(ShrinkingDeviceUtils.isShrinkingDevice(playerStack)) {
             TeleportationTools.tryToEnterMachine(player, machine);
             return true;
         }

src/main/java/org/dave/compactmachines3/block/BlockMachine.java

@@ -0,0 +1,16 @@
+package org.dave.compactmachines3.compat;
+
+import net.minecraft.world.DimensionType;
+import net.minecraftforge.common.DimensionManager;
+import org.dave.compactmachines3.skyworld.SkyWorldProviderNether;
+import org.dave.compactmachines3.skyworld.SkyWorldProviderVoid;
+
+public class YUNoMakeGoodMap {
+    public static void init() {
+        DimensionManager.unregisterDimension(-1);
+        DimensionManager.unregisterDimension(1);
+
+        DimensionManager.registerDimension(-1, DimensionType.register("Nether (CompactSky)", "_nether", 1, SkyWorldProviderNether.class, false));
+        DimensionManager.registerDimension(1, DimensionType.register("The End (CompactSky)", "_end", 1, SkyWorldProviderVoid.class, false));
+    }
+}

src/main/java/org/dave/compactmachines3/capability/PlayerShrinkingCapability.java

@@ -23,7 +23,6 @@
 import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.fml.client.config.GuiCheckBox;
 import org.dave.compactmachines3.CompactMachines3;
-import org.dave.compactmachines3.capability.PlayerShrinkingCapability;
 import org.dave.compactmachines3.gui.GUIHelper;
 import org.dave.compactmachines3.init.Blockss;
 import org.dave.compactmachines3.init.Itemss;
@@ -34,6 +33,7 @@
 import org.dave.compactmachines3.network.PackageHandler;
 import org.dave.compactmachines3.utility.ChunkUtils;
 import org.dave.compactmachines3.utility.Logz;
+import org.dave.compactmachines3.utility.ShrinkingDeviceUtils;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 
@@ -42,7 +42,6 @@
 import java.util.List;
 
 public class GuiMachine extends GuiContainer {
-    protected ResourceLocation bgImage;
     protected ResourceLocation tabIcons;
 
     private int windowWidth = 200;
@@ -78,7 +77,6 @@ private boolean shouldShowTabs() {
     public void initGui() {
         super.initGui();
 
-        this.bgImage = new ResourceLocation("minecraft", "textures/gui/container/crafting_table.png");
         this.tabIcons = new ResourceLocation(CompactMachines3.MODID, "textures/gui/tabicons.png");
 
         int offsetX = (int)((this.width - this.windowWidth) / 2.0f);
@@ -158,7 +156,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
         }
 
         if(GuiMachineData.chunk != null && activeTab == 0) {
-            renderChunk();
+            renderChunk(partialTicks);
 
             drawOwner(partialTicks, mouseX, mouseY);
             drawEnterButton(partialTicks, mouseX, mouseY);
@@ -172,7 +170,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
     }
 
     private void drawEnterButton(float partialTicks, int mouseX, int mouseY) {
-        if(!PlayerShrinkingCapability.hasShrinkingDeviceInInventory(mc.player)) {
+        if(!ShrinkingDeviceUtils.hasShrinkingDeviceInInventory(mc.player)) {
             return;
         }
 
@@ -229,7 +227,7 @@ protected void drawTabs(float partialTicks, int mouseX, int mouseY) {
         float offsetY = (this.height - this.windowHeight) / 2.0f;
 
         GlStateManager.pushMatrix();
-        GlStateManager.translate(offsetX-28, offsetY, 0);
+        GlStateManager.translate(offsetX-28, offsetY-1, 0);
 
         mc.getTextureManager().bindTexture(tabIcons);
 
@@ -266,39 +264,42 @@ protected void drawTabs(float partialTicks, int mouseX, int mouseY) {
 
     protected void drawWindow(float partialTicks, int mouseX, int mouseY) {
         GlStateManager.color(1f, 1f, 1f, 1f);
-        mc.renderEngine.bindTexture(bgImage);
+        mc.renderEngine.bindTexture(tabIcons);
 
         float offsetX = (this.width - this.windowWidth) / 2.0f;
         float offsetY = (this.height - this.windowHeight) / 2.0f;
 
         GlStateManager.pushMatrix();
         GlStateManager.translate(offsetX, offsetY, 0);
 
+        int texOffsetY = 12;
+        int texOffsetX = 64;
+
         // Top Left corner
-        drawTexturedModalRect(0, 0, 0, 0, 4, 4);
+        drawTexturedModalRect(0, 0, texOffsetX, texOffsetY, 4, 4);
 
         // Top right corner
-        drawTexturedModalRect(this.windowWidth - 4, 0, 172, 0, 4, 4);
+        drawTexturedModalRect(this.windowWidth - 4, 0, texOffsetX + 4 + 64, texOffsetY, 4, 4);
 
         // Bottom Left corner
-        drawTexturedModalRect(0, this.windowHeight - 4, 0, 162, 4, 4);
+        drawTexturedModalRect(0, this.windowHeight - 4, texOffsetX, texOffsetY + 4 + 64, 4, 4);
 
         // Bottom Right corner
-        drawTexturedModalRect(this.windowWidth - 4, this.windowHeight - 4, 172, 162, 4, 4);
+        drawTexturedModalRect(this.windowWidth - 4, this.windowHeight - 4, texOffsetX + 4 + 64, texOffsetY + 4 + 64, 4, 4);
 
         // Top edge
-        GUIHelper.drawStretchedTexture(4, 0, this.windowWidth - 8, 4, 4, 0, 4, 4);
+        GUIHelper.drawStretchedTexture(4, 0, this.windowWidth - 8, 4, texOffsetX + 4, texOffsetY, 64, 4);
 
         // Bottom edge
-        GUIHelper.drawStretchedTexture(4, this.windowHeight - 4, this.windowWidth - 8, 4, 4, 162, 4, 4);
+        GUIHelper.drawStretchedTexture(4, this.windowHeight - 4, this.windowWidth - 8, 4, texOffsetX + 4, texOffsetY + 4 + 64, 64, 4);
 
         // Left edge
-        GUIHelper.drawStretchedTexture(0, 4, 4, this.windowHeight - 8, 0, 4, 4, 4);
+        GUIHelper.drawStretchedTexture(0, 4, 4, this.windowHeight - 8, texOffsetX, texOffsetY+4, 4, 64);
 
         // Right edge
-        GUIHelper.drawStretchedTexture(this.windowWidth - 4, 4, 4, this.windowHeight - 8, 172, 4, 4, 4);
+        GUIHelper.drawStretchedTexture(this.windowWidth - 4, 4, 4, this.windowHeight - 8, texOffsetX + 64 + 4, texOffsetY + 3, 4, 64);
 
-        GUIHelper.drawStretchedTexture(4, 4, this.windowWidth - 8, this.windowHeight - 8, 4, 4, 1, 1);
+        GUIHelper.drawStretchedTexture(4, 4, this.windowWidth - 8, this.windowHeight - 8, texOffsetX + 4, texOffsetY+4, 64, 64);
 
         GlStateManager.popMatrix();
     }
@@ -374,7 +375,7 @@ protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOEx
             }
         } else if(activeTab == 0 && mouseButton == 0) {
             boolean mousePressed = this.guiEnterButton.mousePressed(this.mc, mouseX, mouseY);
-            boolean hasDevice = PlayerShrinkingCapability.hasShrinkingDeviceInInventory(mc.player);
+            boolean hasDevice = ShrinkingDeviceUtils.hasShrinkingDeviceInInventory(mc.player);
             boolean validCoords = GuiMachineData.coords != -1;
             boolean isAllowedToEnter = GuiMachineData.isAllowedToEnter(mc.player);
 
@@ -444,7 +445,7 @@ public void handleMouseInput() throws IOException {
         }
     }
 
-    public void renderChunk() {
+    public void renderChunk(float partialTicks) {
         // Init GlStateManager
         TextureManager textureManager = Minecraft.getMinecraft().getTextureManager();
         textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
@@ -492,6 +493,13 @@ public void renderChunk() {
         GlStateManager.rotate(180.0f, 0.0f, 0.0f, -1.0f);
 
         // Auto rotate
+        /*
+        int rotationTime = 120; // 6 seconds to rotate one time
+        int rotationTicks = (int) (Minecraft.getMinecraft().world.getWorldTime() % rotationTime * 8);
+
+        float percent = ((rotationTicks / 8.0f) + partialTicks) / rotationTime;
+        */
+
         GlStateManager.rotate(rotateX == 0.0d ? RenderTickCounter.renderTicks * 45.0f / 128.0f : (float)rotateX, 0.0f, 1.0f, 0.0f);
 
         // Get rid of the wall+floor