Skip to content

Commit

Permalink
enable spotless formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
TechLord22 committed Sep 10, 2023
1 parent 3bc8872 commit 626685a
Show file tree
Hide file tree
Showing 68 changed files with 1,027 additions and 643 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ customMavenPublishUrl =
# By default this will use the files found here: https://github.com/GregTechCEu/Buildscripts/tree/master/spotless
# to format your code. However, you can create your own version of these files and place them in your project's
# root directory to apply your own formatting options instead.
enableSpotless = false
enableSpotless = true

# Enable JUnit testing platform used for testing your code.
# Uses JUnit 5. See guide and documentation here: https://junit.org/junit5/docs/current/user-guide/
Expand Down
8 changes: 8 additions & 0 deletions spotless.importorder
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#Organize Import Order
0=java
1=javax
2=net
3=org
4=com
5=gregtech
6=gregicality
25 changes: 15 additions & 10 deletions src/main/java/gregicality/multiblocks/GregicalityMultiblocks.java
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
package gregicality.multiblocks;

import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;

import org.jetbrains.annotations.NotNull;

import gregtech.GTInternalTags;

import gregicality.GCYMInternalTags;
import gregicality.multiblocks.api.fluids.GCYMMetaFluids;
import gregicality.multiblocks.api.utils.GCYMLog;
import gregicality.multiblocks.common.CommonProxy;
import gregicality.multiblocks.common.block.GCYMMetaBlocks;
import gregicality.multiblocks.common.metatileentities.GCYMMetaTileEntities;
import gregtech.GTInternalTags;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import org.jetbrains.annotations.NotNull;

