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

Commit

Permalink
Update spotless to the GT5u version
Browse files Browse the repository at this point in the history
  • Loading branch information
@eigenraven
eigenraven committed May 25, 2024
1 parent 38c0e7b commit 84481c2
Show file tree
Hide file tree
Showing 63 changed files with 9,034 additions and 7,233 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
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 = Good Generator
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/goodgenerator/api/recipe/ComponentAssemblyLineFrontend.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
public class ComponentAssemblyLineFrontend extends RecipeMapFrontend {

public ComponentAssemblyLineFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder,
NEIRecipePropertiesBuilder neiPropertiesBuilder) {
NEIRecipePropertiesBuilder neiPropertiesBuilder) {
super(uiPropertiesBuilder, neiPropertiesBuilder);
}

Expand Down
18 changes: 9 additions & 9 deletions src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
public class ExtremeHeatExchangerFrontend extends RecipeMapFrontend {

public ExtremeHeatExchangerFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder,
NEIRecipePropertiesBuilder neiPropertiesBuilder) {
NEIRecipePropertiesBuilder neiPropertiesBuilder) {
super(uiPropertiesBuilder, neiPropertiesBuilder.neiSpecialInfoFormatter(new EHESpecialValueFormatter()));
}

Expand All @@ -45,14 +45,14 @@ public List<String> format(RecipeDisplayInfo recipeInfo) {
FluidStack[] Outputs = recipeInfo.recipe.mFluidOutputs;
int threshold = recipeInfo.recipe.mSpecialValue;
return Arrays.asList(
StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " "
+ GT_Utility.formatNumbers(Inputs[0].amount)
+ " L/s",
StatCollector.translateToLocal("value.extreme_heat_exchanger.1"),
GT_Utility.formatNumbers(Outputs[0].amount / 160) + " L/s",
StatCollector.translateToLocal("value.extreme_heat_exchanger.2"),
GT_Utility.formatNumbers(Outputs[1].amount / 160) + " L/s",
StatCollector.translateToLocal("value.extreme_heat_exchanger.4") + " " + threshold + " L/s");
StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " "
+ GT_Utility.formatNumbers(Inputs[0].amount)
+ " L/s",
StatCollector.translateToLocal("value.extreme_heat_exchanger.1"),
GT_Utility.formatNumbers(Outputs[0].amount / 160) + " L/s",
StatCollector.translateToLocal("value.extreme_heat_exchanger.2"),
GT_Utility.formatNumbers(Outputs[1].amount / 160) + " L/s",
StatCollector.translateToLocal("value.extreme_heat_exchanger.4") + " " + threshold + " L/s");
}
}
}
84 changes: 52 additions & 32 deletions src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,41 +18,61 @@
public class GoodGeneratorRecipeMaps {

public static final RecipeMap<RecipeMapBackend> naquadahReactorFuels = RecipeMapBuilder
.of("gg.recipe.naquadah_reactor").maxIO(0, 0, 1, 1).minInputs(0, 1)
.neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.naquadah_reactor"))
.neiRecipeComparator(Comparator.comparing(recipe -> recipe.mSpecialValue)).dontUseProgressBar()
.addSpecialTexture(59, 20, 58, 42, GG_UITextures.PICTURE_NAQUADAH_REACTOR).build();
.of("gg.recipe.naquadah_reactor")
.maxIO(0, 0, 1, 1)
.minInputs(0, 1)
.neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.naquadah_reactor"))
.neiRecipeComparator(Comparator.comparing(recipe -> recipe.mSpecialValue))
.dontUseProgressBar()
.addSpecialTexture(59, 20, 58, 42, GG_UITextures.PICTURE_NAQUADAH_REACTOR)
.build();
public static final RecipeMap<RecipeMapBackend> naquadahFuelRefineFactoryRecipes = RecipeMapBuilder
.of("gg.recipe.naquadah_fuel_refine_factory").maxIO(6, 0, 2, 1).minInputs(0, 1)
.neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.naquadah_fuel_refine_factory")).build();
.of("gg.recipe.naquadah_fuel_refine_factory")
.maxIO(6, 0, 2, 1)
.minInputs(0, 1)
.neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.naquadah_fuel_refine_factory"))
.build();
public static final RecipeMap<?> neutronActivatorRecipes = RecipeMapBuilder.of("gg.recipe.neutron_activator")
.maxIO(9, 9, 1, 1).dontUseProgressBar()
.addSpecialTexture(73, 22, 31, 21, GG_UITextures.PICTURE_NEUTRON_ACTIVATOR)
.neiSpecialInfoFormatter(recipeInfo -> {
int minNKE = recipeInfo.recipe.mSpecialValue % 10000;
int maxNKE = recipeInfo.recipe.mSpecialValue / 10000;
return Arrays.asList(
StatCollector.translateToLocal("value.neutron_activator.0"),
GT_Utility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"),
StatCollector.translateToLocal("value.neutron_activator.1"),
GT_Utility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2"));
}).build();
.maxIO(9, 9, 1, 1)
.dontUseProgressBar()
.addSpecialTexture(73, 22, 31, 21, GG_UITextures.PICTURE_NEUTRON_ACTIVATOR)
.neiSpecialInfoFormatter(recipeInfo -> {
int minNKE = recipeInfo.recipe.mSpecialValue % 10000;
int maxNKE = recipeInfo.recipe.mSpecialValue / 10000;
return Arrays.asList(
StatCollector.translateToLocal("value.neutron_activator.0"),
GT_Utility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"),
StatCollector.translateToLocal("value.neutron_activator.1"),
GT_Utility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2"));
})
.build();
public static final RecipeMap<ExtremeHeatExchangerBackend> extremeHeatExchangerFuels = RecipeMapBuilder
.of("gg.recipe.extreme_heat_exchanger", ExtremeHeatExchangerBackend::new).maxIO(0, 0, 2, 3)
.dontUseProgressBar().addSpecialTexture(47, 13, 78, 59, GG_UITextures.PICTURE_EXTREME_HEAT_EXCHANGER)
.frontend(ExtremeHeatExchangerFrontend::new).build();
.of("gg.recipe.extreme_heat_exchanger", ExtremeHeatExchangerBackend::new)
.maxIO(0, 0, 2, 3)
.dontUseProgressBar()
.addSpecialTexture(47, 13, 78, 59, GG_UITextures.PICTURE_EXTREME_HEAT_EXCHANGER)
.frontend(ExtremeHeatExchangerFrontend::new)
.build();
public static final RecipeMap<RecipeMapBackend> preciseAssemblerRecipes = RecipeMapBuilder
.of("gg.recipe.precise_assembler").maxIO(4, 1, 4, 0).progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
.progressBarPos(85, 30).neiTransferRect(80, 30, 35, 18)
.neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.precise_assembler"))
.frontend(PreciseAssemblerFrontend::new).build();
.of("gg.recipe.precise_assembler")
.maxIO(4, 1, 4, 0)
.progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
.progressBarPos(85, 30)
.neiTransferRect(80, 30, 35, 18)
.neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.precise_assembler"))
.frontend(PreciseAssemblerFrontend::new)
.build();
public static final RecipeMap<RecipeMapBackend> componentAssemblyLineRecipes = RecipeMapBuilder
.of("gg.recipe.componentassemblyline").maxIO(12, 1, 12, 0).neiTransferRect(70, 15, 18, 54)
.neiSpecialInfoFormatter(
recipeInfo -> Collections.singletonList(
StatCollector.translateToLocalFormatted(
"value.component_assembly_line",
GT_Values.VN[recipeInfo.recipe.mSpecialValue])))
.dontUseProgressBar().addSpecialTexture(70, 11, 72, 40, GG_UITextures.PICTURE_COMPONENT_ASSLINE)
.frontend(ComponentAssemblyLineFrontend::new).build();
.of("gg.recipe.componentassemblyline")
.maxIO(12, 1, 12, 0)
.neiTransferRect(70, 15, 18, 54)
.neiSpecialInfoFormatter(
recipeInfo -> Collections.singletonList(
StatCollector.translateToLocalFormatted(
"value.component_assembly_line",
GT_Values.VN[recipeInfo.recipe.mSpecialValue])))
.dontUseProgressBar()
.addSpecialTexture(70, 11, 72, 40, GG_UITextures.PICTURE_COMPONENT_ASSLINE)
.frontend(ComponentAssemblyLineFrontend::new)
.build();
}
2 changes: 1 addition & 1 deletion src/main/java/goodgenerator/api/recipe/PreciseAssemblerFrontend.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
public class PreciseAssemblerFrontend extends RecipeMapFrontend {

public PreciseAssemblerFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder,
NEIRecipePropertiesBuilder neiPropertiesBuilder) {
NEIRecipePropertiesBuilder neiPropertiesBuilder) {
super(uiPropertiesBuilder, neiPropertiesBuilder);
}

Expand Down
53 changes: 38 additions & 15 deletions src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ public static void Register() {

public static void crackedNaquadahGas_Lightly() {
Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedNaquadahGas");
tmp.setGaseous(true).setTemperature(800);
tmp.setGaseous(true)
.setTemperature(800);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("lightlyCrackedNaquadahGas");
tmp2.setBlockName("lightlyCrackedNaquadahGas");
Expand All @@ -40,7 +41,8 @@ public static void crackedNaquadahGas_Lightly() {

public static void crackedNaquadahGas_Moderately() {
Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedNaquadahGas");
tmp.setGaseous(true).setTemperature(800);
tmp.setGaseous(true)
.setTemperature(800);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("moderatelyCrackedNaquadahGas");
tmp2.setBlockName("moderatelyCrackedNaquadahGas");
Expand All @@ -50,7 +52,8 @@ public static void crackedNaquadahGas_Moderately() {

public static void crackedNaquadahGas_Heavily() {
Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedNaquadahGas");
tmp.setGaseous(true).setTemperature(800);
tmp.setGaseous(true)
.setTemperature(800);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("heavilyCrackedNaquadahGas");
tmp2.setBlockName("heavilyCrackedNaquadahGas");
Expand All @@ -60,7 +63,8 @@ public static void crackedNaquadahGas_Heavily() {

public static void crackedLightNaquadahFuel_Lightly() {
Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedLightNaquadahFuel");
tmp.setGaseous(false).setTemperature(1200);
tmp.setGaseous(false)
.setTemperature(1200);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("lightlyCrackedLightNaquadahFuel");
tmp2.setBlockName("lightlyCrackedLightNaquadahFuel");
Expand All @@ -70,7 +74,8 @@ public static void crackedLightNaquadahFuel_Lightly() {

public static void crackedLightNaquadahFuel_Moderately() {
Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedLightNaquadahFuel");
tmp.setGaseous(false).setTemperature(1200);
tmp.setGaseous(false)
.setTemperature(1200);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("moderatelyCrackedLightNaquadahFuel");
tmp2.setBlockName("moderatelyCrackedLightNaquadahFuel");
Expand All @@ -80,7 +85,8 @@ public static void crackedLightNaquadahFuel_Moderately() {

public static void crackedLightNaquadahFuel_Heavily() {
Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedLightNaquadahFuel");
tmp.setGaseous(false).setTemperature(1200);
tmp.setGaseous(false)
.setTemperature(1200);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("heavilyCrackedLightNaquadahFuel");
tmp2.setBlockName("heavilyCrackedLightNaquadahFuel");
Expand All @@ -90,7 +96,8 @@ public static void crackedLightNaquadahFuel_Heavily() {

public static void crackedHeavyNaquadahFuel_Lightly() {
Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedHeavyNaquadahFuel");
tmp.setGaseous(false).setTemperature(1200);
tmp.setGaseous(false)
.setTemperature(1200);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("lightlyCrackedHeavyNaquadahFuel");
tmp2.setBlockName("lightlyCrackedHeavyNaquadahFuel");
Expand All @@ -100,7 +107,8 @@ public static void crackedHeavyNaquadahFuel_Lightly() {

public static void crackedHeavyNaquadahFuel_Moderately() {
Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedHeavyNaquadahFuel");
tmp.setGaseous(false).setTemperature(1200);
tmp.setGaseous(false)
.setTemperature(1200);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("moderatelyCrackedHeavyNaquadahFuel");
tmp2.setBlockName("moderatelyCrackedHeavyNaquadahFuel");
Expand All @@ -110,7 +118,8 @@ public static void crackedHeavyNaquadahFuel_Moderately() {

public static void crackedHeavyNaquadahFuel_Heavily() {
Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedHeavyNaquadahFuel");
tmp.setGaseous(false).setTemperature(1200);
tmp.setGaseous(false)
.setTemperature(1200);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("heavilyCrackedHeavyNaquadahFuel");
tmp2.setBlockName("heavilyCrackedHeavyNaquadahFuel");
Expand All @@ -120,7 +129,10 @@ public static void crackedHeavyNaquadahFuel_Heavily() {

public static void crackedNaquadahAsphalt_Lightly() {
Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedNaquadahAsphalt");
tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000);
tmp.setGaseous(false)
.setTemperature(1800)
.setDensity(20000)
.setViscosity(20000);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("lightlyCrackedNaquadahAsphalt");
tmp2.setBlockName("lightlyCrackedNaquadahAsphalt");
Expand All @@ -130,7 +142,10 @@ public static void crackedNaquadahAsphalt_Lightly() {

public static void crackedNaquadahAsphalt_Moderately() {
Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedNaquadahAsphalt");
tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000);
tmp.setGaseous(false)
.setTemperature(1800)
.setDensity(20000)
.setViscosity(20000);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("moderatelyCrackedNaquadahAsphalt");
tmp2.setBlockName("moderatelyCrackedNaquadahAsphalt");
Expand All @@ -140,7 +155,10 @@ public static void crackedNaquadahAsphalt_Moderately() {

public static void crackedNaquadahAsphalt_Heavily() {
Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedNaquadahAsphalt");
tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000);
tmp.setGaseous(false)
.setTemperature(1800)
.setDensity(20000)
.setViscosity(20000);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("heavilyCrackedNaquadahAsphalt");
tmp2.setBlockName("heavilyCrackedNaquadahAsphalt");
Expand All @@ -150,7 +168,8 @@ public static void crackedNaquadahAsphalt_Heavily() {

public static void combustionPromotor() {
Fluid tmp = BaseFluid.BuildFluid("combustionPromotor");
tmp.setGaseous(false).setTemperature(300);
tmp.setGaseous(false)
.setTemperature(300);
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("combustionPromotor");
tmp2.setBlockName("combustionPromotor");
Expand All @@ -160,7 +179,9 @@ public static void combustionPromotor() {

public static void coalTar() {
Fluid tmp = BaseFluid.BuildFluid("fluid.coalTar");
tmp.setGaseous(false).setTemperature(450).setUnlocalizedName("fluid.coalTar");
tmp.setGaseous(false)
.setTemperature(450)
.setUnlocalizedName("fluid.coalTar");
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("coalTar");
tmp2.setBlockTextureName("coalTar");
Expand All @@ -170,7 +191,9 @@ public static void coalTar() {

public static void supercriticalSteam() {
Fluid tmp = BaseFluid.BuildFluid("supercriticalSteam");
tmp.setGaseous(true).setTemperature(648).setUnlocalizedName("supercriticalSteam");
tmp.setGaseous(true)
.setTemperature(648)
.setUnlocalizedName("supercriticalSteam");
BaseFluid tmp2 = new BaseFluid(tmp, Material.water);
tmp2.SetTexture("supercriticalSteam");
tmp2.setBlockTextureName("supercriticalSteam");
Expand Down
19 changes: 10 additions & 9 deletions src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public TileEntity createTileEntity(World world, int meta) {

@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7,
float par8, float par9) {
float par8, float par9) {
if (world.isRemote) {
return false;
} else {
Expand All @@ -167,16 +167,17 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p
if (tItemStack != null) {
Item tItem = tItemStack.getItem();
if (tItem instanceof IEssentiaContainerItem
&& ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) != null
&& ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).size() > 0) {
&& ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) != null
&& ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem())
.size() > 0) {
Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem())
.getAspects()[0];
.getAspects()[0];
((EssentiaHatch) tile).setLockedAspect(tLocked);
GT_Utility.sendChatToPlayer(
player,
String.format(
StatCollector.translateToLocal("essentiahatch.chat.0"),
tLocked.getLocalizedDescription()));
player,
String.format(
StatCollector.translateToLocal("essentiahatch.chat.0"),
tLocked.getLocalizedDescription()));
}
} else {
((EssentiaHatch) tile).setLockedAspect(null);
Expand All @@ -191,7 +192,7 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p
if (tItemStack == null) {
((EssentiaOutputHatch) tile).clear();
GT_Utility
.sendChatToPlayer(player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0"));
.sendChatToPlayer(player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0"));
}
return true;
} else return false;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public ITexture[] getTurbineCasing(int iconIndex, boolean active, boolean hasTur

@Override
public ITexture[] getTexture(Block aBlock, ForgeDirection side, IBlockAccess aWorld, int xCoord, int yCoord,
int zCoord) {
int zCoord) {
final int ordinalSide = side.ordinal();
int tInvertLeftRightMod = ordinalSide % 2 * 2 - 1;
switch (ordinalSide / 2) {
Expand Down
Loading

0 comments on commit 84481c2

Please sign in to comment.