aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kekztech
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-02-07 10:08:13 +0000
committerRaven Szewczyk <git@eigenraven.me>2023-02-07 10:08:13 +0000
commitddd9040627f1fc7ace5cd7fd1af7e1a9720016bd (patch)
tree9932fba5af9b14e5e4d75d0bc02c73022212c479 /src/main/java/kekztech
parentc9bae478b42acbbc96a4631226c3b19a99db1fc7 (diff)
downloadGT5-Unofficial-ddd9040627f1fc7ace5cd7fd1af7e1a9720016bd.tar.gz
GT5-Unofficial-ddd9040627f1fc7ace5cd7fd1af7e1a9720016bd.tar.bz2
GT5-Unofficial-ddd9040627f1fc7ace5cd7fd1af7e1a9720016bd.zip
Apply spotless
Diffstat (limited to 'src/main/java/kekztech')
-rw-r--r--src/main/java/kekztech/GuiHandler.java8
-rw-r--r--src/main/java/kekztech/Items.java63
-rw-r--r--src/main/java/kekztech/KekzCore.java14
-rw-r--r--src/main/java/kekztech/ServerProxy.java3
4 files changed, 42 insertions, 46 deletions
diff --git a/src/main/java/kekztech/GuiHandler.java b/src/main/java/kekztech/GuiHandler.java
index 56c7a8b102..8e16da8f37 100644
--- a/src/main/java/kekztech/GuiHandler.java
+++ b/src/main/java/kekztech/GuiHandler.java
@@ -1,13 +1,15 @@
package kekztech;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
import client.gui.Gui_ItemProxyEndpoint;
import client.gui.Gui_ItemProxySource;
+
import common.container.Container_ItemProxyEndpoint;
import common.container.Container_ItemProxySource;
import cpw.mods.fml.common.network.IGuiHandler;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
public class GuiHandler implements IGuiHandler {
diff --git a/src/main/java/kekztech/Items.java b/src/main/java/kekztech/Items.java
index 2444eb2fe9..defec1c9b7 100644
--- a/src/main/java/kekztech/Items.java
+++ b/src/main/java/kekztech/Items.java
@@ -1,42 +1,36 @@
package kekztech;
-import common.items.MetaItem_CraftingComponent;
-import common.items.MetaItem_ReactorComponent;
import java.util.Arrays;
+
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
+
import util.Util;
+import common.items.MetaItem_CraftingComponent;
+import common.items.MetaItem_ReactorComponent;
+
public enum Items {
+
/*
- // Heat Vents
- T1HeatVent(0,0), T2HeatVent(1,0), T3HeatVent(2,0), T4HeatVent(3,0),
- T1ComponentHeatVent(4,0), T2ComponentHeatVent(5,0), T3ComponentHeatVent(6,0), T4ComponentHeatVent(7,0),
- T1OverclockedHeatVent(8,0), T2OverclockedHeatVent(9,0), T3OverclockedHeatVent(10,0), T4OverclockedHeatVent(11,0),
- // Heat Exchanger
- T1HeatExchanger(12,0), T2HeatExchanger(13,0), T3HeatExchanger(14,0), T4HeatExchanger(15,0),
- // Fuel Rods
- UraniumFuelRod(16,0), UraniumDualFuelRod(17,0), UraniumQuadFuelRod(18,0),
- ThoriumFuelRod(19,0), ThoriumDualFuelRod(20,0), ThoriumQuadFuelRod(21,0),
- MOXFuelRod(22,0), MOXDualFuelRod(23,0), MOXQuadFuelRod(24,0),
- NaquadahFuelRod(25,0), NaquadahDualFuelRod(26,0), NaquadahQuadFuelRod(27,0),
- Th_MOXFuelRod(28,0), Th_MOXDualFuelRod(29,0), Th_MOXQuadFuelRod(30,0),
- // Depleted Fuel Rods
- DepletedUraniumFuelRod(31,0), DepletedUraniumDualFuelRod(32,0), DepletedUraniumQuadFuelRod(33,0),
- DepletedThoriumFuelRod(34,0), DepletedThoriumDualFuelRod(35,0), DepletedThoriumQuadFuelRod(36,0),
- DepletedMOXFuelRod(37,0), DepletedMOXDualFuelRod(38,0), DepletedMOXQuadFuelRod(39,0),
- DepletedNaquadahFuelRod(40,0), DepletedNaquadahDualFuelRod(41,0), DepletedNaquadahQuadFuelRod(42,0),
- Th_DepletedMOXFuelRod(43,0), Th_DepletedMOXDualFuelRod(44,0), Th_DepletedMOXQuadFuelRod(45,0),
- // Neutron Reflectors
- T1NeutronReflector(46,0), T2NeutronReflector(47,0),
- // Coolant Cells
- HeliumCoolantCell360k(48,0), NaKCoolantCell360k(49,0),
-
- // Heat Pipes
- CopperHeatPipe(0,1), SilverHeatPipe(1,1), BoronArsenideHeatPipe(2,1), DiamondHeatPipe(3,1),
- BoronArsenideDust(4,1), IsotopicallyPureDiamondDust(5,1), AmineCarbamiteDust(6,1),
- BoronArsenideCrystal(7,1), IsotopicallyPureDiamondCrystal(8,1),
- */
+ * // Heat Vents T1HeatVent(0,0), T2HeatVent(1,0), T3HeatVent(2,0), T4HeatVent(3,0), T1ComponentHeatVent(4,0),
+ * T2ComponentHeatVent(5,0), T3ComponentHeatVent(6,0), T4ComponentHeatVent(7,0), T1OverclockedHeatVent(8,0),
+ * T2OverclockedHeatVent(9,0), T3OverclockedHeatVent(10,0), T4OverclockedHeatVent(11,0), // Heat Exchanger
+ * T1HeatExchanger(12,0), T2HeatExchanger(13,0), T3HeatExchanger(14,0), T4HeatExchanger(15,0), // Fuel Rods
+ * UraniumFuelRod(16,0), UraniumDualFuelRod(17,0), UraniumQuadFuelRod(18,0), ThoriumFuelRod(19,0),
+ * ThoriumDualFuelRod(20,0), ThoriumQuadFuelRod(21,0), MOXFuelRod(22,0), MOXDualFuelRod(23,0), MOXQuadFuelRod(24,0),
+ * NaquadahFuelRod(25,0), NaquadahDualFuelRod(26,0), NaquadahQuadFuelRod(27,0), Th_MOXFuelRod(28,0),
+ * Th_MOXDualFuelRod(29,0), Th_MOXQuadFuelRod(30,0), // Depleted Fuel Rods DepletedUraniumFuelRod(31,0),
+ * DepletedUraniumDualFuelRod(32,0), DepletedUraniumQuadFuelRod(33,0), DepletedThoriumFuelRod(34,0),
+ * DepletedThoriumDualFuelRod(35,0), DepletedThoriumQuadFuelRod(36,0), DepletedMOXFuelRod(37,0),
+ * DepletedMOXDualFuelRod(38,0), DepletedMOXQuadFuelRod(39,0), DepletedNaquadahFuelRod(40,0),
+ * DepletedNaquadahDualFuelRod(41,0), DepletedNaquadahQuadFuelRod(42,0), Th_DepletedMOXFuelRod(43,0),
+ * Th_DepletedMOXDualFuelRod(44,0), Th_DepletedMOXQuadFuelRod(45,0), // Neutron Reflectors T1NeutronReflector(46,0),
+ * T2NeutronReflector(47,0), // Coolant Cells HeliumCoolantCell360k(48,0), NaKCoolantCell360k(49,0), // Heat Pipes
+ * CopperHeatPipe(0,1), SilverHeatPipe(1,1), BoronArsenideHeatPipe(2,1), DiamondHeatPipe(3,1),
+ * BoronArsenideDust(4,1), IsotopicallyPureDiamondDust(5,1), AmineCarbamiteDust(6,1), BoronArsenideCrystal(7,1),
+ * IsotopicallyPureDiamondCrystal(8,1),
+ */
// Ceramics
YSZCeramicDust(9, 1),
GDCCeramicDust(10, 1),
@@ -78,16 +72,13 @@ public enum Items {
}
public ItemStack getNonOreDictedItemStack(int amount) {
- return identifier == 0
- ? new ItemStack(MetaItem_ReactorComponent.getInstance(), amount, this.getMetaID())
+ return identifier == 0 ? new ItemStack(MetaItem_ReactorComponent.getInstance(), amount, this.getMetaID())
: new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID());
}
public ItemStack getOreDictedItemStack(int amount) {
- return this.getOreDictName() != null
- ? Util.getStackofAmountFromOreDict(this.getOreDictName(), amount)
- : identifier == 0
- ? new ItemStack(MetaItem_ReactorComponent.getInstance(), amount, this.getMetaID())
+ return this.getOreDictName() != null ? Util.getStackofAmountFromOreDict(this.getOreDictName(), amount)
+ : identifier == 0 ? new ItemStack(MetaItem_ReactorComponent.getInstance(), amount, this.getMetaID())
: new ItemStack(MetaItem_CraftingComponent.getInstance(), amount, this.getMetaID());
}
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index dbef680cc3..557cfcb28c 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -1,18 +1,21 @@
package kekztech;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
import com.google.common.collect.ImmutableSet;
import common.CommonProxy;
import common.tileentities.*;
+
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import java.util.List;
-import java.util.Set;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
/**
* My GT-Meta-IDs are: 13101 - 13500
@@ -23,8 +26,7 @@ import org.apache.logging.log4j.Logger;
modid = KekzCore.MODID,
name = KekzCore.NAME,
version = KekzCore.VERSION,
- dependencies = "required-after:IC2;"
- + "required-after:gregtech;"
+ dependencies = "required-after:IC2;" + "required-after:gregtech;"
+ "required-after:tectech;"
+ "required-after:Thaumcraft;"
+ "required-after:ThaumicTinkerer;"
diff --git a/src/main/java/kekztech/ServerProxy.java b/src/main/java/kekztech/ServerProxy.java
index ac366a54fd..e509ab1722 100644
--- a/src/main/java/kekztech/ServerProxy.java
+++ b/src/main/java/kekztech/ServerProxy.java
@@ -2,4 +2,5 @@ package kekztech;
import common.CommonProxy;
-public class ServerProxy extends CommonProxy {}
+public class ServerProxy extends CommonProxy {
+}