@Mod( modid = GregicalityMultiblocks.MODID,
name = GregicalityMultiblocks.NAME,
version = GregicalityMultiblocks.VERSION,
dependencies = GTInternalTags.DEP_VERSION_STRING)
@Mod(modid = GregicalityMultiblocks.MODID,
name = GregicalityMultiblocks.NAME,
version = GregicalityMultiblocks.VERSION,
dependencies = GTInternalTags.DEP_VERSION_STRING)
public class GregicalityMultiblocks {

public static final String MODID = "gcym";
public static final String NAME = "Gregicality Multiblocks";
public static final String VERSION = GCYMInternalTags.VERSION;

@SidedProxy(modId = MODID, clientSide = "gregicality.multiblocks.common.ClientProxy", serverSide = "gregicality.multiblocks.common.CommonProxy")
@SidedProxy(modId = MODID,
clientSide = "gregicality.multiblocks.common.ClientProxy",
serverSide = "gregicality.multiblocks.common.CommonProxy")
public static CommonProxy proxy;

@Mod.EventHandler
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/gregicality/multiblocks/api/AlloyBlastUtil.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package gregicality.multiblocks.api;

import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey;
import gregtech.api.unification.material.Material;
import gregtech.api.unification.material.properties.PropertyKey;
import gregtech.api.unification.ore.OrePrefix;
import net.minecraftforge.fluids.Fluid;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import gregtech.api.unification.material.Material;
import gregtech.api.unification.material.properties.PropertyKey;
import gregtech.api.unification.ore.OrePrefix;

import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey;

public final class AlloyBlastUtil {

private AlloyBlastUtil() {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package gregicality.multiblocks.api.capability.impl;

import gregicality.multiblocks.api.capability.IParallelMultiblock;
import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility;
import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController;
import gregicality.multiblocks.common.GCYMConfigHolder;
import java.util.List;

import org.jetbrains.annotations.NotNull;

import gregtech.api.GTValues;
import gregtech.api.capability.impl.MultiblockRecipeLogic;
import gregtech.api.metatileentity.ITieredMetaTileEntity;
import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController;
import org.jetbrains.annotations.NotNull;

import java.util.List;
import gregicality.multiblocks.api.capability.IParallelMultiblock;
import gregicality.multiblocks.api.metatileentity.GCYMMultiblockAbility;
import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController;
import gregicality.multiblocks.common.GCYMConfigHolder;

public class GCYMMultiblockRecipeLogic extends MultiblockRecipeLogic {

Expand All @@ -36,7 +38,8 @@ protected long getMaxVoltage() {
if (!GCYMConfigHolder.globalMultiblocks.enableTieredCasings)
return super.getMaxVoltage();

if (getMetaTileEntity() instanceof GCYMRecipeMapMultiblockController && !((GCYMRecipeMapMultiblockController) getMetaTileEntity()).isTiered())
if (getMetaTileEntity() instanceof GCYMRecipeMapMultiblockController &&
!((GCYMRecipeMapMultiblockController) getMetaTileEntity()).isTiered())
return super.getMaxVoltage();

List<ITieredMetaTileEntity> list = getMetaTileEntity().getAbilities(GCYMMultiblockAbility.TIERED_HATCH);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
package gregicality.multiblocks.api.fluids;

import gregicality.multiblocks.GregicalityMultiblocks;
import gregicality.multiblocks.api.fluids.fluidType.GCYMFluidTypes;
import gregicality.multiblocks.api.unification.GCYMMaterialFlags;
import gregicality.multiblocks.api.unification.properties.AlloyBlastProperty;
import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey;
import java.util.Collection;

import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;

import org.jetbrains.annotations.NotNull;

import gregtech.api.GregTechAPI;
import gregtech.api.fluids.MetaFluids;
import gregtech.api.unification.material.Material;
import gregtech.api.unification.material.properties.BlastProperty;
import gregtech.api.unification.material.properties.PropertyKey;
import gregtech.api.unification.ore.OrePrefix;
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
import org.jetbrains.annotations.NotNull;

import java.util.Collection;
import gregicality.multiblocks.GregicalityMultiblocks;
import gregicality.multiblocks.api.fluids.fluidType.GCYMFluidTypes;
import gregicality.multiblocks.api.unification.GCYMMaterialFlags;
import gregicality.multiblocks.api.unification.properties.AlloyBlastProperty;
import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey;

import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;

public final class GCYMMetaFluids {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package gregicality.multiblocks.api.fluids.fluidType;

import gregtech.api.fluids.fluidType.FluidTypeLiquid;
import net.minecraftforge.fluids.Fluid;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import gregtech.api.fluids.fluidType.FluidTypeLiquid;

public class FluidTypeMolten extends FluidTypeLiquid {

public FluidTypeMolten(@NotNull String name, @Nullable String prefix, @Nullable String suffix, @NotNull String localization) {
public FluidTypeMolten(@NotNull String name, @Nullable String prefix, @Nullable String suffix,
@NotNull String localization) {
super(name, prefix, suffix, localization);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package gregicality.multiblocks.api.fluids.fluidType;

import crafttweaker.annotations.ZenRegister;
import gregtech.api.fluids.fluidType.FluidType;

import crafttweaker.annotations.ZenRegister;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenProperty;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package gregicality.multiblocks.api.metatileentity;

import gregicality.multiblocks.api.capability.IParallelHatch;
import gregtech.api.metatileentity.ITieredMetaTileEntity;
import gregtech.api.metatileentity.multiblock.MultiblockAbility;

import gregicality.multiblocks.api.capability.IParallelHatch;

@SuppressWarnings("InstantiationOfUtilityClass")
public final class GCYMMultiblockAbility {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
package gregicality.multiblocks.api.metatileentity;

import gregicality.multiblocks.api.capability.IParallelMultiblock;
import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic;
import gregicality.multiblocks.common.GCYMConfigHolder;
import gregtech.api.GTValues;
import gregtech.api.metatileentity.ITieredMetaTileEntity;
import gregtech.api.metatileentity.multiblock.MultiMapMultiblockController;
import gregtech.api.pattern.TraceabilityPredicate;
import gregtech.api.recipes.RecipeMap;
import java.util.List;

import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.world.World;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.List;
import gregtech.api.GTValues;
import gregtech.api.metatileentity.ITieredMetaTileEntity;
import gregtech.api.metatileentity.multiblock.MultiMapMultiblockController;
import gregtech.api.pattern.TraceabilityPredicate;
import gregtech.api.recipes.RecipeMap;

import gregicality.multiblocks.api.capability.IParallelMultiblock;
import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic;
import gregicality.multiblocks.common.GCYMConfigHolder;

public abstract class GCYMRecipeMapMultiblockController extends MultiMapMultiblockController implements IParallelMultiblock {
public abstract class GCYMRecipeMapMultiblockController extends MultiMapMultiblockController
implements IParallelMultiblock {

public GCYMRecipeMapMultiblockController(ResourceLocation metaTileEntityId, RecipeMap<?> recipeMap) {
this(metaTileEntityId, new RecipeMap<?>[]{recipeMap});
this(metaTileEntityId, new RecipeMap<?>[] { recipeMap });
}

public GCYMRecipeMapMultiblockController(ResourceLocation metaTileEntityId, RecipeMap<?>[] recipeMaps) {
Expand All @@ -44,7 +48,8 @@ protected void addDisplayText(List<ITextComponent> textList) {
super.addDisplayText(textList);
List<ITieredMetaTileEntity> list = getAbilities(GCYMMultiblockAbility.TIERED_HATCH);
if (GCYMConfigHolder.globalMultiblocks.enableTieredCasings && !list.isEmpty()) {
long maxVoltage = Math.min(GTValues.V[list.get(0).getTier()], Math.max(energyContainer.getInputVoltage(), energyContainer.getOutputVoltage()));
long maxVoltage = Math.min(GTValues.V[list.get(0).getTier()],
Math.max(energyContainer.getInputVoltage(), energyContainer.getOutputVoltage()));
String voltageName = GTValues.VNF[list.get(0).getTier()];
textList.add(new TextComponentTranslation("gcym.multiblock.tiered_hatch.tooltip", maxVoltage, voltageName));
}
Expand All @@ -66,14 +71,20 @@ public boolean isTiered() {
}

@Override
public TraceabilityPredicate autoAbilities(boolean checkEnergyIn, boolean checkMaintenance, boolean checkItemIn, boolean checkItemOut, boolean checkFluidIn, boolean checkFluidOut, boolean checkMuffler) {
TraceabilityPredicate predicate = super.autoAbilities(checkEnergyIn, checkMaintenance, checkItemIn, checkItemOut, checkFluidIn, checkFluidOut, checkMuffler);
public TraceabilityPredicate autoAbilities(boolean checkEnergyIn, boolean checkMaintenance, boolean checkItemIn,
boolean checkItemOut, boolean checkFluidIn, boolean checkFluidOut,
boolean checkMuffler) {
TraceabilityPredicate predicate = super.autoAbilities(checkEnergyIn, checkMaintenance, checkItemIn,
checkItemOut, checkFluidIn, checkFluidOut, checkMuffler);
if (isParallel())
predicate = predicate.or(abilities(GCYMMultiblockAbility.PARALLEL_HATCH).setMaxGlobalLimited(1).setPreviewCount(1));
predicate = predicate
.or(abilities(GCYMMultiblockAbility.PARALLEL_HATCH).setMaxGlobalLimited(1).setPreviewCount(1));
return predicate;
}

public static @NotNull TraceabilityPredicate tieredCasing() {
return new TraceabilityPredicate(abilities(GCYMMultiblockAbility.TIERED_HATCH).setMinGlobalLimited(GCYMConfigHolder.globalMultiblocks.enableTieredCasings ? 1 : 0).setMaxGlobalLimited(1));
return new TraceabilityPredicate(abilities(GCYMMultiblockAbility.TIERED_HATCH)
.setMinGlobalLimited(GCYMConfigHolder.globalMultiblocks.enableTieredCasings ? 1 : 0)
.setMaxGlobalLimited(1));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@

public final class GCYMRecipeMaps {

public static final RecipeMap<BlastRecipeBuilder> ALLOY_BLAST_RECIPES = new RecipeMap<>("alloy_blast_smelter", 9, 0, 3, 1, new BlastRecipeBuilder(), false)
.setSlotOverlay(false, false, false, GuiTextures.FURNACE_OVERLAY_1)
.setSlotOverlay(false, false, true, GuiTextures.FURNACE_OVERLAY_1)
.setSlotOverlay(false, true, false, GuiTextures.FURNACE_OVERLAY_2)
.setSlotOverlay(false, true, true, GuiTextures.FURNACE_OVERLAY_2)
.setSlotOverlay(true, true, false, GuiTextures.FURNACE_OVERLAY_2)
.setSlotOverlay(true, true, true, GuiTextures.FURNACE_OVERLAY_2)
.setSound(GTSoundEvents.FURNACE);
public static final RecipeMap<BlastRecipeBuilder> ALLOY_BLAST_RECIPES = new RecipeMap<>("alloy_blast_smelter", 9, 0,
3, 1, new BlastRecipeBuilder(), false)
.setSlotOverlay(false, false, false, GuiTextures.FURNACE_OVERLAY_1)
.setSlotOverlay(false, false, true, GuiTextures.FURNACE_OVERLAY_1)
.setSlotOverlay(false, true, false, GuiTextures.FURNACE_OVERLAY_2)
.setSlotOverlay(false, true, true, GuiTextures.FURNACE_OVERLAY_2)
.setSlotOverlay(true, true, false, GuiTextures.FURNACE_OVERLAY_2)
.setSlotOverlay(true, true, true, GuiTextures.FURNACE_OVERLAY_2)
.setSound(GTSoundEvents.FURNACE);

private GCYMRecipeMaps() {}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package gregicality.multiblocks.api.recipes.alloyblast;

import gregicality.multiblocks.api.AlloyBlastUtil;
import gregicality.multiblocks.api.recipes.GCYMRecipeMaps;
import gregicality.multiblocks.api.unification.GCYMMaterialFlags;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;

import org.jetbrains.annotations.NotNull;

import gregtech.api.GTValues;
import gregtech.api.recipes.RecipeBuilder;
import gregtech.api.recipes.RecipeMaps;
Expand All @@ -16,9 +18,10 @@
import gregtech.api.unification.stack.MaterialStack;
import gregtech.common.items.MetaItems;
import gregtech.loaders.recipe.CraftingComponent;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import org.jetbrains.annotations.NotNull;

import gregicality.multiblocks.api.AlloyBlastUtil;
import gregicality.multiblocks.api.recipes.GCYMRecipeMaps;
import gregicality.multiblocks.api.unification.GCYMMaterialFlags;

public class AlloyBlastRecipeProducer {

Expand Down Expand Up @@ -114,7 +117,8 @@ protected int addInputs(@NotNull Material material, @NotNull RecipeBuilder<Blast
* @param componentAmount the amount of different components in the material
* @param builder the builder to continue
*/
protected void buildRecipes(@NotNull BlastProperty property, @NotNull Fluid molten, int outputAmount, int componentAmount,
protected void buildRecipes(@NotNull BlastProperty property, @NotNull Fluid molten, int outputAmount,
int componentAmount,
@NotNull RecipeBuilder<BlastRecipeBuilder> builder) {
// add the fluid output with the correct amount
builder.fluidOutputs(new FluidStack(molten, GTValues.L * outputAmount));
Expand Down Expand Up @@ -163,7 +167,6 @@ protected int getGasCircuitNum(int componentAmount) {
*/
@SuppressWarnings("MethodMayBeStatic")
protected void addFreezerRecipes(@NotNull Material material, @NotNull Fluid molten, int temperature) {

// build the freezer recipe
RecipeBuilder<?> freezerBuilder = RecipeMaps.VACUUM_RECIPES.recipeBuilder()
.fluidInputs(new FluidStack(molten, GTValues.L))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package gregicality.multiblocks.api.recipes.alloyblast;

import org.jetbrains.annotations.NotNull;

import com.google.common.base.Preconditions;

import gregtech.api.recipes.RecipeBuilder;
import gregtech.api.recipes.builders.BlastRecipeBuilder;
import gregtech.api.unification.material.Material;
import org.jetbrains.annotations.NotNull;

public class CustomAlloyBlastRecipeProducer extends AlloyBlastRecipeProducer {

Expand All @@ -15,7 +17,8 @@ public class CustomAlloyBlastRecipeProducer extends AlloyBlastRecipeProducer {
/**
* @param circuitNum the custom circuit number to use
* @param gasCircuitNum the custom gas circuit number to use
* @param outputAmount the custom output amount in quantities of {@link gregtech.api.unification.ore.OrePrefix#ingot}
* @param outputAmount the custom output amount in quantities of
* {@link gregtech.api.unification.ore.OrePrefix#ingot}
* / {@link gregtech.api.GTValues#M}) to use
*/
public CustomAlloyBlastRecipeProducer(int circuitNum, int gasCircuitNum, int outputAmount) {
Expand Down
Loading

0 comments on commit 626685a

Please sign in to comment.