I'm finally finished!

NoahJelen · Jul 24, 2018 · b2255c6 · b2255c6
1 parent ae8fbd5
commit b2255c6
Show file tree

Hide file tree

Showing 49 changed files with 501 additions and 312 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -203,7 +203,7 @@
 1.2:
     Added biomes to Deep Underground
     For performance reasons, most of the gravel generation has been removed from the deep underground dimension.
-    Liquid Redstone now generate underground in lakes
+    Liquid Redstone now generates underground in lakes
     Added Glowing Ice
     Optimized the DU and DV chunk generators
 
@@ -223,3 +223,6 @@
 
 1.3 (Cave Update):
     Improved cave generation (thank you for the idea, u/SaveThePhytoplankton!)
+    Added 2 easter eggs
+    Added underground villages
+    Optimized ore generation
diff --git a/src/.directory b/src/.directory
@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2018,7,23,17,33,53
+Version=4
diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/RSDoor.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/RSDoor.java
@@ -179,9 +179,7 @@ public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, Ent
         BlockPos blockpos = pos.down();
         BlockPos blockpos1 = pos.up();
         if (player.capabilities.isCreativeMode && state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER && worldIn.getBlockState(blockpos).getBlock() == this)
-        {
             worldIn.setBlockToAir(blockpos);
-        }
         if (state.getValue(HALF) == BlockDoor.EnumDoorHalf.LOWER && worldIn.getBlockState(blockpos1).getBlock() == this)
         {
             if (player.capabilities.isCreativeMode)

diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/DiamondButtonTicks.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/DiamondButtonTicks.java
@@ -83,9 +83,7 @@ public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
         for (EnumFacing enumfacing : EnumFacing.values())
         {
             if (canPlaceBlock(worldIn, pos, enumfacing))
-            {
                 return true;
-            }
         }
         return false;
     }
@@ -111,9 +109,7 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc
     private boolean checkForDrop(World worldIn, BlockPos pos, IBlockState state)
     {
         if (canPlaceBlockAt(worldIn, pos))
-        {
             return true;
-        }
         else
         {
             dropBlockAsItem(worldIn, pos, state, 0);
@@ -147,9 +143,7 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, Bloc
 	public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)
     {
         if (state.getValue(POWERED).booleanValue())
-        {
             return true;
-        }
         else
         {
             worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(true)), 3);
@@ -166,9 +160,7 @@ public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state,
 	public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
     {
         if (state.getValue(POWERED).booleanValue())
-        {
             notifyNeighbors(worldIn, pos, state.getValue(FACING));
-        }
         super.breakBlock(worldIn, pos, state);
     }
     @Override
@@ -198,9 +190,7 @@ public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random ra
             if (state.getValue(POWERED).booleanValue())
             {
                 if (wooden)
-                {
                     checkPressed(state, worldIn, pos);
-                }
                 else
                 {
                     worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(false)));
@@ -219,9 +209,7 @@ public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState s
             if (wooden)
             {
                 if (!state.getValue(POWERED).booleanValue())
-                {
                     checkPressed(state, worldIn, pos);
-                }
             }
         }
     }
@@ -245,9 +233,7 @@ private void checkPressed(IBlockState p_185616_1_, World p_185616_2_, BlockPos p
             playReleaseSound(p_185616_2_, p_185616_3_);
         }
         if (flag)
-        {
             p_185616_2_.scheduleUpdate(new BlockPos(p_185616_3_), this, tickRate(p_185616_2_));
-        }
     }
     private void notifyNeighbors(World worldIn, BlockPos pos, EnumFacing facing)
     {
@@ -307,9 +293,7 @@ public int getMetaFromState(IBlockState state)
                 i = 0;
         }
         if (state.getValue(POWERED).booleanValue())
-        {
             i |= 8;
-        }
         return i;
     }
     @Override

diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/EmeraldButtonTicks.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/EmeraldButtonTicks.java
@@ -84,9 +84,7 @@ public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
         for (EnumFacing enumfacing : EnumFacing.values())
         {
             if (canPlaceBlock(worldIn, pos, enumfacing))
-            {
                 return true;
-            }
         }
         return false;
     }
