diff options
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/cache.properties.lock | bin | 17 -> 0 bytes | |||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/fileHashes.bin | bin | 543733 -> 0 bytes | |||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/fileSnapshots.bin | bin | 10292690 -> 0 bytes | |||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/outputFileStates.bin | bin | 21902 -> 0 bytes | |||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/taskArtifacts.bin | bin | 35852 -> 0 bytes | |||
| -rw-r--r-- | .gradle/gradle.log | 38 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaBasicTank.java | 261 |
9 files changed, 2 insertions, 301 deletions
diff --git a/.classpath b/.classpath index d5998108e6..f64ee72b03 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="conduits/|miscutil/enderio/conduit/GregTech/|miscutil/gregtech/enums/Materials2.java|miscutil/gregtech/objects/GregMaterialStack.java|miscutil/core/util/Log.java|miscutil/enderio/|miscutil/core/item/tool/bloodsteel/|miscutil/core/block/reactor/|miscutil/gregtech/common/tools/GT_Tool_Turbine_Large.java|miscutil/gregtech/common/tools/GT_Tool_Turbine_Normal.java|miscutil/gregtech/common/tools/GT_Tool_Turbine_Small.java|miscutil/gregtech/api/enums/GregtechTextures.java|miscutil/gregtech/api/enums/GregtechTextureSet.java|libshapedraw/api/|miscutil/core/xmod/forestry/bees/multiblock/|miscutil/core/multiblock/|miscutil/core/xmod/forestry/bees/alveary/gui/old/FR_GuiID.java|miscutil/core/xmod/forestry/bees/alveary/gui/old/FR_GuiIDRegistry.java|miscutil/core/xmod/forestry/bees/alveary/gui/old/ContainerAlvearyFrameHousing.java|miscutil/core/xmod/forestry/core/|miscutil/core/xmod/forestry/bees/alveary/gui/old/|gtPlusPlus/xmod/gregtech/loaders/Processing_Block.java|gtPlusPlus/xmod/gregtech/loaders/Processing_Ingot1.java|gtPlusPlus/xmod/gregtech/loaders/Processing_Plate1.java|gtPlusPlus/core/lib/MaterialInfo.java|gtPlusPlus/xmod/gregtech/common/tools/GT_Tool_Turbine_Large.java|gtPlusPlus/xmod/gregtech/common/tools/GT_Tool_Turbine_Normal.java|gtPlusPlus/xmod/gregtech/common/tools/GT_Tool_Turbine_Small.java|gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java|gtPlusPlus/xmod/ic2/item/IC2_ItemFluidCell.java|gtPlusPlus/xmod/psychedelicraft/fluids/|gtPlusPlus/core/inventories/InventoryWorkbenchCraftingEx.java|gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaBasicTank.java" kind="src" path="src/Java"/> + <classpathentry excluding="conduits/|miscutil/enderio/conduit/GregTech/|miscutil/gregtech/enums/Materials2.java|miscutil/gregtech/objects/GregMaterialStack.java|miscutil/core/util/Log.java|miscutil/enderio/|miscutil/core/item/tool/bloodsteel/|miscutil/core/block/reactor/|miscutil/gregtech/common/tools/GT_Tool_Turbine_Large.java|miscutil/gregtech/common/tools/GT_Tool_Turbine_Normal.java|miscutil/gregtech/common/tools/GT_Tool_Turbine_Small.java|miscutil/gregtech/api/enums/GregtechTextures.java|miscutil/gregtech/api/enums/GregtechTextureSet.java|libshapedraw/api/|miscutil/core/xmod/forestry/bees/multiblock/|miscutil/core/multiblock/|miscutil/core/xmod/forestry/bees/alveary/gui/old/FR_GuiID.java|miscutil/core/xmod/forestry/bees/alveary/gui/old/FR_GuiIDRegistry.java|miscutil/core/xmod/forestry/bees/alveary/gui/old/ContainerAlvearyFrameHousing.java|miscutil/core/xmod/forestry/core/|miscutil/core/xmod/forestry/bees/alveary/gui/old/|gtPlusPlus/xmod/gregtech/loaders/Processing_Block.java|gtPlusPlus/xmod/gregtech/loaders/Processing_Ingot1.java|gtPlusPlus/xmod/gregtech/loaders/Processing_Plate1.java|gtPlusPlus/core/lib/MaterialInfo.java|gtPlusPlus/xmod/gregtech/common/tools/GT_Tool_Turbine_Large.java|gtPlusPlus/xmod/gregtech/common/tools/GT_Tool_Turbine_Normal.java|gtPlusPlus/xmod/gregtech/common/tools/GT_Tool_Turbine_Small.java|gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_MaxEfficiencyMultiBlockItem.java|gtPlusPlus/xmod/ic2/item/IC2_ItemFluidCell.java|gtPlusPlus/xmod/psychedelicraft/fluids/|gtPlusPlus/core/inventories/InventoryWorkbenchCraftingEx.java" kind="src" path="src/Java"/> <classpathentry kind="src" path="src/resources"/> <classpathentry combineaccessrules="false" kind="src" path="/Forge"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock Binary files differdeleted file mode 100644 index cac13168e3..0000000000 --- a/.gradle/2.0/taskArtifacts/cache.properties.lock +++ /dev/null diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin Binary files differdeleted file mode 100644 index b15e1bd5ee..0000000000 --- a/.gradle/2.0/taskArtifacts/fileHashes.bin +++ /dev/null diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin Binary files differdeleted file mode 100644 index 8a6b6080c0..0000000000 --- a/.gradle/2.0/taskArtifacts/fileSnapshots.bin +++ /dev/null diff --git a/.gradle/2.0/taskArtifacts/outputFileStates.bin b/.gradle/2.0/taskArtifacts/outputFileStates.bin Binary files differdeleted file mode 100644 index 2cd6170fc4..0000000000 --- a/.gradle/2.0/taskArtifacts/outputFileStates.bin +++ /dev/null diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin Binary files differdeleted file mode 100644 index 7794814800..0000000000 --- a/.gradle/2.0/taskArtifacts/taskArtifacts.bin +++ /dev/null diff --git a/.gradle/gradle.log b/.gradle/gradle.log deleted file mode 100644 index 0a374d07d9..0000000000 --- a/.gradle/gradle.log +++ /dev/null @@ -1,38 +0,0 @@ -**************************** - Powered By MCP: - http://modcoderpack.com/ - Searge, ProfMobius, Fesh0r, - R4wk, ZeuX, IngisKahn, bspkrs - MCP Data version : unknown -**************************** -:compileApiJava UP-TO-DATE -:processApiResources UP-TO-DATE -:apiClasses UP-TO-DATE -:sourceMainJava -:compileJavawarning: [options] bootstrap class path not set in conjunction with -source 1.7 -Note: Some input files use or override a deprecated API. -Note: Recompile with -Xlint:deprecation for details. -Note: Some input files use unchecked or unsafe operations. -Note: Recompile with -Xlint:unchecked for details. -1 warning - -:processResources UP-TO-DATE -:classes -:devJar -:jar -:compileTestJava UP-TO-DATE -:processTestResources UP-TO-DATE -:testClasses UP-TO-DATE -:test UP-TO-DATE -:extractMcpData UP-TO-DATE -:getVersionJson -:extractUserDev UP-TO-DATE -:genSrgs SKIPPED -:reobf -:assemble -:check UP-TO-DATE -:build - -BUILD SUCCESSFUL - -Total time: 27.449 secs diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index d8798f707b..14f587326e 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -21,7 +21,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.4.8.2-prerelease"; + public static final String VERSION = "1.4.8.5-release"; public static final String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); public static boolean isModUpToDate = Utils.isModUpToDate(); public static boolean DEBUG = false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaBasicTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaBasicTank.java deleted file mode 100644 index c199114daa..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaBasicTank.java +++ /dev/null @@ -1,261 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; - -import gregtech.api.enums.ItemList; -import gregtech.api.gui.GT_Container_BasicTank; -import gregtech.api.gui.GT_GUIContainer_BasicTank; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.GT_Utility; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidStack; - -/** - * NEVER INCLUDE THIS FILE IN YOUR MOD!!! - * <p/> - * This is the main construct for my generic Tanks. Filling and emptying behavior have to be implemented manually - */ -public abstract class GregtechMetaBasicTank extends GregtechMetaTieredMachineBlock { - - public FluidStack mFluid; - public FluidStack mInternal; - /** - * @param aInvSlotCount should be 3 - */ - public GregtechMetaBasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription, ITexture... aTextures) { - super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures); - } - - public GregtechMetaBasicTank(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aInvSlotCount, aDescription, aTextures); - } - - @Override - public boolean isSimpleMachine() { - return false; - } - - @Override - public boolean isValidSlot(int aIndex) { - return aIndex != getStackDisplaySlot(); - } - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - if (mFluid != null) aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound())); - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid")); - } - - public abstract boolean doesFillContainers(); - - public abstract boolean doesEmptyContainers(); - - public abstract boolean canTankBeFilled(); - - public abstract boolean canTankBeEmptied(); - - public abstract boolean displaysItemStack(); - - public abstract boolean displaysStackSize(); - - public int getInputSlot() { - return 0; - } - - public int getOutputSlot() { - return 1; - } - - public int getStackDisplaySlot() { - return 2; - } - - public boolean isFluidInputAllowed(FluidStack aFluid) { - return true; - } - - public boolean isFluidChangingAllowed() { - return true; - } - - public FluidStack getFillableStack() { - return mFluid; - } - - public FluidStack setFillableStack(FluidStack aFluid) { - mFluid = aFluid; - return mFluid; - } - - public FluidStack setInternalStack(FluidStack aFluid) { - mInternal = aFluid; - return mInternal; - } - - public FluidStack getInternalStack() { - return mInternal; - } - - public FluidStack getDrainableStack() { - return mFluid; - } - - public FluidStack setDrainableStack(FluidStack aFluid) { - mFluid = aFluid; - return mFluid; - } - - public FluidStack getDisplayedFluid() { - return getDrainableStack(); - } - - @Override - public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_Container_BasicTank(aPlayerInventory, aBaseMetaTileEntity); - } - - @Override - public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_BasicTank(aPlayerInventory, aBaseMetaTileEntity, getLocalName()); - } - - @Override - public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if (aBaseMetaTileEntity.isServerSide()) { - if (isFluidChangingAllowed() && getFillableStack() != null && getFillableStack().amount <= 0) - setFillableStack(null); - if (isFluidChangingAllowed() && getFillableStack() != null && getFillableStack().amount >= 1) - setInternalStack(getFillableStack()); - if (displaysItemStack() && getStackDisplaySlot() >= 0 && getStackDisplaySlot() < mInventory.length) { - if (getDisplayedFluid() == null) { - if (ItemList.Display_Fluid.isStackEqual(mInventory[getStackDisplaySlot()], true, true)) - mInventory[getStackDisplaySlot()] = null; - } else { - mInventory[getStackDisplaySlot()] = GT_Utility.getFluidDisplayStack(getDisplayedFluid(), displaysStackSize()); - } - } - - if (doesEmptyContainers()) { - FluidStack tFluid = GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true); - if (tFluid != null && isFluidInputAllowed(tFluid)) { - if (getFillableStack() == null) { - if (isFluidInputAllowed(tFluid) && tFluid.amount <= getCapacity()) { - if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) { - setFillableStack(tFluid.copy()); - aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1); - } - } - } else { - if (tFluid.isFluidEqual(getFillableStack()) && tFluid.amount + getFillableStack().amount <= getCapacity()) { - if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) { - getFillableStack().amount += tFluid.amount; - aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1); - } - } - } - } - } - - if (doesFillContainers()) { - ItemStack tOutput = GT_Utility.fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true); - if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) { - FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true); - aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1); - if (tFluid != null) getDrainableStack().amount -= tFluid.amount; - if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) setDrainableStack(null); - } - } - } - } - - @Override - public FluidStack getFluid() { - return getDrainableStack(); - } - - @Override - public int getFluidAmount() { - return getDrainableStack() != null ? getDrainableStack().amount : 0; - } - - @Override - public int fill(FluidStack aFluid, boolean doFill) { - if (aFluid == null || aFluid.getFluid().getID() <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid)) - return 0; - - if (getFillableStack() == null || getFillableStack().getFluid().getID() <= 0) { - if (aFluid.amount <= getCapacity()) { - if (doFill) { - setFillableStack(aFluid.copy()); - getBaseMetaTileEntity().markDirty(); - } - return aFluid.amount; - } - if (doFill) { - setFillableStack(aFluid.copy()); - getFillableStack().amount = getCapacity(); - getBaseMetaTileEntity().markDirty(); - } - return getCapacity(); - } - - if (!getFillableStack().isFluidEqual(aFluid)) - return 0; - - int space = getCapacity() - getFillableStack().amount; - if (aFluid.amount <= space) { - if (doFill) { - getFillableStack().amount += aFluid.amount; - getBaseMetaTileEntity().markDirty(); - } - return aFluid.amount; - } - if (doFill) - getFillableStack().amount = getCapacity(); - return space; - } - - @Override - public FluidStack drain(int maxDrain, boolean doDrain) { - if (getDrainableStack() == null || !canTankBeEmptied()) return null; - if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) { - setDrainableStack(null); - getBaseMetaTileEntity().markDirty(); - return null; - } - - int used = maxDrain; - if (getDrainableStack().amount < used) - used = getDrainableStack().amount; - - if (doDrain) { - getDrainableStack().amount -= used; - getBaseMetaTileEntity().markDirty(); - } - - FluidStack drained = getDrainableStack().copy(); - drained.amount = used; - - if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) { - setDrainableStack(null); - getBaseMetaTileEntity().markDirty(); - } - - return drained; - } - - @Override - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return aIndex == getOutputSlot(); - } - - @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return aIndex == getInputSlot(); - } -}
\ No newline at end of file |