Merge pull request #65 from GTNewHorizons/unified-build-script2

Move sources and resources

1 files changed, 0 insertions, 83 deletions

diff --git a/src/Java/gtPlusPlus/core/fluids/FluidPackage.java b/src/Java/gtPlusPlus/core/fluids/FluidPackage.java
deleted file mode 100644
index 29f831776b..0000000000
--- a/src/Java/gtPlusPlus/core/fluids/FluidPackage.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package gtPlusPlus.core.fluids;
-
-import static gtPlusPlus.core.fluids.FluidFactory.mBlockToBucketMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mBlockToFluidMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mBlockToMetaMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mBlockToNameMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mBucketToBlockMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mBucketToFluidMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mBucketToMetaMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mBucketToNameMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mFluidToBlockMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mFluidToBucketMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mFluidToMetaMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mFluidToNameMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mMetaToBlockMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mMetaToBucketMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mMetaToColourMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mMetaToFluidMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mMetaToNameMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mNameToBlockMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mNameToBucketMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mNameToFluidMap;
-import static gtPlusPlus.core.fluids.FluidFactory.mNameToMetaMap;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-
-public class FluidPackage {
-
-
-	public final int mID;
-	public final String mName;
-	private final Fluid mFluid;
-	public final ItemStack mBucket;
-	public final Block mBlock;
-
-	public FluidPackage(int aID, String aName, Fluid aFluid, ItemStack aBucket, Block aBlock) {
-
-		mNameToFluidMap.put(aName, aFluid);
-		mNameToBucketMap.put(aName, aBucket);
-		mNameToBlockMap.put(aName, aBlock);
-		mNameToMetaMap.put(aName, aID);
-
-		mFluidToNameMap.put(aFluid, aName);
-		mFluidToBucketMap.put(aFluid, aBucket);
-		mFluidToBlockMap.put(aFluid, aBlock);
-		mFluidToMetaMap.put(aFluid, aID);
-
-		mBucketToFluidMap.put(aBucket, aFluid);
-		mBucketToNameMap.put(aBucket, aName);
-		mBucketToBlockMap.put(aBucket, aBlock);
-		mBucketToMetaMap.put(aBucket, aID);
-
-		mBlockToNameMap.put(aBlock, aName);
-		mBlockToFluidMap.put(aBlock, aFluid);
-		mBlockToBucketMap.put(aBlock, aBucket);
-		mBlockToMetaMap.put(aBlock, aID);	
-
-		mMetaToNameMap.put(aID, aName);
-		mMetaToFluidMap.put(aID, aFluid);
-		mMetaToBucketMap.put(aID, aBucket);
-		mMetaToBlockMap.put(aID, aBlock);
-		
-		mMetaToColourMap.put(aID, aFluid.getColor());
-		
-		mID = aID;
-		mName = aName;
-		mFluid = aFluid;
-		mBucket = aBucket;
-		mBlock = aBlock;
-
-	}
-	
-	public Fluid get() {
-		return mFluid;
-	}
-	
-	public boolean valid() {
-		return mName != null && mName.length() > 0 && mFluid != null && mBucket != null && mBlock != null;
-	}
-
-}