From c0eb617fa5c146b7a222c5461faf14394508cf4b Mon Sep 17 00:00:00 2001 From: miozune Date: Fri, 15 Jul 2022 14:34:19 +0900 Subject: 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 --- .../goodgenerator/blocks/regularBlock/Casing.java | 17 ++++----- .../blocks/regularBlock/ComplexTextureCasing.java | 10 ++--- .../goodgenerator/blocks/regularBlock/Frame.java | 9 ++--- .../blocks/regularBlock/ITextureBlock.java | 1 - .../goodgenerator/blocks/regularBlock/TEBlock.java | 43 ++++++++++++++-------- .../blocks/regularBlock/TurbineCasing.java | 40 +++++++++----------- 6 files changed, 62 insertions(+), 58 deletions(-) (limited to 'src/main/java/goodgenerator/blocks/regularBlock') 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.translateToLocal("essentiahatch.chat.0"), tLocked.getLocalizedDescription())); + GT_Utility.sendChatToPlayer( + player, + String.format( + StatCollector.translateToLocal("essentiahatch.chat.0"), + tLocked.getLocalizedDescription())); } } else { ((EssentiaHatch) tile).setLockedAspect(null); @@ -180,7 +192,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 6fd25af048..b07d173491 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java @@ -1,7 +1,7 @@ package goodgenerator.blocks.regularBlock; -import goodgenerator.client.render.BlockRenderHandler; import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase; +import goodgenerator.client.render.BlockRenderHandler; import goodgenerator.main.GoodGenerator; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -12,19 +12,19 @@ import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -public class TurbineCasing extends Casing implements ITextureBlock{ +public class TurbineCasing extends Casing implements ITextureBlock { public static IIconContainer[][] turbineShape = new IIconContainer[3][9]; public IIconContainer base; static { - for (int i = 0; i < 3; i ++) - for (int j = 1; j <= 9; 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); } @@ -32,7 +32,8 @@ public class TurbineCasing extends Casing implements ITextureBlock{ TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; - if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase && tTile.getFrontFacing() == aSide) { + if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase + && tTile.getFrontFacing() == aSide) { if (tTile.isActive()) return 1; return ((GT_MetaTileEntity_LargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3; } @@ -41,10 +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 @@ -54,10 +52,10 @@ public class TurbineCasing extends Casing implements ITextureBlock{ case 0: for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { - if (i == 0 && j == 0) - continue; + if (i == 0 && j == 0) continue; int tState; - if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide)) != 0) { + if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide)) + != 0) { return getTurbineCasing(4 - i * 3 - j, tState == 1, tState == 2); } } @@ -66,10 +64,10 @@ public class TurbineCasing extends Casing implements ITextureBlock{ case 1: for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { - if (i == 0 && j == 0) - continue; + if (i == 0 && j == 0) continue; int tState; - if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide)) != 0) { + if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide)) + != 0) { return getTurbineCasing(4 + i * 3 - j * tInvertLeftRightMod, tState == 1, tState == 2); } } @@ -78,10 +76,10 @@ public class TurbineCasing extends Casing implements ITextureBlock{ case 2: for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { - if (i == 0 && j == 0) - continue; + if (i == 0 && j == 0) continue; int tState; - if ((tState = isTurbineControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide)) != 0) { + if ((tState = isTurbineControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide)) + != 0) { return getTurbineCasing(4 + i * 3 + j * tInvertLeftRightMod, tState == 1, tState == 2); } } @@ -93,9 +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 -- cgit