diff options
Diffstat (limited to 'src/main/java/gregtech/api/objects')
11 files changed, 94 insertions, 49 deletions
diff --git a/src/main/java/gregtech/api/objects/GT_ChunkManager.java b/src/main/java/gregtech/api/objects/GT_ChunkManager.java index 291e669741..6101deedbc 100644 --- a/src/main/java/gregtech/api/objects/GT_ChunkManager.java +++ b/src/main/java/gregtech/api/objects/GT_ChunkManager.java @@ -46,9 +46,12 @@ public class GT_ChunkManager List<Ticket> validTickets = new ArrayList<>(); if (GT_Values.alwaysReloadChunkloaders) { for (Ticket ticket : tickets) { - int x = ticket.getModData().getInteger("OwnerX"); - int y = ticket.getModData().getInteger("OwnerY"); - int z = ticket.getModData().getInteger("OwnerZ"); + int x = ticket.getModData() + .getInteger("OwnerX"); + int y = ticket.getModData() + .getInteger("OwnerY"); + int z = ticket.getModData() + .getInteger("OwnerZ"); if (y > 0) { TileEntity tile = world.getTileEntity(x, y, z); if (tile != null && tile instanceof IGregTechTileEntity @@ -59,8 +62,7 @@ public class GT_ChunkManager if (((IGregTechTileEntity) tile).getMetaTileEntity() instanceof IChunkLoader) ForgeChunkManager.forceChunk( ticket, - ((IChunkLoader) ((IGregTechTileEntity) tile).getMetaTileEntity()) - .getActiveChunk()); + ((IChunkLoader) ((IGregTechTileEntity) tile).getMetaTileEntity()).getActiveChunk()); validTickets.add(ticket); } } @@ -86,16 +88,21 @@ public class GT_ChunkManager public static boolean requestPlayerChunkLoad(TileEntity owner, ChunkCoordIntPair chunkXZ, String player) { if (!GT_Values.enableChunkloaders) return false; if (!GT_Values.alwaysReloadChunkloaders && chunkXZ == null) return false; - if (GT_Values.debugChunkloaders && chunkXZ != null) GT_Log.out - .println("GT_ChunkManager: Chunk request: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")"); + if (GT_Values.debugChunkloaders && chunkXZ != null) GT_Log.out.println( + "GT_ChunkManager: Chunk request: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")"); if (instance.registeredTickets.containsKey(owner)) { ForgeChunkManager.forceChunk(instance.registeredTickets.get(owner), chunkXZ); } else { Ticket ticket; - if (player.equals("")) ticket = ForgeChunkManager - .requestTicket(GT_Mod.instance, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL); - else ticket = ForgeChunkManager - .requestPlayerTicket(GT_Mod.instance, player, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL); + if (player.equals("")) ticket = ForgeChunkManager.requestTicket( + GT_Mod.instance, + owner.getWorldObj(), + ForgeChunkManager.Type.NORMAL); + else ticket = ForgeChunkManager.requestPlayerTicket( + GT_Mod.instance, + player, + owner.getWorldObj(), + ForgeChunkManager.Type.NORMAL); if (ticket == null) { if (GT_Values.debugChunkloaders) GT_Log.out.println("GT_ChunkManager: ForgeChunkManager.requestTicket failed"); @@ -128,8 +135,8 @@ public class GT_ChunkManager if (!GT_Values.enableChunkloaders) return; Ticket ticket = instance.registeredTickets.get(owner); if (ticket != null) { - if (GT_Values.debugChunkloaders) GT_Log.out - .println("GT_ChunkManager: Chunk release: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")"); + if (GT_Values.debugChunkloaders) GT_Log.out.println( + "GT_ChunkManager: Chunk release: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")"); ForgeChunkManager.unforceChunk(ticket, chunkXZ); } } @@ -146,8 +153,8 @@ public class GT_ChunkManager + ", " + owner.zCoord + ")"); - for (ChunkCoordIntPair chunk : ticket.getChunkList()) GT_Log.out - .println("GT_ChunkManager: Chunk release: (" + chunk.chunkXPos + ", " + chunk.chunkZPos + ")"); + for (ChunkCoordIntPair chunk : ticket.getChunkList()) GT_Log.out.println( + "GT_ChunkManager: Chunk release: (" + chunk.chunkXPos + ", " + chunk.chunkZPos + ")"); } ForgeChunkManager.releaseTicket(ticket); instance.registeredTickets.remove(owner); diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java index 55bbf712fa..b5b6f6ff19 100644 --- a/src/main/java/gregtech/api/objects/GT_FluidStack.java +++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java @@ -18,8 +18,8 @@ import gregtech.api.util.GT_Utility; */ public class GT_FluidStack extends FluidStack { - private static final Collection<GT_FluidStack> sAllFluidStacks = Collections - .newSetFromMap(new WeakHashMap<>(10000)); + private static final Collection<GT_FluidStack> sAllFluidStacks = Collections.newSetFromMap( + new WeakHashMap<>(10000)); private static volatile boolean lock = false; private Fluid mFluid; @@ -57,7 +57,8 @@ public class GT_FluidStack extends FluidStack { if (ForgeVersion.getBuildVersion() < 1355 && ForgeVersion.getRevisionVersion() < 4) { int fluidID; try { - fluidID = this.getFluid().getID(); + fluidID = this.getFluid() + .getID(); } catch (Throwable e) { System.err.println(e); } @@ -79,7 +80,11 @@ public class GT_FluidStack extends FluidStack { @Override public String toString() { - return String - .format("GT_FluidStack: %s x %s, ID:%s", this.amount, this.getFluid().getName(), this.getFluidID()); + return String.format( + "GT_FluidStack: %s x %s, ID:%s", + this.amount, + this.getFluid() + .getName(), + this.getFluidID()); } } diff --git a/src/main/java/gregtech/api/objects/GT_HashSet.java b/src/main/java/gregtech/api/objects/GT_HashSet.java index 578d22a4a3..1f12b669b3 100644 --- a/src/main/java/gregtech/api/objects/GT_HashSet.java +++ b/src/main/java/gregtech/api/objects/GT_HashSet.java @@ -44,7 +44,8 @@ public class GT_HashSet<E extends GT_ItemStack> extends AbstractSet<E> { @Override public Iterator<E> iterator() { - return (Iterator<E>) map.keySet().iterator(); + return (Iterator<E>) map.keySet() + .iterator(); } @Override diff --git a/src/main/java/gregtech/api/objects/GT_StdRenderedTexture.java b/src/main/java/gregtech/api/objects/GT_StdRenderedTexture.java index 079260c7dc..e40fb96ef2 100644 --- a/src/main/java/gregtech/api/objects/GT_StdRenderedTexture.java +++ b/src/main/java/gregtech/api/objects/GT_StdRenderedTexture.java @@ -35,7 +35,8 @@ public class GT_StdRenderedTexture extends GT_RenderedTexture { @Override public void renderYNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) { LightingHelper lighting = new LightingHelper(aRenderer); - lighting.setupLightingYNeg(aBlock, aX, aY, aZ).setupColor(ForgeDirection.DOWN.ordinal(), mRGBa); + lighting.setupLightingYNeg(aBlock, aX, aY, aZ) + .setupColor(ForgeDirection.DOWN.ordinal(), mRGBa); aRenderer.renderFaceYNeg(aBlock, aX, aY, aZ, mIconContainer.getIcon()); if (mIconContainer.getOverlayIcon() != null) { lighting.setupColor(ForgeDirection.DOWN.ordinal(), 0xffffff); diff --git a/src/main/java/gregtech/api/objects/GT_UO_Dimension.java b/src/main/java/gregtech/api/objects/GT_UO_Dimension.java index fffa68fadf..4f534956c7 100644 --- a/src/main/java/gregtech/api/objects/GT_UO_Dimension.java +++ b/src/main/java/gregtech/api/objects/GT_UO_Dimension.java @@ -17,12 +17,16 @@ public class GT_UO_Dimension { fFluids = HashBiMap.create(); if (aConfigCategory.containsKey("Dimension")) { aConfigCategory.get("Dimension").comment = "Dimension ID or Class Name"; - Dimension = aConfigCategory.get("Dimension").getString(); + Dimension = aConfigCategory.get("Dimension") + .getString(); } maxChance = 0; // GT_FML_LOGGER.info("GT UO "+aConfigCategory.getName()+" Dimension:"+Dimension); - for (int i = 0; i < aConfigCategory.getChildren().size(); i++) { - GT_UO_Fluid fluid = new GT_UO_Fluid((ConfigCategory) aConfigCategory.getChildren().toArray()[i]); + for (int i = 0; i < aConfigCategory.getChildren() + .size(); i++) { + GT_UO_Fluid fluid = new GT_UO_Fluid( + (ConfigCategory) aConfigCategory.getChildren() + .toArray()[i]); fFluids.put(fluid.Registry, fluid); maxChance += fluid.Chance; } @@ -40,7 +44,8 @@ public class GT_UO_Dimension { } public String getUOFluidKey(GT_UO_Fluid uoFluid) { - return fFluids.inverse().get(uoFluid); + return fFluids.inverse() + .get(uoFluid); } public GT_UO_Fluid getUOFluid(String key) { diff --git a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java index e717f857d5..cd03380d8d 100644 --- a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java +++ b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java @@ -24,7 +24,10 @@ public class GT_UO_DimensionList { if (fDimensionList.containsKey(Integer.toString(aDimension))) return fDimensionList.get(Integer.toString(aDimension)); for (BiMap.Entry<String, GT_UO_Dimension> dl : fDimensionList.entrySet()) - if (DimensionManager.getProvider(aDimension).getClass().getName().contains(dl.getValue().Dimension)) + if (DimensionManager.getProvider(aDimension) + .getClass() + .getName() + .contains(dl.getValue().Dimension)) return dl.getValue(); return fDimensionList.get("Default"); } @@ -41,14 +44,19 @@ public class GT_UO_DimensionList { public void SetConfigValues(String aDimensionName, String aDimension, String aName, String aRegistry, int aMinAmount, int aMaxAmount, int aChance, int aDecreasePerOperationAmount) { String Category = fCategory + "." + aDimensionName; - fConfig.get(Category, "Dimension", aDimension).getString(); + fConfig.get(Category, "Dimension", aDimension) + .getString(); Category += "." + aName; - fConfig.get(Category, "Registry", aRegistry).getString(); - fConfig.get(Category, "MinAmount", aMinAmount).getInt(aMinAmount); - fConfig.get(Category, "MaxAmount", aMaxAmount).getInt(aMaxAmount); - fConfig.get(Category, "Chance", aChance).getInt(aChance); + fConfig.get(Category, "Registry", aRegistry) + .getString(); + fConfig.get(Category, "MinAmount", aMinAmount) + .getInt(aMinAmount); + fConfig.get(Category, "MaxAmount", aMaxAmount) + .getInt(aMaxAmount); + fConfig.get(Category, "Chance", aChance) + .getInt(aChance); fConfig.get(Category, "DecreasePerOperationAmount", aDecreasePerOperationAmount) - .getInt(aDecreasePerOperationAmount); + .getInt(aDecreasePerOperationAmount); // IT IS IN BUCKETS!!! } @@ -74,12 +82,17 @@ public class GT_UO_DimensionList { fConfig.setCategoryComment(fCategory + ".Moon", "Set Moon Generating"); blackList = new int[] { -1, 1 }; - blackList = aConfig.get(fCategory, "DimBlackList", blackList, "Dimension IDs Black List").getIntList(); + blackList = aConfig.get(fCategory, "DimBlackList", blackList, "Dimension IDs Black List") + .getIntList(); java.util.Arrays.sort(blackList); - for (int i = 0; i < fConfig.getCategory(fCategory).getChildren().size(); i++) { + for (int i = 0; i < fConfig.getCategory(fCategory) + .getChildren() + .size(); i++) { GT_UO_Dimension Dimension = new GT_UO_Dimension( - (ConfigCategory) fConfig.getCategory(fCategory).getChildren().toArray()[i]); + (ConfigCategory) fConfig.getCategory(fCategory) + .getChildren() + .toArray()[i]); fDimensionList.put(Dimension.Dimension, Dimension); } } diff --git a/src/main/java/gregtech/api/objects/GT_UO_Fluid.java b/src/main/java/gregtech/api/objects/GT_UO_Fluid.java index 7916131b63..555d8856b2 100644 --- a/src/main/java/gregtech/api/objects/GT_UO_Fluid.java +++ b/src/main/java/gregtech/api/objects/GT_UO_Fluid.java @@ -19,26 +19,31 @@ public class GT_UO_Fluid { public GT_UO_Fluid(ConfigCategory aConfigCategory) { // TODO CONFIGURE if (aConfigCategory.containsKey("Registry")) { aConfigCategory.get("Registry").comment = "Fluid registry name"; - Registry = aConfigCategory.get("Registry").getString(); + Registry = aConfigCategory.get("Registry") + .getString(); } if (aConfigCategory.containsKey("MaxAmount")) { - aConfigCategory - .get("MaxAmount").comment = "Max amount generation (per operation, sets the VeinData) 80000 MAX"; - MaxAmount = aConfigCategory.get("MaxAmount").getInt(0); + aConfigCategory.get( + "MaxAmount").comment = "Max amount generation (per operation, sets the VeinData) 80000 MAX"; + MaxAmount = aConfigCategory.get("MaxAmount") + .getInt(0); } if (aConfigCategory.containsKey("MinAmount")) { aConfigCategory.get("MinAmount").comment = "Min amount generation (per operation, sets the VeinData) 0 MIN"; - MinAmount = aConfigCategory.get("MinAmount").getInt(0); + MinAmount = aConfigCategory.get("MinAmount") + .getInt(0); } if (aConfigCategory.containsKey("Chance")) { aConfigCategory.get( "Chance").comment = "Chance generating (weighted chance!, there will be a fluid in chunk always!)"; - Chance = aConfigCategory.get("Chance").getInt(0); + Chance = aConfigCategory.get("Chance") + .getInt(0); } if (aConfigCategory.containsKey("DecreasePerOperationAmount")) { aConfigCategory.get( "DecreasePerOperationAmount").comment = "Decrease per operation (actual fluid gained works like (Litre)VeinData/5000)"; - DecreasePerOperationAmount = aConfigCategory.get("DecreasePerOperationAmount").getInt(5); + DecreasePerOperationAmount = aConfigCategory.get("DecreasePerOperationAmount") + .getInt(5); } // GT_FML_LOGGER.info("GT UO "+aConfigCategory.getName()+" Fluid:"+Registry+" Max:"+MaxAmount+" // Min:"+MinAmount+" Chance:"+Chance); diff --git a/src/main/java/gregtech/api/objects/ItemData.java b/src/main/java/gregtech/api/objects/ItemData.java index 52abab19cb..72d5cc5900 100644 --- a/src/main/java/gregtech/api/objects/ItemData.java +++ b/src/main/java/gregtech/api/objects/ItemData.java @@ -121,6 +121,8 @@ public class ItemData { @Override public String toString() { if (mPrefix == null || mMaterial == null || mMaterial.mMaterial == null) return ""; - return String.valueOf(new StringBuilder().append(mPrefix.name()).append(mMaterial.mMaterial.mName)); + return String.valueOf( + new StringBuilder().append(mPrefix.name()) + .append(mMaterial.mMaterial.mName)); } } diff --git a/src/main/java/gregtech/api/objects/ReverseShapedRecipe.java b/src/main/java/gregtech/api/objects/ReverseShapedRecipe.java index 5dd14186e1..9b0507402c 100644 --- a/src/main/java/gregtech/api/objects/ReverseShapedRecipe.java +++ b/src/main/java/gregtech/api/objects/ReverseShapedRecipe.java @@ -35,8 +35,10 @@ public class ReverseShapedRecipe { if (!recipeOptional.isPresent()) continue; GT_Recipe recipe = recipeOptional.get(); ItemStack[] replacement = new ItemStack[recipe.mOutputs.length]; - GT_MetaTileEntity_Disassembler - .handleRecipeTransformation(recipe.mOutputs, replacement, Collections.singleton(recipe.mOutputs)); + GT_MetaTileEntity_Disassembler.handleRecipeTransformation( + recipe.mOutputs, + replacement, + Collections.singleton(recipe.mOutputs)); recipe.mOutputs = replacement; sDisassemblerRecipes.add(recipe); diff --git a/src/main/java/gregtech/api/objects/ReverseShapelessRecipe.java b/src/main/java/gregtech/api/objects/ReverseShapelessRecipe.java index 656f7728c5..a872f2a8f0 100644 --- a/src/main/java/gregtech/api/objects/ReverseShapelessRecipe.java +++ b/src/main/java/gregtech/api/objects/ReverseShapelessRecipe.java @@ -35,8 +35,10 @@ public class ReverseShapelessRecipe { if (!recipeOptional.isPresent()) continue; GT_Recipe recipe = recipeOptional.get(); ItemStack[] replacement = new ItemStack[recipe.mOutputs.length]; - GT_MetaTileEntity_Disassembler - .handleRecipeTransformation(recipe.mOutputs, replacement, Collections.singleton(recipe.mOutputs)); + GT_MetaTileEntity_Disassembler.handleRecipeTransformation( + recipe.mOutputs, + replacement, + Collections.singleton(recipe.mOutputs)); recipe.mOutputs = replacement; sDisassemblerRecipes.add(recipe); diff --git a/src/main/java/gregtech/api/objects/XSTR.java b/src/main/java/gregtech/api/objects/XSTR.java index cd4f0e6bb4..d9c0b4bdb1 100644 --- a/src/main/java/gregtech/api/objects/XSTR.java +++ b/src/main/java/gregtech/api/objects/XSTR.java @@ -39,7 +39,9 @@ public class XSTR extends Random { @Override public synchronized void setSeed(long seed) { - if (!Thread.currentThread().getStackTrace()[2].getClassName().equals(Random.class.getName())) + if (!Thread.currentThread() + .getStackTrace()[2].getClassName() + .equals(Random.class.getName())) throw new NoSuchMethodError("This is meant to be shared!, leave seed state alone!"); } }; |