aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/goodgenerator/blocks
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
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')
-rw-r--r--src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java34
-rw-r--r--src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java118
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/Casing.java17
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java10
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/Frame.java9
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java1
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java43
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java40
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java287
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java25
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java6
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java36
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java242
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java182
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java142
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java16
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java50
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java161
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java333
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java189
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java59
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java19
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java19
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java68
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java66
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java19
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java220
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java172
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java155
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java31
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java215
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java206
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java232
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_TooltipMultiBlockBase_EM.java7
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java677
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java669
36 files changed, 2635 insertions, 2140 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);
}
}
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
index 7a1db3278d..8808abd169 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
@@ -1,9 +1,10 @@
package goodgenerator.blocks.regularBlock;
-import goodgenerator.main.GoodGenerator;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import goodgenerator.main.GoodGenerator;
import gregtech.api.GregTech_API;
+import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -16,12 +17,11 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
-import java.util.List;
-
public class Casing extends Block {
@SideOnly(Side.CLIENT)
protected IIcon[] texture;
+
String[] textureNames;
protected String name;
@@ -30,29 +30,29 @@ public class Casing extends Block {
this.setHardness(9.0F);
this.setResistance(5.0F);
this.name = name;
- this.setHarvestLevel("wrench",2);
+ this.setHarvestLevel("wrench", 2);
this.setCreativeTab(GoodGenerator.GG);
GregTech_API.registerMachineBlock(this, -1);
}
- public Casing(String name, String[] texture){
+ public Casing(String name, String[] texture) {
super(Material.iron);
this.setHardness(9.0F);
this.setResistance(5.0F);
this.name = name;
this.textureNames = texture;
- this.setHarvestLevel("wrench",2);
+ this.setHarvestLevel("wrench", 2);
this.setCreativeTab(GoodGenerator.GG);
GregTech_API.registerMachineBlock(this, -1);
}
- public Casing(String name, String[] texture, Material material){
+ public Casing(String name, String[] texture, Material material) {
super(material);
this.setHardness(9.0F);
this.setResistance(5.0F);
this.name = name;
this.textureNames = texture;
- this.setHarvestLevel("wrench",2);
+ this.setHarvestLevel("wrench", 2);
this.setCreativeTab(GoodGenerator.GG);
GregTech_API.registerMachineBlock(this, -1);
}
@@ -119,5 +119,4 @@ public class Casing extends Block {
public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
return false;
}
-
}
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
index 18a1629cbf..149a1b2bfb 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
@@ -2,22 +2,21 @@ package goodgenerator.blocks.regularBlock;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
-import java.util.List;
-
-public class ComplexTextureCasing extends Casing{
+public class ComplexTextureCasing extends Casing {
@SideOnly(Side.CLIENT)
protected IIcon[] texture1, texture2;
String[] textureSide;
String[] textureTopAndDown;
- public ComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown){
+ public ComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown) {
super(name);
this.textureSide = textureSide;
this.textureTopAndDown = textureTopAndDown;
@@ -28,8 +27,7 @@ public class ComplexTextureCasing extends Casing{
public IIcon getIcon(int side, int meta) {
if (side < 2) {
return meta < this.texture2.length ? this.texture2[meta] : this.texture2[0];
- }
- else {
+ } else {
return meta < this.texture1.length ? this.texture1[meta] : this.texture1[0];
}
}
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
index 90c38c4cce..f5a62bed4f 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
@@ -5,9 +5,9 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.world.IBlockAccess;
-public class Frame extends Casing{
- public Frame(String name,String[] texture){
- super(name,texture, Material.iron);
+public class Frame extends Casing {
+ public Frame(String name, String[] texture) {
+ super(name, texture, Material.iron);
}
@Override
@@ -18,8 +18,7 @@ public class Frame extends Casing{
@Override
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockAccess worldClient, int xCoord, int yCoord, int zCoord, int aSide) {
- if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof Frame)
- return false;
+ if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof Frame) return false;
return super.shouldSideBeRendered(worldClient, xCoord, yCoord, zCoord, aSide);
}
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java
index eba7c2c890..914552ad8d 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java
@@ -13,5 +13,4 @@ public interface ITextureBlock {
ITexture[] getTexture(Block aBlock, byte aSide, IBlockAccess aWorld, int xCoord, int yCoord, int zCoord);
ITexture[] getTexture(Block aBlock, int aMeta, byte aSide);
-
}
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
index 3be9619968..df98dc67dd 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
@@ -1,13 +1,14 @@
package goodgenerator.blocks.regularBlock;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
import goodgenerator.blocks.tileEntity.EssentiaHatch;
import goodgenerator.blocks.tileEntity.EssentiaOutputHatch;
import goodgenerator.blocks.tileEntity.EssentiaOutputHatch_ME;
import goodgenerator.main.GoodGenerator;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTech_API;
import gregtech.api.util.GT_Utility;
+import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -26,46 +27,45 @@ import net.minecraft.world.World;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.IEssentiaContainerItem;
-import java.util.List;
-
public class TEBlock extends BlockContainer {
@SideOnly(Side.CLIENT)
protected IIcon[] texture;
+
String[] textureNames;
protected String name;
protected int index;
- public TEBlock(String name, String[] texture, CreativeTabs Tab){
+ public TEBlock(String name, String[] texture, CreativeTabs Tab) {
super(Material.iron);
this.setHardness(9.0F);
this.setResistance(5.0F);
this.name = name;
this.textureNames = texture;
- this.setHarvestLevel("wrench",2);
+ this.setHarvestLevel("wrench", 2);
this.setCreativeTab(GoodGenerator.GG);
GregTech_API.registerMachineBlock(this, -1);
}
- public TEBlock(String name, String[] texture, int index){
+ public TEBlock(String name, String[] texture, int index) {
super(Material.iron);
this.setHardness(9.0F);
this.setResistance(5.0F);
this.name = name;
this.textureNames = texture;
- this.setHarvestLevel("wrench",2);
+ this.setHarvestLevel("wrench", 2);
this.index = index;
this.setCreativeTab(GoodGenerator.GG);
GregTech_API.registerMachineBlock(this, -1);
}
- public TEBlock(String name, String[] texture, Material material){
+ public TEBlock(String name, String[] texture, Material material) {
super(material);
this.setHardness(9.0F);
this.setResistance(5.0F);
this.name = name;
this.textureNames = texture;
- this.setHarvestLevel("wrench",2);
+ this.setHarvestLevel("wrench", 2);
this.setCreativeTab(GoodGenerator.GG);
GregTech_API.registerMachineBlock(this, -1);
}
@@ -153,7 +153,8 @@ public class TEBlock extends BlockContainer {
}
@Override
- public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) {
+ public boolean onBlockActivated(
+ World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) {
if (world.isRemote) {
return false;
} else {
@@ -163,10 +164,21 @@ public class TEBlock extends BlockContainer {
ItemStack tItemStack = player.getHeldItem();
if (tItemStack != null) {
Item tItem = tItemStack.getItem();
- if (tItem instanceof IEssentiaContainerItem && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) != null && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).size() > 0) {
- Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).getAspects()[0];
+ if (tItem instanceof IEssentiaContainerItem
+ && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) != null
+ && ((IEssentiaContainerItem) tItem)
+ .getAspects(player.getHeldItem())
+ .size()
+ > 0) {
+ Aspect tLocked = ((IEssentiaContainerItem) tItem)
+ .getAspects(player.getHeldItem())
+ .getAspects()[0];
((EssentiaHatch) tile).setLockedAspect(tLocked);
- GT_Utility.sendChatToPlayer(player, String.format(StatCollector.transla