diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
| commit | 55f64675b42ac8d3c557cc850f78664bee006f6f (patch) | |
| tree | 2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/xmod/gregtech/common/helpers | |
| parent | 0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff) | |
| download | GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2 GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip | |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/helpers')
11 files changed, 363 insertions, 275 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java index a55cae39ea..ac30942a5f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java @@ -2,6 +2,15 @@ package gtPlusPlus.xmod.gregtech.common.helpers; import static gregtech.api.GregTech_API.mEUtoRF; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; + import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -21,20 +30,11 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaWirelessCharger; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; public class ChargingHelper { - private static Map<String, Pair<GregtechMetaWirelessCharger, Byte>> mValidPlayers = - new HashMap<String, Pair<GregtechMetaWirelessCharger, Byte>>(); - protected static Map<BlockPos, GregtechMetaWirelessCharger> mChargerMap = - new HashMap<BlockPos, GregtechMetaWirelessCharger>(); + private static Map<String, Pair<GregtechMetaWirelessCharger, Byte>> mValidPlayers = new HashMap<String, Pair<GregtechMetaWirelessCharger, Byte>>(); + protected static Map<BlockPos, GregtechMetaWirelessCharger> mChargerMap = new HashMap<BlockPos, GregtechMetaWirelessCharger>(); private int mTickTimer = 0; private final int mTickMultiplier = 20; @@ -66,9 +66,8 @@ public class ChargingHelper { for (GregtechMetaWirelessCharger mEntityTemp : mChargerMap.values()) { if (mEntityTemp != null) { if (mEntityTemp.getBaseMetaTileEntity() == null - || !mEntityTemp - .getBaseMetaTileEntity() - .isAllowedToWork()) continue; + || !mEntityTemp.getBaseMetaTileEntity().isAllowedToWork()) + continue; if (mPlayerMan.getEntityWorld().provider.dimensionId == mEntityTemp.getDimensionID()) { mVoltage = mEntityTemp.maxEUInput(); @@ -85,32 +84,48 @@ public class ChargingHelper { if (!LR.isEmpty() && LR.containsKey(mPlayerMan.getDisplayName())) { mCurrentEu = chargeItems( - mEntityTemp, mArmourContents, mPlayerMan); + mEntityTemp, + mArmourContents, + mPlayerMan); mCurrentEu = chargeItems( - mEntityTemp, mInventoryContents, mPlayerMan); + mEntityTemp, + mInventoryContents, + mPlayerMan); } } else if (mEntityTemp.getMode() == 1) { if (!LO.isEmpty() && LO.containsKey(mPlayerMan.getDisplayName())) { mCurrentEu = chargeItems( - mEntityTemp, mArmourContents, mPlayerMan); + mEntityTemp, + mArmourContents, + mPlayerMan); mCurrentEu = chargeItems( - mEntityTemp, mInventoryContents, mPlayerMan); + mEntityTemp, + mInventoryContents, + mPlayerMan); } } else { if (!LR.isEmpty() && LR.containsKey(mPlayerMan.getDisplayName())) { mCurrentEu = chargeItems( - mEntityTemp, mArmourContents, mPlayerMan); + mEntityTemp, + mArmourContents, + mPlayerMan); mCurrentEu = chargeItems( - mEntityTemp, mInventoryContents, mPlayerMan); + mEntityTemp, + mInventoryContents, + mPlayerMan); } if (!LO.isEmpty() && LO.containsKey(mPlayerMan.getDisplayName())) { mCurrentEu = chargeItems( - mEntityTemp, mArmourContents, mPlayerMan); + mEntityTemp, + mArmourContents, + mPlayerMan); mCurrentEu = chargeItems( - mEntityTemp, mInventoryContents, mPlayerMan); + mEntityTemp, + mInventoryContents, + mPlayerMan); } } @@ -125,13 +140,14 @@ public class ChargingHelper { mMaxDistance = (4 * GT_Values.V[mEntityTemp.getTier()] / 2); } double mDistance = calculateDistance(mEntityTemp, mPlayerMan); - long mVoltageCost = MathUtils.findPercentageOfInt( - mMaxDistance, (float) mDistance); + long mVoltageCost = MathUtils + .findPercentageOfInt(mMaxDistance, (float) mDistance); if (mVoltageCost > 0) { if (mVoltageCost > mEntityTemp.maxEUInput()) { - mEntityTemp.setEUVar((mEntityTemp.getEUVar() - - mEntityTemp.maxEUInput())); + mEntityTemp.setEUVar( + (mEntityTemp.getEUVar() + - mEntityTemp.maxEUInput())); } else { mEntityTemp.setEUVar( (mEntityTemp.getEUVar() - mVoltageCost)); @@ -202,8 +218,9 @@ public class ChargingHelper { return false; } else { Logger.WARNING("key not found, adding"); - Pair<GregtechMetaWirelessCharger, Byte> mEntry = - new Pair<GregtechMetaWirelessCharger, Byte>(mEntity, (byte) mEntity.getMode()); + Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<GregtechMetaWirelessCharger, Byte>( + mEntity, + (byte) mEntity.getMode()); if (mValidPlayers.put(mPlayer.getDisplayName(), mEntry) == null) { Logger.WARNING("Added a Player to the Tick Map."); return true; @@ -221,8 +238,9 @@ public class ChargingHelper { Logger.WARNING("trying to remove player from map"); if (mValidPlayers.containsKey(mPlayer.getDisplayName())) { Logger.WARNING("key found, removing"); - Pair<GregtechMetaWirelessCharger, Byte> mEntry = - new Pair<GregtechMetaWirelessCharger, Byte>(mEntity, (byte) mEntity.getMode()); + Pair<GregtechMetaWirelessCharger, Byte> mEntry = new Pair<GregtechMetaWirelessCharger, Byte>( + mEntity, + (byte) mEntity.getMode()); if (mValidPlayers.remove(mPlayer, mEntry)) { Logger.WARNING("Removed a Player to the Tick Map."); return true; @@ -241,7 +259,8 @@ public class ChargingHelper { return 0; } return mEntityTemp.getDistanceBetweenTwoPositions( - mEntityTemp.getTileEntityPosition(), mEntityTemp.getPositionOfEntity(mPlayerMan)); + mEntityTemp.getTileEntityPosition(), + mEntityTemp.getPositionOfEntity(mPlayerMan)); } public long chargeItems(GregtechMetaWirelessCharger mEntity, ItemStack[] mItems, EntityPlayer mPlayer) { @@ -305,10 +324,7 @@ public class ChargingHelper { || mTemp.getItem() instanceof GT_MetaGenerated_Item_02 || ReflectionUtils.getClass("gregtech.common.items.GT_MetaGenerated_Item_03") .isInstance(mTemp.getItem()) - || mTemp.getItem() - .getClass() - .getName() - .toLowerCase() + || mTemp.getItem().getClass().getName().toLowerCase() .equals(("gregtech.common.items.GT_MetaGenerated_Tool_01").toLowerCase())) { if (!NBTUtils.hasKey(mTemp, "GT.ItemCharge")) { if (!mTemp.getDisplayName().toLowerCase().contains("battery")) { @@ -341,13 +357,14 @@ public class ChargingHelper { mMulti = 20; } else if ((mitemCurrentCharge + (mVoltageIncrease * 10)) <= (mItemMaxCharge - (mVoltageIncrease * 10))) { - mMulti = 10; - } else if ((mitemCurrentCharge + (mVoltageIncrease * 5)) - <= (mItemMaxCharge - (mVoltageIncrease * 5))) { - mMulti = 5; - } else { - mMulti = 1; - } + mMulti = 10; + } else + if ((mitemCurrentCharge + (mVoltageIncrease * 5)) + <= (mItemMaxCharge - (mVoltageIncrease * 5))) { + mMulti = 5; + } else { + mMulti = 1; + } Logger.WARNING("5"); int mMultiVoltage = (int) (mMulti * mVoltageIncrease); @@ -359,9 +376,8 @@ public class ChargingHelper { > 0) { Logger.WARNING("6.5 - " + g + " - " + mMulti); for (int i = 0; i < mMulti; i++) { - if (ElectricItem.manager.charge( - mTemp, mVoltageIncrease, Integer.MAX_VALUE, false, false) - > 0) { + if (ElectricItem.manager + .charge(mTemp, mVoltageIncrease, Integer.MAX_VALUE, false, false) > 0) { continue; } } @@ -370,11 +386,22 @@ public class ChargingHelper { Logger.WARNING("7"); mEntity.setEUVar(mEuStored - (mVoltage * mMulti)); mEuStored = mEntity.getEUVar(); - Logger.WARNING("Charged " + mTemp.getDisplayName() + " | Slot: " + mItemSlot - + " | EU Multiplier: " + mMulti + " | EU/t input: " + mVoltageIncrease - + " | EU/t consumed by Tile: " + mVoltage + " | Item Max Charge: " + mItemMaxCharge - + " | Item Start Charge: " + mitemCurrentCharge + " | Item New Charge" - + ElectricItem.manager.getCharge(mTemp)); + Logger.WARNING( + "Charged " + mTemp.getDisplayName() + + " | Slot: " + + mItemSlot + + " | EU Multiplier: " + + mMulti + + " | EU/t input: " + + mVoltageIncrease + + " | EU/t consumed by Tile: " + + mVoltage + + " | Item Max Charge: " + + mItemMaxCharge + + " | Item Start Charge: " + + mitemCurrentCharge + + " | Item New Charge" + + ElectricItem.manager.getCharge(mTemp)); mChargedItems++; } } @@ -391,11 +418,22 @@ public class ChargingHelper { Logger.WARNING("9"); mEntity.setEUVar(mEntity.getEUVar() - (xDif)); mEuStored = mEntity.getEUVar(); - Logger.WARNING("Charged " + mTemp.getDisplayName() + " | Slot: " + mItemSlot - + " | EU Multiplier: " + mMulti + " | EU/t input: " + mVoltageIncrease - + " | EU/t consumed by Tile: " + mVoltage + " | Item Max Charge: " - + mItemMaxCharge + " | Item Start Charge: " + mitemCurrentCharge - + " | Item New Charge" + ElectricItem.manager.getCharge(mTemp)); + Logger.WARNING( + "Charged " + mTemp.getDisplayName() + + " | Slot: " + + mItemSlot + + " | EU Multiplier: " + + mMulti + + " | EU/t input: " + + mVoltageIncrease + + " | EU/t consumed by Tile: " + + mVoltage + + " | Item Max Charge: " + + mItemMaxCharge + + " | Item Start Charge: " + + mitemCurrentCharge + + " | Item New Charge" + + ElectricItem.manager.getCharge(mTemp)); mChargedItems++; } } @@ -408,7 +446,9 @@ public class ChargingHelper { rfItem.getMaxEnergyStored(mTemp) - rfItem.getEnergyStored(mTemp), mEntity.getEUVar() * mEUtoRF / 100L); chargedPower = rfItem.receiveEnergy( - mTemp, chargedPower > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) chargedPower, false); + mTemp, + chargedPower > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) chargedPower, + false); chargedPower = chargedPower * 100L / mEUtoRF; mEntity.setEUVar(Math.max(mEntity.getEUVar() - chargedPower, 0)); mChargedItems++; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java index bb81c349a0..0d85d6299f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java @@ -1,12 +1,13 @@ package gtPlusPlus.xmod.gregtech.common.helpers; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.world.World; + import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.common.helpers.autocrafter.AC_Helper_Container; import gtPlusPlus.xmod.gregtech.common.helpers.autocrafter.AC_Helper_Utils; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.world.World; public class CraftingHelper { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java index bb8dac49d7..58a4aba71c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java @@ -1,13 +1,15 @@ package gtPlusPlus.xmod.gregtech.common.helpers; +import java.util.HashMap; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.sys.Log; import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix; -import java.util.HashMap; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; public class FlotationRecipeHandler { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java index 0b60e057f4..0c0baf4723 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java @@ -1,16 +1,18 @@ package gtPlusPlus.xmod.gregtech.common.helpers; -import gregtech.api.enums.Textures.BlockIcons; -import gregtech.api.interfaces.ITexture; -import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; + import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; +import gregtech.api.enums.Textures.BlockIcons; +import gregtech.api.interfaces.ITexture; +import gregtech.api.metatileentity.BaseMetaTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gtPlusPlus.core.util.reflect.ReflectionUtils; + public class GT_MethodHelper { private static final Method mGetTexture; @@ -46,28 +48,25 @@ public class GT_MethodHelper { Field aColor = ReflectionUtils.getField(BaseMetaTileEntity.class, "mColor"); Field aActive = ReflectionUtils.getField(BaseMetaTileEntity.class, "mActive"); Field aMetaTile = ReflectionUtils.getField(BaseMetaTileEntity.class, "mMetaTileEntity"); - Method aHasValidTile = ReflectionUtils.getMethod( - BaseMetaTileEntity.class, "hasValidMetaTileEntity", new Class[] {}); + Method aHasValidTile = ReflectionUtils + .getMethod(BaseMetaTileEntity.class, "hasValidMetaTileEntity", new Class[] {}); boolean hasValidTileObj = (boolean) aHasValidTile.invoke(aTile, new Object[] {}); boolean aActiveObj = aActive.getBoolean(aTile); byte aFacingObj = aFacing.getByte(aTile); - byte aColorObj = aColor.getByte(aTile); - ; + byte aColorObj = aColor.getByte(aTile);; MetaTileEntity aMetaTileObj = (MetaTileEntity) aMetaTile.get(aTile); if (rIcon != null) { - return new ITexture[] {rIcon}; + return new ITexture[] { rIcon }; } else { - return hasValidTileObj - ? aMetaTileObj.getTexture( - aTile, - aSide, - aFacingObj, - (byte) (aColorObj - 1), - aActiveObj, - aTile.getOutputRedstoneSignal(aSide) > 0) - : BlockIcons.ERROR_RENDERING; + return hasValidTileObj ? aMetaTileObj.getTexture( + aTile, + aSide, + aFacingObj, + (byte) (aColorObj - 1), + aActiveObj, + aTile.getOutputRedstoneSignal(aSide) > 0) : BlockIcons.ERROR_RENDERING; } } catch (Throwable t) { t.printStackTrace(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java index 8263243474..2710f5dc78 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java @@ -1,11 +1,13 @@ package gtPlusPlus.xmod.gregtech.common.helpers; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gregtech.api.GregTech_API; import java.util.HashMap; + import net.minecraft.block.Block; import net.minecraftforge.event.world.BlockEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import gregtech.api.GregTech_API; + public class MachineUpdateHandler { private static final HashMap<String, Block> mBlockCache = new HashMap<String, Block>(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java index d054e5da3b..7ce06c7974 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java @@ -2,7 +2,37 @@ package gtPlusPlus.xmod.gregtech.common.helpers; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableTreeFarmerParticles; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Queue; +import java.util.Set; +import java.util.Stack; +import java.util.concurrent.ConcurrentHashMap; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockAir; +import net.minecraft.block.IGrowable; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.network.play.server.S23PacketBlockChange; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.BonemealEvent; +import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import com.google.common.collect.Lists; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.Event.Result; @@ -30,33 +60,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.particles.BlockBreakParticles; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Queue; -import java.util.Set; -import java.util.Stack; -import java.util.concurrent.ConcurrentHashMap; -import net.minecraft.block.Block; -import net.minecraft.block.BlockAir; -import net.minecraft.block.IGrowable; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.network.play.server.S23PacketBlockChange; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.ChunkPosition; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.BonemealEvent; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class TreeFarmHelper { @@ -83,23 +86,23 @@ public class TreeFarmHelper { } public static ITexture[] getFront(final byte aColor) { - return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1]}; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] }; } public static ITexture[] getBack(final byte aColor) { - return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1]}; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] }; } public static ITexture[] getBottom(final byte aColor) { - return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1]}; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] }; } public static ITexture[] getTop(final byte aColor) { - return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1]}; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] }; } public static ITexture[] getSides(final byte aColor) { - return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1]}; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] }; } public static ITexture[] getFrontActive(final byte aColor) { @@ -122,13 +125,8 @@ public class TreeFarmHelper { return getSides(aColor); } - public static boolean applyBonemeal( - final EntityPlayer player, - final World world, - final int intX, - final int intY, - final int intZ, - final short multiplier) { + public static boolean applyBonemeal(final EntityPlayer player, final World world, final int intX, final int intY, + final int intZ, final short multiplier) { final Block block = world.getBlock(intX, intY, intZ); int roll; @@ -183,14 +181,10 @@ public class TreeFarmHelper { public static boolean cleanUp(final IGregTechTileEntity aBaseMetaTileEntity) { Logger.MACHINE_INFO("called cleanUp()"); int cleanedUp = 0; - final int xDir = - net.minecraftforge.common.util.ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()) - .offsetX - * 11; - final int zDir = - net.minecraftforge.common.util.ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()) - .offsetZ - * 11; + final int xDir = net.minecraftforge.common.util.ForgeDirection + .getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 11; + final int zDir = net.minecraftforge.common.util.ForgeDirection + .getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 11; for (int h = 1; h < 175; h++) { for (int i = -11; i <= 11; i++) { @@ -198,12 +192,10 @@ public class TreeFarmHelper { final Block testBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j); - if ((((i == -8) || (i == 8)) - || ((i == -9) || (i == 9)) - || ((i == -10) || (i == 10)) - || ((i == -11) || (i == 11))) - && (((j == -8) || (j == 8)) - || ((j == -9) || (j == 9)) + if ((((i == -8) || (i == 8)) || ((i == -9) || (i == 9)) + || ((i == -10) || (i == 10)) + || ((i == -11) || (i == 11))) + && (((j == -8) || (j == 8)) || ((j == -9) || (j == 9)) || ((j == -10) || (j == 10)) || ((j == -11) || (j == 11)))) { @@ -211,34 +203,54 @@ public class TreeFarmHelper { || !testBlock.getUnlocalizedName().toLowerCase().contains("pumpkin")) { // Logger.WARNING("5:"+testBlock.getUnlocalizedName()); } else { - aBaseMetaTileEntity - .getWorld() - .setBlock( - aBaseMetaTileEntity.getXCoord() + xDir + i, - aBaseMetaTileEntity.getYCoord() + h, - aBaseMetaTileEntity.getZCoord() + zDir + j, - Blocks.bookshelf); + aBaseMetaTileEntity.getWorld().setBlock( + aBaseMetaTileEntity.getXCoord() + xDir + i, + aBaseMetaTileEntity.getYCoord() + h, + aBaseMetaTileEntity.getZCoord() + zDir + j, + Blocks.bookshelf); } } // If not in the middle - don't know how else to check this one without lots of != - if ((i != 7) && (i != -7) && (j != 7) && (j != -7) && (i != 6) && (i != -6) && (j != 6) && (j != -6) - && (i != 5) && (i != -5) && (j != 5) && (j != -5) && (i != 4) && (i != -4) && (j != 4) - && (j != -4) && (i != 3) && (i != -3) && (j != 3) && (j != -3) && (i != 2) && (i != -2) - && (j != 2) && (j != -2) && (i != 1) && (i != -1) && (j != 1) && (j != -1) && (i != 0) + if ((i != 7) && (i != -7) + && (j != 7) + && (j != -7) + && (i != 6) + && (i != -6) + && (j != 6) + && (j != -6) + && (i != 5) + && (i != -5) + && (j != 5) + && (j != -5) + && (i != 4) + && (i != -4) + && (j != 4) + && (j != -4) + && (i != 3) + && (i != -3) + && (j != 3) + && (j != -3) + && (i != 2) + && (i != -2) + && (j != 2) + && (j != -2) + && (i != 1) + && (i != -1) + && (j != 1) + && (j != -1) + && (i != 0) |
