From 325a5f154e8d8d7dac6c03deb632a0041b3d69ca Mon Sep 17 00:00:00 2001 From: miozune Date: Tue, 17 Oct 2023 13:37:11 +0900 Subject: Remove unused classes --- src/main/java/gtPlusPlus/RoadMap.java | 47 -- .../gtPlusPlus/api/helpers/MaterialHelper.java | 80 --- .../gtPlusPlus/api/interfaces/IEntityCatcher.java | 20 - .../java/gtPlusPlus/api/interfaces/IToolable.java | 22 - .../gtPlusPlus/api/objects/GregtechException.java | 25 - .../api/objects/data/ConcurrentHashSet.java | 17 - .../gtPlusPlus/api/objects/data/ConcurrentSet.java | 53 -- .../gtPlusPlus/api/objects/data/FlexiblePair.java | 39 -- .../api/objects/minecraft/FakeBlockPos.java | 272 --------- .../api/objects/minecraft/FakeWorld.java | 154 ----- .../objects/minecraft/FormattedTooltipString.java | 23 - .../gtPlusPlus/core/block/base/BlockBaseNBT.java | 86 --- .../gtPlusPlus/core/fluids/BlockFluidBase.java | 106 ---- .../java/gtPlusPlus/core/fluids/FactoryFluid.java | 67 --- .../gtPlusPlus/core/gui/item/box/GuiBaseBox.java | 124 ---- .../gtPlusPlus/core/gui/item/box/LunchBoxGui.java | 14 - .../gtPlusPlus/core/gui/item/box/MagicBagGui.java | 14 - .../gtPlusPlus/core/gui/item/box/ToolBoxGui.java | 14 - .../java/gtPlusPlus/core/item/base/BaseEuItem.java | 636 --------------------- .../core/item/base/dusts/BaseItemDustAbstract.java | 43 -- .../item/base/dusts/decimal/BaseItemCentidust.java | 57 -- .../item/base/dusts/decimal/BaseItemDecidust.java | 57 -- .../core/item/base/foods/BaseItemFood.java | 45 -- .../core/item/base/foods/BaseItemHotFood.java | 84 --- .../core/item/base/itemblock/FluidItemBlock.java | 60 -- .../core/item/base/itemblock/ItemBlockDoor.java | 101 ---- .../item/base/itemblock/ItemBlockGtFrameBox.java | 91 --- .../core/item/base/itemblock/ItemBlockNBT.java | 96 ---- .../core/item/tool/misc/box/BaseBoxItem.java | 75 --- .../core/item/tool/misc/box/ContainerBoxBase.java | 314 ---------- .../item/tool/misc/box/CustomBoxInventory.java | 216 ------- .../java/gtPlusPlus/core/players/FakeFarmer.java | 85 --- .../java/gtPlusPlus/core/slots/SlotBlockedInv.java | 39 -- .../java/gtPlusPlus/core/slots/SlotFuelRod.java | 52 -- .../java/gtPlusPlus/core/slots/SlotGtTool.java | 30 - .../java/gtPlusPlus/core/slots/SlotLunchBox.java | 29 - .../gtPlusPlus/core/slots/SlotMagicToolBag.java | 29 - .../java/gtPlusPlus/core/slots/SlotToolBox.java | 107 ---- .../core/tileentities/base/TileBasicTank.java | 157 ----- .../redstone/TileEntityRedstoneHandler.java | 441 -------------- .../gtPlusPlus/core/util/minecraft/FoodUtils.java | 61 -- .../minecraft/particles/BlockBreakParticles.java | 17 - .../java/gtPlusPlus/core/util/sys/SystemUtils.java | 85 --- .../xmod/galacticraft/util/GalacticUtils.java | 160 ------ .../helpers/autocrafter/AC_Helper_Container.java | 113 ---- 45 files changed, 4457 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/RoadMap.java delete mode 100644 src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java delete mode 100644 src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java delete mode 100644 src/main/java/gtPlusPlus/api/interfaces/IToolable.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/GregtechException.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/data/ConcurrentSet.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/minecraft/FormattedTooltipString.java delete mode 100644 src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java delete mode 100644 src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java delete mode 100644 src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockDoor.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/box/CustomBoxInventory.java delete mode 100644 src/main/java/gtPlusPlus/core/players/FakeFarmer.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotBlockedInv.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotGtTool.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotToolBox.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/FoodUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java delete mode 100644 src/main/java/gtPlusPlus/core/util/sys/SystemUtils.java delete mode 100644 src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java (limited to 'src/main/java/gtPlusPlus') diff --git a/src/main/java/gtPlusPlus/RoadMap.java b/src/main/java/gtPlusPlus/RoadMap.java deleted file mode 100644 index e10c40d1cf..0000000000 --- a/src/main/java/gtPlusPlus/RoadMap.java +++ /dev/null @@ -1,47 +0,0 @@ -package gtPlusPlus; - -/** - * This Class purely exists to note down ideas and or plans to (re)implement things. - * - * @author Alkalus - * - */ -public class RoadMap { - - // Reorganization of Item, Block and Common Class loading. - /* - * So, due to the complex/silly way I've done things, I've ran into some circular loading problems around the mod. - * Issues occur where Classes like CI.java try access the GregtechItemList.java objects before they're actually set. - * A plan should be created to organize the best scheme to load things in the best order. - */ - - // Recreation of GUIs for all Multiblocks - /* - * Most Multi's use generic or straight out wrong GUI's on the controller. I'd like to go back and recreate all of - * these. Some could even benefit from a totally new type of UI (Instead of Text issues, just change a 2x2px area - * between red and green for status lights) These advanced GUIs are probably out of my capability, but if anyone - * thinks they're a good idea, I'll give them a go. - */ - - // Better Integration with GTNH - /* - * Refactor things to be more common, refactor things to automatically switch between GTNH and standard variants - * without having to over-abuse CORE.GTNH switches everywhere. Most of this can be done via expanding CI.java, so - * that we have automated handlers for everything (IE. getX(5) will get 5x of the correct version of X) - */ - - /* - * Thallium - Everglades only. (Mostly useless) Technetium - Has some recipes but seem to be dead ends so - * unobtainable. Polonium - Unobtainable. (Radioactive, Mostly Useless) Francium - Unobtainable. (Radioactive, - * Mostly Useless) Promethium - Unobtainable. Radium - Everglades only. (Do use, Moderately Rare) Actinium - - * Unobtainable. (Radioactive, Do use) Proactinium - Unobtainable. (Do use) Neptunium - Has some recipes but seem to - * be dead ends so unobtainable. Curium - Fusion only. Berkelium - Unobtainable. Californium - Fusion only. - * Einsteinium - Unobtainable. Fermium - Unobtainable. Strontium - Everglades only. (Do use 1) Iodine - Everglades - * only. Dysprosium - Everglades only. (Do use 1) Rhenium - Weird ABS recipe only. Flerovium - Unobtainable. Dubnium - * - Unobtainable. Seaborgium - Unobtainable. Bohrium - Unobtainable. Hassium - Unobtainable. Meitnerium - - * Unobtainable. Darmstadtium - Unobtainable. Roentgenium - Unobtainable. Copernicium - Unobtainable. Nihonium - - * Unobtainable. Moscovium - Unobtainable. Livermorium - Unobtainable. Tennessine - Unobtainable. Nobelium - - * Unobtainable. Lawrencium - Unobtainable. Astatine - Unobtainable. (Radioactive, Mostly Useless) - */ - -} diff --git a/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java deleted file mode 100644 index 4bfa15855c..0000000000 --- a/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java +++ /dev/null @@ -1,80 +0,0 @@ -package gtPlusPlus.api.helpers; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class MaterialHelper { - - public static ItemStack getComponentFromMaterial(OrePrefixes oreprefix, Material material, int amount) { - return ItemUtils.getOrePrefixStack(oreprefix, material, amount); - } - - /** - * Generates a 16 Fluid Pipe - * - * @see {@code Example: Copper 16x Pipe (Materials.Copper, Materials.Copper.mName, "Copper", ID, 60, 1000, true)} - * @param aMaterial - Pipe Material - * @param name - Pipe Internal name - * @param displayName - Pipe Display Name - * @param aID - Pipe's Meta ID - * @param baseCapacity - Pipes Base Capacity - * @param heatCapacity - Pipe Max Temp - * @param gasProof - Is Gas Proof? - * @return A boolean which corresponds to whether or not the Pipe was registered to the Ore Dictionary. - */ - public static boolean generateHexadecuplePipe(Materials aMaterial, String name, String displayName, int aID, - int baseCapacity, int heatCapacity, boolean gasProof) { - try { - Class aPipeEntity = GT_MetaPipeEntity_Fluid.class; - Constructor constructor = aPipeEntity.getConstructor( - new Class[] { int.class, String.class, String.class, float.class, Materials.class, int.class, - int.class, boolean.class, int.class }); - if (constructor != null) { - GT_MetaPipeEntity_Fluid aPipe; - aPipe = constructor.newInstance( - aID, - "GT_Pipe_" + name + "_Hexadecuple", - "Hexadecuple " + displayName + " Fluid Pipe", - 1.0F, - aMaterial, - baseCapacity, - heatCapacity, - gasProof, - 16); - return GT_OreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L)); - } - - } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException - | IllegalArgumentException | InvocationTargetException e) {} - return false; - } - - public static ItemStack getCells(Materials aMaterial, int i) { - return ItemUtils.getOrePrefixStack(OrePrefixes.cell, aMaterial, i); - } - - public static ItemStack getDust(Materials aMaterial, int i) { - return ItemUtils.getOrePrefixStack(OrePrefixes.dust, aMaterial, i); - } - - public static ItemStack getDustSmall(Materials aMaterial, int i) { - return ItemUtils.getOrePrefixStack(OrePrefixes.dustSmall, aMaterial, i); - } - - public static ItemStack getDustTiny(Materials aMaterial, int i) { - return ItemUtils.getOrePrefixStack(OrePrefixes.dustTiny, aMaterial, i); - } - - public static ItemStack getGems(Materials aMaterial, int i) { - return ItemUtils.getOrePrefixStack(OrePrefixes.gem, aMaterial, i); - } -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java b/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java deleted file mode 100644 index e3aa00e7a1..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java +++ /dev/null @@ -1,20 +0,0 @@ -package gtPlusPlus.api.interfaces; - -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import gtPlusPlus.api.objects.minecraft.BlockPos; - -public interface IEntityCatcher { - - public boolean hasEntity(ItemStack aStack); - - public Entity getStoredEntity(World aWorld, ItemStack aStack); - - public boolean setStoredEntity(World aWorld, ItemStack aStack, Entity aEntity); - - public Class getStoredEntityClass(ItemStack aStack); - - public boolean spawnStoredEntity(World aWorld, ItemStack aStack, BlockPos aPos); -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/IToolable.java b/src/main/java/gtPlusPlus/api/interfaces/IToolable.java deleted file mode 100644 index d696585b76..0000000000 --- a/src/main/java/gtPlusPlus/api/interfaces/IToolable.java +++ /dev/null @@ -1,22 +0,0 @@ -package gtPlusPlus.api.interfaces; - -public interface IToolable { - - public boolean isScrewdriverable(); - - public boolean onScrewdriverLMB(); - - public boolean onScrewdriverRMB(); - - public boolean isWrenchable(); - - public boolean onWrenchLMB(); - - public boolean onWrenchRMB(); - - public boolean isMalletable(); - - public boolean onMalletLMB(); - - public boolean onMalletRMB(); -} diff --git a/src/main/java/gtPlusPlus/api/objects/GregtechException.java b/src/main/java/gtPlusPlus/api/objects/GregtechException.java deleted file mode 100644 index 083a15f790..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/GregtechException.java +++ /dev/null @@ -1,25 +0,0 @@ -package gtPlusPlus.api.objects; - -public class GregtechException extends Throwable { - - private static final long serialVersionUID = 3601884582161841486L; - - public GregtechException(String aError) { - this(aError, true); - } - - public GregtechException(String aError, boolean aIsVerbose) { - Logger.ERROR("Throwing GT++ Exception!"); - Logger.ERROR("[EXCEPTION] " + aError); - if (aIsVerbose) { - Logger.INFO("Throwing GT++ Exception!"); - Logger.INFO("[EXCEPTION] " + aError); - printStackTrace(); - } - } - - @Override - public void printStackTrace() { - super.printStackTrace(); - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java b/src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java deleted file mode 100644 index 1d6cad3a38..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java +++ /dev/null @@ -1,17 +0,0 @@ -package gtPlusPlus.api.objects.data; - -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -public class ConcurrentHashSet extends ConcurrentSet { - - private static final long serialVersionUID = -1293478938482781728L; - - public ConcurrentHashSet() { - this(new ConcurrentHashMap()); - } - - public ConcurrentHashSet(ConcurrentMap defaultMapType) { - super(defaultMapType); - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/data/ConcurrentSet.java b/src/main/java/gtPlusPlus/api/objects/data/ConcurrentSet.java deleted file mode 100644 index aaa759edfa..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/data/ConcurrentSet.java +++ /dev/null @@ -1,53 +0,0 @@ -package gtPlusPlus.api.objects.data; - -import java.io.Serializable; -import java.util.AbstractSet; -import java.util.Iterator; -import java.util.concurrent.ConcurrentMap; - -public abstract class ConcurrentSet extends AbstractSet implements Serializable { - - private static final long serialVersionUID = -6761513279741915432L; - - private final ConcurrentMap mInternalMap; - - private int mInternalID = 0; - - /** - * Creates a new instance which wraps the specified {@code map}. - */ - public ConcurrentSet(ConcurrentMap aMap) { - mInternalMap = aMap; - } - - @Override - public int size() { - return mInternalMap.size(); - } - - @Override - public boolean contains(Object o) { - return mInternalMap.containsKey(o); - } - - @Override - public boolean add(E o) { - return mInternalMap.putIfAbsent(mInternalID++, o) == null; - } - - @Override - public boolean remove(Object o) { - return mInternalMap.remove(o) != null; - } - - @Override - public void clear() { - this.mInternalID = 0; - mInternalMap.clear(); - } - - @Override - public Iterator iterator() { - return mInternalMap.values().iterator(); - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java b/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java deleted file mode 100644 index 8ec21dab59..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java +++ /dev/null @@ -1,39 +0,0 @@ -package gtPlusPlus.api.objects.data; - -import java.io.Serializable; - -import com.google.common.base.Objects; - -public class FlexiblePair implements Serializable { - - /** - * SVUID - */ - private static final long serialVersionUID = 1250550491092812443L; - - private final K key; - private V value; - - public FlexiblePair(final K key, final V value) { - this.key = key; - this.value = value; - } - - public final K getKey() { - return this.key; - } - - public final V getValue() { - return this.value; - } - - public final void setValue(V aObj) { - value = aObj; - } - - @Override - public int hashCode() { - Integer aCode = Objects.hashCode(getKey(), getValue()); - return aCode != null ? aCode : super.hashCode(); - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java deleted file mode 100644 index 4af3df18ba..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java +++ /dev/null @@ -1,272 +0,0 @@ -package gtPlusPlus.api.objects.minecraft; - -import java.util.HashSet; -import java.util.Set; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; - -import gtPlusPlus.api.objects.data.AutoMap; - -public class FakeBlockPos extends BlockPos { - - private static final long serialVersionUID = -6442245826092414593L; - private transient Block aBlockAtPos; - private int aBlockMetaAtPos = 0; - - public static FakeBlockPos generateBlockPos(String sUUID) { - String[] s2 = sUUID.split("@"); - return new FakeBlockPos(s2); - } - - public FakeBlockPos(String[] s) { - this(Integer.parseInt(s[1]), Integer.parseInt(s[2]), Integer.parseInt(s[3]), Integer.parseInt(s[0])); - } - - public FakeBlockPos(int x, int y, int z, Block aBlock, int aMeta) { - this(x, y, z, 0); - aBlockAtPos = aBlock; - aBlockMetaAtPos = aMeta; - } - - private FakeBlockPos(int x, int y, int z, int dim) { - this(x, y, z, DimensionManager.getWorld(dim)); - } - - private FakeBlockPos(int x, int y, int z, World dim) { - super(x, y, z, null); - } - - @Override - public String getLocationString() { - String S = "" + this.xPos + "@" + this.yPos + "@" + this.zPos; - return S; - } - - @Override - public String getUniqueIdentifier() { - String S = "" + this.xPos - + "@" - + this.yPos - + "@" - + this.zPos - + this.aBlockAtPos.getLocalizedName() - + "@" - + this.aBlockMetaAtPos; - return S; - } - - @Override - public int hashCode() { - int hash = 5; - hash += (13 * this.xPos); - hash += (19 * this.yPos); - hash += (31 * this.zPos); - hash += (17 * this.dim); - return hash; - } - - @Override - public boolean equals(Object other) { - if (other == null) { - return false; - } - if (other == this) { - return true; - } - if (!(other instanceof FakeBlockPos)) { - return false; - } - FakeBlockPos otherPoint = (FakeBlockPos) other; - return this.xPos == otherPoint.xPos && this.yPos == otherPoint.yPos && this.zPos == otherPoint.zPos; - } - - public int distanceFrom(FakeBlockPos target) { - if (target.dim != this.dim) { - return Short.MIN_VALUE; - } - return distanceFrom(target.xPos, target.yPos, target.zPos); - } - - /** - * - * @param x X coordinate of target. - * @param y Y coordinate of target. - * @param z Z coordinate of target. - * @return square of distance - */ - @Override - public int distanceFrom(int x, int y, int z) { - int distanceX = this.xPos - x; - int distanceY = this.yPos - y; - int distanceZ = this.zPos - z; - return distanceX * distanceX + distanceY * distanceY + distanceZ * distanceZ; - } - - public boolean isWithinRange(FakeBlockPos target, int range) { - if (target.dim != this.dim) { - return false; - } - return isWithinRange(target.xPos, target.yPos, target.zPos, range); - } - - @Override - public boolean isWithinRange(int x, int y, int z, int range) { - return distanceFrom(x, y, z) <= (range * range); - } - - @Override - public FakeBlockPos getUp() { - return new FakeBlockPos(this.xPos, this.yPos + 1, this.zPos, this.dim); - } - - @Override - public FakeBlockPos getDown() { - return new FakeBlockPos(this.xPos, this.yPos - 1, this.zPos, this.dim); - } - - @Override - public FakeBlockPos getXPos() { - return new FakeBlockPos(this.xPos + 1, this.yPos, this.zPos, this.dim); - } - - @Override - public FakeBlockPos getXNeg() { - return new FakeBlockPos(this.xPos - 1, this.yPos, this.zPos, this.dim); - } - - @Override - public FakeBlockPos getZPos() { - return new FakeBlockPos(this.xPos, this.yPos, this.zPos + 1, this.dim); - } - - @Override - public FakeBlockPos getZNeg() { - return new FakeBlockPos(this.xPos, this.yPos, this.zPos - 1, this.dim); - } - - @Override - public AutoMap getSurroundingBlocks() { - AutoMap sides = new AutoMap(); - sides.put(getUp()); - sides.put(getDown()); - sides.put(getXPos()); - sides.put(getXNeg()); - sides.put(getZPos()); - sides.put(getZNeg()); - return sides; - } - - @Override - public Block getBlockAtPos() { - return getBlockAtPos(this); - } - - public Block getBlockAtPos(FakeBlockPos pos) { - return getBlockAtPos(world, pos); - } - - public Block getBlockAtPos(World world, FakeBlockPos pos) { - return aBlockAtPos; - } - - @Override - public int getMetaAtPos() { - return getMetaAtPos(this); - } - - public int getMetaAtPos(FakeBlockPos pos) { - return getMetaAtPos(world, pos); - } - - public int getMetaAtPos(World world, FakeBlockPos pos) { - return aBlockMetaAtPos; - } - - @Override - public boolean hasSimilarNeighbour() { - return hasSimilarNeighbour(false); - } - - /** - * @param strict - Does this check Meta Data? - * @return - Does this block have a neighbour that is the same? - */ - @Override - public boolean hasSimilarNeighbour(boolean strict) { - for (BlockPos g : getSurroundingBlocks().values()) { - if (getBlockAtPos(g) == getBlockAtPos()) { - if (!strict) { - return true; - } else { - if (getMetaAtPos() == getMetaAtPos(g)) { - return true; - } - } - } - } - return false; - } - - @Override - public AutoMap getSimilarNeighbour() { - return getSimilarNeighbour(false); - } - - /** - * @param strict - Does this check Meta Data? - * @return - Does this block have a neighbour that is the same? - */ - @Override - public AutoMap getSimilarNeighbour(boolean strict) { - AutoMap sides = new AutoMap(); - for (BlockPos g : getSurroundingBlocks().values()) { - if (getBlockAtPos(g) == getBlockAtPos()) { - if (!strict) { - sides.put(g); - } else { - if (getMetaAtPos() == getMetaAtPos(g)) { - sides.put(g); - } - } - } - } - return sides; - } - - @Override - public Set getValidNeighboursAndSelf() { - AutoMap h = getSimilarNeighbour(true); - h.put(this); - Set result = new HashSet(); - for (BlockPos f : h.values()) { - result.add(f); - } - return result; - } - - /** - * Called when a plant grows on this block, only implemented for saplings using the WorldGen*Trees classes right - * now. Modder may implement this for custom plants. This does not use ForgeDirection, because large/huge trees can - * be located in non-representable direction, so the source location is specified. Currently this just changes the - * block to dirt if it was grass. - * - * Note: This happens DURING the generation, the generation may not be complete when this is called. - * - * @param world Current world - * @param x Soil X - * @param y Soil Y - * @param z Soil Z - * @param sourceX Plant growth location X - * @param sourceY Plant growth location Y - * @param sourceZ Plant growth location Z - */ - public void onPlantGrow(FakeWorld world, int x, int y, int z, int sourceX, int sourceY, int sourceZ) { - if (getBlockAtPos() == Blocks.grass || getBlockAtPos() == Blocks.farmland) { - this.aBlockAtPos = Blocks.dirt; - this.aBlockMetaAtPos = 0; - } - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java deleted file mode 100644 index be158a38cd..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java +++ /dev/null @@ -1,154 +0,0 @@ -package gtPlusPlus.api.objects.minecraft; - -import java.util.HashMap; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.util.ForgeDirection; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class FakeWorld implements IBlockAccess { - - public static HashMap mStaticFakeWorldData; - - public HashMap mFakeWorldData = new HashMap(); - - /** - * Must be an odd number - */ - private int aWorldSize = 99; - - private final int aDistanceFromOrigin; - private final int aWorldHeight; - - public FakeWorld() { - this(99); - } - - public FakeWorld(int aSize) { - if (MathUtils.isNumberEven(aSize)) { - aSize++; - } - aWorldSize = aSize; - aDistanceFromOrigin = ((aWorldSize - 1) / 2); - aWorldHeight = aDistanceFromOrigin >= 255 ? 255 : aDistanceFromOrigin; - Logger.WARNING("Created a Fake World with data:"); - Logger.WARNING("World Size: " + aWorldSize); - Logger.WARNING("Distance from Origin in each dir: " + aDistanceFromOrigin); - Logger.WARNING("World Height: " + aWorldHeight); - init(); - } - - public void init() { - - /* - * if (mStaticFakeWorldData == null) { Logger.WARNING("Setting all Blocks in Fake World to Air."); - * mStaticFakeWorldData = new HashMap(); for (int y=0;y<=aWorldHeight;y++) { for (int - * x=-aDistanceFromOrigin;x<=aDistanceFromOrigin;x++) { for (int - * z=-aDistanceFromOrigin;z<=aDistanceFromOrigin;z++) { FakeBlockPos aTempPos = new FakeBlockPos(x, y, z, - * Blocks.air, 0); mStaticFakeWorldData.put(aTempPos.getLocationString(), aTempPos); } } } } - */ - // if (mStaticFakeWorldData != null) { - // Logger.WARNING(" Instancing static air world."); - mFakeWorldData = new HashMap(); - // mFakeWorldData = (HashMap) mStaticFakeWorldData.clone(); - // } - - // Logger.WARNING("Initialisation of FakeWorld is now complete."); - } - - public FakeBlockPos getBlockAtCoords(int x, int y, int z) { - String S = "" + x + "@" + y + "@" + z; - FakeBlockPos aBlock = mFakeWorldData.get(S); - if (aBlock == null) { - return new FakeBlockPos(x, y, z, Blocks.air, 0); - } - return aBlock; - } - - public void setBlockAtCoords(int x, int y, int z, Block aBlock, int aMeta) { - FakeBlockPos aTempPos = new FakeBlockPos(x, y, z, aBlock, aMeta); - Logger.WARNING("Setting " + x + ", " + y + ", " + z + " to " + aBlock.getLocalizedName() + ":" + aMeta); - mFakeWorldData.put(aTempPos.getLocationString(), aTempPos); - } - - public AutoMap getAllBlocksStoredInFakeWorld() { - AutoMap aOutput = new AutoMap(); - for (FakeBlockPos aPos : mFakeWorldData.values()) { - if (aPos == null || aPos.getBlockAtPos() == Blocks.air) { - continue; - } else { - ItemStack aTempStack = ItemUtils.simpleMetaStack(aPos.getBlockAtPos(), aPos.getMetaAtPos(), 1); - if (ItemUtils.checkForInvalidItems(aTempStack)) { - // Logger.WARNING("Output: "+aTempStack.getDisplayName()); - aOutput.put(aTempStack); - } - } - } - return aOutput; - } - - @Override - public Block getBlock(int x, int y, int z) { - FakeBlockPos aPos = getBlockAtCoords(x, y, z); - return aPos.getBlockAtPos(); - } - - @Override - public boolean isAirBlock(int x, int y, int z) { - Block aBlock = getBlock(x, y, z); - return aBlock == Blocks.air || aBlock.getMaterial() == Material.air; - } - - @Override - public TileEntity getTileEntity(int p_147438_1_, int p_147438_2_, int p_147438_3_) { - return null; - } - - @Override - public int getLightBrightnessForSkyBlocks(int p_72802_1_, int p_72802_2_, int p_72802_3_, int p_72802_4_) { - return 0; - } - - @Override - public int getBlockMetadata(int x, int y, int z) { - return getBlockAtCoords(x, y, z).getMetaAtPos(); - } - - @Override - public int isBlockProvidingPowerTo(int p_72879_1_, int p_72879_2_, int p_72879_3_, int p_72879_4_) { - return 0; - } - - @Override - public BiomeGenBase getBiomeGenForCoords(int p_72807_1_, int p_72807_2_) { - return BiomeGenBase.plains; - } - - @Override - public int getHeight() { - return aWorldHeight; - } - - @Override - public boolean extendedLevelsInChunkCache() { - return false; - } - - @Override - public boolean isSideSolid(int x, int y, int z, ForgeDirection side, boolean _default) { - if (!isAirBlock(x, y, z)) { - return true; - } - return false; - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FormattedTooltipString.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FormattedTooltipString.java deleted file mode 100644 index 73d17aba39..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FormattedTooltipString.java +++ /dev/null @@ -1,23 +0,0 @@ -package gtPlusPlus.api.objects.minecraft; - -public class FormattedTooltipString { - - public final String mText; - public final boolean mPrefix; - - public FormattedTooltipString(String aText, boolean aPrefix) { - mText = aText; - mPrefix = aPrefix; - } - - public String getTooltip(Object aTagValue) { - String aTip; - - if (mPrefix) { - aTip = mText + ": " + aTagValue.toString(); - } else { - aTip = "" + aTagValue.toString() + ": " + mText; - } - return aTip; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java deleted file mode 100644 index 55f1df240f..0000000000 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java +++ /dev/null @@ -1,86 +0,0 @@ -package gtPlusPlus.core.block.base; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.Explosion; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockNBT; - -public abstract class BlockBaseNBT extends BlockContainer { - - @SideOnly(Side.CLIENT) - private IIcon textureTop; - - @SideOnly(Side.CLIENT) - private IIcon textureBottom; - - @SideOnly(Side.CLIENT) - private IIcon textureFront; - - public BlockBaseNBT(final Material material, final String unlocalName, final String displayName) { - super(material); - this.setBlockName(unlocalName); - this.setCreativeTab(AddToCreativeTab.tabMachines); - GameRegistry.registerBlock(this, ItemBlockNBT.class, unlocalName); - // LanguageRegistry.addName(this, displayName); - } - - /** - * Gets the block's texture. Args: side, meta - */ - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(final int ordinalSide, final int meta) { - return ordinalSide == 1 ? this.textureTop - : (ordinalSide == 0 ? this.textureBottom - : ((ordinalSide != 2) && (ordinalSide != 4) ? this.blockIcon : this.textureFront)); - } - - @Override - public abstract TileEntity createNewTileEntity(final World world, final int p_149915_2_); - - @Override - public void breakBlock(final World world, final int x, final int y, final int z, final Block block, - final int meta) { - super.breakBlock(world, x, y, z, block, meta); - } - - @Override - public void onBlockDestroyedByPlayer(final World world, final int x, final int y, final int z, final int meta) { - super.onBlockDestroyedByPlayer(world, x, y, z, meta); - } - - @Override - public void onBlockDestroyedByExplosion(final World world, final int x, final int y, final int z, - final Explosion explosion) { - super.onBlockDestroyedByExplosion(world, x, y, z, explosion); - } - - @Override - public void onBlockHarvested(final World world, final int x, final int y, final int z, final int meta, - final EntityPlayer player) { - super.onBlockHarvested(world, x, y, z, meta, player); - } - - @Override - public void onBlockExploded(final World world, final int x, final int y, final int z, final Explosion explosion) { - super.onBlockExploded(world, x, y, z, explosion); - } - - @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/fluids/BlockFluidBase.java b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java deleted file mode 100644 index 9c4fb4d66a..0000000000 --- a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java +++ /dev/null @@ -1,106 +0,0 @@ -package gtPlusPlus.core.fluids; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.BlockFluidClassic; -import net.minecraftforge.fluids.Fluid; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.util.Utils; - -public class BlockFluidBase extends BlockFluidClassic { - - @SideOnly(Side.CLIENT) - protected static IIcon stillIcon; - - @SideOnly(Side.CLIENT) - protected static IIcon flowingIcon; - - protected final short[] mRGB; - - public BlockFluidBase(Fluid fluid, short[] aRGB) { - this(fluid, Material.water, aRGB); - } - - public BlockFluidBase(Fluid fluid, Material material, short[] aRGB) { - super(fluid, material); - mRGB = aRGB; - this.setHardness(100.0F); - this.setLightOpacity(3); - this.disableStats(); - } - - @Override - public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity ent) { - if (!(ent instanceof EntityLivingBase)) { - return; - } - /* - * EntityLivingBase player = (EntityLivingBase) ent; int pot = world.rand.nextInt(Potion.potionTypes.length); - * Potion.potionTypes[pot].performEffect(player, 40); - */ - } - - @Override - public IIcon getIcon(int ordinalSide, int meta) { - return (ordinalSide == 0 || ordinalSide == 1) ? stillIcon : flowingIcon; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister register) { - if (stillIcon == null) { - stillIcon = register.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid.fluid.autogenerated.still"); - } - if (flowingIcon == null) { - flowingIcon = register.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid.fluid.autogenerated.flowing"); - } - } - - @Override - public int getBlockColor() { - if (mRGB != null && mRGB.length >= 3) { - return Utils.rgbtoHexValue(mRGB[0], mRGB[1], mRGB[2]); - } - return super.getBlockColor(); - } - - @Override - public int getRenderColor(int aMeta) { - if (mRGB != null && mRGB.length >= 3) { - return Utils.rgbtoHexValue(mRGB[0], mRGB[1], mRGB[2]); - } - return super.getRenderColor(aMeta); - } - - @Override - public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour) { - // TODO Auto-generated method stub - return super.recolourBlock(world, x, y, z, side, colour); - } - - @Override - public boolean canDisplace(IBlockAccess world, int x, int y, int z) { - if (world.getBlock(x, y, z).getMaterial().isLiquid()) { - return false; - } - return super.canDisplace(world, x, y, z); - } - - @Override - public boolean displaceIfPossible(World world, int x, int y, int z) { - if (world.getBlock(x, y, z).getMaterial().isLiquid()) { - return false; - } - return super.displaceIfPossible(world, x, y, z); - } -} diff --git a/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java b/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java deleted file mode 100644 index 96936cced8..0000000000 --- a/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java +++ /dev/null @@ -1,67 +0,0 @@ -package gtPlusPlus.core.fluids; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.block.Block; -import net.minecraft.item.EnumRarity; -import net.minecraftforge.fluids.Fluid; - -import gregtech.api.GregTech_API; - -public class FactoryFluid extends Fluid implements Runnable { - - private final String mTextureName; - private final short[] mRGBa; - - public FactoryFluid(String fluidName, final short[] aRGBa) { - this( - fluidName, - null, - Short.MIN_VALUE, - Short.MIN_VALUE, - Short.MIN_VALUE, - Short.MIN_VALUE, - false, - EnumRarity.common, - aRGBa); - } - - public FactoryFluid(String fluidName, int luminosity, int density, int temp, int viscosity, final short[] aRGBa) { - this( - fluidName, - null, - luminosity, - density, - temp, - viscosity, - (density == Short.MIN_VALUE || density >= 0 ? false : true), - EnumRarity.common, - aRGBa); - } - - public FactoryFluid(String fluidName, Block aBlock, int luminosity, int density, int temp, int viscosity, - boolean gas, EnumRarity aRarity, final short[] aRGBa) { - super(fluidName); - this.mRGBa = aRGBa; - this.setBlock(aBlock); - if (luminosity != Short.MIN_VALUE) this.setLuminosity(luminosity); - if (density != Short.MIN_VALUE) this.setDensity(density); - if (temp != Short.MIN_VALUE) this.setTemperature(temp); - if (viscosity != Short.MIN_VALUE) this.setViscosity(viscosity); - this.setGaseous(gas); - this.setRarity(aRarity); - this.mTextureName = GTPlusPlus.ID + ":fluids/fluid.fluid.autogenerated"; - GregTech_API.sGTBlockIconload.add(this); - } - - @Override - public int getColor() { - return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16) | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8) - | Math.max(0, Math.min(255, this.mRGBa[2])); - } - - @Override - public void run() { - this.setIcons(GregTech_API.sBlockIcons.registerIcon(this.mTextureName)); - } -} diff --git a/src/main/java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java b/src/main/java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java deleted file mode 100644 index 5bbb405aa3..0000000000 --- a/src/main/java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java +++ /dev/null @@ -1,124 +0,0 @@ -package gtPlusPlus.core.gui.item.box; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase; -import gtPlusPlus.core.item.tool.misc.box.CustomBoxInventory; - -public class GuiBaseBox extends GuiContainer { - - /** - * x and y size of the inventory window in pixels. Defined as float, passed as int These are used for drawing the - * player model. - */ - private float xSize_lo; - - private float ySize_lo; - - /** - * ResourceLocation takes 2 parameters: ModId, path to texture at the location: "src/minecraft/assets/modid/" - * - * I have provided a sample texture file that works with this tutorial. Download it from - * Forge_Tutorials/textures/gui/ - */ - private final ResourceLocation iconLocation; - - /** The inventory to render on screen */ - private final CustomBoxInventory inventory; - - public GuiBaseBox(ContainerBoxBase containerItem, ResourceLocation aGuiTexture) { - super(containerItem); - this.inventory = containerItem.getInventoryObject(); - this.iconLocation = aGuiTexture; - } - - /** - * Draws the screen and all the components in it. - */ - @Override - public void drawScreen(int par1, int par2, float par3) { - super.drawScreen(par1, par2, par3); - this.xSize_lo = (float) par1; - this.ySize_lo = (float) par2; - } - - /** - * Draw the foreground layer for the GuiContainer (everything in front of the items) - */ - @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { - String s = this.inventory.hasCustomInventoryName() ? this.inventory.getInventoryName() - : I18n.format(this.inventory.getInventoryName()); - this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 0, 4210752); - this.fontRendererObj.drawString(I18n.format("container.inventory"), 26, this.ySize - 96 + 4, 4210752); - } - - /** - * Draw the background layer for the GuiContainer (everything behind the items) - */ - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(iconLocation); - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); - int i1; - drawPlayerModel( - k + 51, - l + 75, - 30, - (float) (k + 51) - this.xSize_lo, - (float) (l + 75 - 50) - this.ySize_lo, - this.mc.thePlayer); - } - - /** - * This renders the player model in standard inventory position (in later versions of Minecraft / Forge, you can - * simply call GuiInventory.drawEntityOnScreen directly instead of copying this code) - */ - public static void drawPlayerModel(int x, int y, int scale, float yaw, float pitch, EntityLivingBase entity) { - GL11.glEnable(GL11.GL_COLOR_MATERIAL); - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, 50.0F); - GL11.glScalef(-scale, scale, scale); - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); - float f2 = entity.renderYawOffset; - float f3 = entity.rotationYaw; - float f4 = entity.rotationPitch; - float f5 = entity.prevRotationYawHead; - float f6 = entity.rotationYawHead; - GL11.glRotatef(135.0F, 0.0F, 1.0F, 0.0F); - RenderHelper.enableStandardItemLighting(); - GL11.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-((float) Math.atan(pitch / 40.0F)) * 20.0F, 1.0F, 0.0F, 0.0F); - entity.renderYawOffset = (float) Math.atan(yaw / 40.0F) * 20.0F; - entity.rotationYaw = (float) Math.atan(yaw / 40.0F) * 40.0F; - entity.rotationPitch = -((float) Math.atan(pitch / 40.0F)) * 20.0F; - entity.rotationYawHead = entity.rotationYaw; - entity.prevRotationYawHead = entity.rotationYaw; - GL11.glTranslatef(0.0F, entity.yOffset, 0.0F); - RenderManager.instance.playerViewY = 180.0F; - RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); - entity.renderYawOffset = f2; - entity.rotationYaw = f3; - entity.rotationPitch = f4; - entity.prevRotationYawHead = f5; - entity.rotationYawHead = f6; - GL11.glPopMatrix(); - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); - GL11.glDisable(GL11.GL_TEXTURE_2D); - OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); - } -} diff --git a/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java b/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java deleted file mode 100644 index 80d2d6902f..0000000000 --- a/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java +++ /dev/null @@ -1,14 +0,0 @@ -package gtPlusPlus.core.gui.item.box; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.util.ResourceLocation; - -import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase; - -public class LunchBoxGui extends GuiBaseBox { - - public LunchBoxGui(ContainerBoxBase containerItem) { - super(containerItem, new ResourceLocation(GTPlusPlus.ID, "textures/gui/schematic_rocket_GS1.png")); - } -} diff --git a/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java b/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java deleted file mode 100644 index 6858c17afb..0000000000 --- a/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java +++ /dev/null @@ -1,14 +0,0 @@ -package gtPlusPlus.core.gui.item.box; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.util.ResourceLocation; - -import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase; - -public class MagicBagGui extends GuiBaseBox { - - public MagicBagGui(ContainerBoxBase containerItem) { - super(containerItem, new ResourceLocation(GTPlusPlus.ID, "textures/gui/schematic_rocket_GS1.png")); - } -} diff --git a/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java b/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java deleted file mode 100644 index 4d994eee41..0000000000 --- a/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java +++ /dev/null @@ -1,14 +0,0 @@ -package gtPlusPlus.core.gui.item.box; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.util.ResourceLocation; - -import gtPlusPlus.core.item.tool.misc.box.ContainerBoxBase; - -public class ToolBoxGui extends GuiBaseBox { - - public ToolBoxGui(ContainerBoxBase containerItem) { - super(containerItem, new ResourceLocation(GTPlusPlus.ID, "textures/gui/schematic_rocket_GS1.png")); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java deleted file mode 100644 index 194e585c0d..0000000000 --- a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java +++ /dev/null @@ -1,636 +0,0 @@ -package gtPlusPlus.core.item.base; - -import static gregtech.api.enums.GT_Values.D1; -import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.ArrayList; -import java.util.BitSet; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.SubTag; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; -import gregtech.api.interfaces.IItemBehaviour; -import gregtech.api.interfaces.IItemContainer; -import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.creative.AddToCreativeTab; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - -public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricItemManager { - - /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ - private final HashMap>> mItemBehaviors = new HashMap<>(); - public final short mOffset, mItemAmount; - public final BitSet mEnabledItems; - public final BitSet mVisibleItems; - public final IIcon[][] mIconList; - /** The unlocalized name of this item. */ - private String unlocalizedName; - - private final ArrayList> rarity = new ArrayList<>(); - private final ArrayList> descColour = new ArrayList<>(); - private final ArrayList> itemName = new ArrayList<>(); - private final ArrayList> itemDescription = new ArrayList<>(); - private final ArrayList> hasEffect = new ArrayList<>(); - - public final HashMap mElectricStats = new HashMap<>(); - public final HashMap mBurnValues = new HashMap<>(); - - public BaseEuItem() { - this("MU-metaitem.02", AddToCreativeTab.tabOther, (short) 1000, (short) 31766); - } - - public BaseEuItem(final String unlocalizedName, final CreativeTabs creativeTab, final short aOffset, - final short aItemAmount) { - this.mEnabledItems = new BitSet(aItemAmount); - this.mVisibleItems = new BitSet(aItemAmount); - this.mOffset = (short) Math.min(32766, aOffset); - this.mItemAmount = (short) Math.min(aItemAmount, 32766 - this.mOffset); - this.mIconList = new IIcon[aItemAmount][1]; - this.setHasSubtypes(true); - this.setMaxDamage(0); - this.setUnlocalizedName(unlocalizedName); - this.setCreativeTab(creativeTab); - this.setMaxStackSize(1); - GameRegistry.registerItem(this, unlocalizedName); - } - - public void registerItem(final int id, final String localizedName, final long euStorage, final int tier, - final String description) { - this.registerItem( - id, - localizedName, - euStorage, - (short) tier, - description, - EnumRarity.common, - EnumChatFormatting.GRAY, - false); - } - - public void registerItem(final int id, final String localizedName, final long euStorage, final int tier, - final String description, final int burnTime) { - this.registerItem( - id, - localizedName, - euStorage, - (short) tier, - description, - EnumRarity.common, - EnumChatFormatting.GRAY, - false); - this.setBurnValue(id, burnTime); - } - - public void registerItem(final int id, final String localizedName, final long euStorage, final short tier, - final String description, final EnumRarity regRarity, final EnumChatFormatting colour, - final boolean Effect) { - this.addItem(id, localizedName, colour + description, new Object[] {}); - this.setElectricStats(this.mOffset + id, euStorage, GT_Values.V[tier], tier, -3L, true); - this.rarity.add(new Pair<>(id, regRarity)); - this.hasEffect.add(new Pair<>(id, Effect)); - } - - @Override - @SideOnly(Side.CLIENT) - public EnumRarity getRarity(final ItemStack par1ItemStack) { - if (this.rarity.get(par1ItemStack.getItemDamage() - this.mOffset) != null) { - return this.rarity.get(par1ItemStack.getItemDamage() - this.mOffset).getValue(); - } - return EnumRarity.common; - } - - @Override - public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { - if (this.hasEffect.get(par1ItemStack.getItemDamage() - this.mOffset) != null) { - return this.hasEffect.get(par1ItemStack.getItemDamage() - this.mOffset).getValue(); - } - return false; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList, final boolean aF3_H) { - // aList.add("Meta: "+(aStack.getItemDamage()-mOffset)); - int keyValue = aStack.getItemDamage() - this.mOffset; - final String tKey = "gtplusplus." + this.getUnlocalizedName(aStack) + "." + keyValue + ".tooltip", - tString = GT_LanguageManager.getTranslation(tKey); - if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) { - aList.add(tString); - } - aList.add(StatCollector.translateToLocal("item.itemBaseEuItem.tooltip.0")); - final Long[] tStats = this.getElectricStats(aStack); - if (tStats != null) { - if (tStats[3] > 0) { - aList.add( - EnumChatFormatting.AQUA + StatCollector.translateToLocalFormatted( - "item.itemBaseEuItem.tooltip.1", - GT_Utility.formatNumbers(tStats[3]), - (tStats[2] >= 0 ? tStats[2] : 0)) + EnumChatFormatting.GRAY); - } else { - final long tCharge = this.getRealCharge(aStack); - if ((tStats[3] == -2) && (tCharge <= 0)) { - aList.add( - EnumChatFormatting.AQUA + StatCollector.translateToLocal("item.itemBaseEuItem.tooltip.2") - + EnumChatFormatting.GRAY); - } else { - aList.add( - EnumChatFormatting.AQUA + StatCollector.translateToLocalFormatted( - "item.itemBaseEuItem.tooltip.3", - GT_Utility.formatNumbers(tCharge), - GT_Utility.formatNumbers(Math.abs(tStats[0])), - V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)]) - + EnumChatFormatting.GRAY); - } - } - } - final ArrayList> tList = this.mItemBehaviors.get((short) this.getDamage(aStack)); - if (tList != null) { - for (final IItemBehaviour tBehavior : tList) { - aList = tBehavior.getAdditionalToolTips(this, aList, aStack); - } - } - } - - @Override - public final Item getChargedItem(final ItemStack itemStack) { - return this; - } - - @Override - public final Item getEmptyItem(final ItemStack itemStack) { - return this; - } - - @Override - public final double getMaxCharge(final ItemStack aStack) { - final Long[] tStats = this.getElectricStats(aStack); - if (tStats == null) { - return 0; - } - return Math.abs(tStats[0]); - } - - @Override - public final double getTransferLimit(final ItemStack aStack) { - final Long[] tStats = this.getElectricStats(aStack); - if (tStats == null) { - return 0; - } - return Math.max(tStats[1], tStats[3]); - } - - @Override - public final int getTier(final ItemStack aStack) { - final Long[] tStats = this.getElectricStats(aStack); - return (int) (tStats == null ? Integer.MAX_VALUE : tStats[2]); - } - - @Override - public final double charge(final ItemStack aStack, final double aCharge, final int aTier, - final boolean aIgnoreTransferLimit, final boolean aSimulate) { - final Long[] tStats = this.getElectricStats(aStack); - if ((tStats == null) || (tStats[2] > aTier) - || !((tStats[3] == -1) || (tStats[3] == -3) || ((tStats[3] < 0) && (aCharge == Integer.MAX_VALUE))) - || (aStack.stackSize != 1)) { - return 0; - } - final long tChargeBefore = this.getRealCharge(aStack), tNewCharge = aCharge == Integer.MAX_VALUE - ? Long.MAX_VALUE - : Math.min( - Math.abs(tStats[0]), - tChargeBefore + (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge))); - if (!aSimulate) { - this.setCharge(aStack, tNewCharge); - } - return tNewCharge - tChargeBefore; - } - - @Override - public final double discharge(final ItemStack aStack, final double aCharge, final int aTier, - final boolean aIgnoreTransferLimit, final boolean aBatteryAlike, final boolean aSimulate) { - final Long[] tStats = this.getElectricStats(aStack); - if ((tStats == null) || (tStats[2] > aTier)) { - return 0; - } - if (aBatteryAlike && !this.canProvideEnergy(aStack)) { - return 0; - } - if (tStats[3] > 0) { - if ((aCharge < tStats[3]) || (aStack.stackSize < 1)) { - return 0; - } - if (!aSimulate) { - aStack.stackSize--; - } - return tStats[3]; - } - final long tChargeBefore = this.getRealCharge(aStack), tNewCharge = Math - .max(0, tChargeBefore - (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge))); - if (!aSimulate) { - this.setCharge(aStack, tNewCharge); - } - return tChargeBefore - tNewCharge; - } - - @Override - public final double getCharge(final ItemStack aStack) { - return this.getRealCharge(aStack); - } - - @Override - public final boolean canUse(final ItemStack aStack, final double aAmount) { - return this.getRealCharge(aStack) >= aAmount; - } - - @Override - public final boolean use(final ItemStack aStack, final double aAmount, final EntityLivingBase aPlayer) { - this.chargeFromArmor(aStack, aPlayer); - if ((aPlayer instanceof EntityPlayer) && ((EntityPlayer) aPlayer).capabilities.isCreativeMode) { - return true; - } - final double tTransfer = this.discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, true); - if (tTransfer == aAmount) { - this.discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, false); - this.chargeFromArmor(aStack, aPlayer); - return true; - } - this.discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, false); - this.chargeFromArmor(aStack, aPlayer); - return false; - } - - @Override - public final boolean canProvideEnergy(final ItemStack aStack) { - final Long[] tStats = this.getElectricStats(aStack); - if (tStats == null) { - return false; - } - return (tStats[3] > 0) || ((aStack.stackSize == 1) && ((tStats[3] == -2) || (tStats[3] == -3))); - } - - @Override - public final void chargeFromArmor(final ItemStack aStack, final EntityLivingBase aPlayer)