diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/api')
13 files changed, 254 insertions, 180 deletions
diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java index aedd6c6073..a3551326c2 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java @@ -107,7 +107,8 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect public synchronized boolean setValue(V object) { int mOriginalID = this.mInternalID; put(object); - if (this.mInternalMap.get(mOriginalID).equals(object) || mOriginalID > this.mInternalID) { + if (this.mInternalMap.get(mOriginalID) + .equals(object) || mOriginalID > this.mInternalID) { return true; } else { return false; @@ -173,7 +174,10 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect @Override @SuppressWarnings("unchecked") public V[] toArray() { - V[] toR = (V[]) java.lang.reflect.Array.newInstance(mInternalMap.get(0).getClass(), mInternalMap.size()); + V[] toR = (V[]) java.lang.reflect.Array.newInstance( + mInternalMap.get(0) + .getClass(), + mInternalMap.size()); for (int i = 0; i < mInternalMap.size(); i++) { toR[i] = mInternalMap.get(i); } diff --git a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java index ae1f28f0c9..5d99097169 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java +++ b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java @@ -31,7 +31,8 @@ public class WeightedCollection<E> implements Map<Integer, E> { private E next() { int value = random.nextInt(total) + 1; // Can also use floating-point weights - return map.ceilingEntry(value).getValue(); + return map.ceilingEntry(value) + .getValue(); } @Override diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java index bf98c7d633..13f12503f0 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java @@ -84,12 +84,13 @@ public class BTF_FluidTank extends FluidTank { @Override public int fill(FluidStack aFluid, boolean doFill) { - if (aFluid != null && aFluid.getFluid().getID() > 0 - && aFluid.amount > 0 - && this.canTankBeFilled() - && this.isFluidInputAllowed(aFluid)) { - if (this.getFillableStack() != null && this.getFillableStack().getFluid().getID() > 0) { - if (!this.getFillableStack().isFluidEqual(aFluid)) { + if (aFluid != null && aFluid.getFluid() + .getID() > 0 && aFluid.amount > 0 && this.canTankBeFilled() && this.isFluidInputAllowed(aFluid)) { + if (this.getFillableStack() != null && this.getFillableStack() + .getFluid() + .getID() > 0) { + if (!this.getFillableStack() + .isFluidEqual(aFluid)) { return 0; } else { int space = this.getCapacity() - this.getFillableStack().amount; @@ -144,7 +145,8 @@ public class BTF_FluidTank extends FluidTank { arg9999.amount -= used; } - FluidStack drained = this.getDrainableStack().copy(); + FluidStack drained = this.getDrainableStack() + .copy(); drained.amount = used; if (this.getDrainableStack().amount <= 0 && this.isFluidChangingAllowed()) { this.setDrainableStack((FluidStack) null); diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java index 7718f68176..fc71869d9e 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java @@ -97,7 +97,7 @@ public class BTF_Inventory implements ISidedInventory { for (int rArray = 0; rArray < this.getSizeInventory(); ++rArray) { if (this.isValidSlot(rArray) - && (tSkip || coverInfo.letsItemsOut(rArray) || coverInfo.letsItemsIn(rArray))) { + && (tSkip || coverInfo.letsItemsOut(rArray) || coverInfo.letsItemsIn(rArray))) { tList.add(rArray); } } @@ -114,16 +114,16 @@ public class BTF_Inventory implements ISidedInventory { @Override public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { return this.isValidSlot(aIndex) && aStack != null - && aIndex < this.mInventory.length - && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, this.mInventory[aIndex])) - && this.allowPutStack(this.mTile, aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); + && aIndex < this.mInventory.length + && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, this.mInventory[aIndex])) + && this.allowPutStack(this.mTile, aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); } @Override public boolean canExtractItem(int aIndex, ItemStack aStack, int ordinalSide) { return this.isValidSlot(aIndex) && aStack != null - && aIndex < this.mInventory.length - && this.allowPullStack(this.mTile, aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); + && aIndex < this.mInventory.length + && this.allowPullStack(this.mTile, aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); } public boolean allowPullStack(TileEntityBase mTile2, int aIndex, ForgeDirection side, ItemStack aStack) { @@ -131,9 +131,9 @@ public class BTF_Inventory implements ISidedInventory { } public boolean allowPutStack(TileEntityBase aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { + ItemStack aStack) { return (aIndex >= 0 && aIndex < this.getSizeInventory()) - && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(this.mInventory[aIndex], aStack)); + && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(this.mInventory[aIndex], aStack)); } @Override @@ -198,7 +198,8 @@ public class BTF_Inventory implements ISidedInventory { if (mInventory != null && mInventory[s] != null) { ItemStack slot = mInventory[s]; if (slot == null || (slot != null && GT_Utility.areStacksEqual(aInput, slot) - && slot.stackSize != slot.getItem().getItemStackLimit(slot))) { + && slot.stackSize != slot.getItem() + .getItemStackLimit(slot))) { if (slot == null) { slot = aInput.copy(); } else { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java index 686c0e7667..3853f61793 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java @@ -91,8 +91,8 @@ public class BlockPos implements Serializable { return false; } return this.xPos == otherPoint.xPos && this.yPos == otherPoint.yPos - && this.zPos == otherPoint.zPos - && this.dim == otherPoint.dim; + && this.zPos == otherPoint.zPos + && this.dim == otherPoint.dim; } public int distanceFrom(BlockPos target) { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java index a90a52e829..c5c903cd1f 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java @@ -23,7 +23,7 @@ public class FluidGT6 extends Fluid implements Runnable { @Override public int getColor() { return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16) | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8) - | Math.max(0, Math.min(255, this.mRGBa[2])); + | Math.max(0, Math.min(255, this.mRGBa[2])); } @Override diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java index db9599e130..f799623dd6 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java @@ -17,7 +17,7 @@ public class ShapedRecipe { ItemStack[] mBlackList = null; public ShapedRecipe(Object aInput1, Object aInput2, Object aInput3, Object aInput4, Object aInput5, Object aInput6, - Object aInput7, Object aInput8, Object aInput9, ItemStack aOutput) { + Object aInput7, Object aInput8, Object aInput9, ItemStack aOutput) { this(new Object[] { aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9 }, aOutput); } @@ -68,10 +68,10 @@ public class ShapedRecipe { if (aInputs.length < 9 || aInputs.length > 9) { Logger.RECIPE( - "[Fix] Recipe for " + aOutput.getDisplayName() - + " has incorrect number of inputs. Size: " - + aInputs.length - + "."); + "[Fix] Recipe for " + aOutput.getDisplayName() + + " has incorrect number of inputs. Size: " + + aInputs.length + + "."); } // Build a Pair for each slot @@ -92,11 +92,12 @@ public class ShapedRecipe { } aRecipePairs.put(new Pair<>(CHARS.charAt(aCharSlot), stack)); Logger.RECIPE( - "Storing '" + CHARS.charAt(aCharSlot) - + "' with an object of type " - + stack.getClass().getSimpleName() - + " and a value of " - + mInfo); + "Storing '" + CHARS.charAt(aCharSlot) + + "' with an object of type " + + stack.getClass() + .getSimpleName() + + " and a value of " + + mInfo); aChar[aMemSlot++] = CHARS.charAt(aCharSlot); aCharSlot++; aLoggingInfo[aInfoSlot++] = mInfo; @@ -130,7 +131,7 @@ public class ShapedRecipe { aGrid[2] = "" + aGridWhole.charAt(6) + aGridWhole.charAt(7) + aGridWhole.charAt(8); } else { Logger.RECIPE( - "[Fix] Grid length for recipe outputting " + aOutput.getDisplayName() + " is not 9."); + "[Fix] Grid length for recipe outputting " + aOutput.getDisplayName() + " is not 9."); } // Rebuild the Map without spaces @@ -155,22 +156,23 @@ public class ShapedRecipe { } aRecipePairs.put(new Pair<>(CHARS.charAt(aCharSlot), stack)); Logger.RECIPE( - "Registering Pair of '" + CHARS.charAt(aCharSlot) - + "' and a " - + stack.getClass().getSimpleName() - + " object. Object has a value of " - + mInfo); + "Registering Pair of '" + CHARS.charAt(aCharSlot) + + "' and a " + + stack.getClass() + .getSimpleName() + + " object. Object has a value of " + + mInfo); aCharSlot++; counter++; } } Logger.RECIPE( - "Counter started at " + KEY_COUNTER - + ", counter is now at " - + counter - + ". Trying to create Varag array with a size of " - + (KEY_COUNTER + (counter - KEY_COUNTER) * 2)); + "Counter started at " + KEY_COUNTER + + ", counter is now at " + + counter + + ". Trying to create Varag array with a size of " + + (KEY_COUNTER + (counter - KEY_COUNTER) * 2)); // Counter started at 3, counter is now at 4. Trying to create Varag array with a size of 2 // Register the shaped grid straight to the varags @@ -214,7 +216,7 @@ public class ShapedRecipe { } else { Logger.RECIPE( - "[Fix] Recipe for " + aOutput.getDisplayName() + " contains a strange number of inputs."); + "[Fix] Recipe for " + aOutput.getDisplayName() + " contains a strange number of inputs."); } // Try set the recipe for this object. diff --git a/src/main/java/gtPlusPlus/api/recipe/ChemicalPlantFrontend.java b/src/main/java/gtPlusPlus/api/recipe/ChemicalPlantFrontend.java index c03ac8e146..beede78173 100644 --- a/src/main/java/gtPlusPlus/api/recipe/ChemicalPlantFrontend.java +++ b/src/main/java/gtPlusPlus/api/recipe/ChemicalPlantFrontend.java @@ -21,7 +21,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class ChemicalPlantFrontend extends RecipeMapFrontend { public ChemicalPlantFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super(uiPropertiesBuilder, neiPropertiesBuilder); } @@ -47,7 +47,7 @@ public class ChemicalPlantFrontend extends RecipeMapFrontend { @Override protected List<String> handleNEIItemInputTooltip(List<String> currentTip, - GT_NEI_DefaultHandler.FixedPositionedStack pStack) { + GT_NEI_DefaultHandler.FixedPositionedStack pStack) { if (ItemUtils.isCatalyst(pStack.item)) { currentTip.add(GRAY + "Does not always get consumed in the process"); currentTip.add(GRAY + "Higher tier pipe casings allow this item to last longer"); diff --git a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeCategories.java b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeCategories.java index 2d1aff7add..310f6f540d 100644 --- a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeCategories.java +++ b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeCategories.java @@ -10,10 +10,8 @@ public class GTPPRecipeCategories { @RecipeCategoryHolder public static final RecipeCategory absNonAlloyRecipes = new RecipeCategory( - "gtpp.recipe.category.abs_non_alloy_recipes", - GTPPRecipeMaps.alloyBlastSmelterRecipes, - builder -> builder.setDisplayImage( - createIcon( - Mods.GTPlusPlus - .getResourcePath("textures", "gui", "picture", "abs_non_alloy_recipes.png")))); + "gtpp.recipe.category.abs_non_alloy_recipes", + GTPPRecipeMaps.alloyBlastSmelterRecipes, + builder -> builder.setDisplayImage( + createIcon(Mods.GTPlusPlus.getResourcePath("textures", "gui", "picture", "abs_non_alloy_recipes.png")))); } diff --git a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java index 1796529c84..d2171d1bdd 100644 --- a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java +++ b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java @@ -26,139 +26,207 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr public class GTPPRecipeMaps { public static final RecipeMap<RecipeMapBackend> cokeOvenRecipes = RecipeMapBuilder.of("gtpp.recipe.cokeoven") - .maxIO(2, 9, 1, 1).minInputs(1, 0).progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) - .build(); + .maxIO(2, 9, 1, 1) + .minInputs(1, 0) + .progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) + .build(); public static final RecipeMap<RecipeMapBackend> multiblockMassFabricatorRecipes = RecipeMapBuilder - .of("gtpp.recipe.matterfab2").maxIO(2, 0, 1, 1).build(); + .of("gtpp.recipe.matterfab2") + .maxIO(2, 0, 1, 1) + .build(); public static final RecipeMap<FuelBackend> rocketFuels = RecipeMapBuilder - .of("gtpp.recipe.rocketenginefuel", FuelBackend::new).maxIO(0, 0, 1, 0) - .neiSpecialInfoFormatter( - recipeInfo -> Collections.singletonList( - StatCollector.translateToLocalFormatted( - "GT5U.nei.fuel", - GT_Utility.formatNumbers(recipeInfo.recipe.mSpecialValue * 3000L)))) - .build(); + .of("gtpp.recipe.rocketenginefuel", FuelBackend::new) + .maxIO(0, 0, 1, 0) + .neiSpecialInfoFormatter( + recipeInfo -> Collections.singletonList( + StatCollector.translateToLocalFormatted( + "GT5U.nei.fuel", + GT_Utility.formatNumbers(recipeInfo.recipe.mSpecialValue * 3000L)))) + .build(); public static final RecipeMap<RecipeMapBackend> quantumForceTransformerRecipes = RecipeMapBuilder - .of("gtpp.recipe.quantumforcesmelter").maxIO(6, 6, 6, 6).minInputs(1, 0) - .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) - .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("GT5U.nei.tier")).frontend(LargeNEIFrontend::new) - .build(); + .of("gtpp.recipe.quantumforcesmelter") + .maxIO(6, 6, 6, 6) + .minInputs(1, 0) + .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("GT5U.nei.tier")) + .frontend(LargeNEIFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> chemicalDehydratorRecipes = RecipeMapBuilder - .of("gtpp.recipe.chemicaldehydrator").maxIO(2, 9, 1, 1) - .progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN).build(); + .of("gtpp.recipe.chemicaldehydrator") + .maxIO(2, 9, 1, 1) + .progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) + .build(); public static final RecipeMap<RecipeMapBackend> vacuumFurnaceRecipes = RecipeMapBuilder.of("gtpp.recipe.vacfurnace") - .maxIO(9, 9, 3, 3).minInputs(1, 0).neiSpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE) - .frontend(LargeNEIFrontend::new).build(); + .maxIO(9, 9, 3, 3) + .minInputs(1, 0) + .neiSpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE) + .frontend(LargeNEIFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> alloyBlastSmelterRecipes = RecipeMapBuilder - .of("gtpp.recipe.alloyblastsmelter").maxIO(9, 9, 3, 3).minInputs(1, 0).frontend(LargeNEIFrontend::new) - .build(); + .of("gtpp.recipe.alloyblastsmelter") + .maxIO(9, 9, 3, 3) + .minInputs(1, 0) + .frontend(LargeNEIFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> liquidFluorineThoriumReactorRecipes = RecipeMapBuilder - .of("gtpp.recipe.lftr").maxIO(0, 0, 6, 6).minInputs(0, 2).frontend(FluidOnlyFrontend::new) - .neiSpecialInfoFormatter(recipeInfo -> { - final long eut = recipeInfo.recipe.mSpecialValue; - final int duration = recipeInfo.recipe.mDuration; - return Arrays.asList( - StatCollector.translateToLocalFormatted("gtpp.nei.lftr.power", GT_Utility.formatNumbers(eut)), - StatCollector.translateToLocalFormatted( - "gtpp.nei.lftr.dynamo", - MathUtils.formatNumbers(duration * eut)), - StatCollector.translateToLocalFormatted( - "gtpp.nei.lftr.total", - MathUtils.formatNumbers(duration * eut * 4))); - }).build(); + .of("gtpp.recipe.lftr") + .maxIO(0, 0, 6, 6) + .minInputs(0, 2) + .frontend(FluidOnlyFrontend::new) + .neiSpecialInfoFormatter(recipeInfo -> { + final long eut = recipeInfo.recipe.mSpecialValue; + final int duration = recipeInfo.recipe.mDuration; + return Arrays.asList( + StatCollector.translateToLocalFormatted("gtpp.nei.lftr.power", GT_Utility.formatNumbers(eut)), + StatCollector + .translateToLocalFormatted("gtpp.nei.lftr.dynamo", MathUtils.formatNumbers(duration * eut)), + StatCollector + .translateToLocalFormatted("gtpp.nei.lftr.total", MathUtils.formatNumbers(duration * eut * 4))); + }) + .build(); public static final RecipeMap<RecipeMapBackend> nuclearSaltProcessingPlantRecipes = RecipeMapBuilder - .of("gtpp.recipe.nuclearsaltprocessingplant").maxIO(1, 6, 2, 3).frontend(LargeNEIFrontend::new).build(); + .of("gtpp.recipe.nuclearsaltprocessingplant") + .maxIO(1, 6, 2, 3) + .frontend(LargeNEIFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> millingRecipes = RecipeMapBuilder.of("gtpp.recipe.oremill") - .maxIO(3, 1, 0, 0).minInputs(1, 0).frontend(MillingFrontend::new).build(); + .maxIO(3, 1, 0, 0) + .minInputs(1, 0) + .frontend(MillingFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> fissionFuelProcessingRecipes = RecipeMapBuilder - .of("gtpp.recipe.fissionfuel").maxIO(0, 0, 6, 1).frontend(FluidOnlyFrontend::new).build(); + .of("gtpp.recipe.fissionfuel") + .maxIO(0, 0, 6, 1) + .frontend(FluidOnlyFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> coldTrapRecipes = RecipeMapBuilder.of("gtpp.recipe.coldtrap") - .maxIO(2, 9, 1, 1).progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN).build(); + .maxIO(2, 9, 1, 1) + .progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) + .build(); public static final RecipeMap<RecipeMapBackend> reactorProcessingUnitRecipes = RecipeMapBuilder - .of("gtpp.recipe.reactorprocessingunit").maxIO(2, 9, 1, 1) - .progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN).build(); + .of("gtpp.recipe.reactorprocessingunit") + .maxIO(2, 9, 1, 1) + .progressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) + .build(); public static final RecipeMap<RecipeMapBackend> simpleWasherRecipes = RecipeMapBuilder - .of("gtpp.recipe.simplewasher").maxIO(1, 1, 1, 0) - .slotOverlays( - (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_CAULDRON - : null) - .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE).build(); + .of("gtpp.recipe.simplewasher") + .maxIO(1, 1, 1, 0) + .slotOverlays( + (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_CAULDRON : null) + .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .build(); public static final RecipeMap<RecipeMapBackend> molecularTransformerRecipes = RecipeMapBuilder - .of("gtpp.recipe.moleculartransformer").maxIO(1, 1, 0, 0) - .slotOverlays( - (index, isFluid, isOutput, - isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_MICROSCOPE : null) - .neiHandlerInfo( - builder -> builder.setDisplayStack( - ItemUtils.getItemStackFromFQRN("AdvancedSolarPanel:BlockMolecularTransformer", 1))) - .build(); + .of("gtpp.recipe.moleculartransformer") + .maxIO(1, 1, 0, 0) + .slotOverlays( + (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_MICROSCOPE + : null) + .neiHandlerInfo( + builder -> builder + .setDisplayStack(ItemUtils.getItemStackFromFQRN("AdvancedSolarPanel:BlockMolecularTransformer", 1))) + .build(); public static final RecipeMap<RecipeMapBackend> chemicalPlantRecipes = RecipeMapBuilder - .of("gtpp.recipe.fluidchemicaleactor").maxIO(4, 6, 4, 3) - .slotOverlays((index, isFluid, isOutput, isSpecial) -> { - if (isFluid) { - if (isOutput) { - return GT_UITextures.OVERLAY_SLOT_VIAL_2; - } - return GT_UITextures.OVERLAY_SLOT_MOLECULAR_3; - } + .of("gtpp.recipe.fluidchemicaleactor") + .maxIO(4, 6, 4, 3) + .slotOverlays((index, isFluid, isOutput, isSpecial) -> { + if (isFluid) { if (isOutput) { - return GT_UITextures.OVERLAY_SLOT_VIAL_1; + return GT_UITextures.OVERLAY_SLOT_VIAL_2; } - return GT_UITextures.OVERLAY_SLOT_MOLECULAR_1; - }).progressBar(GTPP_UITextures.PROGRESSBAR_FLUID_REACTOR, ProgressBar.Direction.CIRCULAR_CW) - .progressBarPos(82, 24).neiSpecialInfoFormatter(recipeInfo -> { - int tier = recipeInfo.recipe.mSpecialValue + 1; - String materialName = StatCollector.translateToLocal("gtpp.nei.chemplant.tier." + tier); - return Collections.singletonList( - StatCollector.translateToLocalFormatted("GT5U.nei.tier", tier + " - " + materialName)); - }).frontend(ChemicalPlantFrontend::new).build(); + return GT_UITextures.OVERLAY_SLOT_MOLECULAR_3; + } + if (isOutput) { + return GT_UITextures.OVERLAY_SLOT_VIAL_1; + } + return GT_UITextures.OVERLAY_SLOT_MOLECULAR_1; + }) + .progressBar(GTPP_UITextures.PROGRESSBAR_FLUID_REACTOR, ProgressBar.Direction.CIRCULAR_CW) + .progressBarPos(82, 24) + .neiSpecialInfoFormatter(recipeInfo -> { + int tier = recipeInfo.recipe.mSpecialValue + 1; + String materialName = StatCollector.translateToLocal("gtpp.nei.chemplant.tier." + tier); + return Collections + .singletonList(StatCollector.translateToLocalFormatted("GT5U.nei.tier", tier + " - " + materialName)); + }) + .frontend(ChemicalPlantFrontend::new) + .build(); public static final RecipeMap<FuelBackend> rtgFuels = RecipeMapBuilder - .of("gtpp.recipe.RTGgenerators", FuelBackend::new).maxIO(1, 0, 0, 0) - .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("gtpp.nei.rtg.days", 365)).build(); + .of("gtpp.recipe.RTGgenerators", FuelBackend::new) + .maxIO(1, 0, 0, 0) + .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("gtpp.nei.rtg.days", 365)) + .build(); public static final RecipeMap<RecipeMapBackend> thermalBoilerRecipes = RecipeMapBuilder - .of("gtpp.recipe.thermalgeneratorfuel").maxIO(0, 9, 2, 3).frontend(ThermalBoilerFrontend::new).build(); + .of("gtpp.recipe.thermalgeneratorfuel") + .maxIO(0, 9, 2, 3) + .frontend(ThermalBoilerFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> solarTowerRecipes = RecipeMapBuilder.of("gtpp.recipe.solartower") - .maxIO(0, 0, 1, 1) - .neiSpecialInfoFormatter( - recipeInfo -> Arrays.asList( - StatCollector.translateToLocal("gtpp.nei.solar_tower.1"), - StatCollector.translateToLocal("gtpp.nei.solar_tower.2"), - StatCollector.translateToLocal("gtpp.nei.solar_tower.3"))) - .frontend(FluidOnlyFrontend::new).build(); + .maxIO(0, 0, 1, 1) + .neiSpecialInfoFormatter( + recipeInfo -> Arrays.asList( + StatCollector.translateToLocal("gtpp.nei.solar_tower.1"), + StatCollector.translateToLocal("gtpp.nei.solar_tower.2"), + StatCollector.translateToLocal("gtpp.nei.solar_tower.3"))) + .frontend(FluidOnlyFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> cyclotronRecipes = RecipeMapBuilder.of("gtpp.recipe.cyclotron") - .maxIO(9, 9, 1, 1).build(); + .maxIO(9, 9, 1, 1) + .build(); public static final RecipeMap<RecipeMapBackend> fishPondRecipes = RecipeMapBuilder.of("gtpp.recipe.fishpond") - .maxIO(1, 1, 0, 0) - .slotOverlays( - (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_CAULDRON - : null) - .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE).build(); + .maxIO(1, 1, 0, 0) + .slotOverlays( + (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_CAULDRON : null) + .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .build(); public static final RecipeMap<RecipeMapBackend> spargeTowerFakeRecipes = RecipeMapBuilder - .of("gtpp.recipe.spargetower").maxIO(0, 0, 9, 9).disableRegisterNEI().build(); + .of("gtpp.recipe.spargetower") + .maxIO(0, 0, 9, 9) + .disableRegisterNEI() + .build(); public static final RecipeMap<RecipeMapBackend> advancedFreezerRecipes = RecipeMapBuilder - .of("gtpp.recipe.cryogenicfreezer").maxIO(1, 1, 2, 1).build(); + .of("gtpp.recipe.cryogenicfreezer") + .maxIO(1, 1, 2, 1) + .build(); public static final RecipeMap<RecipeMapBackend> centrifugeNonCellRecipes = RecipeMapBuilder - .of("gtpp.recipe.multicentrifuge").maxIO(6, 6, 6, 6).progressBar(GT_UITextures.PROGRESSBAR_EXTRACT) - .frontend(LargeNEIFrontend::new).build(); + .of("gtpp.recipe.multicentrifuge") + .maxIO(6, 6, 6, 6) + .progressBar(GT_UITextures.PROGRESSBAR_EXTRACT) + .frontend(LargeNEIFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> electrolyzerNonCellRecipes = RecipeMapBuilder - .of("gtpp.recipe.multielectro").maxIO(6, 6, 6, 6).progressBar(GT_UITextures.PROGRESSBAR_EXTRACT) - .frontend(LargeNEIFrontend::new).build(); + .of("gtpp.recipe.multielectro") + .maxIO(6, 6, 6, 6) + .progressBar(GT_UITextures.PROGRESSBAR_EXTRACT) + .frontend(LargeNEIFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> mixerNonCellRecipes = RecipeMapBuilder.of("gtpp.recipe.multimixer") - .maxIO(9, 9, 6, 6).progressBar(GT_UITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW) - .frontend(LargeNEIFrontend::new).build(); + .maxIO(9, 9, 6, 6) + .progressBar(GT_UITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW) + .frontend(LargeNEIFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> chemicalDehydratorNonCellRecipes = RecipeMapBuilder - .of("gtpp.recipe.multidehydrator").maxIO(6, 9, 3, 3).frontend(LargeNEIFrontend::new).build(); + .of("gtpp.recipe.multidehydrator") + .maxIO(6, 9, 3, 3) + .frontend(LargeNEIFrontend::new) + .build(); public static final RecipeMap<FuelBackend> semiFluidFuels = RecipeMapBuilder - .of("gtpp.recipe.semifluidgeneratorfuels", FuelBackend::new).maxIO(0, 0, 1, 0) - .neiSpecialInfoFormatter(FuelSpecialValueFormatter.INSTANCE).build(); + .of("gtpp.recipe.semifluidgeneratorfuels", FuelBackend::new) + .maxIO(0, 0, 1, 0) + .neiSpecialInfoFormatter(FuelSpecialValueFormatter.INSTANCE) + .build(); public static final RecipeMap<RecipeMapBackend> flotationCellRecipes = RecipeMapBuilder - .of("gtpp.recipe.flotationcell").maxIO(6, 0, 1, 1).build(); + .of("gtpp.recipe.flotationcell") + .maxIO(6, 0, 1, 1) + .build(); public static final RecipeMap<RecipeMapBackend> treeGrowthSimulatorFakeRecipes = RecipeMapBuilder - .of("gtpp.recipe.treefarm") - .maxIO( - GregtechMetaTileEntityTreeFarm.Mode.values().length, - GregtechMetaTileEntityTreeFarm.Mode.values().length, - 0, - 0) - .minInputs(1, 0).useSpecialSlot().frontend(TGSFrontend::new).build(); + .of("gtpp.recipe.treefarm") + .maxIO( + GregtechMetaTileEntityTreeFarm.Mode.values().length, + GregtechMetaTileEntityTreeFarm.Mode.values().length, + 0, + 0) + .minInputs(1, 0) + .useSpecialSlot() + .frontend(TGSFrontend::new) + .build(); } diff --git a/src/main/java/gtPlusPlus/api/recipe/MillingFrontend.java b/src/main/java/gtPlusPlus/api/recipe/MillingFrontend.java index 924dcf3a0e..26e2ab2ec9 100644 --- a/src/main/java/gtPlusPlus/api/recipe/MillingFrontend.java +++ b/src/main/java/gtPlusPlus/api/recipe/MillingFrontend.java @@ -20,13 +20,13 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class MillingFrontend extends RecipeMapFrontend { public MillingFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super(uiPropertiesBuilder, neiPropertiesBuilder); } @Override protected List<String> handleNEIItemInputTooltip(List<String> currentTip, - GT_NEI_DefaultHandler.FixedPositionedStack pStack) { + GT_NEI_DefaultHandler.FixedPositionedStack pStack) { if (ItemUtils.isMillingBall(pStack.item)) { currentTip.add(GRAY + StatCollector.translateToLocal("gtpp.nei.milling.not_consumed")); } else { diff --git a/src/main/java/gtPlusPlus/api/recipe/TGSFrontend.java b/src/main/java/gtPlusPlus/api/recipe/TGSFrontend.java index b36bf62b56..e57ebaf5f9 100644 --- a/src/main/java/gtPlusPlus/api/recipe/TGSFrontend.java +++ b/src/main/java/gtPlusPlus/api/recipe/TGSFrontend.java @@ -39,10 +39,11 @@ public class TGSFrontend extends RecipeMapFrontend { public TGSFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, NEIRecipePropertiesBuilder ne |