diff options
Diffstat (limited to 'src/main/java/gregtech/api/fluid')
| -rw-r--r-- | src/main/java/gregtech/api/fluid/GTFluidFactory.java (renamed from src/main/java/gregtech/api/fluid/GT_FluidFactory.java) | 30 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/fluid/GTFluidTank.java (renamed from src/main/java/gregtech/api/fluid/FluidTankGT.java) | 58 |
2 files changed, 44 insertions, 44 deletions
diff --git a/src/main/java/gregtech/api/fluid/GT_FluidFactory.java b/src/main/java/gregtech/api/fluid/GTFluidFactory.java index 7c65956c69..291cdf3384 100644 --- a/src/main/java/gregtech/api/fluid/GT_FluidFactory.java +++ b/src/main/java/gregtech/api/fluid/GTFluidFactory.java @@ -6,9 +6,9 @@ import net.minecraftforge.fluids.FluidRegistry; import gregtech.api.enums.FluidState; import gregtech.api.enums.Materials; -import gregtech.api.interfaces.fluid.IGT_Fluid; -import gregtech.api.interfaces.fluid.IGT_FluidBuilder; -import gregtech.common.fluid.GT_FluidBuilder; +import gregtech.api.interfaces.fluid.IGTFluid; +import gregtech.api.interfaces.fluid.IGTFluidBuilder; +import gregtech.common.fluid.GTFluidBuilder; /** * <p> @@ -17,12 +17,12 @@ import gregtech.common.fluid.GT_FluidBuilder; * <ol> * <li> * <p> - * Build {@link IGT_Fluid} instances. + * Build {@link IGTFluid} instances. * </p> * </li> * <li> * <p> - * Register the corresponding {@link Fluid}, built from an {@link IGT_Fluid}, to the {@link FluidRegistry}: + * Register the corresponding {@link Fluid}, built from an {@link IGTFluid}, to the {@link FluidRegistry}: * </p> * <ul> * <li> @@ -40,15 +40,15 @@ import gregtech.common.fluid.GT_FluidBuilder; * </ol> */ @SuppressWarnings("unused") // API might legitimately expose unused methods within this local project's scope -public class GT_FluidFactory { +public class GTFluidFactory { /** * Helper for quick fluid creation and registration * * @param fluidName The name key of the {@link Fluid} to register in the {@link FluidRegistry} - * @param localizedName The localized name of this {@link IGT_Fluid} - * @param material The {@link Materials} of this {@link IGT_Fluid} - * @param state The {@link FluidState} of this {@link IGT_Fluid} + * @param localizedName The localized name of this {@link IGTFluid} + * @param material The {@link Materials} of this {@link IGTFluid} + * @param state The {@link FluidState} of this {@link IGTFluid} * @param temperature The fluid temperature in Kelvin * @return the registered {@link Fluid} */ @@ -65,8 +65,8 @@ public class GT_FluidFactory { * Helper for quick fluid creation and registration * * @param fluidName The name key of the {@link Fluid} to register in the {@link FluidRegistry} - * @param localizedName The localized name of this {@link IGT_Fluid} - * @param state The {@link FluidState} of this {@link IGT_Fluid} + * @param localizedName The localized name of this {@link IGTFluid} + * @param state The {@link FluidState} of this {@link IGTFluid} * @param temperature The fluid temperature in Kelvin * @return the registered {@link Fluid} */ @@ -79,12 +79,12 @@ public class GT_FluidFactory { } /** - * Gets an {@link IGT_Fluid} builder instance + * Gets an {@link IGTFluid} builder instance * * @param fluidName The name key of the {@link Fluid} to register in the {@link FluidRegistry} - * @return the {@link IGT_FluidBuilder} instance + * @return the {@link IGTFluidBuilder} instance */ - public static IGT_FluidBuilder builder(final String fluidName) { - return new GT_FluidBuilder(fluidName); + public static IGTFluidBuilder builder(final String fluidName) { + return new GTFluidBuilder(fluidName); } } diff --git a/src/main/java/gregtech/api/fluid/FluidTankGT.java b/src/main/java/gregtech/api/fluid/GTFluidTank.java index 0c224985e6..46fc098000 100644 --- a/src/main/java/gregtech/api/fluid/FluidTankGT.java +++ b/src/main/java/gregtech/api/fluid/GTFluidTank.java @@ -15,11 +15,11 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; import gregtech.api.interfaces.fluid.IFluidStore; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; -public class FluidTankGT implements IFluidTank, IFluidStore { +public class GTFluidTank implements IFluidTank, IFluidStore { - public final FluidTankGT[] AS_ARRAY = new FluidTankGT[] { this }; + public final GTFluidTank[] AS_ARRAY = new GTFluidTank[] { this }; private FluidStack mFluid; private long mCapacity = 0, mAmount = 0; private boolean mPreventDraining = false, mVoidExcess = false, mChangedFluids = false; @@ -30,15 +30,15 @@ public class FluidTankGT implements IFluidTank, IFluidStore { /** Gives you a Tank Index in case there is multiple Tanks on a TileEntity that cares. */ public int mIndex = 0; - public FluidTankGT() { + public GTFluidTank() { mCapacity = Long.MAX_VALUE; } - public FluidTankGT(long aCapacity) { + public GTFluidTank(long aCapacity) { mCapacity = aCapacity; } - public FluidTankGT(FluidStack aFluid) { + public GTFluidTank(FluidStack aFluid) { mFluid = aFluid; if (aFluid != null) { mCapacity = aFluid.amount; @@ -46,33 +46,33 @@ public class FluidTankGT implements IFluidTank, IFluidStore { } } - public FluidTankGT(FluidStack aFluid, long aCapacity) { + public GTFluidTank(FluidStack aFluid, long aCapacity) { mFluid = aFluid; mCapacity = aCapacity; mAmount = (aFluid == null ? 0 : aFluid.amount); } - public FluidTankGT(FluidStack aFluid, long aAmount, long aCapacity) { + public GTFluidTank(FluidStack aFluid, long aAmount, long aCapacity) { mFluid = aFluid; mCapacity = aCapacity; mAmount = (aFluid == null ? 0 : aAmount); } - public FluidTankGT(Fluid aFluid, long aAmount) { + public GTFluidTank(Fluid aFluid, long aAmount) { this(new FluidStack(aFluid, saturatedCast(aAmount))); mAmount = aAmount; } - public FluidTankGT(Fluid aFluid, long aAmount, long aCapacity) { + public GTFluidTank(Fluid aFluid, long aAmount, long aCapacity) { this(new FluidStack(aFluid, saturatedCast(aAmount)), aCapacity); mAmount = aAmount; } - public FluidTankGT(NBTTagCompound aNBT, String aKey, long aCapacity) { + public GTFluidTank(NBTTagCompound aNBT, String aKey, long aCapacity) { this(aNBT.hasKey(aKey) ? aNBT.getCompoundTag(aKey) : null, aCapacity); } - public FluidTankGT(NBTTagCompound aNBT, long aCapacity) { + public GTFluidTank(NBTTagCompound aNBT, long aCapacity) { mCapacity = aCapacity; if (aNBT != null && !aNBT.hasNoTags()) { mFluid = FluidStack.loadFluidStackFromNBT(aNBT); @@ -80,7 +80,7 @@ public class FluidTankGT implements IFluidTank, IFluidStore { } } - public FluidTankGT readFromNBT(NBTTagCompound aNBT, String aKey) { + public GTFluidTank readFromNBT(NBTTagCompound aNBT, String aKey) { if (aNBT.hasKey(aKey)) { aNBT = aNBT.getCompoundTag(aKey); if (aNBT != null && !aNBT.hasNoTags()) { @@ -269,7 +269,7 @@ public class FluidTankGT implements IFluidTank, IFluidStore { } /** Resets Tank Contents entirely */ - public FluidTankGT setEmpty() { + public GTFluidTank setEmpty() { mFluid = null; mChangedFluids = true; mAmount = 0; @@ -277,7 +277,7 @@ public class FluidTankGT implements IFluidTank, IFluidStore { } /** Sets Fluid Content, taking Amount from the Fluid Parameter */ - public FluidTankGT setFluid(FluidStack aFluid) { + public GTFluidTank setFluid(FluidStack aFluid) { mFluid = aFluid; mChangedFluids = true; mAmount = (aFluid == null ? 0 : aFluid.amount); @@ -285,7 +285,7 @@ public class FluidTankGT implements IFluidTank, IFluidStore { } /** Sets Fluid Content and Amount */ - public FluidTankGT setFluid(FluidStack aFluid, long aAmount) { + public GTFluidTank setFluid(FluidStack aFluid, long aAmount) { mFluid = aFluid; mChangedFluids = true; mAmount = (aFluid == null ? 0 : aAmount); @@ -293,7 +293,7 @@ public class FluidTankGT implements IFluidTank, IFluidStore { } /** Sets Fluid Content, taking Amount from the Tank Parameter */ - public FluidTankGT setFluid(FluidTankGT aTank) { + public GTFluidTank setFluid(GTFluidTank aTank) { mFluid = new FluidStack(aTank.mFluid, saturatedCast(aTank.mAmount)); mChangedFluids = true; mAmount = aTank.mAmount; @@ -301,48 +301,48 @@ public class FluidTankGT implements IFluidTank, IFluidStore { } /** Sets the Tank Index for easier Reverse Mapping. */ - public FluidTankGT setIndex(int aIndex) { + public GTFluidTank setIndex(int aIndex) { mIndex = aIndex; return this; } /** Sets the Capacity */ - public FluidTankGT setCapacity(long aCapacity) { + public GTFluidTank setCapacity(long aCapacity) { if (aCapacity >= 0) mCapacity = aCapacity; return this; } /** Sets the Capacity Multiplier */ - public FluidTankGT setCapacityMultiplier(long aCapacityMultiplier) { + public GTFluidTank setCapacityMultiplier(long aCapacityMultiplier) { if (aCapacityMultiplier >= 0) mAdjustableMultiplier = aCapacityMultiplier; return this; } /** Sets Tank capacity Map, should it be needed. */ - public FluidTankGT setCapacity(Map<String, Long> aMap, long aCapacityMultiplier) { + public GTFluidTank setCapacity(Map<String, Long> aMap, long aCapacityMultiplier) { mAdjustableCapacity = aMap; mAdjustableMultiplier = aCapacityMultiplier; return this; } /** Always keeps at least 0 Liters of Fluid instead of setting it to null */ - public FluidTankGT setPreventDraining() { + public GTFluidTank setPreventDraining() { return setPreventDraining(true); } /** Always keeps at least 0 Liters of Fluid instead of setting it to null */ - public FluidTankGT setPreventDraining(boolean aPrevent) { + public GTFluidTank setPreventDraining(boolean aPrevent) { mPreventDraining = aPrevent; return this; } /** Voids any Overlow */ - public FluidTankGT setVoidExcess() { + public GTFluidTank setVoidExcess() { return setVoidExcess(true); } /** Voids any Overlow */ - public FluidTankGT setVoidExcess(boolean aVoidExcess) { + public GTFluidTank setVoidExcess(boolean aVoidExcess) { mVoidExcess = aVoidExcess; return this; } @@ -382,7 +382,7 @@ public class FluidTankGT implements IFluidTank, IFluidStore { } public boolean contains(FluidStack aFluid) { - return GT_Utility.areFluidsEqual(mFluid, aFluid); + return GTUtility.areFluidsEqual(mFluid, aFluid); } public boolean has(long aAmount) { @@ -460,12 +460,12 @@ public class FluidTankGT implements IFluidTank, IFluidStore { return new FluidTankInfo(isEmpty() ? null : mFluid.copy(), saturatedCast(capacity())); } - public static FluidStack[] getFluidsFromTanks(FluidTankGT[] tanks) { + public static FluidStack[] getFluidsFromTanks(GTFluidTank[] tanks) { if (tanks == null) { return null; } List<FluidStack> fluidStacks = new ArrayList<>(); - for (FluidTankGT tank : tanks) { + for (GTFluidTank tank : tanks) { if (tank.getFluid() != null) { fluidStacks.add(tank.getFluid()); } @@ -480,6 +480,6 @@ public class FluidTankGT implements IFluidTank, IFluidStore { @Override public boolean canStoreFluid(@Nonnull FluidStack fluidStack) { - return GT_Utility.areFluidsEqual(mFluid, fluidStack); + return GTUtility.areFluidsEqual(mFluid, fluidStack); } } |