diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/world')
9 files changed, 30 insertions, 31 deletions
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java index 6ad9a60a5a..33881c1e21 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java @@ -1,8 +1,8 @@ package gtPlusPlus.core.world.darkworld; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.world.darkworld.block.blockDarkWorldPortal; -import gtPlusPlus.core.world.darkworld.item.itemDarkWorldPortalTrigger; +import gtPlusPlus.core.world.darkworld.block.BlockDarkWorldPortal; +import gtPlusPlus.core.world.darkworld.item.ItemDarkWorldPortalTrigger; import gtPlusPlus.core.world.darkworld.world.WorldProviderMod; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -12,8 +12,8 @@ public class Dimension_DarkWorld { public Object instance; public static int DIMID = CORE.DARKWORLD_ID; - public static blockDarkWorldPortal portalBlock; - public static itemDarkWorldPortalTrigger portalItem; + public static BlockDarkWorldPortal portalBlock; + public static ItemDarkWorldPortalTrigger portalItem; public static Block blockTopLayer; public static Block blockSecondLayer; public static Block blockMainFiller = Blocks.stone; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java index 481b16c6ee..1b7ab242e8 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java @@ -25,6 +25,6 @@ public class GenLayerDarkWorld extends GenLayer { @Override public int[] getInts(int p_75904_1_, int p_75904_2_, int p_75904_3_, int p_75904_4_) { - return null; + return new int[] {}; } }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldGround.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java index ccfb1b0595..a16836bce0 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldGround.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java @@ -5,9 +5,9 @@ import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; import net.minecraft.block.BlockGrass; -public class blockDarkWorldGround extends BlockGrass implements ITileTooltip{ +public class BlockDarkWorldGround extends BlockGrass implements ITileTooltip{ - public blockDarkWorldGround() { + public BlockDarkWorldGround() { this.setCreativeTab(AddToCreativeTab.tabBOP); this.setBlockName("blockDarkWorldGround"); this.setHardness(1.0F); diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java index ee5a106bd3..d8a05e9612 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java @@ -9,9 +9,9 @@ import net.minecraft.block.BlockDirt; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; -public class blockDarkWorldPollutedDirt extends BlockDirt implements ITileTooltip{ +public class BlockDarkWorldPollutedDirt extends BlockDirt implements ITileTooltip{ - public blockDarkWorldPollutedDirt() { + public BlockDarkWorldPollutedDirt() { this.setCreativeTab(AddToCreativeTab.tabBOP); this.setBlockName("blockDarkWorldGround2"); this.setHardness(0.5F); diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java index eab52a4183..74bf034cf7 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java @@ -24,17 +24,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class blockDarkWorldPortal extends BlockBreakable implements ITileTooltip{ +public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip{ IIcon gor = null, dol = null, st1 = null, st2 = null, st3 = null, st4 = null; - public blockDarkWorldPortal() { + public BlockDarkWorldPortal() { super("portal", Material.portal, false); this.setTickRandomly(true); this.setHardness(-1.0F); this.setLightLevel(0.75F); this.setCreativeTab(CreativeTabs.tabBlock); this.setBlockName("blockDarkWorldPortal"); - LanguageRegistry.addName(this, "A Glimpse of the Toxic Everglades"); } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java index ef6f2b0c7d..1ab195d1aa 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java @@ -7,9 +7,9 @@ import gtPlusPlus.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -public class blockDarkWorldPortalFrame extends Block implements ITileTooltip{ +public class BlockDarkWorldPortalFrame extends Block implements ITileTooltip{ - public blockDarkWorldPortalFrame() { + public BlockDarkWorldPortalFrame() { super(Material.iron); this.setCreativeTab(AddToCreativeTab.tabBOP); this.setBlockName("blockDarkWorldPortalFrame"); diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldSludgeFluid.java b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java index c3c9beddc8..9f8ed377bc 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldSludgeFluid.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java @@ -3,7 +3,7 @@ package gtPlusPlus.core.world.darkworld.block; import net.minecraft.block.material.*; import net.minecraftforge.fluids.Fluid; -public class blockDarkWorldSludgeFluid extends Fluid { +public class BlockDarkWorldSludgeFluid extends Fluid { public static final Material SLUDGE = new MaterialLiquid(MapColor.dirtColor); @@ -15,11 +15,11 @@ public class blockDarkWorldSludgeFluid extends Fluid { protected static Material material = SLUDGE; - public blockDarkWorldSludgeFluid(String fluidName, int rgbColour) { + public BlockDarkWorldSludgeFluid(String fluidName, int rgbColour) { this(fluidName, rgbColour, null); } - public blockDarkWorldSludgeFluid(String fluidName, int rgbColour, Float overlayAlpha) { + public BlockDarkWorldSludgeFluid(String fluidName, int rgbColour, Float overlayAlpha) { super(fluidName); setColor(rgbColour); if (overlayAlpha != null){ @@ -36,7 +36,7 @@ public class blockDarkWorldSludgeFluid extends Fluid { return mapColor; } - public blockDarkWorldSludgeFluid setColor(int parColor) + public BlockDarkWorldSludgeFluid setColor(int parColor) { mapColor = parColor; return this; @@ -47,7 +47,7 @@ public class blockDarkWorldSludgeFluid extends Fluid { return overlayAlpha; } - public blockDarkWorldSludgeFluid setAlpha(float parOverlayAlpha) + public BlockDarkWorldSludgeFluid setAlpha(float parOverlayAlpha) { overlayAlpha = parOverlayAlpha; return this; @@ -77,7 +77,7 @@ public class blockDarkWorldSludgeFluid extends Fluid { return fillSound; }*/ - public blockDarkWorldSludgeFluid setMaterial(Material parMaterial) + public BlockDarkWorldSludgeFluid setMaterial(Material parMaterial) { material = parMaterial; return this; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java b/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java index 1908eeb11e..94e35a97ed 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java @@ -7,14 +7,14 @@ import gtPlusPlus.core.block.base.BlockBaseFluid; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTooltip; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.world.darkworld.item.ItemBlockToxicEverglades; -import gtPlusPlus.core.world.darkworld.item.itemDarkWorldPortalTrigger; +import gtPlusPlus.core.world.darkworld.item.ItemDarkWorldPortalTrigger; import net.minecraft.init.Blocks; import net.minecraftforge.fluids.FluidRegistry; public class DarkWorldContentLoader { //Static Vars - public static blockDarkWorldSludgeFluid SLUDGE; + public static BlockDarkWorldSludgeFluid SLUDGE; public synchronized static void run() { @@ -26,7 +26,7 @@ public class DarkWorldContentLoader { public synchronized static boolean initMisc(){ //Fluids - SLUDGE = (blockDarkWorldSludgeFluid) new blockDarkWorldSludgeFluid( + SLUDGE = (BlockDarkWorldSludgeFluid) new BlockDarkWorldSludgeFluid( "sludge", Utils.rgbtoHexValue(30, 130, 30)) .setDensity(1800) @@ -40,7 +40,7 @@ public class DarkWorldContentLoader { } public synchronized static boolean initItems(){ - portalItem = (itemDarkWorldPortalTrigger) (new itemDarkWorldPortalTrigger().setUnlocalizedName("everglades.trigger")); + portalItem = (ItemDarkWorldPortalTrigger) (new ItemDarkWorldPortalTrigger().setUnlocalizedName("everglades.trigger")); GameRegistry.registerItem(portalItem, "everglades.trigger"); return true; } @@ -48,11 +48,11 @@ public class DarkWorldContentLoader { public synchronized static boolean initBlocks(){ //Create Block Instances - blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, blockDarkWorldSludgeFluid.SLUDGE).setLightLevel(2f).setLightOpacity(1).setBlockName("fluidSludge"); - portalBlock = new blockDarkWorldPortal(); - blockTopLayer = new blockDarkWorldGround(); - blockSecondLayer = new blockDarkWorldPollutedDirt(); - blockPortalFrame = new blockDarkWorldPortalFrame(); + blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, BlockDarkWorldSludgeFluid.SLUDGE).setLightLevel(2f).setLightOpacity(1).setBlockName("fluidSludge"); + portalBlock = new BlockDarkWorldPortal(); + blockTopLayer = new BlockDarkWorldGround(); + blockSecondLayer = new BlockDarkWorldPollutedDirt(); + blockPortalFrame = new BlockDarkWorldPortalFrame(); //Registry GameRegistry.registerBlock(portalBlock, ItemBlockToxicEverglades.class, "dimensionDarkWorld_portal"); diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java index fa85cbe4a3..f3fd499ce4 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java @@ -14,8 +14,8 @@ import net.minecraft.item.*; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -public class itemDarkWorldPortalTrigger extends Item { - public itemDarkWorldPortalTrigger() { +public class ItemDarkWorldPortalTrigger extends Item { + public ItemDarkWorldPortalTrigger() { super(); this.maxStackSize = 1; setMaxDamage(64); |