From ae21012d216df71f31aed6fbc9d76215fc24ceed Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 4 Mar 2017 12:58:47 +1000 Subject: + New texture for the slow builders ring. + Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project. --- src/Java/gtPlusPlus/core/block/ModBlocks.java | 10 +- .../gtPlusPlus/core/block/base/AdvancedBlock.java | 36 +- .../gtPlusPlus/core/block/base/BasicBlock.java | 90 +- .../core/block/base/BlockBaseModular.java | 104 +- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 40 +- src/Java/gtPlusPlus/core/block/base/MetaBlock.java | 36 +- .../core/block/base/MultiTextureBlock.java | 48 +- .../gtPlusPlus/core/block/general/FirePit.java | 223 +-- .../gtPlusPlus/core/block/general/LightGlass.java | 81 +- .../core/block/general/antigrief/TowerDevice.java | 513 +++--- .../general/fluids/BlockFluidJackDaniels.java | 78 +- .../core/block/machine/BlockGtFrameBox.java | 28 +- .../gtPlusPlus/core/block/machine/FishTrap.java | 96 +- .../core/block/machine/Machine_Workbench.java | 134 +- .../block/machine/Machine_WorkbenchAdvanced.java | 32 +- .../machine/heliumgen/block/HeliumGenerator.java | 286 ++-- .../container/ContainerHeliumGenerator.java | 29 +- .../machine/heliumgen/gui/GUIHeliumGenerator.java | 107 +- .../machine/heliumgen/slots/InvSlotRadiation.java | 40 +- .../tileentity/TileEntityHeliumGenerator.java | 247 +-- src/Java/gtPlusPlus/core/commands/CommandMath.java | 150 +- .../gtPlusPlus/core/commands/CommandUtils.java | 4 +- src/Java/gtPlusPlus/core/common/BasePlayer.java | 88 +- src/Java/gtPlusPlus/core/common/CommonProxy.java | 45 +- .../core/common/compat/COMPAT_BigReactors.java | 4 +- .../common/compat/COMPAT_CompactWindmills.java | 77 +- .../core/common/compat/COMPAT_EnderIO.java | 4 +- .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 15 +- .../core/common/compat/COMPAT_MorePlanets.java | 8 +- .../core/common/compat/COMPAT_PneumaticCraft.java | 6 +- .../core/common/compat/COMPAT_RFTools.java | 6 +- .../core/common/compat/COMPAT_SimplyJetpacks.java | 6 +- .../core/common/compat/COMPAT_Thaumcraft.java | 8 +- .../core/container/Container_BackpackBase.java | 39 +- .../core/container/Container_FishTrap.java | 59 +- .../core/container/Container_Workbench.java | 186 +-- .../container/Container_WorkbenchAdvanced.java | 170 +- .../gtPlusPlus/core/creative/AddToCreativeTab.java | 2 +- .../creative/tabs/MiscUtilCreativeTabBlock.java | 2 +- .../creative/tabs/MiscUtilCreativeTabMachines.java | 4 +- .../creative/tabs/MiscUtilCreativeTabMisc.java | 2 +- .../creative/tabs/MiscUtilCreativeTabOther.java | 2 +- .../creative/tabs/MiscUtilCreativeTabTools.java | 2 +- .../gtPlusPlus/core/entity/EntityTeleportFX.java | 456 +++--- .../gtPlusPlus/core/fluids/BlockFluidBase.java | 158 +- .../core/fluids/FluidRegistryHandler.java | 41 +- src/Java/gtPlusPlus/core/fluids/GenericFluid.java | 70 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 24 +- src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java | 10 +- src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java | 54 +- .../gtPlusPlus/core/gui/item/GuiBaseBackpack.java | 48 +- .../gtPlusPlus/core/gui/machine/GUI_FishTrap.java | 25 +- .../gtPlusPlus/core/gui/machine/GUI_Workbench.java | 29 +- .../core/gui/machine/GUI_WorkbenchAdvanced.java | 25 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 88 +- .../core/handler/COMPAT_IntermodStaging.java | 4 +- .../gtPlusPlus/core/handler/CraftingManager.java | 4 +- src/Java/gtPlusPlus/core/handler/GuiHandler.java | 44 +- .../handler/Recipes/LateRegistrationHandler.java | 16 +- .../core/handler/Recipes/RegistrationHandler.java | 10 +- .../core/handler/events/BlockEventHandler.java | 60 +- .../core/handler/events/CustomMovementHandler.java | 38 +- .../core/handler/events/LoginEventHandler.java | 32 +- .../events/PickaxeBlockBreakEventHandler.java | 47 +- .../core/handler/events/SneakManager.java | 8 +- .../handler/events/UnbreakableBlockManager.java | 38 +- .../core/handler/render/CapeHandler.java | 184 +-- .../core/handler/render/FirepitModel.java | 134 +- .../core/handler/render/FirepitRender.java | 30 +- .../workbench/Workbench_CraftingHandler.java | 80 +- .../handler/workbench/Workbench_RecipeSorter.java | 43 +- .../gtPlusPlus/core/interfaces/IItemBlueprint.java | 56 +- .../core/inventories/BaseInventoryBackpack.java | 105 +- .../core/inventories/InventoryFishTrap.java | 113 +- .../core/inventories/InventoryWorkbenchChest.java | 124 +- .../inventories/InventoryWorkbenchCrafting.java | 138 +- .../InventoryWorkbenchHoloCrafting.java | 54 +- .../inventories/InventoryWorkbenchHoloSlots.java | 96 +- .../core/inventories/InventoryWorkbenchTools.java | 122 +- .../InventoryWorkbenchToolsElectric.java | 126 +- src/Java/gtPlusPlus/core/item/ModItems.java | 148 +- src/Java/gtPlusPlus/core/item/base/BaseEuItem.java | 701 +++++---- .../core/item/base/BaseItemBackpack.java | 88 +- .../gtPlusPlus/core/item/base/BaseItemBrain.java | 50 +- .../core/item/base/BaseItemComponent.java | 125 +- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 21 +- .../gtPlusPlus/core/item/base/BaseItemLoot.java | 47 +- .../gtPlusPlus/core/item/base/BaseItemTCShard.java | 39 +- .../core/item/base/BaseItemWithCharge.java | 43 +- .../core/item/base/BaseItemWithDamageValue.java | 13 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 401 +++-- src/Java/gtPlusPlus/core/item/base/CoreItem.java | 94 +- .../core/item/base/bolts/BaseItemBolt.java | 2 +- .../core/item/base/cell/BaseItemCell.java | 34 +- .../core/item/base/cell/BaseItemPlasmaCell.java | 52 +- .../core/item/base/dusts/BaseItemDust.java | 168 +- .../core/item/base/dusts/BaseItemDustAbstract.java | 23 +- .../core/item/base/dusts/BaseItemDustUnique.java | 186 ++- .../item/base/dusts/decimal/BaseItemCentidust.java | 29 +- .../item/base/dusts/decimal/BaseItemDecidust.java | 29 +- .../core/item/base/foods/BaseItemFood.java | 19 +- .../core/item/base/foods/BaseItemHotFood.java | 47 +- .../core/item/base/gears/BaseItemGear.java | 4 +- .../core/item/base/ingots/BaseItemIngot.java | 30 +- .../core/item/base/ingots/BaseItemIngotHot.java | 36 +- .../core/item/base/ingots/BaseItemIngotOLD.java | 100 -- .../core/item/base/ingots/BaseItemIngot_OLD.java | 100 ++ .../core/item/base/itemblock/ItemBlockBase.java | 22 +- .../core/item/base/itemblock/ItemBlockFluid.java | 57 +- .../core/item/base/itemblock/ItemBlockGtBlock.java | 69 +- .../item/base/itemblock/ItemBlockGtFrameBox.java | 12 +- .../item/base/itemblock/ItemBlockTileEntity.java | 44 +- .../core/item/base/nugget/BaseItemNugget.java | 4 +- .../core/item/base/plates/BaseItemPlate.java | 8 +- .../core/item/base/plates/BaseItemPlateDouble.java | 8 +- .../core/item/base/plates/BaseItemPlate_OLD.java | 68 + .../core/item/base/rings/BaseItemRing.java | 2 +- .../core/item/base/rods/BaseItemRod.java | 16 +- .../core/item/base/rods/BaseItemRodLong.java | 28 +- .../core/item/base/rotors/BaseItemRotor.java | 2 +- .../core/item/base/screws/BaseItemScrew.java | 24 +- .../gtPlusPlus/core/item/effects/RarityEffect.java | 20 +- .../gtPlusPlus/core/item/effects/RarityEpic.java | 16 +- .../gtPlusPlus/core/item/effects/RarityRare.java | 16 +- .../core/item/effects/RarityUncommon.java | 12 +- .../core/item/general/BedLocator_Base.java | 77 +- .../gtPlusPlus/core/item/general/BufferCore.java | 59 +- .../core/item/general/ItemBasicFirestarter.java | 20 +- .../core/item/general/ItemBlueprint.java | 124 +- .../core/item/general/ItemCloakingDevice.java | 115 +- .../core/item/general/ItemHealingDevice.java | 117 +- .../core/item/general/ItemSlowBuildingRing.java | 61 +- .../core/item/general/NuclearFuelRodBase.java | 334 ++-- .../core/item/general/RF2EU_Battery.java | 145 +- .../core/item/general/fuelrods/FuelRod_Base.java | 171 +- .../item/general/fuelrods/FuelRod_Thorium.java | 2 +- src/Java/gtPlusPlus/core/item/init/ItemsFoods.java | 20 +- .../gtPlusPlus/core/item/init/ItemsMultiTools.java | 88 +- .../core/item/materials/MaterialHandler.java | 6 +- .../core/item/tool/misc/SandstoneHammer.java | 27 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 137 +- .../core/item/tool/staballoy/MultiSpadeBase.java | 52 +- .../core/item/tool/staballoy/StaballoyAxe.java | 323 ++-- .../core/item/tool/staballoy/StaballoyPickaxe.java | 229 ++- .../core/item/tool/staballoy/StaballoySpade.java | 203 ++- src/Java/gtPlusPlus/core/lib/CORE.java | 65 +- src/Java/gtPlusPlus/core/lib/LoadedMods.java | 33 +- src/Java/gtPlusPlus/core/material/ALLOY.java | 152 +- src/Java/gtPlusPlus/core/material/ELEMENT.java | 26 +- src/Java/gtPlusPlus/core/material/Material.java | 322 ++-- .../core/material/MaterialGenerator.java | 60 +- .../gtPlusPlus/core/material/MaterialStack.java | 35 +- .../core/material/nuclear/FLUORIDES.java | 100 +- .../gtPlusPlus/core/material/nuclear/NUCLIDE.java | 16 +- .../core/material/state/MaterialState.java | 2 +- src/Java/gtPlusPlus/core/players/FakeFarmer.java | 29 +- src/Java/gtPlusPlus/core/proxy/ClientProxy.java | 82 +- src/Java/gtPlusPlus/core/proxy/ServerProxy.java | 8 +- .../core/recipe/Gregtech_Recipe_Adder.java | 40 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 288 ++-- .../gtPlusPlus/core/recipe/RECIPES_General.java | 2 +- .../core/recipe/RECIPES_LaserEngraver.java | 12 +- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 47 +- .../core/recipe/RECIPES_MachineComponents.java | 24 +- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 143 +- .../gtPlusPlus/core/recipe/RECIPES_Shapeless.java | 50 +- src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java | 4 +- .../gtPlusPlus/core/recipe/RECIPE_Batteries.java | 16 +- .../gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java | 8 +- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 16 +- src/Java/gtPlusPlus/core/slots/SlotBlueprint.java | 6 +- src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java | 22 +- src/Java/gtPlusPlus/core/slots/SlotCrafting.java | 295 ++-- src/Java/gtPlusPlus/core/slots/SlotFrame.java | 6 +- src/Java/gtPlusPlus/core/slots/SlotGeneric.java | 4 +- src/Java/gtPlusPlus/core/slots/SlotGtTool.java | 6 +- .../gtPlusPlus/core/slots/SlotGtToolElectric.java | 30 +- .../gtPlusPlus/core/slots/SlotItemBackpackInv.java | 4 +- src/Java/gtPlusPlus/core/slots/SlotNoInput.java | 4 +- src/Java/gtPlusPlus/core/slots/SlotOutput.java | 22 +- src/Java/gtPlusPlus/core/slots/SlotRTG.java | 4 +- .../core/tileentities/ModTileEntities.java | 2 +- .../core/tileentities/base/TILE_ENTITY_BASE.java | 22 +- .../tileentities/general/TileEntityFirepit.java | 22 +- .../tileentities/general/TileEntityFishTrap.java | 88 +- .../tileentities/general/TileEntityReverter.java | 113 +- .../tileentities/machines/TileEntityWorkbench.java | 89 +- .../machines/TileEntityWorkbenchAdvanced.java | 89 +- src/Java/gtPlusPlus/core/util/BaseHandler.java | 6 +- src/Java/gtPlusPlus/core/util/ClassUtils.java | 18 +- src/Java/gtPlusPlus/core/util/Log.java | 42 +- src/Java/gtPlusPlus/core/util/LoggingUtils.java | 52 +- src/Java/gtPlusPlus/core/util/Quality.java | 21 +- src/Java/gtPlusPlus/core/util/Utils.java | 376 +++-- .../gtPlusPlus/core/util/UtilsChatFormatting.java | 282 ++-- src/Java/gtPlusPlus/core/util/UtilsRarity.java | 30 +- src/Java/gtPlusPlus/core/util/UtilsText.java | 4 +- .../gtPlusPlus/core/util/array/ArrayUtils.java | 14 +- src/Java/gtPlusPlus/core/util/array/Pair.java | 22 +- src/Java/gtPlusPlus/core/util/array/Triplet.java | 28 +- .../core/util/debug/DEBUG_BLOCK_ShapeSpawner.java | 61 +- .../gtPlusPlus/core/util/debug/DEBUG_INIT.java | 6 +- .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 34 +- .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 1653 +++++++++++--------- .../core/util/debug/DEBUG_ScreenOverlay.java | 14 +- .../core/util/debug/DEBUG_TimerThread.java | 59 +- .../core/util/debug/UtilityGL11Debug.java | 618 ++++---- .../gtPlusPlus/core/util/entity/EntityUtils.java | 40 +- src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java | 38 +- .../gtPlusPlus/core/util/fluid/FluidUtils.java | 168 +- .../gregtech/recipehandlers/GregtechRecipe.java | 35 +- src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 285 ++-- .../core/util/materials/MaterialUtils.java | 85 +- src/Java/gtPlusPlus/core/util/math/MathUtils.java | 236 +-- .../core/util/networking/NetworkUtils.java | 118 +- .../core/util/particles/BlockBreakParticles.java | 8 +- .../util/particles/EntityParticleFXMysterious.java | 18 +- .../gtPlusPlus/core/util/player/PlayerCache.java | 79 +- .../gtPlusPlus/core/util/player/PlayerUtils.java | 78 +- .../gtPlusPlus/core/util/player/UtilsMining.java | 84 +- .../gtPlusPlus/core/util/recipe/RecipeUtils.java | 145 +- .../core/util/recipe/shapeless/ShapelessUtils.java | 15 +- .../core/util/reflect/ClientProxyFinder.java | 42 +- .../core/util/reflect/ReflectionUtils.java | 38 +- src/Java/gtPlusPlus/core/util/wrapper/var.java | 110 +- 225 files changed, 9535 insertions(+), 9083 deletions(-) delete mode 100644 src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOLD.java create mode 100644 src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java create mode 100644 src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java index 1f8ca23b30..8acb757063 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.block; +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseOre; import gtPlusPlus.core.block.general.FirePit; @@ -11,7 +12,6 @@ import gtPlusPlus.core.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.common.registry.GameRegistry; public final class ModBlocks { @@ -34,9 +34,9 @@ public final class ModBlocks { public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels"); public static Block blockFluidJackDaniels; public static Block blockCasings2Misc; - + public static Block blockFirePit; - + public static Block blockOreFluorite; @@ -45,7 +45,7 @@ public final class ModBlocks { Utils.LOG_INFO("Initializing Blocks."); //blockGriefSaver = new TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault"); - registerBlocks(); + registerBlocks(); } public static void registerBlocks(){ @@ -63,7 +63,7 @@ public final class ModBlocks { blockFishTrap = new FishTrap(); blockOreFluorite = new BlockBaseOre("oreFluorite", "Fluorite", Material.rock, BlockTypes.ORE, Utils.rgbtoHexValue(120, 120, 30), 3); - + } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java index b7ac24a71b..7a0b715138 100644 --- a/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java @@ -9,23 +9,23 @@ import net.minecraft.world.World; public class AdvancedBlock extends Block { - protected AdvancedBlock(String unlocalizedName, Material material, CreativeTabs x, float blockHardness, float blockResistance, float blockLightLevel, - String blockHarvestTool, int blockHarvestLevel, SoundType BlockSound) { - super(material); - this.setBlockName(unlocalizedName); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); - this.setCreativeTab(x); - this.setHardness(blockHardness); //block Hardness - this.setResistance(blockResistance); - this.setLightLevel(blockLightLevel); - this.setHarvestLevel(blockHarvestTool, blockHarvestLevel); - this.setStepSound(BlockSound); - } - - @Override - public boolean onBlockActivated(World p_149727_1_, int p_149727_2_, int p_149727_3_, int p_149727_4_, EntityPlayer p_149727_5_, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) - { - return false; - } + protected AdvancedBlock(final String unlocalizedName, final Material material, final CreativeTabs x, final float blockHardness, final float blockResistance, final float blockLightLevel, + final String blockHarvestTool, final int blockHarvestLevel, final SoundType BlockSound) { + super(material); + this.setBlockName(unlocalizedName); + this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + this.setCreativeTab(x); + this.setHardness(blockHardness); //block Hardness + this.setResistance(blockResistance); + this.setLightLevel(blockLightLevel); + this.setHarvestLevel(blockHarvestTool, blockHarvestLevel); + this.setStepSound(BlockSound); + } + + @Override + public boolean onBlockActivated(final World p_149727_1_, final int p_149727_2_, final int p_149727_3_, final int p_149727_4_, final EntityPlayer p_149727_5_, final int p_149727_6_, final float p_149727_7_, final float p_149727_8_, final float p_149727_9_) + { + return false; + } } diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java index 2823fcc5b7..9e3a5fc37f 100644 --- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java @@ -10,56 +10,56 @@ import net.minecraft.world.World; public class BasicBlock extends BlockContainer { - public BasicBlock(final String unlocalizedName, final Material material) { - this(unlocalizedName, material, 2); - } - - public BasicBlock(final String unlocalizedName, final Material material, int harvestLevel) { - super(material); - this.setBlockName(Utils.sanitizeString(unlocalizedName)); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); - this.setCreativeTab(AddToCreativeTab.tabBlock); - this.setHardness(2.0F); - this.setResistance(6.0F); - this.setLightLevel(0.0F); - this.setHarvestLevel("pickaxe", harvestLevel); - this.setStepSound(soundTypeMetal); - } + public BasicBlock(final String unlocalizedName, final Material material) { + this(unlocalizedName, material, 2); + } + + public BasicBlock(final String unlocalizedName, final Material material, final int harvestLevel) { + super(material); + this.setBlockName(Utils.sanitizeString(unlocalizedName)); + this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabBlock); + this.setHardness(2.0F); + this.setResistance(6.0F); + this.setLightLevel(0.0F); + this.setHarvestLevel("pickaxe", harvestLevel); + this.setStepSound(soundTypeMetal); + } + + + public static enum BlockTypes { + STANDARD("blockBlock", "pickaxe", soundTypeMetal), + FRAME("blockFrameGt", "wrench", soundTypeMetal), + ORE("blockStone", "pickaxe", soundTypeStone); - - public static enum BlockTypes { - STANDARD("blockBlock", "pickaxe", soundTypeMetal), - FRAME("blockFrameGt", "wrench", soundTypeMetal), - ORE("blockStone", "pickaxe", soundTypeStone); - - private String TEXTURE_NAME; - private String HARVEST_TOOL; - private SoundType soundOfBlock; - private BlockTypes (final String textureName, final String harvestTool, final SoundType blockSound) - { - this.TEXTURE_NAME = textureName; - this.HARVEST_TOOL = harvestTool; - this.soundOfBlock = blockSound; - } + private String TEXTURE_NAME; + private String HARVEST_TOOL; + private SoundType soundOfBlock; + private BlockTypes (final String textureName, final String harvestTool, final SoundType blockSound) + { + this.TEXTURE_NAME = textureName; + this.HARVEST_TOOL = harvestTool; + this.soundOfBlock = blockSound; + } - public String getTexture() { - return TEXTURE_NAME; - } - - public String getHarvestTool(){ - return HARVEST_TOOL; - } - - public SoundType getBlockSoundType(){ - return soundOfBlock; - } - - } + public String getTexture() { + return this.TEXTURE_NAME; + } + + public String getHarvestTool(){ + return this.HARVEST_TOOL; + } + + public SoundType getBlockSoundType(){ + return this.soundOfBlock; + } + + } @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) { return null; } - + } diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java index d694557f55..c8923a9301 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -1,5 +1,9 @@ package gtPlusPlus.core.block.base; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock; import gtPlusPlus.core.item.base.itemblock.ItemBlockGtFrameBox; import gtPlusPlus.core.lib.CORE; @@ -8,10 +12,6 @@ import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockBaseModular extends BasicBlock{ @@ -21,11 +21,11 @@ public class BlockBaseModular extends BasicBlock{ protected final String thisBlockType; - public BlockBaseModular(String unlocalizedName, String blockMaterial, BlockTypes blockType, int colour) { + public BlockBaseModular(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, final int colour) { this(unlocalizedName, blockMaterial, Material.iron, blockType, colour, 2); } - - public BlockBaseModular(String unlocalizedName, String blockMaterial, Material vanillaMaterial, BlockTypes blockType, int colour, int miningLevel) { + + public BlockBaseModular(final String unlocalizedName, final String blockMaterial, final Material vanillaMaterial, final BlockTypes blockType, final int colour, final int miningLevel) { super(unlocalizedName, vanillaMaterial); this.setHarvestLevel(blockType.getHarvestTool(), miningLevel); this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture()); @@ -33,8 +33,8 @@ public class BlockBaseModular extends BasicBlock{ this.thisBlock = blockType; this.thisBlockMaterial = blockMaterial; this.thisBlockType = blockType.name().toUpperCase(); - this.setBlockName(GetProperName()); - + this.setBlockName(this.GetProperName()); + if (!CORE.DEBUG){ //Utils.LOG_INFO("=============Block Info Dump============="); //Utils.LOG_INFO("thisBlock.name().toLowerCase() - "+thisBlock.name().toLowerCase()); @@ -44,43 +44,43 @@ public class BlockBaseModular extends BasicBlock{ //Utils.LOG_INFO("blockMaterial - "+blockMaterial); //Utils.LOG_INFO("=========================================="); } - - if (thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())){ + + if (this.thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())){ LanguageRegistry.addName(this, "Block of "+blockMaterial); //Utils.LOG_INFO("Registered Block in Language Registry as: "+"Block of "+blockMaterial); } - else if (thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())){ + else if (this.thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())){ LanguageRegistry.addName(this, blockMaterial+ " Frame Box"); //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box"); } - else if (thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())){ + else if (this.thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())){ LanguageRegistry.addName(this, blockMaterial+ " Ore"); //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box"); } else { LanguageRegistry.addName(this, blockMaterial); //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial); - } - + } + //setOreDict(unlocalizedName, blockType); - if (thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())){ - GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); - //Utils.LOG_INFO("Registered Block in Block Registry as: "+"Block of "+blockMaterial); + if (this.thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())){ + GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); + //Utils.LOG_INFO("Registered Block in Block Registry as: "+"Block of "+blockMaterial); } - else if (thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())){ + else if (this.thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())){ GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); - //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box"); + //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box"); } - else if (thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())){ + else if (this.thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())){ GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); - //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box"); + //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box"); } else { GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); - //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial); + //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial); } - - + + } /** @@ -90,15 +90,15 @@ public class BlockBaseModular extends BasicBlock{ @SideOnly(Side.CLIENT) public int getRenderBlockPass() { - if (thisBlock == BlockTypes.FRAME){ - return 1; + if (this.thisBlock == BlockTypes.FRAME){ + return 1; } return 0; } - + /*@Override public String getLocalizedName() { - String tempIngot; + String tempIngot; if (thisBlock == BlockTypes.STANDARD){ tempIngot = "Block of "+thisBlockMaterial; } @@ -111,55 +111,55 @@ public class BlockBaseModular extends BasicBlock{ } return tempIngot; }*/ - + public String GetProperName() { - String tempIngot; - if (thisBlock == BlockTypes.STANDARD){ - tempIngot = "Block of "+thisBlockMaterial; + String tempIngot; + if (this.thisBlock == BlockTypes.STANDARD){ + tempIngot = "Block of "+this.thisBlockMaterial; } - else if (thisBlock == BlockTypes.FRAME){ - tempIngot = thisBlockMaterial + " Frame Box"; + else if (this.thisBlock == BlockTypes.FRAME){ + tempIngot = this.thisBlockMaterial + " Frame Box"; } - else if (thisBlock == BlockTypes.ORE){ - tempIngot = thisBlockMaterial + " Ore"; + else if (this.thisBlock == BlockTypes.ORE){ + tempIngot = this.thisBlockMaterial + " Ore"; } else { - tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot"); + tempIngot = this.getUnlocalizedName().replace("tile.blockGt", "ingot"); } return tempIngot; } @Override public boolean isOpaqueCube() - { - return false; - } + { + return false; + } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIcon) + public void registerBlockIcons(final IIconRegister iIcon) { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + thisBlock.getTexture()); + this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); } @Override - public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){ - + public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4){ + if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } - + return this.blockColour; } - - @Override - public int getRenderColor(int aMeta) { - if (this.blockColour == 0){ + + @Override + public int getRenderColor(final int aMeta) { + if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } - + return this.blockColour; - } + } } diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java index c57aa248b4..c1e58e9393 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -1,13 +1,13 @@ package gtPlusPlus.core.block.base; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockBaseOre extends BlockBaseModular{ @@ -21,18 +21,18 @@ public class BlockBaseOre extends BlockBaseModular{ return true; }*/ - public BlockBaseOre(String unlocalizedName, String blockMaterial, BlockTypes blockType, int colour) { + public BlockBaseOre(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, final int colour) { this(unlocalizedName, blockMaterial, Material.iron, blockType, colour, 2); } - - public BlockBaseOre(String unlocalizedName, String blockMaterial, Material vanillaMaterial, BlockTypes blockType, int colour, int miningLevel) { - super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel); + + public BlockBaseOre(final String unlocalizedName, final String blockMaterial, final Material vanillaMaterial, final BlockTypes blockType, final int colour, final int miningLevel) { + super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel); } /** * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha */ - + /*@Override @SideOnly(Side.CLIENT) public int getRenderBlockPass() @@ -48,30 +48,30 @@ public class BlockBaseOre extends BlockBaseModular{ @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIcon) + public void registerBlockIcons(final IIconRegister iIcon) { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + thisBlock.getTexture()); - //this.base = iIcon.registerIcon(CORE.MODID + ":" + "blockStone"); + this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); + //this.base = iIcon.registerIcon(CORE.MODID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(CORE.MODID + ":" + "blockOre_Overlay"); } @Override - public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4){ + public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4){ if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); - } + } return this.blockColour; } - - @Override - public int getRenderColor(int aMeta) { - if (this.blockColour == 0){ + + @Override + public int getRenderColor(final int aMeta) { + if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } return this.blockColour; - } - - - + } + + + } diff --git a/src/Java/gtPlusPlus/core/block/base/MetaBlock.java b/src/Java/gtPlusPlus/core/block/base/MetaBlock.java index 4009c36726..3e116eeb7f 100644 --- a/src/Java/gtPlusPlus/core/block/base/MetaBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/MetaBlock.java @@ -7,22 +7,22 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class MetaBlock extends MultiTextureBlock { +public class MetaBlock extends MultiTextureBlock { - protected MetaBlock(String unlocalizedName, Material material, SoundType soundType) { - super(unlocalizedName, material, soundType); - } - - @Override - public int damageDropped(int meta) { - return meta; - } - - @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < 6; i ++) { - list.add(new ItemStack(item, 1, i)); - } - } - -} \ No newline at end of file + protected MetaBlock(final String unlocalizedName, final Material material, final SoundType soundType) { + super(unlocalizedName, material, soundType); + } + + @Override + public int damageDropped(final int meta) { + return meta; + } + + @Override + public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) { + for (int i = 0; i < 6; i ++) { + list.add(new ItemStack(item, 1, i)); + } + } + +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java b/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java index 4f022bae6d..4e91509c6e 100644 --- a/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java @@ -7,30 +7,30 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -public class MultiTextureBlock extends Block { +public class MultiTextureBlock extends Block { public IIcon[] icons = new IIcon[6]; - - protected MultiTextureBlock(String unlocalizedName, Material material, SoundType blockSound) - { - super(material); - this.setBlockName(unlocalizedName); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); - this.setCreativeTab(AddToCreativeTab.tabBlock); - this.setHardness(2.0F); - this.setResistance(6.0F); - this.setStepSound(blockSound); - } - - @Override - public void registerBlockIcons(IIconRegister reg) { - for (int i = 0; i < 6; i ++) { - this.icons[i] = reg.registerIcon(this.textureName + "_" + i); - } - } - - @Override - public IIcon getIcon(int side, int meta) { - return this.icons[side]; - } + + protected MultiTextureBlock(final String unlocalizedName, final Material material, final SoundType blockSound) + { + super(material); + this.setBlockName(unlocalizedName); + this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabBlock); + this.setHardness(2.0F); + this.setResistance(6.0F); + this.setStepSound(blockSound); + } + + @Override + public void registerBlockIcons(final IIconRegister reg) { + for (int i = 0; i < 6; i ++) { + this.icons[i] = reg.registerIcon(this.textureName + "_" + i); + } + } + + @Override + public IIcon getIcon(final int side, final int meta) { + return this.icons[side]; + } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/block/general/FirePit.java b/src/Java/gtPlusPlus/core/block/general/FirePit.java index 4dd58df6a4..cf24025124 100644 --- a/src/Java/gtPlusPlus/core/block/general/FirePit.java +++ b/src/Java/gtPlusPlus/core/block/general/FirePit.java @@ -1,13 +1,17 @@ package gtPlusPlus.core.block.general; import static net.minecraftforge.common.util.ForgeDirection.*; -import gtPlusPlus.core.block.base.BasicBlock; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.tileentities.general.TileEntityFirepit; import java.util.List; import java.util.Random; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.block.base.BasicBlock; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.tileentities.general.TileEntityFirepit; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,10 +23,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class FirePit extends BasicBlock{ private static IIcon[] TEXTURE; @@ -40,44 +40,44 @@ public class FirePit extends BasicBlock{ GameRegistry.registerBlock(this, "blockFirePit"); LanguageRegistry.addName(this, "Fire Pit"); } - + @Override - public int tickRate(World aParWorld) { - return 30; - } - - @Override - public TileEntity createNewTileEntity(World world, int i) { - return new TileEntityFirepit(); - } - + public int tickRate(final World aParWorld) { + return 30; + } + + @Override + public TileEntity createNewTileEntity(final World world, final int i) { + return new TileEntityFirepit(); + } + @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister){ + public void registerBlockIcons(final IIconRegister par1IconRegister){ TEXTURE = new IIcon[] {par1IconRegister.registerIcon(this.getTextureName() + "_layer_0"), par1IconRegister.registerIcon(this.getTextureName() + "_layer_1")}; } @SuppressWarnings({ "rawtypes", "unchecked" }) @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List){ + public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List){ par3List.add(new ItemStack(par1, 1, 2)); } @Override - public void updateTick(World par1World, int x, int y, int z, Random par5Random){ + public void updateTick(final World par1World, final int x, final int y, final int z, final Random par5Random){ if (!par1World.isRemote){ //Sets meta. - meta = par1World.getBlockMetadata(x, y, z); + this.meta = par1World.getBlockMetadata(x, y, z); //If Raining, Put out. - if (par1World.isRaining() - && (par1World.canLightningStrikeAt(x, y, z) - || par1World.canLightningStrikeAt(x - 1, y, z) - || par1World.canLightningStrikeAt(x + 1, y, z) - || par1World.canLightningStrikeAt(x, y, z - 1) - || par1World.canLightningStrikeAt(x, y, z + 1))){ + if (par1World.isRaining() + && (par1World.canLightningStrikeAt(x, y, z) + || par1World.canLightningStrikeAt(x - 1, y, z) + || par1World.canLightningStrikeAt(x + 1, y, z) + || par1World.canLightningStrikeAt(x, y, z - 1) + || par1World.canLightningStrikeAt(x, y, z + 1))){ //Fire goes out - par1World.setBlockMetadataWithNotify(x, y, z, 1, 4); - } + par1World.setBlockMetadataWithNotify(x, y, z, 1, 4); + } if (isNeighborBurning(par1World, x, y, z)){ //Fire can ignite from a nearby flame source. par1World.setBlockMetadataWithNotify(x, y, z, 2, 4); @@ -86,9 +86,9 @@ public class FirePit extends BasicBlock{ } @Override - public Item getItemDropped(int meta, Random par2Random, int par3){ + public Item getItemDropped(final int meta, final Random par2Random, final int par3){ switch (meta){ - case 0: + case 0: return null; default: break; @@ -97,20 +97,20 @@ public class FirePit extends BasicBlock{ } @Override - public int damageDropped(int meta){ + public int damageDropped(final int meta){ return meta; } - + @Override public boolean isOpaqueCube(){ - return false; - } + return false; + } @Override public int getRenderType(){ - return -1; - } - + return -1; + } + @Override @SideOnly(Side.CLIENT) public int getRenderBlockPass(){ @@ -121,7 +121,7 @@ public class FirePit extends BasicBlock{ public boolean renderAsNormalBlock(){ return false; } - + /*@Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World aParWorld, int x, int y, int z){ return null; @@ -134,92 +134,95 @@ public class FirePit extends BasicBlock{ @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick(World p_149734_1_, int p_149734_2_, int p_149734_3_, int p_149734_4_, Random p_149734_5_){ + public void randomDisplayTick(final World p_149734_1_, final int p_149734_2_, final int p_149734_3_, final int p_149734_4_, final Random p_149734_5_){ int l; float f; float f1; float f2; - if (meta == 2) - if (p_149734_5_.nextInt(24) == 0){ - p_149734_1_.playSound((double)((float)p_149734_2_ + 0.5F), (double)((float)p_149734_3_ + 0.5F), (double)((float)p_149734_4_ + 0.5F), "fire.fire", 1.0F + p_149734_5_.nextFloat(), p_149734_5_.nextFloat() * 0.7F + 0.3F, false); + if (this.meta == 2) { + if (p_149734_5_.nextInt(24) == 0){ + p_149734_1_.playSound(p_149734_2_ + 0.5F, p_149734_3_ + 0.5F, p_149734_4_ + 0.5F, "fire.fire", 1.0F + p_149734_5_.nextFloat(), (p_149734_5_.nextFloat() * 0.7F) + 0.3F, false); + } } - if (meta == 2) - if (!World.doesBlockHaveSolidTopSurface(p_149734_1_, p_149734_2_, p_149734_3_ - 1, p_149734_4_) && !Blocks.fire.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_ - 1, p_149734_4_, UP)){ - if (Blocks.fire.canCatchFire(p_149734_1_, p_149734_2_ - 1, p_149734_3_, p_149734_4_, EAST)){ - for (l = 0; l < 2; ++l){ - f = (float)p_149734_2_ + p_149734_5_.nextFloat() * 0.1F; - f1 = (float)p_149734_3_ + p_149734_5_.nextFloat(); - f2 = (float)p_149734_4_ + p_149734_5_.nextFloat(); - p_149734_1_.spawnParticle("largesmoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + if (this.meta == 2) { + if (!World.doesBlockHaveSolidTopSurface(p_149734_1_, p_149734_2_, p_149734_3_ - 1, p_149734_4_) && !Blocks.fire.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_ - 1, p_149734_4_, UP)){ + if (Blocks.fire.canCatchFire(p_149734_1_, p_149734_2_ - 1, p_149734_3_, p_149734_4_, EAST)){ + for (l = 0; l < 2; ++l){ + f = p_149734_2_ + (p_149734_5_.nextFloat() * 0.1F); + f1 = p_149734_3_ + p_149734_5_.nextFloat(); + f2 = p_149734_4_ + p_149734_5_.nextFloat(); + p_149734_1_.spawnParticle("largesmoke", f, f1, f2, 0.0D, 0.0D, 0.0D); + } } - } - if (Blocks.fire.canCatchFire(p_149734_1_, p_149734_2_ + 1, p_149734_3_, p_149734_4_, WEST)){ - for (l = 0; l < 2; ++l){ - f = (float)(p_149734_2_ + 1) - p_149734_5_.nextFloat() * 0.1F; - f1 = (float)p_149734_3_ + p_149734_5_.nextFloat(); - f2 = (float)p_149734_4_ + p_149734_5_.nextFloat(); - p_149734_1_.spawnParticle("largesmoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + if (Blocks.fire.canCatchFire(p_149734_1_, p_149734_2_ + 1, p_149734_3_, p_149734_4_, WEST)){ + for (l = 0; l < 2; ++l){ + f = p_149734_2_ + 1 - (p_149734_5_.nextFloat() * 0.1F); + f1 = p_149734_3_ + p_149734_5_.nextFloat(); + f2 = p_149734_4_ + p_149734_5_.nextFloat(); + p_149734_1_.spawnParticle("largesmoke", f, f1, f2, 0.0D, 0.0D, 0.0D); + } } - } - if (Blocks.fire.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_ - 1, SOUTH)){ - for (l = 0; l < 2; ++l){ - f = (float)p_149734_2_ + p_149734_5_.nextFloat(); - f1 = (float)p_149734_3_ + p_149734_5_.nextFloat(); - f2 = (float)p_149734_4_ + p_149734_5_.nextFloat() * 0.1F; - p_149734_1_.spawnParticle("largesmoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + if (Blocks.fire.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_ - 1, SOUTH)){ + for (l = 0; l < 2; ++l){ + f = p_149734_2_ + p_149734_5_.nextFloat(); + f1 = p_149734_3_ + p_149734_5_.nextFloat(); + f2 = p_149734_4_ + (p_149734_5_.nextFloat() * 0.1F); + p_149734_1_.spawnParticle("largesmoke", f, f1, f2, 0.0D, 0.0D, 0.0D); + } } - } - if (Blocks.fire.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_ + 1, NORTH)){ - for (l = 0; l < 2; ++l){ - f = (float)p_149734_2_ + p_149734_5_.nextFloat(); - f1 = (float)p_149734_3_ + p_149734_5_.nextFloat(); - f2 = (float)(p_149734_4_ + 1) - p_149734_5_.nextFloat() * 0.1F; - p_149734_1_.spawnParticle("largesmoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + if (Blocks.fire.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_ + 1, NORTH)){ + for (l = 0; l < 2; ++l){ + f = p_149734_2_ + p_149734_5_.nextFloat(); + f1 = p_149734_3_ + p_149734_5_.nextFloat(); + f2 = p_149734_4_ + 1 - (p_149734_5_.nextFloat() * 0.1F); + p_149734_1_.spawnParticle("largesmoke", f, f1, f2, 0.0D, 0.0D, 0.0D); + } } - } - if (Blocks.fire.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_ + 1, p_149734_4_, DOWN)){ - for (l = 0; l < 2; ++l){ - f = (float)p_149734_2_ + p_149734_5_.nextFloat(); - f1 = (float)(p_149734_3_ + 1) - p_149734_5_.nextFloat() * 0.1F; - f2 = (float)p_149734_4_ + p_149734_5_.nextFloat(); - p_149734_1_.spawnParticle("largesmoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + if (Blocks.fire.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_ + 1, p_149734_4_, DOWN)){ + for (l = 0; l < 2; ++l){ + f = p_149734_2_ + p_149734_5_.nextFloat(); + f1 = p_149734_3_ + 1 - (p_149734_5_.nextFloat() * 0.1F); + f2 = p_149734_4_ + p_149734_5_.nextFloat(); + p_149734_1_.spawnParticle("largesmoke", f, f1, f2, 0.0D, 0.0D, 0.0D); + } } } - } - else{ - if (meta == 2) - for (l = 0; l < 3; ++l){ - f = (float)p_149734_2_ + p_149734_5_.nextFloat(); - f1 = (float)p_149734_3_ + p_149734_5_.nextFloat() * 0.5F + 0.5F; - f2 = (float)p_149734_4_ + p_149734_5_.nextFloat(); - p_149734_1_.spawnParticle("largesmoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + else{ + if (this.meta == 2) { + for (l = 0; l < 3; ++l){ + f = p_149734_2_ + p_149734_5_.nextFloat(); + f1 = p_149734_3_ + (p_149734_5_.nextFloat() * 0.5F) + 0.5F; + f2 = p_149734_4_ + p_149734_5_.nextFloat(); + p_149734_1_.spawnParticle("largesmoke", f, f1, f2, 0.0D, 0.0D, 0.0D); + } + } } } } - @SideOnly(Side.CLIENT) - public static IIcon getFireIcon(int p_149840_1_){ - return FirePit.TEXTURE[p_149840_1_]; - } + @SideOnly(Side.CLIENT) + public static IIcon getFireIcon(final int p_149840_1_){ + return FirePit.TEXTURE[p_149840_1_]; + } - @Override + @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(int p_149691_1_, int p_149691_2_){ - return FirePit.TEXTURE[0]; - } - - private static boolean isNeighborBurning(World world, int x, int y, int z){ - return canCatchFire(world, x + 1, y, z, WEST ) || - canCatchFire(world, x - 1, y, z, EAST ) || - canCatchFire(world, x, y - 1, z, UP ) || - canCatchFire(world, x, y + 1, z, DOWN ) || - canCatchFire(world, x, y, z - 1, SOUTH) || - canCatchFire(world, x, y, z + 1, NORTH); - } - - public static boolean canCatchFire(World world, int x, int y, int z, ForgeDirection face) - { - return world.getBlock(x, y, z).isFireSource(world, x, y, z, face); - } - + public IIcon getIcon(final int p_149691_1_, final int p_149691_2_){ + return FirePit.TEXTURE[0]; + } + + private static boolean isNeighborBurning(final World world, final int x, final int y, final int z){ + return canCatchFire(world, x + 1, y, z, WEST ) || + canCatchFire(world, x - 1, y, z, EAST ) || + canCatchFire(world, x, y - 1, z, UP ) || + canCatchFire(world, x, y + 1, z, DOWN ) || + canCatchFire(world, x, y, z - 1, SOUTH) || + canCatchFire(world, x, y, z + 1, NORTH); + } + + public static boolean canCatchFire(final World world, final int x, final int y, final int z, final ForgeDirection face) + { + return world.getBlock(x, y, z).isFireSource(world, x, y, z, face); + } + } diff --git a/src/Java/gtPlusPlus/core/block/general/LightGlass.java b/src/Java/gtPlusPlus/core/block/general/LightGlass.java index 5aa9f5b818..fd2d575158 100644 --- a/src/Java/gtPlusPlus/core/block/general/LightGlass.java +++ b/src/Java/gtPlusPlus/core/block/general/LightGlass.java @@ -1,29 +1,28 @@ package gtPlusPlus.core.block.general; +import java.util.Random; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; - -import java.util.Random; - import net.minecraft.block.BlockBreakable; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class LightGlass extends BlockBreakable { private int state = 0; - private int a = 255; + private final int a = 255; private int r = 255; private int g = 0; private int b = 0; private int hex; - public LightGlass(Material mat, boolean bool) + public LightGlass(final Material mat, final boolean bool) { super("blockMFEffect", mat, bool); this.setCreativeTab(AddToCreativeTab.tabBlock); @@ -38,7 +37,7 @@ public class LightGlass extends BlockBreakable * Returns the quantity of items to drop on block destruction. */ @Override - public int quantityDropped(Random rand) + public int quantityDropped(final Random rand) { return 0; } @@ -73,47 +72,53 @@ public class LightGlass extends BlockBreakable @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIcon) + public void registerBlockIcons(final IIconRegister iIcon) { this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "blockMFEffect"); } @Override //http://stackoverflow.com/questions/31784658/how-can-i-loop-through-all-rgb-combinations-in-rainbow-order-in-java - public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4) { - if(state == 0){ - g++; - if(g == 255) - state = 1; + if(this.state == 0){ + this.g++; + if(this.g == 255) { + this.state = 1; + } } - if(state == 1){ - r--; - if(r == 0) - state = 2; + if(this.state == 1){ + this.r--; + if(this.r == 0) { + this.state = 2; + } } - if(state == 2){ - b++; - if(b == 255) - state = 3; + if(this.state == 2){ + this.b++; + if(this.b == 255) { + this.state = 3; + } } - if(state == 3){ - g--; - if(g == 0) - state = 4; + if(this.state == 3){ + this.g--; + if(this.g == 0) { + this.state = 4; + } } - if(state == 4){ - r++; - if(r == 255) - state = 5; + if(this.state == 4){ + this.r++; + if(this.r == 255) { + this.state = 5; + } } - if(state == 5){ - b--; - if(b == 0) - state = 0; + if(this.state == 5){ + this.b--; + if(this.b == 0) { + this.state = 0; + } } - hex = (a << 24) + (r << 16) + (g << 8) + (b); - return hex; + this.hex = (this.a << 24) + (this.r << 16) + (this.g << 8) + (this.b); + return this.hex; } /** @@ -121,8 +126,8 @@ public class LightGlass extends BlockBreakable */ @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int posX, int posY, int posZ, Random random){ + public void randomDisplayTick(final World world, final int posX, final int posY, final int posZ, final Random random){ Utils.spawnFX(world, posX, posY, posZ, "smoke", "cloud"); - + } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java index 7fa890b6c8..8ac4e2df8d 100644 --- a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java +++ b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java @@ -1,14 +1,16 @@ package gtPlusPlus.core.block.general.antigrief; import static gtPlusPlus.core.block.ModBlocks.blockGriefSaver; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityReverter; -import gtPlusPlus.core.util.Utils; import java.util.List; import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.tileentities.general.TileEntityReverter; +import gtPlusPlus.core.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -23,254 +25,267 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TowerDevice extends Block { - private static IIcon TEX_ANTIBUILDER; - public static final int META_ANTIBUILDER = 9; - private boolean bUnbreakable; - - public TowerDevice() - { - super(Material.wood); - setHardness(10.0F); - setResistance(35.0F); - setStepSound(Block.soundTypeWood); - setCreativeTab(AddToCreativeTab.tabMachines); - } - - public int tickRate() - { - return 15; - } - - public void saveNBTData(NBTTagCompound aNBT) { - aNBT.setBoolean("bUnbreakable", bUnbreakable); + private static IIcon TEX_ANTIBUILDER; + public static final int META_ANTIBUILDER = 9; + private boolean bUnbreakable; + + public TowerDevice() + { + super(Material.wood); + this.setHardness(10.0F); + this.setResistance(35.0F); + this.setStepSound(Block.soundTypeWood); + this.setCreativeTab(AddToCreativeTab.tabMachines); + } + + public int tickRate() + { + return 15; + } + + public void saveNBTData(final NBTTagCompound aNBT) { + aNBT.setBoolean("bUnbreakable", this.bUnbreakable); + } + + public void loadNBTData(final NBTTagCompound aNBT) { + this.bUnbreakable = aNBT.getBoolean("bUnbreakable"); + } + + @Override + public IIcon getIcon(final int side, final int meta) + { + return TEX_ANTIBUILDER; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(final IIconRegister par1IconRegister) + { + TEX_ANTIBUILDER = par1IconRegister.registerIcon(CORE.MODID + ":" + "blockAntiGrief"); + } + + @Override + public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) + { + par3List.add(new ItemStack(par1, 1, 9)); + } + + @Override + public boolean onBlockActivated(final World par1World, final int x, final int y, final int z, final EntityPlayer par5EntityPlayer, final int par6, final float par7, final float par8, final float par9) + { + final int meta = par1World.getBlockMetadata(x, y, z); + return false; + } + + @Override + public float getExplosionResistance(final Entity par1Entity, final World world, final int x, final int y, final int z, final double explosionX, final double explosionY, final double explosionZ) + { + final int meta = world.getBlockMetadata(x, y, z); + return super.getExplosionResistance(par1Entity, world, x, y, z, explosionX, explosionY, explosionZ); + } + + @Override + public float getBlockHardness(final World world, final int x, final int y, final int z) + { + final int meta = world.getBlockMetadata(x, y, z); + return super.getBlockHardness(world, x, y, z); + } + + public static boolean areNearbyLockBlocks(final World world, final int x, final int y, final int z) + { + boolean locked = false; + for (int dx = x - 2; dx <= (x + 2); dx++) { + for (int dy = y - 2; dy <= (y + 2); dy++) { + for (int dz = z - 2; dz <= (z + 2); dz++) { + if ((world.getBlock(dx, dy, dz) == blockGriefSaver) && (world.getBlockMetadata(dx, dy, dz) == 4)) { + locked = true; + } + } + } + } + return locked; + } + + public static void unlockBlock(final World par1World, final int x, final int y, final int z) + { + final Block thereBlockID = par1World.getBlock(x, y, z); + final int thereBlockMeta = par1World.getBlockMetadata(x, y, z); + if ((thereBlockID == blockGriefSaver) || (thereBlockMeta == 4)) + { + changeToBlockMeta(par1World, x, y, z, 5); + par1World.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "random.click", 0.3F, 0.6F); + } + } + + private static void changeToBlockMeta(final World par1World, final int x, final int y, final int z, final int meta) + { + final Block thereBlockID = par1World.getBlock(x, y, z); + if ((thereBlockID == blockGriefSaver)) + { + par1World.setBlock(x, y, z, thereBlockID, meta, 3); + par1World.markBlockRangeForRenderUpdate(x, y, z, x, y, z); + par1World.notifyBlocksOfNeighborChange(x, y, z, thereBlockID); + } + } + + @Override + public void onBlockAdded(final World par1World, final int x, final int y, final int z) + { + final int meta = par1World.getBlockMetadata(x, y, z); + if (!par1World.isRemote) { + + } + } + + @Override + public void onNeighborBlockChange(final World par1World, final int x, final int y, final int z, final Block myBlockID) + { + final int meta = par1World.getBlockMetadata(x, y, z); + if (!par1World.isRemote) + { + + } + } + + @Override + public void updateTick(final World par1World, final int x, final int y, final int z, final Random par5Random) + { + if (!par1World.isRemote) + { + final int meta = par1World.getBlockMetadata(x, y, z); + } + } + + private void letsBuild(final World par1World, final int x, final int y, final int z) + { + + } + + private boolean isInactiveTrapCharged(final World par1World, final int x, final int y, final int z) + { + return false; + } + + private boolean isReactorReady(final World world, final int x, final int y, final int z) + { + if ((world.getBlock(x, y + 1, z) != Blocks.redstone_block) || + (world.getBlock(x, y - 1, z) != Blocks.redstone_block) || + (world.getBlock(x + 1, y, z) != Blocks.redstone_block) || + (world.getBlock(x - 1, y, z) != Blocks.redstone_block) || + (world.getBlock(x, y, z + 1) != Blocks.redstone_block) || + (world.getBlock(x, y, z - 1) != Blocks.redstone_block)) { + return false; + } + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(final World par1World, final int x, final int y, final int z, final Random par5Random) + { + final int meta = par1World.getBlockMetadata(x, y, z); + if ((meta == 3) || (meta == 1) || (meta == 9)) { + for (int i = 0; i < 1; i++) { + this.sparkle(par1World, x, y, z, par5Random); + } + } + } + + public void sparkle(final World world, final int x, final int y, final int z, final Random rand) + { + final double offset = 0.0625D; + for (int side = 0; side < 6; side++) + { + double rx = x + rand.nextFloat(); + double ry = y + rand.nextFloat(); + double rz = z + rand.nextFloat(); + if ((side == 0) && (!world.getBlock(x, y + 1, z).isOpaqueCube())) { + ry = y + 1 + offset; + } + if ((side == 1) && (!world.getBlock(x, y - 1, z).isOpaqueCube())) { + ry = (y + 0) - offset; + } + if ((side == 2) && (!world.getBlock(x, y, z + 1).isOpaqueCube())) { + rz = z + 1 + offset; + } + if ((side == 3) && (!world.getBlock(x, y, z - 1).isOpaqueCube())) { + rz = (z + 0) - offset; + } + if ((side == 4) && (!world.getBlock(x + 1, y, z).isOpaqueCube())) { + rx = x + 1 + offset; + } + if ((side == 5) && (!world.getBlock(x - 1, y, z).isOpaqueCube())) { + rx = (x + 0) - offset; + } + if ((rx < x) || (rx > (x + 1)) || (ry < 0.0D) || (ry > (y + 1)) || (rz < z) || (rz > (z + 1))) { + world.spawnParticle("reddust", rx, ry, rz, 0.0D, 0.0D, 0.0D); + } + } + } + + public static void checkAndActivateVanishBlock(final World world, final int x, final int y, final int z) + { + final Block thereID = world.getBlock(x, y, z); + final int thereMeta = world.getBlockMetadata(x, y, z); + } + + public static void changeToActiveVanishBlock(final World par1World, final int x, final int y, final int z, final int meta) + { + changeToBlockMeta(par1World, x, y, z, meta); + par1World.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "random.pop", 0.3F, 0.6F); + + final Block thereBlockID = par1World.getBlock(x, y, z); + par1World.scheduleBlockUpdate(x, y, z, thereBlockID, getTickRateFor(thereBlockID, meta, par1World.rand)); + } + + private static int getTickRateFor(final Block thereBlockID, final int meta, final Random rand) + { + return 15; + } + + @Override + public int getLightValue(final IBlockAccess world, final int x, final int y, final int z) + { + final Block blockID = world.getBlock(x, y, z); + final int meta = world.getBlockMetadata(x, y, z); + if (blockID != this) { + return 0; + } + return 10; + } + + @Override + public boolean hasTileEntity(final int metadata) + { + return (metadata == 0); + } + + @Override + public TileEntity createTileEntity(final World world, final int metadata) + { + if (metadata == 0) { + Utils.LOG_INFO("I have been created. [Antigriefer]"+this.getLocalizedName()); + return new TileEntityReverter(); + } + return null; + } + + @Override + public Item getItemDropped(final int meta, final Random par2Random, final int par3) + { + switch (meta) + { + case 0: + return null; + } + return Item.getItemFromBlock(this); } - public void loadNBTData(NBTTagCompound aNBT) { - bUnbreakable = aNBT.getBoolean("bUnbreakable"); + @Override + public int damageDropped(final int meta) + { + return meta; } - - public IIcon getIcon(int side, int meta) - { - return TEX_ANTIBUILDER; - } - - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) - { - TEX_ANTIBUILDER = par1IconRegister.registerIcon(CORE.MODID + ":" + "blockAntiGrief"); - } - - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) - { - par3List.add(new ItemStack(par1, 1, 9)); - } - - public boolean onBlockActivated(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) - { - int meta = par1World.getBlockMetadata(x, y, z); - return false; - } - - public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) - { - int meta = world.getBlockMetadata(x, y, z); - return super.getExplosionResistance(par1Entity, world, x, y, z, explosionX, explosionY, explosionZ); - } - - public float getBlockHardness(World world, int x, int y, int z) - { - int meta = world.getBlockMetadata(x, y, z); - return super.getBlockHardness(world, x, y, z); - } - - public stat