diff options
Diffstat (limited to 'src/main/java/gregtech/api')
4 files changed, 5 insertions, 58 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index fc13aff66b..8fa67c52bd 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -29,7 +29,6 @@ import gregtech.api.fluid.GT_FluidFactory; import gregtech.api.interfaces.IColorModulationContainer; import gregtech.api.interfaces.IMaterialHandler; import gregtech.api.interfaces.ISubTagContainer; -import gregtech.api.objects.GT_FluidStack; import gregtech.api.objects.MaterialStack; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; @@ -3081,27 +3080,27 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public FluidStack getSolid(long aAmount) { if (mSolid == null) return null; - return new GT_FluidStack(mSolid, (int) aAmount); + return new FluidStack(mSolid, (int) aAmount); } public FluidStack getFluid(long aAmount) { if (mFluid == null) return null; - return new GT_FluidStack(mFluid, (int) aAmount); + return new FluidStack(mFluid, (int) aAmount); } public FluidStack getGas(long aAmount) { if (mGas == null) return null; - return new GT_FluidStack(mGas, (int) aAmount); + return new FluidStack(mGas, (int) aAmount); } public FluidStack getPlasma(long aAmount) { if (mPlasma == null) return null; - return new GT_FluidStack(mPlasma, (int) aAmount); + return new FluidStack(mPlasma, (int) aAmount); } public FluidStack getMolten(long aAmount) { if (mStandardMoltenFluid == null) return null; - return new GT_FluidStack(mStandardMoltenFluid, (int) aAmount); + return new FluidStack(mStandardMoltenFluid, (int) aAmount); } @Override diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java deleted file mode 100644 index 5a017fd590..0000000000 --- a/src/main/java/gregtech/api/objects/GT_FluidStack.java +++ /dev/null @@ -1,47 +0,0 @@ -package gregtech.api.objects; - -import java.util.Collection; -import java.util.Collections; -import java.util.WeakHashMap; - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import gregtech.api.GregTech_API; - -/** - * Because Forge fucked this one up royally. - */ -public class GT_FluidStack extends FluidStack { - - private static final Collection<GT_FluidStack> sAllFluidStacks = Collections - .newSetFromMap(new WeakHashMap<>(10000)); - private final Fluid mFluid; - - public GT_FluidStack(Fluid aFluid, int aAmount) { - super(aFluid, aAmount); - mFluid = aFluid; - if (!GregTech_API.mServerStarted) { - sAllFluidStacks.add(this); - } - } - - public GT_FluidStack(FluidStack aFluid) { - this(aFluid.getFluid(), aFluid.amount); - } - - @Override - public FluidStack copy() { - return new GT_FluidStack(this); - } - - @Override - public String toString() { - return String.format( - "GT_FluidStack: %s x %s, ID:%s", - this.amount, - this.getFluid() - .getName(), - this.getFluidID()); - } -} diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index c300a3739d..63451fa729 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -106,7 +106,6 @@ import gregtech.api.gui.modularui.SteamTexture; import gregtech.api.interfaces.IGT_RecipeMap; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; -import gregtech.api.objects.GT_FluidStack; import gregtech.api.objects.GT_ItemStack; import gregtech.api.objects.ItemData; import gregtech.api.objects.MaterialStack; @@ -262,8 +261,6 @@ public class GT_Recipe implements Comparable<GT_Recipe> { for (ItemStack tStack : aOutputs) GT_Utility.updateItemStack(tStack); for (int i = 0; i < aChances.length; i++) if (aChances[i] <= 0) aChances[i] = 10000; - for (int i = 0; i < aFluidInputs.length; i++) aFluidInputs[i] = new GT_FluidStack(aFluidInputs[i]); - for (int i = 0; i < aFluidOutputs.length; i++) aFluidOutputs[i] = new GT_FluidStack(aFluidOutputs[i]); for (ItemStack aInput : aInputs) if (aInput != null && Items.feather.getDamage(aInput) != W) for (int j = 0; j < aOutputs.length; j++) { diff --git a/src/main/java/gregtech/api/util/GT_RecipeBuilder.java b/src/main/java/gregtech/api/util/GT_RecipeBuilder.java index d7cae76e65..e340089566 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeBuilder.java +++ b/src/main/java/gregtech/api/util/GT_RecipeBuilder.java @@ -21,7 +21,6 @@ import net.minecraft.launchwrapper.Launch; import net.minecraftforge.fluids.FluidStack; import gregtech.api.interfaces.IGT_RecipeMap; -import gregtech.api.objects.GT_FluidStack; import gregtech.api.util.extensions.ArrayExt; public class GT_RecipeBuilder { @@ -110,7 +109,6 @@ public class GT_RecipeBuilder { private static FluidStack[] fix(FluidStack[] fluidInputs) { return Arrays.stream(fluidInputs) .filter(Objects::nonNull) - .map(GT_FluidStack::new) .toArray(FluidStack[]::new); } |