From 04514282c08ebefdb3e68a46db34092f72be2316 Mon Sep 17 00:00:00 2001 From: miozune Date: Wed, 17 May 2023 00:01:01 +0900 Subject: Remove a lot of unused classes (#629) --- src/main/java/gtPlusPlus/core/block/ModBlocks.java | 4 - .../gtPlusPlus/core/block/base/AdvancedBlock.java | 41 - .../gtPlusPlus/core/block/base/BlockBaseOre.java | 74 -- .../java/gtPlusPlus/core/block/base/MetaBlock.java | 35 - .../core/block/base/MultiTextureBlock.java | 37 - .../core/block/general/antigrief/TowerDevice.java | 260 ---- .../redstone/BlockGenericRedstoneEmitter.java | 4 - .../core/block/machine/BlockGtFrameBox.java | 41 - .../core/block/machine/Machine_WireiusDeletus.java | 4 - .../gtPlusPlus/core/client/model/ModelEggBox.java | 68 - .../core/client/model/tabula/ModelTabulaBase.java | 36 - .../core/client/renderer/RenderPotionthrow.java | 98 -- .../client/renderer/tabula/RenderTabulaBase.java | 50 - .../java/gtPlusPlus/core/common/CommonProxy.java | 6 - .../gtPlusPlus/core/creative/AddToCreativeTab.java | 7 - .../creative/tabs/MiscUtilCreativeTabBlock.java | 26 - .../creative/tabs/MiscUtilCreativeTabMachines.java | 17 - .../creative/tabs/MiscUtilCreativeTabMisc.java | 17 - .../creative/tabs/MiscUtilCreativeTabOther.java | 17 - .../creative/tabs/MiscUtilCreativeTabTools.java | 17 - .../gtPlusPlus/core/entity/EntityTeleportFX.java | 242 ---- .../core/gui/machine/GUI_ScrollTest.java | 220 ---- .../gtPlusPlus/core/handler/CraftingManager.java | 13 - .../core/handler/events/PlayerTickHandler.java | 15 - .../handler/events/UnbreakableBlockManager.java | 123 -- .../core/handler/render/CapeHandler.java | 115 -- .../handler/workbench/Workbench_RecipeSorter.java | 37 - .../core/inventories/InventoryWorkbenchChest.java | 160 --- .../inventories/InventoryWorkbenchCrafting.java | 177 --- .../InventoryWorkbenchHoloCrafting.java | 120 -- .../inventories/InventoryWorkbenchHoloSlots.java | 206 --- .../core/inventories/InventoryWorkbenchTools.java | 160 --- .../InventoryWorkbenchToolsElectric.java | 165 --- src/main/java/gtPlusPlus/core/item/ModItems.java | 15 - .../gtPlusPlus/core/item/base/BaseItemBrain.java | 94 -- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 27 - .../gtPlusPlus/core/item/base/BaseItemLoot.java | 105 -- .../core/item/base/BaseItemWithCharge.java | 67 - .../gtPlusPlus/core/item/chemistry/OilChem.java | 35 - .../gtPlusPlus/core/item/effects/RarityEffect.java | 37 - .../gtPlusPlus/core/item/effects/RarityEpic.java | 28 - .../gtPlusPlus/core/item/effects/RarityRare.java | 28 - .../core/item/effects/RarityUncommon.java | 22 - .../core/item/general/BedLocator_Base.java | 95 -- .../core/item/general/ItemCreativeTab.java | 60 - .../core/item/general/NuclearFuelRodBase.java | 188 --- .../core/item/general/fuelrods/FuelRod_Base.java | 205 --- .../item/general/fuelrods/FuelRod_Thorium.java | 12 - .../general/rfchargingpack/ChargingPackBase.java | 107 -- .../gtPlusPlus/core/item/init/ItemsMultiTools.java | 66 - .../core/item/materials/MaterialHandler.java | 7 - .../core/item/tool/misc/ConnectedBlockFinder.java | 127 -- .../core/item/tool/misc/FakeGregtechTool.java | 73 -- .../item/wearable/armour/base/BaseArmourBoots.java | 9 - .../item/wearable/armour/base/BaseArmourChest.java | 9 - .../item/wearable/armour/base/BaseArmourLegs.java | 9 - .../item/wearable/armour/hazmat/ArmourHazmat.java | 119 -- src/main/java/gtPlusPlus/core/material/Ion.java | 30 - .../core/material/gregtech/CustomGTMaterials.java | 39 - .../java/gtPlusPlus/core/proxy/ServerProxy.java | 1 + .../core/recipe/Gregtech_Recipe_Adder.java | 86 -- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 15 - .../core/slots/SlotChemicalPlantInput.java | 45 - src/main/java/gtPlusPlus/core/slots/SlotFrame.java | 24 - .../gtPlusPlus/core/slots/SlotGtToolElectric.java | 92 -- .../java/gtPlusPlus/core/slots/SlotOutput.java | 92 -- src/main/java/gtPlusPlus/core/slots/SlotRTG.java | 24 - .../core/tileentities/base/TILE_ENTITY_BASE.java | 39 - .../core/tileentities/base/TilePoweredGT.java | 289 ----- .../tileentities/general/TileEntityReverter.java | 288 ----- .../java/gtPlusPlus/core/util/data/EnumUtils.java | 45 - .../gtPlusPlus/core/util/data/LoggingUtils.java | 50 - .../java/gtPlusPlus/core/util/data/UUIDUtils.java | 24 - .../gtPlusPlus/core/util/debug/DEBUG_INIT.java | 30 - .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 53 - .../util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java | 953 -------------- .../core/util/debug/DEBUG_ScreenOverlay.java | 45 - .../core/util/debug/DEBUG_TimerThread.java | 84 -- .../core/util/debug/UtilityGL11Debug.java | 1338 -------------------- .../core/util/minecraft/ClientUtils.java | 17 - .../core/util/minecraft/EnergyUtils.java | 125 -- .../gregtech/material/MaterialBuilder.java | 55 - .../gregtech/recipehandlers/GregtechRecipe.java | 4 - .../core/util/minecraft/network/CustomPacket.java | 41 - .../core/util/minecraft/network/PacketBuilder.java | 25 - .../util/minecraft/network/PacketDispatcher.java | 99 -- .../core/util/minecraft/network/PacketHandler.java | 73 -- .../util/minecraft/network/PacketTileEntity.java | 83 -- src/main/java/gtPlusPlus/core/util/sys/Log.java | 25 - 89 files changed, 1 insertion(+), 8388 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java delete mode 100644 src/main/java/gtPlusPlus/core/block/base/MetaBlock.java delete mode 100644 src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java delete mode 100644 src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java delete mode 100644 src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java delete mode 100644 src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java delete mode 100644 src/main/java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java delete mode 100644 src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java delete mode 100644 src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java delete mode 100644 src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java delete mode 100644 src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java delete mode 100644 src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java delete mode 100644 src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java delete mode 100644 src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java delete mode 100644 src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java delete mode 100644 src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/CraftingManager.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java delete mode 100644 src/main/java/gtPlusPlus/core/item/chemistry/OilChem.java delete mode 100644 src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java delete mode 100644 src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java delete mode 100644 src/main/java/gtPlusPlus/core/item/effects/RarityRare.java delete mode 100644 src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java delete mode 100644 src/main/java/gtPlusPlus/core/item/materials/MaterialHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java delete mode 100644 src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java delete mode 100644 src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java delete mode 100644 src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java delete mode 100644 src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java delete mode 100644 src/main/java/gtPlusPlus/core/material/Ion.java delete mode 100644 src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java delete mode 100644 src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java delete mode 100644 src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotFrame.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotOutput.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotRTG.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java delete mode 100644 src/main/java/gtPlusPlus/core/util/data/EnumUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/data/LoggingUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/data/UUIDUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java delete mode 100644 src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java delete mode 100644 src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java delete mode 100644 src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java delete mode 100644 src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java delete mode 100644 src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/ClientUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java delete mode 100644 src/main/java/gtPlusPlus/core/util/sys/Log.java (limited to 'src/main/java/gtPlusPlus/core') diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java index d5dd4958da..9957ae3f92 100644 --- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java @@ -107,8 +107,6 @@ public final class ModBlocks { public static void init() { Logger.INFO("Initializing Blocks."); - // blockGriefSaver = new - // TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault"); registerBlocks(); } @@ -126,8 +124,6 @@ public final class ModBlocks { blockFirePit = new FirePit(); blockFishTrap = new FishTrap(); blockInfiniteFLuidTank = new FluidTankInfinite(); - // blockOreFluorite = new BlockBaseOre.oldOreBlock("oreFluorite", "Fluorite", Material.rock, BlockTypes.ORE, - // Utils.rgbtoHexValue(120, 120, 30), 3); blockMiningExplosive = new MiningExplosives(); blockHellfire = new HellFire(); blockProjectTable = new Machine_ProjectTable(); diff --git a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java deleted file mode 100644 index 932fe7b48d..0000000000 --- a/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java +++ /dev/null @@ -1,41 +0,0 @@ -package gtPlusPlus.core.block.base; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public class AdvancedBlock extends Block { - - 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(GTPlusPlus.ID + ":" + 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; - } - - @Override - public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index c7d8866ec5..208838859b 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -130,78 +130,4 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { @Override public void registerBlockIcons(IIconRegister p_149651_1_) {} - public static class oldOreBlock extends BlockBaseModular implements ITexturedBlock { - - public oldOreBlock(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, - final int colour) { - this(unlocalizedName, blockMaterial, net.minecraft.block.material.Material.iron, blockType, colour, 2); - } - - public oldOreBlock(final String unlocalizedName, final String blockMaterial, - final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, - final int colour, final int miningLevel) { - super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel); - } - - @Override - public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { - return false; - } - - @Override - public int getRenderType() { - if (CustomOreBlockRenderer.INSTANCE != null) { - return CustomOreBlockRenderer.INSTANCE.mRenderID; - } - return super.getRenderType(); - } - - @Override - public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int ordinalSide) { - return Blocks.stone.getIcon(0, 0); - } - - @Override - public IIcon getIcon(int ordinalSide, int aMeta) { - return Blocks.stone.getIcon(0, 0); - } - - /** - * GT Texture Handler - */ - - // .08 compat - IIconContainer[] hiddenTextureArray; - - @Override - public ITexture[] getTexture(ForgeDirection side) { - return getTexture(null, side); - } - - @Override - public ITexture[] getTexture(Block block, ForgeDirection side) { - if (this.blockMaterial != null) { - GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture( - blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], - this.blockMaterial.getRGBA()); - return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet }; - } - - if (hiddenTextureArray == null) { - try { - Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES"); - if (o != null) { - hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class); - } - if (hiddenTextureArray == null) { - hiddenTextureArray = new IIconContainer[6]; - } - } catch (IllegalArgumentException | IllegalAccessException e) { - hiddenTextureArray = new IIconContainer[6]; - } - } - return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) }; - } - } } diff --git a/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java b/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java deleted file mode 100644 index 5995fb7d49..0000000000 --- a/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java +++ /dev/null @@ -1,35 +0,0 @@ -package gtPlusPlus.core.block.base; - -import java.util.List; - -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; - -public class MetaBlock extends MultiTextureBlock { - - 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)); - } - } - - @Override - public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java deleted file mode 100644 index bb6aee18d5..0000000000 --- a/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java +++ /dev/null @@ -1,37 +0,0 @@ -package gtPlusPlus.core.block.base; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - -import gtPlusPlus.core.creative.AddToCreativeTab; - -public class MultiTextureBlock extends Block { - - public IIcon[] icons = new IIcon[6]; - - protected MultiTextureBlock(final String unlocalizedName, final Material material, final SoundType blockSound) { - super(material); - this.setBlockName(unlocalizedName); - this.setBlockTextureName(GTPlusPlus.ID + ":" + 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]; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java deleted file mode 100644 index 58fbced6c3..0000000000 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java +++ /dev/null @@ -1,260 +0,0 @@ -package gtPlusPlus.core.block.general.antigrief; - -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gtPlusPlus.core.block.ModBlocks.blockGriefSaver; - -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -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; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.tileentities.general.TileEntityReverter; - -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); - 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(GTPlusPlus.ID + ":" + "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 ordinalSide = 0; ordinalSide < 6; ordinalSide++) { - double rx = x + rand.nextFloat(); - double ry = y + rand.nextFloat(); - double rz = z + rand.nextFloat(); - if ((ordinalSide == 0) && (!world.getBlock(x, y + 1, z).isOpaqueCube())) { - ry = y + 1 + offset; - } - if ((ordinalSide == 1) && (!world.getBlock(x, y - 1, z).isOpaqueCube())) { - ry = (y + 0) - offset; - } - if ((ordinalSide == 2) && (!world.getBlock(x, y, z + 1).isOpaqueCube())) { - rz = z + 1 + offset; - } - if ((ordinalSide == 3) && (!world.getBlock(x, y, z - 1).isOpaqueCube())) { - rz = (z + 0) - offset; - } - if ((ordinalSide == 4) && (!world.getBlock(x + 1, y, z).isOpaqueCube())) { - rx = x + 1 + offset; - } - if ((ordinalSide == 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) { - Logger.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); - } - - @Override - public int damageDropped(final int meta) { - return meta; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java deleted file mode 100644 index fd5b996160..0000000000 --- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java +++ /dev/null @@ -1,4 +0,0 @@ -package gtPlusPlus.core.block.general.redstone; - -public class BlockGenericRedstoneEmitter { -} diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java deleted file mode 100644 index fa28ef38f9..0000000000 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java +++ /dev/null @@ -1,41 +0,0 @@ -package gtPlusPlus.core.block.machine; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.block.material.Material; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.world.IBlockAccess; - -import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; -import gtPlusPlus.core.block.base.MetaBlock; - -public class BlockGtFrameBox extends MetaBlock { - - private int[] colours; - private int totalColours; - - public BlockGtFrameBox(final String unlocalizedName, final Material material, final BlockTypes blockTypeENUM, - final boolean recolour, final int... colour) { - super(unlocalizedName, material, blockTypeENUM.getBlockSoundType()); - this.setBlockTextureName(GTPlusPlus.ID + ":" + "blockGtFrame"); - this.setHarvestLevel(blockTypeENUM.getHarvestTool(), 2); - if (recolour && ((colour != null) && (colour.length > 0))) { - this.colours = colour; - this.totalColours = this.colours.length; - } - } - - @Override - public int colorMultiplier(final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_, - final int p_149720_4_) { - for (final int i : this.colours) {} - - return super.colorMultiplier(p_149720_1_, p_149720_2_, p_149720_3_, p_149720_4_); - } - - @Override - public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java deleted file mode 100644 index 688dfbb742..0000000000 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java +++ /dev/null @@ -1,4 +0,0 @@ -package gtPlusPlus.core.block.machine; - -public class Machine_WireiusDeletus { // A Block that removes GT Cable and Wire from it's inventory. -} diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java b/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java deleted file mode 100644 index 49a0878678..0000000000 --- a/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java +++ /dev/null @@ -1,68 +0,0 @@ -package gtPlusPlus.core.client.model; - -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.client.model.tabula.ModelTabulaBase; -import gtPlusPlus.core.client.renderer.tabula.RenderTabulaBase; -import gtPlusPlus.core.tileentities.general.TileEntityEggBox; - -/** - * ModelEggBox - Alkalus Created using Tabula 4.1.1 - */ -public class ModelEggBox extends ModelTabulaBase { - - private final AutoMap> mParts = new AutoMap>(); - - private static RenderTabulaBase mRendererInstance; - - public ModelRenderer bottom; - // EggBox_full.png - - public ModelEggBox() { - super(64, 64); - this.textureWidth = 64; - this.textureHeight = 64; - - this.bottom = new ModelRenderer(this, 0, 19); - this.bottom.setRotationPoint(1.0F, 6.0F, 1.0F); - this.bottom.addBox(0.0F, 0.0F, 0.0F, 14, 10, 14, 0.0F); - mParts.add(new Pair(bottom, 0f)); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { - // Logger.INFO("Rendering EggBox"); - this.bottom.render(f5); - } - - /** - * This is a helper function from Tabula to set the rotation of model parts - */ - @Override - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } - - @Override - protected AutoMap> getModelParts() { - AutoMap> aParts = new AutoMap>(); - aParts.add(new Pair(bottom, 0.0625F)); - return aParts; - // return mParts; - } - - public static RenderTabulaBase getRenderer() { - if (mRendererInstance == null) { - mRendererInstance = new RenderTabulaBase( - new ModelEggBox(), - "textures/blocks/TileEntities/EggBox_full.png", - TileEntityEggBox.class); - } - return mRendererInstance; - } -} diff --git a/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java b/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java deleted file mode 100644 index 3c13c83391..0000000000 --- a/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java +++ /dev/null @@ -1,36 +0,0 @@ -package gtPlusPlus.core.client.model.tabula; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; - -/** - * ModelEggBox - Alkalus Created using Tabula 4.1.1 - */ -public abstract class ModelTabulaBase extends ModelBase { - - public ModelTabulaBase(int aTexWidth, int aTexHeight) { - this.textureWidth = aTexWidth; - this.textureHeight = aTexHeight; - } - - protected abstract AutoMap> getModelParts(); - - public void renderAll() { - for (Pair part : getModelParts()) { - // Logger.INFO("Rendering EggBox"); - part.getKey().render(part.getValue()); - } - } - - /** - * This is a helper function from Tabula to set the rotation of model parts - */ - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } -} diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java deleted file mode 100644 index 0f962df641..0000000000 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java +++ /dev/null @@ -1,98 +0,0 @@ -package gtPlusPlus.core.client.renderer; - -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.Entity; -import net.minecraft.entity.projectile.EntityPotion; -import net.minecraft.item.Item; -import net.minecraft.item.ItemPotion; -import net.minecraft.potion.PotionHelper; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class RenderPotionthrow extends Render { - - private Item mRenderItem; - private int mDamage; - - public RenderPotionthrow(Item p_i1259_1_, int p_i1259_2_) { - this.mRenderItem = p_i1259_1_; - this.mDamage = p_i1259_2_; - } - - public RenderPotionthrow(Item p_i1260_1_) { - this(p_i1260_1_, 0); - } - - /** - * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then - * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic - * (Render> 16 & 255) / 255.0F; - float f3 = (i >> 8 & 255) / 255.0F; - float f4 = (i & 255) / 255.0F; - GL11.glColor3f(f2, f3, f4); - GL11.glPushMatrix(); - this.func_77026_a(tessellator, ItemPotion.func_94589_d("overlay")); - GL11.glPopMatrix(); - GL11.glColor3f(1.0F, 1.0F, 1.0F); - } - - this.func_77026_a(tessellator, iicon); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - } - } - - /** - * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture. - */ - @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { - return TextureMap.locationItemsTexture; - } - - private void func_77026_a(Tessellator p_77026_1_, IIcon p_77026_2_) { - float f = p_77026_2_.getMinU(); - float f1 = p_77026_2_.getMaxU(); - float f2 = p_77026_2_.getMinV(); - float f3 = p_77026_2_.getMaxV(); - float f4 = 1.0F; - float f5 = 0.5F; - float f6 = 0.25F; - GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - p_77026_1_.startDrawingQuads(); - p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); - p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); - p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); - p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); - p_77026_1_.draw(); - } -} diff --git a/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java b/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java deleted file mode 100644 index ed3808e815..0000000000 --- a/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java +++ /dev/null @@ -1,50 +0,0 @@ -package gtPlusPlus.core.client.renderer.tabula; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.client.model.tabula.ModelTabulaBase; - -@SideOnly(Side.CLIENT) -public class RenderTabulaBase extends TileEntitySpecialRenderer { - - private final ModelTabulaBase mModel; - private final ResourceLocation mTexture; - private final Class mTileClass; - - public final int mRenderID; - public final RenderTabulaBase mInstance; - - public RenderTabulaBase(ModelTabulaBase aModel, String aTexturePath, Class aTileClass) { - mModel = aModel; - mTexture = new ResourceLocation(GTPlusPlus.ID, aTexturePath); - mTileClass = aTileClass; - this.mRenderID = RenderingRegistry.getNextAvailableRenderId(); - mInstance = this; - } - - public void renderTileEntityAt(Object aTile, double p_147500_2_, double p_147500_4_, double p_147500_6_, - float p_147500_8_) { - if (mTileClass.isInstance(aTile)) { - // Logger.INFO("Rendering EggBox"); - this.bindTexture(mTexture); - mModel.renderAll(); - } - } - - @Override - public void renderTileEntityAt(TileEntity aTile, double p_147500_2_, double p_147500_4_, double p_147500_6_, - float p_147500_8_) { - if (mTileClass != null && aTile != null) { - if (mTileClass.isInstance(aTile)) { - this.renderTileEntityAt((Object) aTile, p_147500_2_, p_147500_4_, p_147500_6_, p_147500_8_); - } - } - } -} diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index d97cb80ba6..b5652af595 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -47,7 +47,6 @@ import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.tileentities.ModTileEntities; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.debug.DEBUG_INIT; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.player.PlayerCache; @@ -104,11 +103,6 @@ public class CommonProxy { } public void init(final FMLInitializationEvent e) { - // Debug Loading - if (CORE_Preloader.DEBUG_MODE) { - DEBUG_INIT.registerHandlers(); - } - registerCustomItemsForMaterials(); ModBlocks.blockCustomMobSpawner = new BlockGenericSpawner(); CI.init(); diff --git a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java index a960ec618a..1a01f47ef5 100644 --- a/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java +++ b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java @@ -16,13 +16,6 @@ public class AddToCreativeTab { public static void initialiseTabs() { // GT_CreativeTab - /* - * tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); tabMisc = new - * MiscUtilCreativeTabMisc("MiscUtilMiscTab"); tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); - * tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); tabOther = new - * MiscUtilCreativeTabOther("MiscUtilOtherTab"); tabBOP = new MiscUtilsBOPTab("MiscUtilBOP"); - */ - tabBlock = new GT_CreativeTab("GTPP_BLOCKS", "GT++ Blocks"); tabMisc = new GT_CreativeTab("GTPP_MISC", "GT++ Misc"); tabTools = new GT_CreativeTab("GTPP_TOOLS", "GT++ Tools"); diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java deleted file mode 100644 index f7b2477398..0000000000 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java +++ /dev/null @@ -1,26 +0,0 @@ -package gtPlusPlus.core.creative.tabs; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class MiscUtilCreativeTabBlock extends CreativeTabs { - - public MiscUtilCreativeTabBlock(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Item.getItemFromBlock(Blocks.bedrock); - } - - @SideOnly(Side.CLIENT) - @Override - public int func_151243_f() { - return 0; - } -} diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java deleted file mode 100644 index 57fb663d40..0000000000 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.core.creative.tabs; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; -import net.minecraft.item.Item; - -public class MiscUtilCreativeTabMachines extends CreativeTabs { - - public MiscUtilCreativeTabMachines(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Items.netherbrick; - } -} diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java deleted file mode 100644 index 397474065f..0000000000 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.core.creative.tabs; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; -import net.minecraft.item.Item; - -public class MiscUtilCreativeTabMisc extends CreativeTabs { - - public MiscUtilCreativeTabMisc(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Items.painting; - } -} diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java deleted file mode 100644 index 7fb99db6f0..0000000000 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.core.creative.tabs; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; -import net.minecraft.item.Item; - -public class MiscUtilCreativeTabOther extends CreativeTabs { - - public MiscUtilCreativeTabOther(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Items.repeater; - } -} diff --git a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java deleted file mode 100644 index 1c81c6b952..0000000000 --- a/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.core.creative.tabs; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; -import net.minecraft.item.Item; - -public class MiscUtilCreativeTabTools extends CreativeTabs { - - public MiscUtilCreativeTabTools(final String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Items.diamond_pickaxe; - } -} diff --git a/src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java b/src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java deleted file mode 100644 index d010624b8c..0000000000 --- a/src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java +++ /dev/null @@ -1,242 +0,0 @@ -package gtPlusPlus.core.entity; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class EntityTeleportFX extends Entity { - - /** 'x' location the eye should float towards. */ - private double targetX; - /** 'y' location the eye should float towards. */ - private double targetY; - /** 'z' location the eye should float towards. */ - private double targetZ; - - private int despawnTimer; - private boolean shatterOrDrop; - - public EntityTeleportFX(final World p_i1757_1_) { - super(p_i1757_1_); - this.setSize(0.25F, 0.25F); - } - - @Override - protected void entityInit() {} - - /** - * Checks if the entity is in range to render by using the past in distance and comparing it to its average edge - * length * 64 * renderDistanceWeight Args: distance - */ - @Override - @SideOnly(Side.CLIENT) - public boolean isInRangeToRenderDist(final double p_70112_1_) { - double d1 = this.boundingBox.getAverageEdgeLength() * 4.0D; - d1 *= 64.0D; - return p_70112_1_ < (d1 * d1); - } - - public EntityTeleportFX(final World p_i1758_1_, final double p_i1758_2_, final double p_i1758_4_, - final double p_i1758_6_) { - super(p_i1758_1_); - this.despawnTimer = 0; - this.setSize(0.25F, 0.25F); - this.setPosition(p_i1758_2_, p_i1758_4_, p_i1758_6_); - this.yOffset = 0.0F; - } - - /** - * The location the eye should float/move towards. Currently used for moving towards the nearest stronghold. Args: - * strongholdX, strongholdY, strongholdZ - */ - public void moveTowards(final double p_70220_1_, final int p_70220_3_, final double p_70220_4_) { - final double d2 = p_70220_1_ - this.posX; - final double d3 = p_70220_4_ - this.posZ; - final float f = MathHelper.sqrt_double((d2 * d2) + (d3 * d3)); - - if (f > 12.0F) { - this.targetX = this.posX + ((d2 / f) * 12.0D); - this.targetZ = this.posZ + ((d3 / f) * 12.0D); - this.targetY = this.posY + 8.0D; - } else { - this.targetX = p_70220_1_; - this.targetY = p_70220_3_; - this.targetZ = p_70220_4_; - } - - this.despawnTimer = 0; - this.shatterOrDrop = this.rand.nextInt(5) > 0; - } - - /** - * Sets the velocity to the args. Args: x, y, z - */ - @Override - @SideOnly(Side.CLIENT) - public void setVelocity(final double p_70016_1_, final double p_70016_3_, final double p_70016_5_) { - this.motionX = p_70016_1_; - this.motionY = p_70016_3_; - this.motionZ = p_70016_5_; - - if ((this.prevRotationPitch == 0.0F) && (this.prevRotationYaw == 0.0F)) { - final float f = MathHelper.sqrt_double((p_70016_1_ * p_70016_1_) + (p_70016_5_ * p_70016_5_)); - this.prevRotationYaw = this.rotationYaw = (float) ((Math.atan2(p_70016_1_, p_70016_5_) * 180.0D) / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float) ((Math.atan2(p_70016_3_, f) * 180.0D) / Math.PI); - } - } - - /** - * Called to update the entity's position/logic. - */ - @Override - public void onUpdate() { - this.lastTickPosX = this.posX; - this.lastTickPosY = this.posY; - this.lastTickPosZ = this.posZ; - super.onUpdate(); - this.posX += this.motionX; - this.posY += this.motionY; - this.posZ += this.motionZ; - final float f = MathHelper.sqrt_double((this.motionX * this.motionX) + (this.motionZ * this.motionZ)); - this.rotationYaw = (float) ((Math.atan2(this.motionX, this.motionZ) * 180.0D) / Math.PI); - - for (this.rotationPitch = (float) ((Math.atan2(this.motionY, f) * 180.0D) / Math.PI); (this.rotationPitch - - this.prevRotationPitch) < -180.0F; this.prevRotationPitch -= 360.0F) { - ; - } - - while ((this.rotationPitch - this.prevRotationPitch) >= 180.0F) { - this.prevRotationPitch += 360.0F; - } - - while ((this.rotationYaw - this.prevRotationYaw) < -180.0F) { - this.prevRotationYaw -= 360.0F; - } - - while ((this.rotationYaw - this.prevRotationYaw) >= 180.0F) { - this.prevRotationYaw += 360.0F; - } - - this.rotationPitch = this.prevRotationPitch + ((this.rotationPitch - this.prevRotationPitch) * 0.2F); - this.rotationYaw = this.prevRotationYaw + ((this.rotationYaw - this.prevRotationYaw) * 0.2F); - - if (!this.worldObj.isRemote) { - final double d0 = this.targetX - this.posX; - final double d1 = this.targetZ - this.posZ; - final float f1 = (float) Math.sqrt((d0 * d0) + (d1 * d1)); - final float f2 = (float) Math.atan2(d1, d0); - double d2 = f + ((f1 - f) * 0.0025D); - - if (f1 < 1.0F) { - d2 *= 0.8D; - this.motionY *= 0.8D; - } - - this.motionX = Math.cos(f2) * d2; - this.motionZ = Math.sin(f2) * d2; - - if (this.posY < this.targetY) { - this.motionY += (1.0D - this.motionY) * 0.014999999664723873D; - } else { - this.motionY += (-1.0D - this.motionY) * 0.014999999664723873D; - } - } - - final float f3 = 0.25F; - - if (this.isInWater()) { - for (int i = 0; i < 4; ++i) { - this.worldObj.spawnParticle( - "bubble", - this.posX - (this.motionX * f3), - this.posY - (this.motionY * f3), - this.posZ - (this.motionZ * f3), - this.motionX, - this.motionY, - this.motionZ); - } - } else { - this.worldObj.spawnParticle( - "portal", - ((this.posX - (this.motionX * f3)) + (this.rand.nextDouble() * 0.6D)) - 0.3D, - this.posY - (this.motionY * f3) - 0.5D, - ((this.posZ - (this.motionZ * f3)) + (this.rand.nextDouble() * 0.6D)) - 0.3D, - this.motionX, - this.motionY, - this.motionZ); - } - - if (!this.worldObj.isRemote) { - this.setPosition(this.posX, this.posY, this.posZ); - ++this.despawnTimer; - - if ((this.despawnTimer > 80) && !this.worldObj.isRemote) { - this.setDead(); - - if (this.shatterOrDrop) { - this.worldObj.spawnEntityInWorld( - new EntityItem( - this.worldObj, - this.posX, - this.posY, - this.posZ, - new ItemStack(Items.ender_eye))); - } else { - this.worldObj.playAuxSFX( - 2003, - (int) Math.round(this.posX), - (int) Math.round(this.posY), - (int) Math.round(this.posZ), - 0); - } - } - } - } - - /** - * (abstract) Protected helper method to write subclass entity data to NBT. - */ - @Override - public void writeEntityToNBT(final NBTTagCompound p_70014_1_) {} - - /** - * (abstract) Protected helper method to read subclass entity data from NBT. - */ - @Override - public void readEntityFromNBT(final NBTTagCompound p_70037_1_) {} - - @Override - @SideOnly(Side.CLIENT) - public float getShadowSize() { - return 0.0F; - } - - /** - * Gets how bright this entity is. - */ - @Override - public float getBrightness(final float p_70013_1_) { - return 1.0F; - } - - @Override - @SideOnly(Side.CLIENT) - public int getBrightnessForRender(final float p_70070_1_) { - return 15728880; - } - - /** - * If returns false, the item will not inflict any damage against entities. - */ - @Override - public boolean canAttackWithItem() { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java deleted file mode 100644 index b4a945ad7e..0000000000 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java +++ /dev/null @@ -1,220 +0,0 @@ -package gtPlusPlus.core.gui.machine; - -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiOptionButton; -import net.minecraft.client.gui.GuiResourcePackAvailable; -import net.minecraft.client.gui.GuiResourcePackSelected; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.resources.I18n; -import net.minecraft.client.resources.ResourcePackListEntry; -import net.minecraft.client.resources.ResourcePackListEntryFound; -import net.minecraft.client.resources.ResourcePackRepository; -import net.minecraft.client.resources.ResourcePackRepository.Entry; -import net.minecraft.util.Util; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.lwjgl.Sys; - -import com.google.common.collect.Lists; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -@SideOnly(Side.CLIENT) -public class GUI_ScrollTest extends GuiScreen { - - private static final Logger logger = LogManager.getLogger(); - private GuiScreen aThisGUIScreen; - private List field_146966_g; - private List field_146969_h; - private GuiResourcePackAvailable MapOfFreeResourcePacks; - private GuiResourcePackSelected MapOfActiveResourcePacks; - - public GUI_ScrollTest(GuiScreen p_i45050_1_) { - this.aThisGUIScreen = p_i45050_1_; - } - - /** - * Adds the buttons (and other controls) to the screen in question. - */ - @Override - @SuppressWarnings("unchecked") - public void initGui() { - this.buttonList.add( - new GuiOptionButton( - 2, - this.width / 2 - 154, - this.height - 48, - I18n.format("resourcePack.openFolder", new Object[0]))); - this.buttonList.add( - new GuiOptionButton(1, this.width / 2 + 4, this.height - 48, I18n.format("gui.done", new Object[0]))); - this.field_146966_g = new ArrayList(); - this.field_146969_h = new ArrayList(); - ResourcePackRepository resourcepackrepository = this.mc.getResourcePackRepository(); - resourcepackrepository.updateRepositoryEntriesAll(); - ArrayList arraylist = Lists.newArrayList(resourcepackrepository.getRepositoryEntriesAll()); - arraylist.removeAll(resourcepackrepository.getRepositoryEntries()); - Iterator iterator = arraylist.iterator(); - ResourcePackRepository.Entry entry; - - while (iterator.hasNext()) { - entry = (ResourcePackRepository.Entry) iterator.next(); - // this.field_146966_g.add(new ResourcePackListEntryFound(this, entry)); - } - - iterator = Lists.reverse(resourcepackrepository.getRepositoryEntries()).iterator(); - - while (iterator.hasNext()) { - entry = (ResourcePackRepository.Entry) iterator.next(); - // this.field_146969_h.add(new ResourcePackListEntryFound(this, entry)); - } - - // this.field_146969_h.add(new ResourcePackListEntryDefault(this)); - this.MapOfFreeResourcePacks = new GuiResourcePackAvailable(this.mc, 200, this.height, this.field_146966_g); - this.MapOfFreeResourcePacks.setSlotXBoundsFromLeft(this.width / 2 - 4 - 200); - this.MapOfFreeResourcePacks.registerScrollButtons(7, 8); -