aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/client
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
committerRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
commit8ac58626bd4caa9e49f58acc6b97ac031f6c2107 (patch)
tree0a8c7b737f1f2607fa6875309f4c6a5c2b8b3331 /src/main/java/gregtech/client
parentd795cf740c3b48b602d3bfb708ed9e6c492ad37d (diff)
downloadGT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.gz
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.bz2
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.zip
Update spotless config to 0.2.2
Diffstat (limited to 'src/main/java/gregtech/client')
-rw-r--r--src/main/java/gregtech/client/GT_GUI_ClientConfig.java24
-rw-r--r--src/main/java/gregtech/client/GT_SoundLoop.java13
-rw-r--r--src/main/java/gregtech/client/GT_TooltipHandler.java270
3 files changed, 151 insertions, 156 deletions
diff --git a/src/main/java/gregtech/client/GT_GUI_ClientConfig.java b/src/main/java/gregtech/client/GT_GUI_ClientConfig.java
index 2a2c321fc7..1e23cd3e9d 100644
--- a/src/main/java/gregtech/client/GT_GUI_ClientConfig.java
+++ b/src/main/java/gregtech/client/GT_GUI_ClientConfig.java
@@ -20,13 +20,13 @@ public class GT_GUI_ClientConfig extends GuiConfig {
public GT_GUI_ClientConfig(GuiScreen parentScreen) {
super(
- parentScreen,
- getConfigElements(),
- GregTech.ID,
- "client",
- false,
- false,
- getAbridgedConfigPath(GregTech_API.sClientDataFile.mConfig.toString()));
+ parentScreen,
+ getConfigElements(),
+ GregTech.ID,
+ "client",
+ false,
+ false,
+ getAbridgedConfigPath(GregTech_API.sClientDataFile.mConfig.toString()));
}
@SuppressWarnings("rawtypes")
@@ -34,10 +34,10 @@ public class GT_GUI_ClientConfig extends GuiConfig {
final Configuration config = GregTech_API.sClientDataFile.mConfig;
setLanguageKeys(config);
return config.getCategoryNames()
- .stream()
- .filter(name -> name.indexOf('.') == -1)
- .map(name -> new ConfigElement(config.getCategory(name)))
- .collect(Collectors.toList());
+ .stream()
+ .filter(name -> name.indexOf('.') == -1)
+ .map(name -> new ConfigElement(config.getCategory(name)))
+ .collect(Collectors.toList());
}
private static void setLanguageKeys(Configuration config) {
@@ -50,7 +50,7 @@ public class GT_GUI_ClientConfig extends GuiConfig {
int defaultStart = name.lastIndexOf('_');
String realName = defaultStart >= 0 ? name.substring(0, defaultStart) : name;
entry.getValue()
- .setLanguageKey(String.format("%s.%s", category.getLanguagekey(), realName));
+ .setLanguageKey(String.format("%s.%s", category.getLanguagekey(), realName));
}
}
}
diff --git a/src/main/java/gregtech/client/GT_SoundLoop.java b/src/main/java/gregtech/client/GT_SoundLoop.java
index 135ef032f5..905f2c20d3 100644
--- a/src/main/java/gregtech/client/GT_SoundLoop.java
+++ b/src/main/java/gregtech/client/GT_SoundLoop.java
@@ -21,7 +21,7 @@ public class GT_SoundLoop extends MovingSound {
private boolean fadeMe = false;
public GT_SoundLoop(ResourceLocation p_i45104_1_, IGregTechTileEntity base, boolean stopWhenActive,
- boolean stopWhenInactive) {
+ boolean stopWhenInactive) {
super(p_i45104_1_);
this.whileActive = stopWhenActive;
this.whileInactive = stopWhenInactive;
@@ -34,7 +34,7 @@ public class GT_SoundLoop extends MovingSound {
}
public GT_SoundLoop(ResourceLocation sound, MultiTileBasicMachine base, boolean stopWhenActive,
- boolean stopWhenInactive) {
+ boolean stopWhenInactive) {
super(sound);
this.whileActive = stopWhenActive;
this.whileInactive = stopWhenInactive;
@@ -61,13 +61,8 @@ public class GT_SoundLoop extends MovingSound {
volume += VOLUME_RAMP;
}
World world = Minecraft.getMinecraft().thePlayer.worldObj;
- donePlaying = world.provider.dimensionId != worldID || !world.checkChunksExist(
- (int) xPosF,
- (int) yPosF,
- (int) zPosF,
- (int) xPosF,
- (int) yPosF,
- (int) zPosF);
+ donePlaying = world.provider.dimensionId != worldID
+ || !world.checkChunksExist((int) xPosF, (int) yPosF, (int) zPosF, (int) xPosF, (int) yPosF, (int) zPosF);
if (donePlaying) return;
TileEntity tile = world.getTileEntity((int) xPosF, (int) yPosF, (int) zPosF);
if ((tile instanceof IGregTechTileEntity)) {
diff --git a/src/main/java/gregtech/client/GT_TooltipHandler.java b/src/main/java/gregtech/client/GT_TooltipHandler.java
index 221e000b13..57a21722d2 100644
--- a/src/main/java/gregtech/client/GT_TooltipHandler.java
+++ b/src/main/java/gregtech/client/GT_TooltipHandler.java
@@ -29,142 +29,142 @@ public class GT_TooltipHandler {
UMV(text(RED + BOLD + UNDERLINE + "UMV-Tier")),
UXV(animatedText("UXV-Tier", 1, 100, DARK_PURPLE + BOLD + UNDERLINE, DARK_RED + UNDERLINE + BOLD)),
MAX(chain(
- animatedText(
- "X",
- 1,
- 100,
- LIGHT_PURPLE + BOLD + OBFUSCATED + UNDERLINE,
- RED + BOLD + OBFUSCATED + UNDERLINE,
- GOLD + OBFUSCATED + BOLD + UNDERLINE,
- YELLOW + OBFUSCATED + BOLD + UNDERLINE,
- GREEN + OBFUSCATED + BOLD + UNDERLINE,
- AQUA + OBFUSCATED + BOLD + UNDERLINE,
- BLUE + OBFUSCATED + BOLD + UNDERLINE),
- animatedText(
- "MAX-Tier",
- 1,
- 100,
- RED + BOLD + UNDERLINE,
- GOLD + BOLD + UNDERLINE,
- YELLOW + BOLD + UNDERLINE,
- GREEN + BOLD + UNDERLINE,
- AQUA + BOLD + UNDERLINE,
- BLUE + BOLD + UNDERLINE,
- LIGHT_PURPLE + BOLD + UNDERLINE),
- animatedText(
- "X",
- 1,
- 100,
- GOLD + OBFUSCATED + BOLD + UNDERLINE,
- YELLOW + OBFUSCATED + BOLD + UNDERLINE,
- GREEN + OBFUSCATED + BOLD + UNDERLINE,
- AQUA + OBFUSCATED + BOLD + UNDERLINE,
- BLUE + OBFUSCATED + BOLD + UNDERLINE,
- LIGHT_PURPLE + OBFUSCATED + BOLD + UNDERLINE,
- RED + OBFUSCATED + BOLD + UNDERLINE))),
+ animatedText(
+ "X",
+ 1,
+ 100,
+ LIGHT_PURPLE + BOLD + OBFUSCATED + UNDERLINE,
+ RED + BOLD + OBFUSCATED + UNDERLINE,
+ GOLD + OBFUSCATED + BOLD + UNDERLINE,
+ YELLOW + OBFUSCATED + BOLD + UNDERLINE,
+ GREEN + OBFUSCATED + BOLD + UNDERLINE,
+ AQUA + OBFUSCATED + BOLD + UNDERLINE,
+ BLUE + OBFUSCATED + BOLD + UNDERLINE),
+ animatedText(
+ "MAX-Tier",
+ 1,
+ 100,
+ RED + BOLD + UNDERLINE,
+ GOLD + BOLD + UNDERLINE,
+ YELLOW + BOLD + UNDERLINE,
+ GREEN + BOLD + UNDERLINE,
+ AQUA + BOLD + UNDERLINE,
+ BLUE + BOLD + UNDERLINE,
+ LIGHT_PURPLE + BOLD + UNDERLINE),
+ animatedText(
+ "X",
+ 1,
+ 100,
+ GOLD + OBFUSCATED + BOLD + UNDERLINE,
+ YELLOW + OBFUSCATED + BOLD + UNDERLINE,
+ GREEN + OBFUSCATED + BOLD + UNDERLINE,
+ AQUA + OBFUSCATED + BOLD + UNDERLINE,
+ BLUE + OBFUSCATED + BOLD + UNDERLINE,
+ LIGHT_PURPLE + OBFUSCATED + BOLD + UNDERLINE,
+ RED + OBFUSCATED + BOLD + UNDERLINE))),
ERV(chain(
- animatedText(
- "E",
- 1,
- 100,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
- animatedText(
- "R",
- 1,
- 100,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
- animatedText(
- "R",
- 1,
- 200,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
- animatedText(
- "O",
- 1,
- 150,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
- animatedText(
- "R",
- 1,
- 150,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
- animatedText(
- "-",
- 1,
- 150,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
- animatedText(
- "T",
- 1,
- 200,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
- animatedText(
- "i",
- 1,
- 100,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
- animatedText(
- "e",
- 1,
- 150,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
- animatedText(
- "r",
- 1,
- 100,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_RED + BOLD + UNDERLINE,
- DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE)));
+ animatedText(
+ "E",
+ 1,
+ 100,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
+ animatedText(
+ "R",
+ 1,
+ 100,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
+ animatedText(
+ "R",
+ 1,
+ 200,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
+ animatedText(
+ "O",
+ 1,
+ 150,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
+ animatedText(
+ "R",
+ 1,
+ 150,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
+ animatedText(
+ "-",
+ 1,
+ 150,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
+ animatedText(
+ "T",
+ 1,
+ 200,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
+ animatedText(
+ "i",
+ 1,
+ 100,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
+ animatedText(
+ "e",
+ 1,
+ 150,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE),
+ animatedText(
+ "r",
+ 1,
+ 100,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_RED + BOLD + UNDERLINE,
+ DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE)));
private final Supplier<String> tooltip;