aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/galacticraft
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-28 19:32:44 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-28 19:32:44 -0800
commit55f64675b42ac8d3c557cc850f78664bee006f6f (patch)
tree2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/xmod/galacticraft
parent0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff)
downloadGT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz
GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2
GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/galacticraft')
-rw-r--r--src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java22
-rw-r--r--src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java25
3 files changed, 30 insertions, 33 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java b/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java
index 5957cfc89d..1cbf4a4787 100644
--- a/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java
+++ b/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java
@@ -9,19 +9,19 @@ public class HANDLER_GalactiCraft {
public static void preInit() {
if (LoadedMods.GalacticraftCore) {
// mSystemsCache.put("HD10180", new SystemHD10180());
- /*for (BaseSolarSystem solar : mSystemsCache.values()) {
- Logger.SPACE("Running 'pre-init' for "+solar.mSystemName);
- solar.preInit();
- }*/
+ /*
+ * for (BaseSolarSystem solar : mSystemsCache.values()) {
+ * Logger.SPACE("Running 'pre-init' for "+solar.mSystemName); solar.preInit(); }
+ */
}
}
public static void init() {
if (LoadedMods.GalacticraftCore) {
- /*for (BaseSolarSystem solar : mSystemsCache.values()) {
- Logger.SPACE("Running 'init' for "+solar.mSystemName);
- solar.init();
- }*/
+ /*
+ * for (BaseSolarSystem solar : mSystemsCache.values()) {
+ * Logger.SPACE("Running 'init' for "+solar.mSystemName); solar.init(); }
+ */
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java
index b0c5032e5f..103699e228 100644
--- a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java
+++ b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java
@@ -1,18 +1,20 @@
package gtPlusPlus.xmod.galacticraft.handler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gtPlusPlus.core.item.chemistry.RocketFuels;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.asm.AsmConfig;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.LinkedHashMap;
+
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.fluids.Fluid;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gtPlusPlus.core.item.chemistry.RocketFuels;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.asm.AsmConfig;
+
public class HandlerTooltip_GC {
private static Item mItemBlock;
@@ -35,8 +37,8 @@ public class HandlerTooltip_GC {
if (GCBlocks != null) {
oMainClass = GCBlocks;
- Class<?> GCFuelLoader =
- ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.blocks.BlockFuelLoader");
+ Class<?> GCFuelLoader = ReflectionUtils
+ .getClass("micdoodle8.mods.galacticraft.core.blocks.BlockFuelLoader");
if (GCFuelLoader != null) {
oFuelLoaderClass = GCFuelLoader;
@@ -51,8 +53,7 @@ public class HandlerTooltip_GC {
}
}
}
- } catch (Throwable t) {
- }
+ } catch (Throwable t) {}
}
if (mFuelNames == null) {
mFuelNames = new LinkedHashMap<Integer, String>();
@@ -69,8 +70,7 @@ public class HandlerTooltip_GC {
if (mItemBlock != null && !mFuelNames.isEmpty()) {
Item aTempItem = event.itemStack.getItem();
Block aTempBlock = Block.getBlockFromItem(aTempItem);
- if (aTempItem == mItemBlock
- || oFuelLoaderClass.isInstance(aTempBlock)
+ if (aTempItem == mItemBlock || oFuelLoaderClass.isInstance(aTempBlock)
|| event.itemStack.getUnlocalizedName().toLowerCase().contains("fuelloader")) {
for (int aMapKey : mFuelNames.keySet()) {
String aFuel = mFuelNames.get(aMapKey);
diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java b/src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java
index b0b5b48d7d..c25d6b4352 100644
--- a/src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java
+++ b/src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java
@@ -1,14 +1,16 @@
package gtPlusPlus.xmod.galacticraft.util;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import net.minecraft.entity.Entity;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Materials;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.chemistry.RocketFuels;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import net.minecraft.entity.Entity;
-import net.minecraftforge.fluids.FluidStack;
public class GalacticUtils {
@@ -51,8 +53,7 @@ public class GalacticUtils {
getRocketTier = m1;
getRocket = m2;
getBuggy = m3;
- if (a1 != null
- && a2 != null
+ if (a1 != null && a2 != null
&& a3 != null
&& a4 != null
&& a5 != null
@@ -94,8 +95,7 @@ public class GalacticUtils {
if (getRocketTier != null) {
try {
return (int) getRocketTier.invoke(aEntity, new Object[] {});
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
}
}
return -1;
@@ -110,8 +110,7 @@ public class GalacticUtils {
if (aIDockable.isInstance(rocket) && rocket != null) {
return getRocketTier((Entity) rocket);
}
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
} else if (aBuggyPad.isInstance(aEntity)) {
Object buggy;
try {
@@ -119,8 +118,7 @@ public class GalacticUtils {
if (aIDockable.isInstance(buggy) && buggy != null) {
return 0;
}
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- }
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
}
}
return -1;
@@ -138,8 +136,7 @@ public class GalacticUtils {
if (aTieredRocket.isInstance(aEntity)) {
return getValidFuelForTier(getRocketTier(aEntity));
} else {
- Logger.SPACE(
- "Failed to get valid rocket fuel for " + aEntity.getClass().getCanonicalName());
+ Logger.SPACE("Failed to get valid rocket fuel for " + aEntity.getClass().getCanonicalName());
return getValidFuelForTier(0);
}
}