aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/fluid
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common/fluid')
-rw-r--r--src/main/java/gregtech/common/fluid/GTFluid.java (renamed from src/main/java/gregtech/common/fluid/GT_Fluid.java)64
-rw-r--r--src/main/java/gregtech/common/fluid/GTFluidBuilder.java (renamed from src/main/java/gregtech/common/fluid/GT_FluidBuilder.java)34
2 files changed, 49 insertions, 49 deletions
diff --git a/src/main/java/gregtech/common/fluid/GT_Fluid.java b/src/main/java/gregtech/common/fluid/GTFluid.java
index 6ba8d7d23a..3969817ee9 100644
--- a/src/main/java/gregtech/common/fluid/GT_Fluid.java
+++ b/src/main/java/gregtech/common/fluid/GTFluid.java
@@ -11,16 +11,16 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
import gregtech.api.enums.FluidState;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
-import gregtech.api.interfaces.fluid.IGT_Fluid;
-import gregtech.api.interfaces.fluid.IGT_RegisteredFluid;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.interfaces.fluid.IGTFluid;
+import gregtech.api.interfaces.fluid.IGTRegisteredFluid;
+import gregtech.api.util.GTLanguageManager;
+import gregtech.api.util.GTUtility;
-public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, Runnable {
+public class GTFluid extends Fluid implements IGTFluid, IGTRegisteredFluid, Runnable {
private final String localizedName;
private final ResourceLocation stillIconResourceLocation;
@@ -31,11 +31,11 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
private Fluid registeredFluid;
/**
- * Constructs this {@link IGT_Fluid} implementation from an {@link GT_FluidBuilder} instance
+ * Constructs this {@link IGTFluid} implementation from an {@link GTFluidBuilder} instance
*
- * @param builder The {@link GT_FluidBuilder} instance to construct this {@link IGT_Fluid} implementation
+ * @param builder The {@link GTFluidBuilder} instance to construct this {@link IGTFluid} implementation
*/
- protected GT_Fluid(@Nonnull final GT_FluidBuilder builder) {
+ protected GTFluid(@Nonnull final GTFluidBuilder builder) {
super(builder.fluidName);
this.localizedName = builder.localizedName;
this.stillIconResourceLocation = builder.stillIconResourceLocation;
@@ -49,7 +49,7 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
}
/**
- * Adjusts this {@link Fluid}'s settings based on this {@link IGT_Fluid}'s state
+ * Adjusts this {@link Fluid}'s settings based on this {@link IGTFluid}'s state
*/
protected void configureFromStateTemperature() {
switch (fluidState) {
@@ -91,24 +91,24 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
| Math.max(0, Math.min(255, colorRGBA[2]));
}
- // ----- IGT_Fluid interface implementations -----
+ // ----- IGTFluid interface implementations -----
- public IGT_RegisteredFluid addFluid() {
- if (FluidRegistry.registerFluid(GT_Fluid.this)) {
+ public IGTRegisteredFluid addFluid() {
+ if (FluidRegistry.registerFluid(GTFluid.this)) {
// Registered as a new Fluid
registeredFluid = this;
// Adds a server-side localized-name
- GT_LanguageManager.addStringLocalization(getUnlocalizedName(), localizedName);
+ GTLanguageManager.addStringLocalization(getUnlocalizedName(), localizedName);
} else {
// Fluid already registered, get it from the registry
- registeredFluid = FluidRegistry.getFluid(GT_Fluid.this.fluidName);
+ registeredFluid = FluidRegistry.getFluid(GTFluid.this.fluidName);
// Sets temperature of already registered fluids if they use the default (temperature = 300)
if (registeredFluid.getTemperature() == new Fluid("test").getTemperature()) {
- registeredFluid.setTemperature(GT_Fluid.this.temperature);
+ registeredFluid.setTemperature(GTFluid.this.temperature);
}
}
// Schedules the fluid for the block icons loader run() tasks
- GregTech_API.sGTBlockIconload.add(this);
+ GregTechAPI.sGTBlockIconload.add(this);
return this;
}
@@ -118,14 +118,14 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
* @inheritDoc
*/
@Override
- public IGT_RegisteredFluid registerContainers(final ItemStack fullContainer, final ItemStack emptyContainer,
+ public IGTRegisteredFluid registerContainers(final ItemStack fullContainer, final ItemStack emptyContainer,
final int containerSize) {
if (fullContainer != null && emptyContainer != null) {
final FluidStack fluidStack = new FluidStack(registeredFluid, containerSize);
if (!FluidContainerRegistry.registerFluidContainer(fluidStack, fullContainer, emptyContainer)) {
- GT_Values.RA.stdBuilder()
+ GTValues.RA.stdBuilder()
.itemInputs(fullContainer)
- .itemOutputs(GT_Utility.getContainerItem(fullContainer, false))
+ .itemOutputs(GTUtility.getContainerItem(fullContainer, false))
.fluidOutputs(fluidStack)
.duration(fluidStack.amount / 62)
.eut(1)
@@ -139,7 +139,7 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
* @inheritDoc
*/
@Override
- public IGT_RegisteredFluid registerBContainers(final ItemStack fullContainer, final ItemStack emptyContainer) {
+ public IGTRegisteredFluid registerBContainers(final ItemStack fullContainer, final ItemStack emptyContainer) {
return registerContainers(fullContainer, emptyContainer, 1000);
}
@@ -147,7 +147,7 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
* @inheritDoc
*/
@Override
- public IGT_RegisteredFluid registerPContainers(final ItemStack fullContainer, final ItemStack emptyContainer) {
+ public IGTRegisteredFluid registerPContainers(final ItemStack fullContainer, final ItemStack emptyContainer) {
return registerContainers(fullContainer, emptyContainer, 250);
}
@@ -155,7 +155,7 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
* @inheritDoc
*/
@Override
- public IGT_RegisteredFluid configureMaterials(final Materials material) {
+ public IGTRegisteredFluid configureMaterials(final Materials material) {
if (material != null) {
switch (fluidState) {
case SLURRY -> material.mSolid = registeredFluid;
@@ -180,30 +180,30 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
// ----- Runnable interface implementations -----
/**
- * This {@link Runnable#run()} implementation is scheduled within the {@link GregTech_API#sGTBlockIconload} to load
- * this {@link IGT_Fluid}'s texture icons.
+ * This {@link Runnable#run()} implementation is scheduled within the {@link GregTechAPI#sGTBlockIconload} to load
+ * this {@link IGTFluid}'s texture icons.
*
* @see Runnable#run()
*/
@Override
public void run() {
- if (iconsFrom instanceof GT_Fluid) {
- // Needs the GT_Fluid to have registered its icons
- ((GT_Fluid) iconsFrom).run();
+ if (iconsFrom instanceof GTFluid) {
+ // Needs the GTFluid to have registered its icons
+ ((GTFluid) iconsFrom).run();
stillIcon = iconsFrom.getStillIcon();
flowingIcon = iconsFrom.getFlowingIcon();
} else {
if (stillIconResourceLocation != null) {
- stillIcon = GregTech_API.sBlockIcons.registerIcon(stillIconResourceLocation.toString());
+ stillIcon = GregTechAPI.sBlockIcons.registerIcon(stillIconResourceLocation.toString());
}
if (flowingIconResourceLocation != null) {
- flowingIcon = GregTech_API.sBlockIcons.registerIcon(flowingIconResourceLocation.toString());
+ flowingIcon = GregTechAPI.sBlockIcons.registerIcon(flowingIconResourceLocation.toString());
}
}
}
@Override
public String toString() {
- return "GT_Fluid{" + "fluidName='" + fluidName + '\'' + '}';
+ return "GTFluid{" + "fluidName='" + fluidName + '\'' + '}';
}
}
diff --git a/src/main/java/gregtech/common/fluid/GT_FluidBuilder.java b/src/main/java/gregtech/common/fluid/GTFluidBuilder.java
index 9a18b8d812..e1532f0dbf 100644
--- a/src/main/java/gregtech/common/fluid/GT_FluidBuilder.java
+++ b/src/main/java/gregtech/common/fluid/GTFluidBuilder.java
@@ -13,11 +13,11 @@ import net.minecraftforge.fluids.Fluid;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.FluidState;
-import gregtech.api.interfaces.fluid.IGT_Fluid;
-import gregtech.api.interfaces.fluid.IGT_FluidBuilder;
-import gregtech.api.interfaces.fluid.IGT_RegisteredFluid;
+import gregtech.api.interfaces.fluid.IGTFluid;
+import gregtech.api.interfaces.fluid.IGTFluidBuilder;
+import gregtech.api.interfaces.fluid.IGTRegisteredFluid;
-public class GT_FluidBuilder implements IGT_FluidBuilder {
+public class GTFluidBuilder implements IGTFluidBuilder {
final String fluidName;
String localizedName;
@@ -30,7 +30,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
IIcon flowingIcon;
Fluid iconsFrom;
- public GT_FluidBuilder(final String fluidName) {
+ public GTFluidBuilder(final String fluidName) {
this.fluidName = fluidName.toLowerCase(Locale.ENGLISH);
}
@@ -38,7 +38,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
* @inheritDoc
*/
@Override
- public IGT_FluidBuilder withColorRGBA(final short[] colorRGBA) {
+ public IGTFluidBuilder withColorRGBA(final short[] colorRGBA) {
this.colorRGBA = colorRGBA;
return this;
}
@@ -47,7 +47,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
* @inheritDoc
*/
@Override
- public IGT_FluidBuilder withLocalizedName(final String localizedName) {
+ public IGTFluidBuilder withLocalizedName(final String localizedName) {
this.localizedName = localizedName;
return this;
}
@@ -56,7 +56,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
* @inheritDoc
*/
@Override
- public IGT_FluidBuilder withStateAndTemperature(final FluidState fluidState, final int temperature) {
+ public IGTFluidBuilder withStateAndTemperature(final FluidState fluidState, final int temperature) {
this.fluidState = fluidState;
this.temperature = temperature;
return this;
@@ -66,7 +66,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
* @inheritDoc
*/
@Override
- public IGT_FluidBuilder withStillIconResourceLocation(final ResourceLocation stillIconResourceLocation) {
+ public IGTFluidBuilder withStillIconResourceLocation(final ResourceLocation stillIconResourceLocation) {
this.stillIconResourceLocation = stillIconResourceLocation;
return this;
}
@@ -75,7 +75,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
* @inheritDoc
*/
@Override
- public IGT_FluidBuilder withFlowingIconResourceLocation(final ResourceLocation flowingIconResourceLocation) {
+ public IGTFluidBuilder withFlowingIconResourceLocation(final ResourceLocation flowingIconResourceLocation) {
this.flowingIconResourceLocation = flowingIconResourceLocation;
return this;
}
@@ -84,7 +84,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
* @inheritDoc
*/
@Override
- public IGT_FluidBuilder withTextureName(final String textureName) {
+ public IGTFluidBuilder withTextureName(final String textureName) {
this.stillIconResourceLocation = new ResourceLocation(GregTech.ID, "fluids/fluid." + textureName);
this.flowingIconResourceLocation = null;
return this;
@@ -94,7 +94,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
* @inheritDoc
*/
@Override
- public IGT_FluidBuilder withIconsFrom(@Nonnull final Fluid fromFluid) {
+ public IGTFluidBuilder withIconsFrom(@Nonnull final Fluid fromFluid) {
this.iconsFrom = fromFluid;
return this;
}
@@ -103,7 +103,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
* @inheritDoc
*/
@Override
- public IGT_FluidBuilder withFluidBlock(final Block fluidBlock) {
+ public IGTFluidBuilder withFluidBlock(final Block fluidBlock) {
this.fluidBlock = fluidBlock;
return this;
}
@@ -112,7 +112,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
* @inheritDoc
*/
@Override
- public IGT_FluidBuilder withTextures(final ResourceLocation stillIconResourceLocation,
+ public IGTFluidBuilder withTextures(final ResourceLocation stillIconResourceLocation,
final ResourceLocation flowingIconResourceLocation) {
this.stillIconResourceLocation = stillIconResourceLocation;
this.flowingIconResourceLocation = flowingIconResourceLocation;
@@ -123,7 +123,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
* @inheritDoc
*/
@Override
- public IGT_Fluid build() {
+ public IGTFluid build() {
if (colorRGBA == null) {
colorRGBA = Dyes._NULL.getRGBA();
}
@@ -133,14 +133,14 @@ public class GT_FluidBuilder implements IGT_FluidBuilder {
if (localizedName == null) {
localizedName = fluidName;
}
- return new GT_Fluid(this);
+ return new GTFluid(this);
}
/**
* @inheritDoc
*/
@Override
- public IGT_RegisteredFluid buildAndRegister() {
+ public IGTRegisteredFluid buildAndRegister() {
return build().addFluid();
}
}
generated by cgit (git 2.46.0) at 2025-03-04 08:32:05 +0000