aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/goodgenerator/blocks/myFluids
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2022-07-15 14:34:19 +0900
committerGitHub <noreply@github.com>2022-07-15 06:34:19 +0100
commitc0eb617fa5c146b7a222c5461faf14394508cf4b (patch)
treee25d23490122b5c663fd4e2791a81704c0183b00 /src/main/java/goodgenerator/blocks/myFluids
parent36301feacf5a33ded24d338ae39985da6080d2bb (diff)
downloadGT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.tar.gz
GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.tar.bz2
GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.zip
Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge (#53)
* Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge * updateBuildScript & spotlessApply
Diffstat (limited to 'src/main/java/goodgenerator/blocks/myFluids')
-rw-r--r--src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java34
-rw-r--r--src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java118
2 files changed, 63 insertions, 89 deletions
diff --git a/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java b/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java
index 9ccbd27e70..078012e64c 100644
--- a/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java
+++ b/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java
@@ -1,5 +1,7 @@
package goodgenerator.blocks.myFluids;
+import static goodgenerator.main.GoodGenerator.MOD_ID;
+
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
@@ -9,46 +11,42 @@ import net.minecraftforge.fluids.BlockFluidClassic;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
-import static goodgenerator.main.GoodGenerator.MOD_ID;
-
-public class BaseFluid extends BlockFluidClassic{
- @SideOnly( Side.CLIENT )
+public class BaseFluid extends BlockFluidClassic {
+ @SideOnly(Side.CLIENT)
protected IIcon stillIcon;
- @SideOnly( Side.CLIENT )
+
+ @SideOnly(Side.CLIENT)
protected IIcon flowingIcon;
+
private String stillTexture;
private String flowingTexture;
- public BaseFluid(Fluid fluid, Material material)
- {
- super( fluid, material );
+ public BaseFluid(Fluid fluid, Material material) {
+ super(fluid, material);
}
- public void SetTexture(String fluidName)
- {
+ public void SetTexture(String fluidName) {
stillTexture = MOD_ID + ":fluids/" + fluidName + ".still";
flowingTexture = MOD_ID + ":fluids/" + fluidName + ".flowing";
}
- public static Fluid BuildFluid(String fluidName){
+ public static Fluid BuildFluid(String fluidName) {
Fluid tFluid = new Fluid(fluidName);
FluidRegistry.registerFluid(tFluid);
return tFluid;
}
- @SideOnly( Side.CLIENT )
+ @SideOnly(Side.CLIENT)
@Override
- public void registerBlockIcons( IIconRegister register )
- {
+ public void registerBlockIcons(IIconRegister register) {
stillIcon = register.registerIcon(stillTexture);
flowingIcon = register.registerIcon(flowingTexture);
- super.getFluid().setIcons( stillIcon, flowingIcon );
+ super.getFluid().setIcons(stillIcon, flowingIcon);
}
@Override
- public IIcon getIcon( int side, int meta )
- {
- return ( side == 0 || side == 1 ) ? stillIcon : flowingIcon;
+ public IIcon getIcon(int side, int meta) {
+ return (side == 0 || side == 1) ? stillIcon : flowingIcon;
}
}
diff --git a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
index eb7879200f..87466ea26a 100644
--- a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
+++ b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
@@ -1,13 +1,12 @@
package goodgenerator.blocks.myFluids;
-import goodgenerator.crossmod.nei.NEI_Config;
import cpw.mods.fml.common.registry.GameRegistry;
+import goodgenerator.crossmod.nei.NEI_Config;
import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.Fluid;
public class FluidsBuilder {
- public FluidsBuilder(){
- }
+ public FluidsBuilder() {}
public static void Register() {
crackedNaquadahGas_Lightly();
@@ -27,176 +26,153 @@ public class FluidsBuilder {
supercriticalSteam();
}
- public static void crackedNaquadahGas_Lightly(){
+ public static void crackedNaquadahGas_Lightly() {
Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedNaquadahGas");
- tmp.setGaseous(true)
- .setTemperature(800);
+ tmp.setGaseous(true).setTemperature(800);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("lightlyCrackedNaquadahGas");
tmp2.setBlockName("lightlyCrackedNaquadahGas");
- GameRegistry.registerBlock(tmp2,"lightlyCrackedNaquadahGas");
+ GameRegistry.registerBlock(tmp2, "lightlyCrackedNaquadahGas");
NEI_Config.hide(tmp2);
}
- public static void crackedNaquadahGas_Moderately(){
+ public static void crackedNaquadahGas_Moderately() {
Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedNaquadahGas");
- tmp.setGaseous(true)
- .setTemperature(800);
+ tmp.setGaseous(true).setTemperature(800);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("moderatelyCrackedNaquadahGas");
tmp2.setBlockName("moderatelyCrackedNaquadahGas");
- GameRegistry.registerBlock(tmp2,"moderatelyCrackedNaquadahGas");
+ GameRegistry.registerBlock(tmp2, "moderatelyCrackedNaquadahGas");
NEI_Config.hide(tmp2);
}
- public static void crackedNaquadahGas_Heavily(){
+ public static void crackedNaquadahGas_Heavily() {
Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedNaquadahGas");
- tmp.setGaseous(true)
- .setTemperature(800);
+ tmp.setGaseous(true).setTemperature(800);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("heavilyCrackedNaquadahGas");
tmp2.setBlockName("heavilyCrackedNaquadahGas");
- GameRegistry.registerBlock(tmp2,"heavilyCrackedNaquadahGas");
+ GameRegistry.registerBlock(tmp2, "heavilyCrackedNaquadahGas");
NEI_Config.hide(tmp2);
}
- public static void crackedLightNaquadahFuel_Lightly(){
+ public static void crackedLightNaquadahFuel_Lightly() {
Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedLightNaquadahFuel");
- tmp.setGaseous(false)
- .setTemperature(1200);
+ tmp.setGaseous(false).setTemperature(1200);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("lightlyCrackedLightNaquadahFuel");
tmp2.setBlockName("lightlyCrackedLightNaquadahFuel");
- GameRegistry.registerBlock(tmp2,"lightlyCrackedLightNaquadahFuel");
+ GameRegistry.registerBlock(tmp2, "lightlyCrackedLightNaquadahFuel");
NEI_Config.hide(tmp2);
}
- public static void crackedLightNaquadahFuel_Moderately(){
+ public static void crackedLightNaquadahFuel_Moderately() {
Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedLightNaquadahFuel");
- tmp.setGaseous(false)
- .setTemperature(1200);
+ tmp.setGaseous(false).setTemperature(1200);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("moderatelyCrackedLightNaquadahFuel");
tmp2.setBlockName("moderatelyCrackedLightNaquadahFuel");
- GameRegistry.registerBlock(tmp2,"moderatelyCrackedLightNaquadahFuel");
+ GameRegistry.registerBlock(tmp2, "moderatelyCrackedLightNaquadahFuel");
NEI_Config.hide(tmp2);
}
- public static void crackedLightNaquadahFuel_Heavily(){
+ public static void crackedLightNaquadahFuel_Heavily() {
Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedLightNaquadahFuel");
- tmp.setGaseous(false)
- .setTemperature(1200);
+ tmp.setGaseous(false).setTemperature(1200);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("heavilyCrackedLightNaquadahFuel");
tmp2.setBlockName("heavilyCrackedLightNaquadahFuel");
- GameRegistry.registerBlock(tmp2,"heavilyCrackedLightNaquadahFuel");
+ GameRegistry.registerBlock(tmp2, "heavilyCrackedLightNaquadahFuel");
NEI_Config.hide(tmp2);
}
- public static void crackedHeavyNaquadahFuel_Lightly(){
+ public static void crackedHeavyNaquadahFuel_Lightly() {
Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedHeavyNaquadahFuel");
- tmp.setGaseous(false)
- .setTemperature(1200);
+ tmp.setGaseous(false).setTemperature(1200);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("lightlyCrackedHeavyNaquadahFuel");
tmp2.setBlockName("lightlyCrackedHeavyNaquadahFuel");
- GameRegistry.registerBlock(tmp2,"lightlyCrackedHeavyNaquadahFuel");
+ GameRegistry.registerBlock(tmp2, "lightlyCrackedHeavyNaquadahFuel");
NEI_Config.hide(tmp2);
}
- public static void crackedHeavyNaquadahFuel_Moderately(){
+ public static void crackedHeavyNaquadahFuel_Moderately() {
Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedHeavyNaquadahFuel");
- tmp.setGaseous(false)
- .setTemperature(1200);
+ tmp.setGaseous(false).setTemperature(1200);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("moderatelyCrackedHeavyNaquadahFuel");
tmp2.setBlockName("moderatelyCrackedHeavyNaquadahFuel");
- GameRegistry.registerBlock(tmp2,"moderatelyCrackedHeavyNaquadahFuel");
+ GameRegistry.registerBlock(tmp2, "moderatelyCrackedHeavyNaquadahFuel");
NEI_Config.hide(tmp2);
}
- public static void crackedHeavyNaquadahFuel_Heavily(){
+ public static void crackedHeavyNaquadahFuel_Heavily() {
Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedHeavyNaquadahFuel");
- tmp.setGaseous(false)
- .setTemperature(1200);
+ tmp.setGaseous(false).setTemperature(1200);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("heavilyCrackedHeavyNaquadahFuel");
tmp2.setBlockName("heavilyCrackedHeavyNaquadahFuel");
- GameRegistry.registerBlock(tmp2,"heavilyCrackedHeavyNaquadahFuel");
+ GameRegistry.registerBlock(tmp2, "heavilyCrackedHeavyNaquadahFuel");
NEI_Config.hide(tmp2);
}
- public static void crackedNaquadahAsphalt_Lightly(){
+ public static void crackedNaquadahAsphalt_Lightly() {
Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedNaquadahAsphalt");
- tmp.setGaseous(false)
- .setTemperature(1800)
- .setDensity(20000)
- .setViscosity(20000);
+ tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("lightlyCrackedNaquadahAsphalt");
tmp2.setBlockName("lightlyCrackedNaquadahAsphalt");
- GameRegistry.registerBlock(tmp2,"lightlyCrackedNaquadahAsphalt");
+ GameRegistry.registerBlock(tmp2, "lightlyCrackedNaquadahAsphalt");
NEI_Config.hide(tmp2);
}
- public static void crackedNaquadahAsphalt_Moderately(){
+ public static void crackedNaquadahAsphalt_Moderately() {
Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedNaquadahAsphalt");
- tmp.setGaseous(false)
- .setTemperature(1800)
- .setDensity(20000)
- .setViscosity(20000);
+ tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("moderatelyCrackedNaquadahAsphalt");
tmp2.setBlockName("moderatelyCrackedNaquadahAsphalt");
- GameRegistry.registerBlock(tmp2,"moderatelyCrackedNaquadahAsphalt");
+ GameRegistry.registerBlock(tmp2, "moderatelyCrackedNaquadahAsphalt");
NEI_Config.hide(tmp2);
}
- public static void crackedNaquadahAsphalt_Heavily(){
+ public static void crackedNaquadahAsphalt_Heavily() {
Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedNaquadahAsphalt");
- tmp.setGaseous(false)
- .setTemperature(1800)
- .setDensity(20000)
- .setViscosity(20000);
+ tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("heavilyCrackedNaquadahAsphalt");
tmp2.setBlockName("heavilyCrackedNaquadahAsphalt");
- GameRegistry.registerBlock(tmp2,"heavilyCrackedNaquadahAsphalt");
+ GameRegistry.registerBlock(tmp2, "heavilyCrackedNaquadahAsphalt");
NEI_Config.hide(tmp2);
}
- public static void combustionPromotor(){
+ public static void combustionPromotor() {
Fluid tmp = BaseFluid.BuildFluid("combustionPromotor");
- tmp.setGaseous(false)
- .setTemperature(300);
+ tmp.setGaseous(false).setTemperature(300);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("combustionPromotor");
tmp2.setBlockName("combustionPromotor");
- GameRegistry.registerBlock(tmp2,"combustionPromotor");
+ GameRegistry.registerBlock(tmp2, "combustionPromotor");
NEI_Config.hide(tmp2);
}
- public static void coalTar(){
+ public static void coalTar() {
Fluid tmp = BaseFluid.BuildFluid("fluid.coalTar");
- tmp.setGaseous(false)
- .setTemperature(450)
- .setUnlocalizedName("fluid.coalTar");
+ tmp.setGaseous(false).setTemperature(450).setUnlocalizedName("fluid.coalTar");
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("coalTar");
tmp2.setBlockTextureName("coalTar");
- GameRegistry.registerBlock(tmp2,"coalTar");
+ GameRegistry.registerBlock(tmp2, "coalTar");
NEI_Config.hide(tmp2);
}
- public static void supercriticalSteam(){
+ public static void supercriticalSteam() {
Fluid tmp = BaseFluid.BuildFluid("supercriticalSteam");
- tmp.setGaseous(true)
- .setTemperature(648)
- .setUnlocalizedName("supercriticalSteam");
+ tmp.setGaseous(true).setTemperature(648).setUnlocalizedName("supercriticalSteam");
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("supercriticalSteam");
tmp2.setBlockTextureName("supercriticalSteam");
- GameRegistry.registerBlock(tmp2,"supercriticalSteam");
+ GameRegistry.registerBlock(tmp2, "supercriticalSteam");
NEI_Config.hide(tmp2);
}
}