@@ -112,9 +110,7 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc
     private boolean checkForDrop(World worldIn, BlockPos pos, IBlockState state)
     {
         if (canPlaceBlockAt(worldIn, pos))
-        {
             return true;
-        }
         else
         {
             dropBlockAsItem(worldIn, pos, state, 0);
@@ -148,9 +144,7 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, Bloc
 	public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)
     {
         if (state.getValue(POWERED).booleanValue())
-        {
             return true;
-        }
         else
         {
             worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(true)), 3);
@@ -167,9 +161,7 @@ public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state,
 	public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
     {
         if (state.getValue(POWERED).booleanValue())
-        {
             notifyNeighbors(worldIn, pos, state.getValue(FACING));
-        }
         super.breakBlock(worldIn, pos, state);
     }
     @Override
@@ -199,9 +191,7 @@ public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random ra
             if (state.getValue(POWERED).booleanValue())
             {
                 if (wooden)
-                {
                     checkPressed(state, worldIn, pos);
-                }
                 else
                 {
                     worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(false)));
@@ -220,9 +210,7 @@ public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState s
             if (wooden)
             {
                 if (!state.getValue(POWERED).booleanValue())
-                {
                     checkPressed(state, worldIn, pos);
-                }
             }
         }
     }
@@ -246,9 +234,7 @@ private void checkPressed(IBlockState p_185616_1_, World p_185616_2_, BlockPos p
             this.playReleaseSound(p_185616_2_, p_185616_3_);
         }
         if (flag)
-        {
             p_185616_2_.scheduleUpdate(new BlockPos(p_185616_3_), this, this.tickRate(p_185616_2_));
-        }
     }
     private void notifyNeighbors(World worldIn, BlockPos pos, EnumFacing facing)
     {
@@ -309,9 +295,7 @@ public int getMetaFromState(IBlockState state)
                 i = 0;
         }
         if (state.getValue(POWERED).booleanValue())
-        {
             i |= 8;
-        }
         return i;
     }
     @Override

diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/IronButtonTicks.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/IronButtonTicks.java
@@ -83,9 +83,7 @@ public boolean canPlaceBlockAt(World worldIn, BlockPos pos)
         for (EnumFacing enumfacing : EnumFacing.values())
         {
             if (canPlaceBlock(worldIn, pos, enumfacing))
-            {
                 return true;
-            }
         }
         return false;
     }
@@ -111,9 +109,7 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc
     private boolean checkForDrop(World worldIn, BlockPos pos, IBlockState state)
     {
         if (canPlaceBlockAt(worldIn, pos))
-        {
             return true;
-        }
         else
         {
             dropBlockAsItem(worldIn, pos, state, 0);
@@ -148,9 +144,7 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, Bloc
 	public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)
     {
         if (state.getValue(POWERED).booleanValue())
-        {
             return true;
-        }
         else
         {
             worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(true)), 3);
@@ -167,9 +161,7 @@ public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state,
 	public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
     {
         if (state.getValue(POWERED).booleanValue())
-        {
             notifyNeighbors(worldIn, pos, state.getValue(FACING));
-        }
         super.breakBlock(worldIn, pos, state);
     }
     @Override
@@ -199,9 +191,7 @@ public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random ra
             if (state.getValue(POWERED).booleanValue())
             {
                 if (wooden)
-                {
                     checkPressed(state, worldIn, pos);
-                }
                 else
                 {
                     worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(false)));
@@ -220,9 +210,7 @@ public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState s
             if (wooden)
             {
                 if (!state.getValue(POWERED).booleanValue())
-                {
                     checkPressed(state, worldIn, pos);
-                }
             }
         }
     }
@@ -246,9 +234,7 @@ private void checkPressed(IBlockState p_185616_1_, World p_185616_2_, BlockPos p
             playReleaseSound(p_185616_2_, p_185616_3_);
         }
         if (flag)
-        {
             p_185616_2_.scheduleUpdate(new BlockPos(p_185616_3_), this, tickRate(p_185616_2_));
-        }
     }
     private void notifyNeighbors(World worldIn, BlockPos pos, EnumFacing facing)
     {
@@ -310,9 +296,7 @@ public int getMetaFromState(IBlockState state)
                 i = 0;
         }
         if (state.getValue(POWERED).booleanValue())
