[ci skip] spotlessApply with the new settings

This commit is contained in:
Jason Mitchell committed 2023-01-28 17:43:10 -08:00
1 parent ab0b8f11d4
commit 69a5c0e6ee
221 files changed
+3125 -2632

No files matched your search

@@ -1,21 +1,23 @@
package com.glodblock.github.nei;
import java.util.HashSet;
import java.util.List;
import net.minecraft.client.gui.inventory.GuiContainer;
import codechicken.nei.api.IOverlayHandler;
import codechicken.nei.recipe.IRecipeHandler;
import codechicken.nei.recipe.TemplateRecipeHandler;
import com.glodblock.github.FluidCraft;
import com.glodblock.github.client.gui.base.FCGuiEncodeTerminal;
import com.glodblock.github.nei.object.OrderStack;
import com.glodblock.github.nei.recipes.FluidRecipe;
import com.glodblock.github.network.CPacketTransferRecipe;
import java.util.HashSet;
import java.util.List;
import net.minecraft.client.gui.inventory.GuiContainer;
public class FluidPatternTerminalRecipeTransferHandler implements IOverlayHandler {
public static final FluidPatternTerminalRecipeTransferHandler INSTANCE =
new FluidPatternTerminalRecipeTransferHandler();
public static final FluidPatternTerminalRecipeTransferHandler INSTANCE = new FluidPatternTerminalRecipeTransferHandler();
public static final HashSet<String> notOtherSet = new HashSet<>();
public static final HashSet<String> craftSet = new HashSet<>();
@@ -1,9 +1,11 @@
package com.glodblock.github.nei;
import net.minecraft.client.gui.inventory.GuiContainer;
import codechicken.nei.api.INEIGuiAdapter;
import com.glodblock.github.client.gui.GuiFluidMonitor;
import com.glodblock.github.client.gui.GuiItemMonitor;
import net.minecraft.client.gui.inventory.GuiContainer;
public class NEIGuiHandler extends INEIGuiAdapter {
@@ -1,14 +1,16 @@
package com.glodblock.github.nei;
import com.glodblock.github.nei.object.OrderStack;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import com.glodblock.github.nei.object.OrderStack;
public class NEIUtils {
public static List<OrderStack<?>> compress(List<OrderStack<?>> list) {
@@ -2,6 +2,7 @@ package com.glodblock.github.nei;
import codechicken.nei.api.API;
import codechicken.nei.api.IConfigureNEI;
import com.glodblock.github.FluidCraft;
import com.glodblock.github.client.gui.GuiFluidPatternTerminal;
import com.glodblock.github.client.gui.GuiFluidPatternTerminalEx;
@@ -15,9 +16,13 @@ public class NEI_FC_Config implements IConfigureNEI {
for (String identifier : FluidRecipe.getSupportRecipes()) {
API.registerGuiOverlayHandler(
GuiFluidPatternTerminal.class, FluidPatternTerminalRecipeTransferHandler.INSTANCE, identifier);
GuiFluidPatternTerminal.class,
FluidPatternTerminalRecipeTransferHandler.INSTANCE,
identifier);
API.registerGuiOverlayHandler(
GuiFluidPatternTerminalEx.class, FluidPatternTerminalRecipeTransferHandler.INSTANCE, identifier);
GuiFluidPatternTerminalEx.class,
FluidPatternTerminalRecipeTransferHandler.INSTANCE,
identifier);
}
}
@@ -1,8 +1,9 @@
package com.glodblock.github.nei.object;
import java.util.List;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.IRecipeHandler;
import java.util.List;
public interface IRecipeExtractor {
@@ -14,8 +15,8 @@ public interface IRecipeExtractor {
return getInputIngredients(rawInputs);
}
default List<OrderStack<?>> getOutputIngredients(
List<PositionedStack> rawOutputs, IRecipeHandler recipe, int index) {
default List<OrderStack<?>> getOutputIngredients(List<PositionedStack> rawOutputs, IRecipeHandler recipe,
int index) {
return getOutputIngredients(rawOutputs);
}
}
@@ -1,14 +1,17 @@
package com.glodblock.github.nei.object;
import codechicken.nei.PositionedStack;
import com.glodblock.github.util.Util;
import javax.annotation.Nullable;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import codechicken.nei.PositionedStack;
import com.glodblock.github.util.Util;
public class OrderStack<T> {
private final T RealStack;
@@ -2,6 +2,7 @@ package com.glodblock.github.nei.recipes;
import com.glodblock.github.nei.recipes.extractor.*;
import com.glodblock.github.util.ModAndClassUtil;
import forestry.factory.recipes.nei.*;
import gregapi.recipes.Recipe;
import gregtech.api.util.GTPP_Recipe;
@@ -20,8 +21,9 @@ public class DefaultExtractorLoader implements Runnable {
for (GT_Recipe.GT_Recipe_Map tMap : GT_Recipe.GT_Recipe_Map.sMappings) {
FluidRecipe.addRecipeMap(
tMap.mNEIName,
new GregTech5RecipeExtractor(tMap.mNEIName.equals("gt.recipe.scanner")
|| tMap.mNEIName.equals("gt.recipe.fakeAssemblylineProcess")));
new GregTech5RecipeExtractor(
tMap.mNEIName.equals("gt.recipe.scanner")
|| tMap.mNEIName.equals("gt.recipe.fakeAssemblylineProcess")));
}
}
@@ -1,18 +1,21 @@
package com.glodblock.github.nei.recipes;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.IRecipeHandler;
import codechicken.nei.recipe.TemplateRecipeHandler;
import com.glodblock.github.nei.object.IRecipeExtractor;
import com.glodblock.github.nei.object.IRecipeExtractorLegacy;
import com.glodblock.github.nei.object.OrderStack;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.IRecipeHandler;
import codechicken.nei.recipe.TemplateRecipeHandler;
import com.glodblock.github.nei.object.IRecipeExtractor;
import com.glodblock.github.nei.object.IRecipeExtractorLegacy;
import com.glodblock.github.nei.object.OrderStack;
public final class FluidRecipe {
private static final HashMap<String, IRecipeExtractor> IdentifierMap = new HashMap<>();
@@ -1,19 +1,23 @@
package com.glodblock.github.nei.recipes.extractor;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.IRecipeHandler;
import codechicken.nei.recipe.TemplateRecipeHandler;
import com.glodblock.github.nei.object.IRecipeExtractor;
import com.glodblock.github.nei.object.OrderStack;
import com.glodblock.github.util.Ae2Reflect;
import crazypants.enderio.machine.crusher.CrusherRecipeManager;
import crazypants.enderio.nei.VatRecipeHandler;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import net.minecraftforge.fluids.FluidStack;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.IRecipeHandler;
import codechicken.nei.recipe.TemplateRecipeHandler;
import com.glodblock.github.nei.object.IRecipeExtractor;
import com.glodblock.github.nei.object.OrderStack;
import com.glodblock.github.util.Ae2Reflect;
import crazypants.enderio.machine.crusher.CrusherRecipeManager;
import crazypants.enderio.nei.VatRecipeHandler;
public class EnderIORecipeExtractor implements IRecipeExtractor {
public EnderIORecipeExtractor() {}
@@ -56,8 +60,8 @@ public class EnderIORecipeExtractor implements IRecipeExtractor {
}
@Override
public List<OrderStack<?>> getOutputIngredients(
List<PositionedStack> rawOutputs, IRecipeHandler recipe, int index) {
public List<OrderStack<?>> getOutputIngredients(List<PositionedStack> rawOutputs, IRecipeHandler recipe,
int index) {
TemplateRecipeHandler tRecipe = (TemplateRecipeHandler) recipe;
List<OrderStack<?>> tmp = new LinkedList<>();
if (tRecipe.arecipes.get(index) instanceof VatRecipeHandler.InnerVatRecipe) {
@@ -1,36 +1,32 @@
package com.glodblock.github.nei.recipes.extractor;
import codechicken.nei.PositionedStack;
import com.glodblock.github.nei.object.OrderStack;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.stream.Collectors;
import codechicken.nei.PositionedStack;
import com.glodblock.github.nei.object.OrderStack;
public final class ExtractorUtil {
public static List<OrderStack<?>> packItemStack(List<PositionedStack> items) {
AtomicInteger index = new AtomicInteger(-1);
return items.stream()
.map(item -> {
index.getAndIncrement();
return OrderStack.pack(item, index.get());
})
.filter(Objects::nonNull)
.collect(Collectors.toList());
return items.stream().map(item -> {
index.getAndIncrement();
return OrderStack.pack(item, index.get());
}).filter(Objects::nonNull).collect(Collectors.toList());
}
public static List<OrderStack<?>> packItemStack(
List<PositionedStack> items, Function<PositionedStack, Object> transformer) {
public static List<OrderStack<?>> packItemStack(List<PositionedStack> items,
Function<PositionedStack, Object> transformer) {
AtomicInteger index = new AtomicInteger(-1);
return items.stream()
.map(item -> {
index.getAndIncrement();
Object o = transformer.apply(item);
return o != null ? new OrderStack<>(o, index.get()) : null;
})
.filter(Objects::nonNull)
.collect(Collectors.toList());
return items.stream().map(item -> {
index.getAndIncrement();
Object o = transformer.apply(item);
return o != null ? new OrderStack<>(o, index.get()) : null;
}).filter(Objects::nonNull).collect(Collectors.toList());
}
}
@@ -1,17 +1,21 @@
package com.glodblock.github.nei.recipes.extractor;
import java.util.ArrayList;
import java.util.List;
import net.minecraftforge.fluids.FluidStack;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.IRecipeHandler;
import codechicken.nei.recipe.TemplateRecipeHandler;
import com.glodblock.github.nei.object.IRecipeExtractorLegacy;
import com.glodblock.github.nei.object.OrderStack;
import forestry.core.recipes.nei.PositionedFluidTank;
import forestry.core.recipes.nei.RecipeHandlerBase;
import forestry.factory.recipes.nei.NEIHandlerFabricator;
import forestry.factory.recipes.nei.NEIHandlerSqueezer;
import java.util.ArrayList;
import java.util.List;
import net.minecraftforge.fluids.FluidStack;
public class ForestryRecipeExtractor implements IRecipeExtractorLegacy {
@@ -42,8 +46,8 @@ public class ForestryRecipeExtractor implements IRecipeExtractorLegacy {
List<OrderStack<?>> tmp = new ArrayList<>();
if (tRecipe.arecipes.get(index) instanceof RecipeHandlerBase.CachedBaseRecipe) {
tmp = getInputIngredients(rawInputs);
List<PositionedFluidTank> tanks =
((RecipeHandlerBase.CachedBaseRecipe) tRecipe.arecipes.get(index)).getFluidTanks();
List<PositionedFluidTank> tanks = ((RecipeHandlerBase.CachedBaseRecipe) tRecipe.arecipes.get(index))
.getFluidTanks();
if (tanks.size() > 0 && !(handler instanceof NEIHandlerSqueezer)) {
FluidStack fluid = tanks.get(0).tank.getFluid();
if (fluid != null) {
@@ -55,15 +59,15 @@ public class ForestryRecipeExtractor implements IRecipeExtractorLegacy {
}
@Override
public List<OrderStack<?>> getOutputIngredients(
List<PositionedStack> rawOutputs, IRecipeHandler recipe, int index) {
public List<OrderStack<?>> getOutputIngredients(List<PositionedStack> rawOutputs, IRecipeHandler recipe,
int index) {
TemplateRecipeHandler tRecipe = (TemplateRecipeHandler) recipe;
removeGlass(rawOutputs);
List<OrderStack<?>> tmp = new ArrayList<>();
if (tRecipe.arecipes.get(index) instanceof RecipeHandlerBase.CachedBaseRecipe) {
tmp = getOutputIngredients(rawOutputs);
List<PositionedFluidTank> tanks =
((RecipeHandlerBase.CachedBaseRecipe) tRecipe.arecipes.get(index)).getFluidTanks();
List<PositionedFluidTank> tanks = ((RecipeHandlerBase.CachedBaseRecipe) tRecipe.arecipes.get(index))
.getFluidTanks();
if (tanks.size() > 0 && handler instanceof NEIHandlerSqueezer) {
FluidStack fluid = tanks.get(0).tank.getFluid();
if (fluid != null) {
@@ -1,16 +1,20 @@
package com.glodblock.github.nei.recipes.extractor;
import codechicken.nei.PositionedStack;
import com.glodblock.github.nei.object.IRecipeExtractor;
import com.glodblock.github.nei.object.OrderStack;
import gregtech.api.enums.ItemList;
import gregtech.common.items.GT_FluidDisplayItem;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import codechicken.nei.PositionedStack;
import com.glodblock.github.nei.object.IRecipeExtractor;
import com.glodblock.github.nei.object.OrderStack;
import gregtech.api.enums.ItemList;
import gregtech.common.items.GT_FluidDisplayItem;
public class GregTech5RecipeExtractor implements IRecipeExtractor {
boolean removeSpecial;
@@ -33,9 +37,8 @@ public class GregTech5RecipeExtractor implements IRecipeExtractor {
private void removeSpecial(List<PositionedStack> list) {
for (int i = list.size() - 1; i >= 0; i--) {
PositionedStack positionedStack = list.get(i);
if (positionedStack != null
&& (positionedStack.items[0].isItemEqual(ItemList.Tool_DataStick.get(1))
|| positionedStack.items[0].isItemEqual(ItemList.Tool_DataOrb.get(1)))) {
if (positionedStack != null && (positionedStack.items[0].isItemEqual(ItemList.Tool_DataStick.get(1))
|| positionedStack.items[0].isItemEqual(ItemList.Tool_DataOrb.get(1)))) {
list.remove(i);
break;
}
@@ -1,14 +1,18 @@
package com.glodblock.github.nei.recipes.extractor;
import codechicken.nei.PositionedStack;
import com.glodblock.github.nei.object.IRecipeExtractor;
import com.glodblock.github.nei.object.OrderStack;
import gregapi.item.ItemFluidDisplay;
import gregapi.recipes.Recipe;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import codechicken.nei.PositionedStack;
import com.glodblock.github.nei.object.IRecipeExtractor;
import com.glodblock.github.nei.object.OrderStack;
import gregapi.item.ItemFluidDisplay;
import gregapi.recipes.Recipe;
public class GregTech6RecipeExtractor implements IRecipeExtractor {
private final Recipe.RecipeMap Recipes;
@@ -1,21 +1,25 @@
package com.glodblock.github.nei.recipes.extractor;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.IRecipeHandler;
import com.glodblock.github.nei.object.IRecipeExtractor;
import com.glodblock.github.nei.object.OrderStack;
import com.glodblock.github.util.Ae2Reflect;
import ic2.neiIntegration.core.recipehandler.FluidCannerRecipeHandler;
import ic2.neiIntegration.core.recipehandler.OreWashingRecipeHandler;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.IRecipeHandler;
import com.glodblock.github.nei.object.IRecipeExtractor;
import com.glodblock.github.nei.object.OrderStack;
import com.glodblock.github.util.Ae2Reflect;
import ic2.neiIntegration.core.recipehandler.FluidCannerRecipeHandler;
import ic2.neiIntegration.core.recipehandler.OreWashingRecipeHandler;
public class IndustrialCraftRecipeExtractor implements IRecipeExtractor {
@Override
@@ -33,9 +37,8 @@ public class IndustrialCraftRecipeExtractor implements IRecipeExtractor {
List<OrderStack<?>> stacks = new LinkedList<>();
if (recipe instanceof FluidCannerRecipeHandler) {
FluidCannerRecipeHandler.CachedFluidCannerRecipe cachedRecipe =
(FluidCannerRecipeHandler.CachedFluidCannerRecipe)
((FluidCannerRecipeHandler) recipe).arecipes.get(index);
FluidCannerRecipeHandler.CachedFluidCannerRecipe cachedRecipe = (FluidCannerRecipeHandler.CachedFluidCannerRecipe) ((FluidCannerRecipeHandler) recipe).arecipes
.get(index);
FluidStack input = ReflectIC2.getInputFluid(cachedRecipe);
PositionedStack add = rawInputs.size() > 1 ? rawInputs.get(1) : null;
stacks.add(OrderStack.pack(add, 0));
@@ -52,14 +55,13 @@ public class IndustrialCraftRecipeExtractor implements IRecipeExtractor {
}
@Override
public List<OrderStack<?>> getOutputIngredients(
List<PositionedStack> rawOutputs, IRecipeHandler recipe, int index) {
public List<OrderStack<?>> getOutputIngredients(List<PositionedStack> rawOutputs, IRecipeHandler recipe,
int index) {
List<OrderStack<?>> stacks = new LinkedList<>();
if (recipe instanceof FluidCannerRecipeHandler) {
FluidCannerRecipeHandler.CachedFluidCannerRecipe cachedRecipe =
(FluidCannerRecipeHandler.CachedFluidCannerRecipe)
((FluidCannerRecipeHandler) recipe).arecipes.get(index);
FluidCannerRecipeHandler.CachedFluidCannerRecipe cachedRecipe = (FluidCannerRecipeHandler.CachedFluidCannerRecipe) ((FluidCannerRecipeHandler) recipe).arecipes
.get(index);
FluidStack output = ReflectIC2.getOutputFluid(cachedRecipe);
stacks.add(new OrderStack<>(output, 0));
} else {
@@ -79,8 +81,8 @@ public class IndustrialCraftRecipeExtractor implements IRecipeExtractor {
static {
try {
inputsF = Ae2Reflect.reflectField(FluidCannerRecipeHandler.CachedFluidCannerRecipe.class, "fluidInput");
resultF =
Ae2Reflect.reflectField(FluidCannerRecipeHandler.CachedFluidCannerRecipe.class, "fluidOutput");
resultF = Ae2Reflect
.reflectField(FluidCannerRecipeHandler.CachedFluidCannerRecipe.class, "fluidOutput");
oreWasherWater = Ae2Reflect.reflectMethod(OreWashingRecipeHandler.class, "getreqWater", int.class);
} catch (NoSuchFieldException | NoSuchMethodException e) {
throw new IllegalStateException("Failed to initialize IC2 reflection hacks!", e);
@@ -1,11 +1,13 @@
package com.glodblock.github.nei.recipes.extractor;
import codechicken.nei.PositionedStack;
import com.glodblock.github.nei.object.IRecipeExtractor;
import com.glodblock.github.nei.object.OrderStack;
import java.util.LinkedList;
import java.util.List;
import codechicken.nei.PositionedStack;
import com.glodblock.github.nei.object.IRecipeExtractor;
import com.glodblock.github.nei.object.OrderStack;
public class VanillaRecipeExtractor implements IRecipeExtractor {
private final boolean c;