Make dimensional portals render in the middle and move things to pocketlib

Runemoro · Runemoro · commit 26317f108d8f · 2018-01-22T20:23:35.000-05:00
diff --git a/src/main/java/org/dimdev/ddutils/StringUtils.java b/src/main/java/org/dimdev/ddutils/StringUtils.java
@@ -7,7 +7,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.dimdev.dimdoors.DimDoors;
 
 /**
  *
diff --git a/src/main/java/org/dimdev/dimdoors/client/ClientProxy.java b/src/main/java/org/dimdev/dimdoors/client/ClientProxy.java
@@ -1,6 +1,5 @@
 package org.dimdev.dimdoors.client;
 
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import org.dimdev.dimdoors.shared.CommonProxy;
 import org.dimdev.dimdoors.shared.entities.EntityMonolith;
 import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift;
diff --git a/src/main/java/org/dimdev/dimdoors/client/DimensionalWallRenderer.java b/src/main/java/org/dimdev/dimdoors/client/DimensionalWallRenderer.java
@@ -19,7 +19,7 @@ public final class DimensionalWallRenderer {
     private static final FloatBuffer buffer = GLAllocation.createDirectFloatBuffer(16);
     private static final ResourceLocation warpPath = new ResourceLocation(DimDoors.MODID + ":textures/other/warp.png");
 
-    // TODO: any renderAngle
+    // TODO: any render angle
     /**
      * @param x           The x coordinate of the wall's center.
      * @param y           The y coordinate of the wall's center.
diff --git a/src/main/java/org/dimdev/dimdoors/shared/Config.java b/src/main/java/org/dimdev/dimdoors/shared/Config.java
@@ -3,7 +3,6 @@
 import java.io.File;
 
 import org.dimdev.dimdoors.shared.world.gateways.DimensionFilter;
-import org.dimdev.dimdoors.shared.world.gateways.GatewayGenerator;
 import lombok.Getter;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoor.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoor.java
@@ -6,19 +6,15 @@
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
-import net.minecraft.world.chunk.Chunk;
 import org.dimdev.ddutils.Location;
 import org.dimdev.dimdoors.DimDoors;
 import org.dimdev.dimdoors.shared.rifts.registry.RiftRegistry;
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoorIron.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoorIron.java
@@ -1,6 +1,5 @@
 package org.dimdev.dimdoors.shared.blocks;
 
-import net.minecraft.block.BlockStainedHardenedClay;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import org.dimdev.dimdoors.DimDoors;
diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalPortal.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalPortal.java
@@ -1,5 +1,6 @@
 package org.dimdev.dimdoors.shared.blocks;
 
+import net.minecraft.block.BlockDoor;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -64,4 +65,14 @@ public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState sta
             }
         }
     }
+
+    @Override
+    public TileEntityEntranceRift createNewTileEntity(World world, int meta) {
+        TileEntityEntranceRift rift = new TileEntityEntranceRift();
+        rift.orientation = getStateFromMeta(meta).getValue(BlockDoor.FACING).getOpposite();
+        rift.extendUp += 1;
+        rift.pushIn = 0.5;
+        return rift;
+    }
+
 }
diff --git a/src/main/java/org/dimdev/dimdoors/shared/commands/CommandFabricConvert.java b/src/main/java/org/dimdev/dimdoors/shared/commands/CommandFabricConvert.java
@@ -1,6 +1,5 @@
 package org.dimdev.dimdoors.shared.commands;
 
-import com.flowpowered.math.vector.Vector3i;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -9,12 +8,9 @@
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.TextComponentString;
-import org.dimdev.ddutils.schem.Schematic;
 import org.dimdev.dimdoors.DimDoors;
 import org.dimdev.dimdoors.shared.blocks.BlockFabric;
-import org.dimdev.dimdoors.shared.pockets.SchematicHandler;
-import org.dimdev.dimdoors.shared.world.pocketdimension.WorldProviderPocket;
+import org.dimdev.pocketlib.WorldProviderPocket;
 import org.dimdev.pocketlib.Pocket;
 import org.dimdev.pocketlib.PocketRegistry;
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/commands/CommandSaveSchem.java b/src/main/java/org/dimdev/dimdoors/shared/commands/CommandSaveSchem.java
@@ -13,7 +13,7 @@
 import org.dimdev.pocketlib.Pocket;
 import org.dimdev.pocketlib.PocketRegistry;
 import org.dimdev.dimdoors.shared.pockets.SchematicHandler;
-import org.dimdev.dimdoors.shared.world.pocketdimension.WorldProviderPocket;
+import org.dimdev.pocketlib.WorldProviderPocket;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/dimdev/dimdoors/shared/tools/SchematicConverter.java b/src/main/java/org/dimdev/dimdoors/shared/tools/SchematicConverter.java
@@ -1,7 +1,5 @@
 package org.dimdev.dimdoors.shared.tools;
 
-import java.util.*;
-import javax.annotation.Nonnull;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockDoor;
 import net.minecraft.block.BlockEndPortalFrame;
@@ -31,6 +29,9 @@
 import org.dimdev.dimdoors.shared.rifts.registry.LinkProperties;
 import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift;
 
+import javax.annotation.Nonnull;
+import java.util.*;
+
 /**
  * @author Robijnvogel
  */