-        {
             i |= 8;
-        }
         return i;
     }
     @Override

diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/QuickButton.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/buttonTicks/QuickButton.java
@@ -85,9 +85,8 @@ public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side)
 	@Override
 	public boolean canPlaceBlockAt(World worldIn, BlockPos pos) {
 		for (EnumFacing enumfacing : EnumFacing.values()) {
-			if (canPlaceBlock(worldIn, pos, enumfacing)) {
+			if (canPlaceBlock(worldIn, pos, enumfacing))
 				return true;
-			}
 		}
 		return false;
 	}
@@ -112,9 +111,9 @@ public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Bloc
 		}
 	}
 	private boolean checkForDrop(World worldIn, BlockPos pos, IBlockState state) {
-		if (canPlaceBlockAt(worldIn, pos)) {
+		if (canPlaceBlockAt(worldIn, pos))
 			return true;
-		} else {
+		else {
 			dropBlockAsItem(worldIn, pos, state, 0);
 			worldIn.setBlockToAir(pos);
 			return false;
@@ -182,9 +181,9 @@ public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random ra
 	public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) {
 		if (!worldIn.isRemote) {
 			if (state.getValue(POWERED).booleanValue()) {
-				if (wooden) {
+				if (wooden)
 					checkPressed(state, worldIn, pos);
-				} else {
+				else {
 					worldIn.setBlockState(pos, state.withProperty(POWERED, Boolean.valueOf(false)));
 					notifyNeighbors(worldIn, pos, state.getValue(FACING));
 					playReleaseSound(worldIn, pos);
@@ -197,9 +196,8 @@ public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random ra
 	public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
 		if (!worldIn.isRemote) {
 			if (wooden) {
-				if (!state.getValue(POWERED).booleanValue()) {
+				if (!state.getValue(POWERED).booleanValue())
 					checkPressed(state, worldIn, pos);
-				}
 			}
 		}
 	}
@@ -220,9 +218,8 @@ private void checkPressed(IBlockState p_185616_1_, World p_185616_2_, BlockPos p
 			p_185616_2_.markBlockRangeForRenderUpdate(p_185616_3_, p_185616_3_);
 			playReleaseSound(p_185616_2_, p_185616_3_);
 		}
-		if (flag) {
+		if (flag)
 			p_185616_2_.scheduleUpdate(new BlockPos(p_185616_3_), this, tickRate(p_185616_2_));
-		}
 	}
 	private void notifyNeighbors(World worldIn, BlockPos pos, EnumFacing facing) {
 		worldIn.notifyNeighborsOfStateChange(pos, this, false);
@@ -277,9 +274,8 @@ public int getMetaFromState(IBlockState state) {
 		case DOWN:
 			i = 0;
 		}
-		if (state.getValue(POWERED).booleanValue()) {
+		if (state.getValue(POWERED).booleanValue())
 			i |= 8;
-		}
 		return i;
 	}
 	@Override

diff --git a/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/planks.java b/src/main/java/com/NetherNoah/ParadiseMod/CustomBlockCode/planks.java
@@ -34,9 +34,7 @@ public int damageDropped(IBlockState state)
     public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList<ItemStack> list)
     {
         for (planks.EnumType blockplanks$enumtype : planks.EnumType.values())
-        {
             list.add(new ItemStack(itemIn, 1, blockplanks$enumtype.getMetadata()));
-        }
     }
     @Override
 	public IBlockState getStateFromMeta(int meta)
@@ -92,9 +90,7 @@ public String toString()
         public static planks.EnumType byMetadata(int meta)
         {
             if (meta < 0 || meta >= META_LOOKUP.length)
-            {
                 meta = 0;
-            }
             return META_LOOKUP[meta];
         }
         @Override
@@ -109,9 +105,7 @@ public String getUnlocalizedName()
         static
         {
             for (planks.EnumType blockplanks$enumtype : values())
-            {
                 META_LOOKUP[blockplanks$enumtype.getMetadata()] = blockplanks$enumtype;
-            }
         }
     }
 }