aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/goodgenerator/blocks/regularBlock
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-28 18:39:10 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-28 18:39:10 -0800
commitb846f1dc3a502d157ecf871e2a4a1ff49915f871 (patch)
tree4a86feaaddd8d00d32f7cc093736d02be92bf358 /src/main/java/goodgenerator/blocks/regularBlock
parent3194d4cbab82e336ecb82b5a2dc80153ed9b1b81 (diff)
downloadGT5-Unofficial-b846f1dc3a502d157ecf871e2a4a1ff49915f871.tar.gz
GT5-Unofficial-b846f1dc3a502d157ecf871e2a4a1ff49915f871.tar.bz2
GT5-Unofficial-b846f1dc3a502d157ecf871e2a4a1ff49915f871.zip
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/goodgenerator/blocks/regularBlock')
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/Casing.java10
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java6
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/Frame.java6
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java3
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java34
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java18
6 files changed, 41 insertions, 36 deletions
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
index 8808abd169..9e01d783d2 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
@@ -1,10 +1,7 @@
package goodgenerator.blocks.regularBlock;
-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;
@@ -17,6 +14,11 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import goodgenerator.main.GoodGenerator;
+import gregtech.api.GregTech_API;
+
public class Casing extends Block {
@SideOnly(Side.CLIENT)
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
index 149a1b2bfb..0a0169d0b4 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
@@ -1,14 +1,16 @@
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 cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class ComplexTextureCasing extends Casing {
@SideOnly(Side.CLIENT)
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
index f5a62bed4f..b4acb03518 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
@@ -1,11 +1,13 @@
package goodgenerator.blocks.regularBlock;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.world.IBlockAccess;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
public class Frame extends Casing {
+
public Frame(String name, String[] texture) {
super(name, texture, Material.iron);
}
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java
index 914552ad8d..fb98b6adc8 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java
@@ -1,9 +1,10 @@
package goodgenerator.blocks.regularBlock;
-import gregtech.api.interfaces.ITexture;
import net.minecraft.block.Block;
import net.minecraft.world.IBlockAccess;
+import gregtech.api.interfaces.ITexture;
+
public interface ITextureBlock {
default ITexture[] getTexture(Block aBlock, byte aSide) {
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
index df98dc67dd..afaca2e834 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
@@ -1,14 +1,7 @@
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 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;
@@ -24,8 +17,17 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.IEssentiaContainerItem;
+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 gregtech.api.GregTech_API;
+import gregtech.api.util.GT_Utility;
public class TEBlock extends BlockContainer {
@@ -153,8 +155,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 {
@@ -166,12 +168,8 @@ public class TEBlock extends BlockContainer {
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())
+ && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).size() > 0) {
+ Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem())
.getAspects()[0];
((EssentiaHatch) tile).setLockedAspect(tLocked);
GT_Utility.sendChatToPlayer(
@@ -192,8 +190,8 @@ public class TEBlock extends BlockContainer {
ItemStack tItemStack = player.getHeldItem();
if (tItemStack == null) {
((EssentiaOutputHatch) tile).clear();
- GT_Utility.sendChatToPlayer(
- player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0"));
+ GT_Utility
+ .sendChatToPlayer(player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0"));
}
return true;
} else return false;
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java
index b07d173491..95358505f6 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java
@@ -1,5 +1,9 @@
package goodgenerator.blocks.regularBlock;
+import net.minecraft.block.Block;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+
import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase;
import goodgenerator.client.render.BlockRenderHandler;
import goodgenerator.main.GoodGenerator;
@@ -8,9 +12,6 @@ import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.render.TextureFactory;
-import net.minecraft.block.Block;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
public class TurbineCasing extends Casing implements ITextureBlock {
@@ -18,13 +19,12 @@ public class TurbineCasing extends Casing implements ITextureBlock {
public IIconContainer base;
static {
- for (int i = 0; i < 3; i++)
- for (int j = 1; j <= 9; j++)
- turbineShape[i][j - 1] = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_" + i + "" + j);
+ for (int i = 0; i < 3; i++) for (int j = 1; j <= 9; j++)
+ turbineShape[i][j - 1] = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_" + i + "" + j);
}
public TurbineCasing(String name, String texture) {
- super(name, new String[] {GoodGenerator.MOD_ID + ":" + texture});
+ super(name, new String[] { GoodGenerator.MOD_ID + ":" + texture });
base = new Textures.BlockIcons.CustomIcon("icons/" + texture);
}
@@ -42,7 +42,7 @@ public class TurbineCasing extends Casing implements ITextureBlock {
public ITexture[] getTurbineCasing(int iconIndex, boolean active, boolean hasTurbine) {
int states = active ? 0 : hasTurbine ? 1 : 2;
- return new ITexture[] {TextureFactory.of(base), TextureFactory.of(turbineShape[states][iconIndex])};
+ return new ITexture[] { TextureFactory.of(base), TextureFactory.of(turbineShape[states][iconIndex]) };
}
@Override
@@ -91,7 +91,7 @@ public class TurbineCasing extends Casing implements ITextureBlock {
@Override
public ITexture[] getTexture(Block aBlock, int aMeta, byte aSide) {
- return new ITexture[] {TextureFactory.of(base)};
+ return new ITexture[] { TextureFactory.of(base) };
}
@Override