Skip to content
This repository has been archived by the owner on May 25, 2024. It is now read-only.

Commit

Permalink
Apply updated spotless from GT5U
Browse files Browse the repository at this point in the history
  • Loading branch information
eigenraven committed May 25, 2024
1 parent a42b771 commit c128c7b
Show file tree
Hide file tree
Showing 12 changed files with 4,464 additions and 3,638 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
# LOCAL to test local config updates.
gtnh.settings.blowdryerTag = 0.2.0
gtnh.settings.blowdryerTag = 0.2.2

# Human-readable mod name, available for mcmod.info population.
modName = GTNH\: Lanthanides
Expand Down
34 changes: 20 additions & 14 deletions src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
import gregtech.api.util.GT_Log;

@Mod(
modid = Tags.MODID,
version = Tags.VERSION,
name = Tags.MODNAME,
dependencies = "required-after:IC2; " + "required-after:gregtech; "
+ "required-after:bartworks; "
+ "required-after:GoodGenerator; "
+ "before:miscutils; ")
modid = Tags.MODID,
version = Tags.VERSION,
name = Tags.MODNAME,
dependencies = "required-after:IC2; " + "required-after:gregtech; "
+ "required-after:bartworks; "
+ "required-after:GoodGenerator; "
+ "before:miscutils; ")
public class GTNHLanthanides {

public static Logger LOG = Logger.getLogger("GTNH:Lanthanides");
Expand All @@ -40,8 +40,8 @@ public class GTNHLanthanides {
public static GTNHLanthanides instance;

@SidedProxy(
clientSide = "com.elisis.gtnhlanth.client.ClientProxy",
serverSide = "com.elisis.gtnhlanth.common.CommonProxy")
clientSide = "com.elisis.gtnhlanth.client.ClientProxy",
serverSide = "com.elisis.gtnhlanth.common.CommonProxy")
public static CommonProxy proxy;

@EventHandler
Expand Down Expand Up @@ -69,13 +69,19 @@ public static void postInit(FMLPostInitializationEvent e) {
proxy.postInit(e);
// GT_Log.out.print(FluidRegistry.getFluid("Sodium Tungstate").getName());

GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffNameHashMap.keySet().toArray()));
GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffHashMap.keySet().toArray()));
GT_Log.out.print(
Arrays.toString(
Werkstoff.werkstoffNameHashMap.keySet()
.toArray()));
GT_Log.out.print(
Arrays.toString(
Werkstoff.werkstoffHashMap.keySet()
.toArray()));

GT_Log.out.print(
"HMMM " + Arrays.toString(
OreDictionary.getOreIDs(
WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1))));
"HMMM " + Arrays.toString(
OreDictionary
.getOreIDs(WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1))));
}

