aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/nei
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-01 18:11:43 +0200
committerGitHub <noreply@github.com>2023-04-01 18:11:43 +0200
commit5f50e4a36ec000657b0a1664784acf00275293c6 (patch)
tree5ef81441032735438c9fd9c620224ca58e46e537 /src/main/java/gregtech/nei
parent6b77557e0e87cf5afd9ebd3985323ff1249e615c (diff)
downloadGT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.gz
GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.bz2
GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.zip
update spotless formatting (#1827)
Diffstat (limited to 'src/main/java/gregtech/nei')
-rw-r--r--src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java155
-rw-r--r--src/main/java/gregtech/nei/NEI_GT_Config.java17
-rw-r--r--src/main/java/gregtech/nei/RecipeMapHandler.java7
-rw-r--r--src/main/java/gregtech/nei/dumper/GregTechIDDumper.java4
-rw-r--r--src/main/java/gregtech/nei/dumper/MaterialDumper.java5
-rw-r--r--src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java6
6 files changed, 121 insertions, 73 deletions
diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
index af03441d02..96ae4b8259 100644
--- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
+++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
@@ -144,7 +144,10 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
if (cacheHolder.getCachedRecipesVersion() != GT_Mod.gregtechproxy.getReloadCount()
|| (cache = cacheHolder.getCachedRecipes()) == null) {
cache = mRecipeMap.mRecipeList.stream() // do not use parallel stream. This is already parallelized by NEI
- .filter(r -> !r.mHidden).sorted().map(CachedDefaultRecipe::new).collect(Collectors.toList());
+ .filter(r -> !r.mHidden)
+ .sorted()
+ .map(CachedDefaultRecipe::new)
+ .collect(Collectors.toList());
// while the NEI parallelize handlers, for each individual handler it still uses sequential execution model,
// so we do not need any synchronization here
// even if it does break, at worst case it's just recreating the cache multiple times, which should be fine
@@ -190,14 +193,17 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
}
}
- if (aResult.getUnlocalizedName().startsWith("gt.blockores")) {
+ if (aResult.getUnlocalizedName()
+ .startsWith("gt.blockores")) {
for (int i = 0; i < 8; i++) {
tResults.add(new ItemStack(aResult.getItem(), 1, aResult.getItemDamage() % 1000 + i * 1000));
}
}
addFluidStacks(aResult, tResults);
for (CachedDefaultRecipe recipe : getCache()) {
- if (tResults.stream().anyMatch(stack -> recipe.contains(recipe.mOutputs, stack))) arecipes.add(recipe);
+ if (tResults.stream()
+ .anyMatch(stack -> recipe.contains(recipe.mOutputs, stack)))
+ arecipes.add(recipe);
}
}
@@ -220,10 +226,12 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
private List<CachedDefaultRecipe> getTieredRecipes(Power power) {
List<CachedDefaultRecipe> recipes = getCache();
if (recipes.size() > 0) {
- recipes = recipes.stream().filter(
- recipe -> power.compareTo(GT_Utility.getTier(recipe.mRecipe.mEUt), recipe.mRecipe.mSpecialValue)
- >= 0)
- .collect(Collectors.toList());
+ recipes = recipes.stream()
+ .filter(
+ recipe -> power.compareTo(
+ GT_Utility.getTier(recipe.mRecipe.mEUt),
+ recipe.mRecipe.mSpecialValue) >= 0)
+ .collect(Collectors.toList());
}
return recipes;
}
@@ -254,7 +262,9 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
}
addFluidStacks(aInput, tInputs);
for (CachedDefaultRecipe recipe : getCache()) {
- if (tInputs.stream().anyMatch(stack -> recipe.contains(recipe.mInputs, stack))) arecipes.add(recipe);
+ if (tInputs.stream()
+ .anyMatch(stack -> recipe.contains(recipe.mInputs, stack)))
+ arecipes.add(recipe);
}
}
@@ -483,7 +493,8 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
}
private boolean hostRectContainsMouse(NEI_TransferRectHost host, Point mousePos) {
- return host.getNeiTransferRect().contains(mousePos);
+ return host.getNeiTransferRect()
+ .contains(mousePos);
}
private boolean handleTransferRectMouseClick(NEI_TransferRectHost gui, boolean usage) {
@@ -719,8 +730,11 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
for (Widget child : modularWindow.getChildren()) {
if (child instanceof SlotWidget) {
SlotWidget widget = (SlotWidget) child;
- if (widget.getMcSlot().getItemHandler() == itemInputsInventory) {
- int i = widget.getMcSlot().getSlotIndex();
+ if (widget.getMcSlot()
+ .getItemHandler()
+ == itemInputsInventory) {
+ int i = widget.getMcSlot()
+ .getSlotIndex();
Object input = aRecipe instanceof GT_Recipe.GT_Recipe_WithAlt
? ((GT_Recipe.GT_Recipe_WithAlt) aRecipe).getAltRepresentativeInput(i)
: aRecipe.getRepresentativeInput(i);
@@ -733,50 +747,68 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
widget.getPos().y + 1,
true));
}
- } else if (widget.getMcSlot().getItemHandler() == itemOutputsInventory) {
- int i = widget.getMcSlot().getSlotIndex();
- if (aRecipe.mOutputs.length > i && aRecipe.mOutputs[i] != null) {
- mOutputs.add(
- new FixedPositionedStack(
- aRecipe.mOutputs[i],
- GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes,
- widget.getPos().x + 1,
- widget.getPos().y + 1,
- aRecipe.getOutputChance(i),
- GT_NEI_DefaultHandler.this.mRecipeMap.mNEIUnificateOutput));
- }
- } else if (widget.getMcSlot().getItemHandler() == specialSlotInventory) {
- if (aRecipe.mSpecialItems != null) {
- mInputs.add(
- new FixedPositionedStack(
- aRecipe.mSpecialItems,
- GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes,
- widget.getPos().x + 1,
- widget.getPos().y + 1));
- }
- } else if (widget.getMcSlot().getItemHandler() == fluidInputsInventory) {
- int i = widget.getMcSlot().getSlotIndex();
- if (aRecipe.mFluidInputs.length > i && aRecipe.mFluidInputs[i] != null
- && aRecipe.mFluidInputs[i].getFluid() != null) {
- mInputs.add(
- new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true),
- GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes,
- widget.getPos().x + 1,
- widget.getPos().y + 1));
- }
- } else if (widget.getMcSlot().getItemHandler() == fluidOutputsInventory) {
- int i = widget.getMcSlot().getSlotIndex();
- if (aRecipe.mFluidOutputs.length > i && aRecipe.mFluidOutputs[i] != null
- && aRecipe.mFluidOutputs[i].getFluid() != null) {
- mOutputs.add(
- new FixedPositionedStack(
- GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true),
- GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes,
- widget.getPos().x + 1,
- widget.getPos().y + 1));
- }
- }
+ } else if (widget.getMcSlot()
+ .getItemHandler()
+ == itemOutputsInventory) {
+ int i = widget.getMcSlot()
+ .getSlotIndex();
+ if (aRecipe.mOutputs.length > i && aRecipe.mOutputs[i] != null) {
+ mOutputs.add(
+ new FixedPositionedStack(
+ aRecipe.mOutputs[i],
+ GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes,
+ widget.getPos().x + 1,
+ widget.getPos().y + 1,
+ aRecipe.getOutputChance(i),
+ GT_NEI_DefaultHandler.this.mRecipeMap.mNEIUnificateOutput));
+ }
+ } else
+ if (widget.getMcSlot()
+ .getItemHandler()
+ == specialSlotInventory) {
+ if (aRecipe.mSpecialItems != null) {
+ mInputs.add(
+ new FixedPositionedStack(
+ aRecipe.mSpecialItems,
+ GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes,
+ widget.getPos().x + 1,
+ widget.getPos().y + 1));
+ }
+ } else
+ if (widget.getMcSlot()
+ .getItemHandler()
+ == fluidInputsInventory) {
+ int i = widget.getMcSlot()
+ .getSlotIndex();
+ if (aRecipe.mFluidInputs.length > i && aRecipe.mFluidInputs[i] != null
+ && aRecipe.mFluidInputs[i].getFluid() != null) {
+ mInputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(
+ aRecipe.mFluidInputs[i],
+ true),
+ GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes,
+ widget.getPos().x + 1,
+ widget.getPos().y + 1));
+ }
+ } else
+ if (widget.getMcSlot()
+ .getItemHandler()
+ == fluidOutputsInventory) {
+ int i = widget.getMcSlot()
+ .getSlotIndex();
+ if (aRecipe.mFluidOutputs.length > i && aRecipe.mFluidOutputs[i] != null
+ && aRecipe.mFluidOutputs[i].getFluid() != null) {
+ mOutputs.add(
+ new FixedPositionedStack(
+ GT_Utility.getFluidDisplayStack(
+ aRecipe.mFluidOutputs[i],
+ true),
+ GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes,
+ widget.getPos().x + 1,
+ widget.getPos().y + 1));
+ }
+ }
}
}
@@ -1027,7 +1059,8 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
// Holds 16 elements without rehashing
mTierIndexes = new HashMap<>(GT_Values.V.length + 1, 1f);
assert mCachedRecipes != null;
- Iterator<CachedDefaultRecipe> iterator = Objects.requireNonNull(mCachedRecipes.get()).iterator();
+ Iterator<CachedDefaultRecipe> iterator = Objects.requireNonNull(mCachedRecipes.get())
+ .iterator();
int index = 0;
int minIndex = 0;
@@ -1036,8 +1069,8 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
byte lowestTier = 0;
while (iterator.hasNext()) {
CachedDefaultRecipe recipe = iterator.next();
- byte recipeTier = GT_Utility
- .getTier(recipe.mRecipe.mEUt / GT_NEI_DefaultHandler.this.mRecipeMap.mAmperage);
+ byte recipeTier = GT_Utility.getTier(
+ recipe.mRecipe.mEUt / GT_NEI_DefaultHandler.this.mRecipeMap.mAmperage);
if (recipeTier != previousTier) {
if (maxIndex != -1) {
mTierIndexes.put(previousTier, Range.between(minIndex, maxIndex));
@@ -1061,7 +1094,8 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
while (mTierIndexes.get(lowTier) == null) {
lowTier++;
}
- return mTierIndexes.get(lowTier).getMinimum();
+ return mTierIndexes.get(lowTier)
+ .getMinimum();
}
private int getHighIndexForTier(byte upperTier) {
@@ -1069,7 +1103,8 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
while (mTierIndexes.get(highTier) == null) {
highTier--;
}
- return mTierIndexes.get(highTier).getMaximum();
+ return mTierIndexes.get(highTier)
+ .getMaximum();
}
}
}
diff --git a/src/main/java/gregtech/nei/NEI_GT_Config.java b/src/main/java/gregtech/nei/NEI_GT_Config.java
index 5c530ed709..7927f065e7 100644
--- a/src/main/java/gregtech/nei/NEI_GT_Config.java
+++ b/src/main/java/gregtech/nei/NEI_GT_Config.java
@@ -34,11 +34,16 @@ public class NEI_GT_Config implements IConfigureNEI {
* will be assigned a value of 0. Negative values are fine.
*/
private static final ImmutableMap<GT_Recipe.GT_Recipe_Map, Integer> RECIPE_MAP_ORDERING = ImmutableMap.<GT_Recipe.GT_Recipe_Map, Integer>builder()
- .put(GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes, 1)
- .put(GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes, 2).build();
+ .put(
+ GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes,
+ 1)
+ .put(
+ GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes,
+ 2)
+ .build();
- private static final Comparator<RecipeMapHandler> RECIPE_MAP_HANDLER_COMPARATOR = Comparator
- .comparingInt(handler -> RECIPE_MAP_ORDERING.getOrDefault(handler.getRecipeMap(), 0));
+ private static final Comparator<RecipeMapHandler> RECIPE_MAP_HANDLER_COMPARATOR = Comparator.comparingInt(
+ handler -> RECIPE_MAP_ORDERING.getOrDefault(handler.getRecipeMap(), 0));
public static boolean sIsAdded = true;
@@ -55,7 +60,9 @@ public class NEI_GT_Config implements IConfigureNEI {
@Override
public void loadConfig() {
sIsAdded = false;
- if (FMLCommonHandler.instance().getEffectiveSide().isClient()) {
+ if (FMLCommonHandler.instance()
+ .getEffectiveSide()
+ .isClient()) {
List<RecipeMapHandler> handlers = new ArrayList<>();
for (GT_Recipe.GT_Recipe_Map tMap : GT_Recipe.GT_Recipe_Map.sMappings) {
diff --git a/src/main/java/gregtech/nei/RecipeMapHandler.java b/src/main/java/gregtech/nei/RecipeMapHandler.java
index 1019d13e28..dbe1d74fd3 100644
--- a/src/main/java/gregtech/nei/RecipeMapHandler.java
+++ b/src/main/java/gregtech/nei/RecipeMapHandler.java
@@ -34,7 +34,10 @@ abstract class RecipeMapHandler extends TemplateRecipeHandler {
}
protected void drawText(int aX, int aY, String aString, int aColor) {
- Minecraft.getMinecraft().fontRenderer
- .drawString(aString, aX, aY, overrideTextColor != -1 ? overrideTextColor : aColor);
+ Minecraft.getMinecraft().fontRenderer.drawString(
+ aString,
+ aX,
+ aY,
+ overrideTextColor != -1 ? overrideTextColor : aColor);
}
}
diff --git a/src/main/java/gregtech/nei/dumper/GregTechIDDumper.java b/src/main/java/gregtech/nei/dumper/GregTechIDDumper.java
index dfcc2f567c..d3c41ed822 100644
--- a/src/main/java/gregtech/nei/dumper/GregTechIDDumper.java
+++ b/src/main/java/gregtech/nei/dumper/GregTechIDDumper.java
@@ -40,8 +40,8 @@ public abstract class GregTechIDDumper extends DataDumper {
protected void logWarn() {
if (!NewHorizonsCoreMod.isModLoaded()) {
NEIClientUtils.printChatMessage(
- new ChatComponentTranslation("nei.options.tools.dump.gt5u.warn_env")
- .setChatStyle(new ChatStyle().setColor(EnumChatFormatting.DARK_RED)));
+ new ChatComponentTranslation("nei.options.tools.dump.gt5u.warn_env").setChatStyle(
+ new ChatStyle().setColor(EnumChatFormatting.DARK_RED)));
}
}
diff --git a/src/main/java/gregtech/nei/dumper/MaterialDumper.java b/src/main/java/gregtech/nei/dumper/MaterialDumper.java
index 60b32e11f1..cf8f38934e 100644
--- a/src/main/java/gregtech/nei/dumper/MaterialDumper.java
+++ b/src/main/java/gregtech/nei/dumper/MaterialDumper.java
@@ -24,8 +24,9 @@ public class MaterialDumper extends GregTechIDDumper {
@Override
protected Iterable<String[]> dump(Mode mode) {
List<String[]> dump = new ArrayList<>();
- Map<Integer, Materials> idMap = Arrays.stream(GregTech_API.sGeneratedMaterials).filter(Objects::nonNull)
- .collect(Collectors.toMap(m -> m.mMetaItemSubID, m -> m));
+ Map<Integer, Materials> idMap = Arrays.stream(GregTech_API.sGeneratedMaterials)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toMap(m -> m.mMetaItemSubID, m -> m));
for (int i = 0; i < 1000; i++) {
if (mode == Mode.FREE && !idMap.containsKey(i)) {
dump.add(new String[] { String.valueOf(i), "", });
diff --git a/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java b/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java
index 0e89183854..d23e8b9897 100644
--- a/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java
+++ b/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java
@@ -26,8 +26,10 @@ public class MetaTileEntityDumper extends GregTechIDDumper {
list.add(new String[] { String.valueOf(i), "", "", });
} else if (mode == Mode.USED && mte != null) {
list.add(
- new String[] { String.valueOf(i), mte.getStackForm(1).getDisplayName(),
- mte.getClass().getSimpleName() });
+ new String[] { String.valueOf(i), mte.getStackForm(1)
+ .getDisplayName(),
+ mte.getClass()
+ .getSimpleName() });
}
}
return list;