@@ -165,14 +166,14 @@ public static Schematic convertSchematic(NBTTagCompound nbt, String schematicId,
                                     switch (oldID) {
                                         case 220:
                                             item = ModItems.ANCIENT_FABRIC;
-                                            newMeta = (oldMeta == 0) ? 15 : 0;
+                                            newMeta = oldMeta == 0 ? 15 : 0;
                                             break;
                                         case 1970:
                                             item = ModItems.DIMENSIONAL_DOOR;
                                             break;
                                         case 1973:
                                             item = ModItems.FABRIC;
-                                            newMeta = (oldMeta == 0) ? 15 : 0;
+                                            newMeta = oldMeta == 0 ? 15 : 0;
                                             break;
                                         case 1975:
                                             item = ModItems.WARP_DIMENSIONAL_DOOR;
@@ -381,7 +382,7 @@ public static Schematic convertSchematic(NBTTagCompound nbt, String schematicId,
         schematic.paletteMax = schematic.palette.size() - 1;
 
         DimDoors.log.info(schematicId + "," + ironDimDoors + "," + warpDoors + "," + monoliths + "," + chests + ","
-                + dispensers + "," + allPistonBases + "," + tnt + "," + diamondBlocks + "," + goldBlocks + "," + ironBlocks);
+                          + dispensers + "," + allPistonBases + "," + tnt + "," + diamondBlocks + "," + goldBlocks + "," + ironBlocks);
 
         return schematic;
     }
@@ -424,8 +425,7 @@ private static String translateId(String id) { // TODO
     }
 
     @Nonnull
-    private static ResourceLocation translateIdCrude(String id) { // TODO
-        ResourceLocation location;
+    private static ResourceLocation translateIdCrude(String id) {
         switch (id) {
             case "Sign":
                 return new ResourceLocation("minecraft:sign");
@@ -446,21 +446,9 @@ private static ResourceLocation translateIdCrude(String id) { // TODO
     }
 
     private static boolean isValidItemIDForSimpleConversion(int id) {
-        if (0 <= id) {
-            if (id == LOCKED_CHEST_ID || id == POTION_ID || id == WRITTEN_BOOK_ID) {
-                return false;
-            }
-            if (id <= 159) { //0-159 Block ids
-                return true;
-            }
-            if (256 <= id && id <= 422) { //256-422 Item ids
-                return true;
-            }
-            if (2256 <= id && id <= 2267) { //2256-2267 Music Disk ids
-                return true;
-            }
-        }
-        return false;
+        return id > 0 && id != LOCKED_CHEST_ID && id != POTION_ID && id != WRITTEN_BOOK_ID &&
+               (id <= 159 // 1.6.4 blocks
+                || 256 <= id && id <= 422 // 1.6.4 items
+                || 2256 <= id && id <= 2267); // 1.6.4 music discs
     }
-
 }
diff --git a/src/main/java/org/dimdev/dimdoors/shared/world/gateways/GatewayGenerator.java b/src/main/java/org/dimdev/dimdoors/shared/world/gateways/GatewayGenerator.java
@@ -2,7 +2,7 @@
 
 import org.dimdev.dimdoors.shared.Config;
 import org.dimdev.dimdoors.shared.blocks.ModBlocks;
-import org.dimdev.dimdoors.shared.world.pocketdimension.WorldProviderPocket;
+import org.dimdev.pocketlib.WorldProviderPocket;
 import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/org/dimdev/dimdoors/shared/world/pocketdimension/WorldProviderDungeonPocket.java b/src/main/java/org/dimdev/dimdoors/shared/world/pocketdimension/WorldProviderDungeonPocket.java
@@ -10,6 +10,7 @@
 import net.minecraft.world.biome.BiomeProviderSingle;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import org.dimdev.pocketlib.WorldProviderPocket;
 
 public class WorldProviderDungeonPocket extends WorldProviderPocket {
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/world/pocketdimension/WorldProviderPersonalPocket.java b/src/main/java/org/dimdev/dimdoors/shared/world/pocketdimension/WorldProviderPersonalPocket.java
@@ -8,6 +8,7 @@
 import net.minecraft.world.biome.BiomeProviderSingle;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import org.dimdev.pocketlib.WorldProviderPocket;
 
 public class WorldProviderPersonalPocket extends WorldProviderPocket {
 
diff --git a/src/main/java/org/dimdev/dimdoors/shared/world/pocketdimension/WorldProviderPublicPocket.java b/src/main/java/org/dimdev/dimdoors/shared/world/pocketdimension/WorldProviderPublicPocket.java
@@ -9,6 +9,7 @@
 import net.minecraft.world.biome.BiomeProviderSingle;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import org.dimdev.pocketlib.WorldProviderPocket;
 
 public class WorldProviderPublicPocket extends WorldProviderPocket {
 
diff --git a/src/main/java/org/dimdev/pocketlib/ChunkGeneratorBlank.java b/src/main/java/org/dimdev/pocketlib/ChunkGeneratorBlank.java
@@ -1,4 +1,4 @@
-package org.dimdev.dimdoors.shared.world.pocketdimension;
+package org.dimdev.pocketlib;
 
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.util.math.BlockPos;
@@ -38,7 +38,7 @@ public boolean generateStructures(Chunk chunk, int x, int z) {
 
     @Override public void recreateStructures(Chunk chunk, int x, int z) {}
 
-    @Override public boolean isInsideStructure(World world, String structureName, BlockPos pos) { return false; }
+    @Override public boolean isInsideStructure(World world, String structureName, BlockPos pos) { return false; } // TODO: make this return true for pockets?
 
     @Override
     public List<Biome.SpawnListEntry> getPossibleCreatures(EnumCreatureType creatureType, BlockPos pos) {
diff --git a/src/main/java/org/dimdev/pocketlib/PocketRegistry.java b/src/main/java/org/dimdev/pocketlib/PocketRegistry.java
@@ -17,7 +17,6 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.storage.MapStorage;
 import net.minecraft.world.storage.WorldSavedData;
-import org.dimdev.dimdoors.shared.world.pocketdimension.WorldProviderPocket;
 
 @NBTSerializable public class PocketRegistry extends WorldSavedData {
 
diff --git a/src/main/java/org/dimdev/pocketlib/VirtualLocation.java b/src/main/java/org/dimdev/pocketlib/VirtualLocation.java
@@ -9,7 +9,6 @@
 import org.dimdev.ddutils.nbt.NBTUtils;
 import org.dimdev.dimdoors.shared.Config;
 import org.dimdev.dimdoors.shared.world.limbo.WorldProviderLimbo;
-import org.dimdev.dimdoors.shared.world.pocketdimension.WorldProviderPocket;
 
 /*@Value*/ @ToString @AllArgsConstructor @NoArgsConstructor @Builder(toBuilder = true)
 @NBTSerializable public class VirtualLocation implements INBTStorable {
diff --git a/src/main/java/org/dimdev/pocketlib/WorldProviderPocket.java b/src/main/java/org/dimdev/pocketlib/WorldProviderPocket.java
@@ -1,4 +1,4 @@
-package org.dimdev.dimdoors.shared.world.pocketdimension;
+package org.dimdev.pocketlib;
 
 import org.dimdev.dimdoors.DimDoors;
 import org.dimdev.ddutils.render.CloudRenderBlank;
@@ -25,13 +25,6 @@ public IChunkGenerator createChunkGenerator() {
         return new ChunkGeneratorBlank(world, world.getSeed());
     }
 
-    /*
-    @Override
-    public DimensionType getDimensionType() {
-        return ModDimensions.getPocketDimensionType(getPocketType());
-    }
-    */
-
     @Override public float calculateCelestialAngle(long worldTime, float partialTicks) { return 0.0F; }
 
     @Override public boolean canRespawnHere() { return false; }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`import java.util.ArrayList;`
`9`	`9`	`import java.util.List;`
`10`		`-import org.dimdev.dimdoors.DimDoors;`
`11`	`10`
`12`	`11`	`/**`
`13`	`12`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package org.dimdev.dimdoors.shared.blocks;`
`2`	`2`
	`3`	`+import net.minecraft.block.BlockDoor;`
`3`	`4`	`import net.minecraft.block.state.IBlockState;`
`4`	`5`	`import net.minecraft.entity.Entity;`
`5`	`6`	`import net.minecraft.entity.player.EntityPlayer;`
`@@ -64,4 +65,14 @@ public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState sta`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`	`}`
	`68`	`+`
	`69`	`+ @Override`
	`70`	`+ public TileEntityEntranceRift createNewTileEntity(World world, int meta) {`
	`71`	`+ TileEntityEntranceRift rift = new TileEntityEntranceRift();`
	`72`	`+ rift.orientation = getStateFromMeta(meta).getValue(BlockDoor.FACING).getOpposite();`
	`73`	`+ rift.extendUp += 1;`
	`74`	`+ rift.pushIn = 0.5;`
	`75`	`+ return rift;`
	`76`	`+ }`
	`77`	`+`
`67`	`78`	`}`