@EventHandler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,16 @@
public class LanthanidesRecipeMaps {

public static final RecipeMap<RecipeMapBackend> digesterRecipes = RecipeMapBuilder.of("gtnhlanth.recipe.digester")
.maxIO(1, 1, 1, 1).minInputs(1, 1).progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
.neiSpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE).build();
.maxIO(1, 1, 1, 1)
.minInputs(1, 1)
.progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
.neiSpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE)
.build();
public static final RecipeMap<RecipeMapBackend> dissolutionTankRecipes = RecipeMapBuilder
.of("gtnhlanth.recipe.disstank").maxIO(2, 3, 2, 1).minInputs(1, 1)
.progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
.neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.disstank")).build();
.of("gtnhlanth.recipe.disstank")
.maxIO(2, 3, 2, 1)
.minInputs(1, 1)
.progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
.neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.disstank"))
.build();
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,74 +15,80 @@
public class BotWerkstoffMaterialPool implements Runnable {

public static final Werkstoff TungsticAcid = new Werkstoff(
new short[] { 0xf5, 0xf1, 0x16 },
"Tungstic Acid",
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust().enforceUnification(),
29900,
SET_SHINY,
new Pair<>(Hydrogen, 2),
new Pair<>(Tungsten, 1),
new Pair<>(Oxygen, 4));
new short[] { 0xf5, 0xf1, 0x16 },
"Tungstic Acid",
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust()
.enforceUnification(),
29900,
SET_SHINY,
new Pair<>(Hydrogen, 2),
new Pair<>(Tungsten, 1),
new Pair<>(Oxygen, 4));
public static final Werkstoff TungstenTrioxide = new Werkstoff(
new short[] { 0x0f, 0x5, 0x16 },
"Tungsten Trioxide",
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust().enforceUnification(),
29901,
SET_SHINY,
new Pair<>(Tungsten, 1),
new Pair<>(Oxygen, 3));
new short[] { 0x0f, 0x5, 0x16 },
"Tungsten Trioxide",
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust()
.enforceUnification(),
29901,
SET_SHINY,
new Pair<>(Tungsten, 1),
new Pair<>(Oxygen, 3));
public static final Werkstoff AmmoniumNitrate = new Werkstoff(
new short[] { 0x81, 0xcc, 0x00 },
"Ammonium Nitrate",
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust(),
29903,
SET_FINE,
new Pair<>(Nitrogen, 1),
new Pair<>(Hydrogen, 4),
new Pair<>(Nitrogen, 1),
new Pair<>(Oxygen, 3));
new short[] { 0x81, 0xcc, 0x00 },
"Ammonium Nitrate",
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().onlyDust(),
29903,
SET_FINE,
new Pair<>(Nitrogen, 1),
new Pair<>(Hydrogen, 4),
new Pair<>(Nitrogen, 1),
new Pair<>(Oxygen, 3));
public static final Werkstoff SodiumTungstate = new Werkstoff(
new short[] { 0xc, 0xed, 0xd7, 0 },
"Sodium Tungstate",
subscriptNumbers("Na2WO4"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29904,
SET_FINE);
new short[] { 0xc, 0xed, 0xd7, 0 },
"Sodium Tungstate",
subscriptNumbers("Na2WO4"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
29904,
SET_FINE);
public static final Werkstoff Phosgene = new Werkstoff(
new short[] { 0x15, 0xa1, 0x1a },
"Phosgene",
subscriptNumbers("COCl2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29905,
SET_FINE);
new short[] { 0x15, 0xa1, 0x1a },
"Phosgene",
subscriptNumbers("COCl2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
29905,
SET_FINE);
public static final Werkstoff OXylene = new Werkstoff(
new short[] { 0x88, 0x94, 0xa8 },
"O-Xylene",
subscriptNumbers("C8H10"),
new Werkstoff.Stats().setGas(true),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29915,
SET_FINE);
new short[] { 0x88, 0x94, 0xa8 },
"O-Xylene",
subscriptNumbers("C8H10"),
new Werkstoff.Stats().setGas(true),
COMPOUND,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
29915,
SET_FINE);
public static final Werkstoff Nitromethane = new Werkstoff(
new short[] { 0x87, 0x7d, 0x60 },
"Nitromethane",
subscriptNumbers("CH3NO2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable().addCells(),
29914,
SET_METALLIC);
new short[] { 0x87, 0x7d, 0x60 },
"Nitromethane",
subscriptNumbers("CH3NO2"),
new Werkstoff.Stats(),
COMPOUND,
new Werkstoff.GenerationFeatures().disable()
.addCells(),
29914,
SET_METALLIC);

@Override
public void run() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ public static void register() {

LanthItemList.DIGESTER = new Digester(10500, "Digester", "Digester").getStackForm(1L);
LanthItemList.DISSOLUTION_TANK = new DissolutionTank(10501, "Dissolution Tank", "Dissolution Tank")
.getStackForm(1L);
.getStackForm(1L);
}
}
Loading

0 comments on commit c128c7b

Please sign in to comment.