aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/GoodGenerator/Blocks/TEs/MetalVaporTurbine.java5
-rw-r--r--src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java (renamed from src/main/java/GoodGenerator/Blocks/MyFluids/BaseFluid.java)4
-rw-r--r--src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java (renamed from src/main/java/GoodGenerator/Blocks/MyFluids/FluidsBuilder.java)5
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/Casing.java (renamed from src/main/java/GoodGenerator/Blocks/RegularBlock/Casing.java)4
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java (renamed from src/main/java/GoodGenerator/Blocks/RegularBlock/ComplexTextureCasing.java)2
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/Frame.java (renamed from src/main/java/GoodGenerator/Blocks/RegularBlock/Frame.java)2
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java (renamed from src/main/java/GoodGenerator/Blocks/RegularBlock/TEBlock.java)6
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java (renamed from src/main/java/GoodGenerator/Blocks/TEs/EssentiaHatch.java)5
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java (renamed from src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java)11
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java (renamed from src/main/java/GoodGenerator/Blocks/TEs/MetaTE/NeutronAccelerator.java)2
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java (renamed from src/main/java/GoodGenerator/Blocks/TEs/MetaTE/NeutronSensor.java)10
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java (renamed from src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java)18
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java (renamed from src/main/java/GoodGenerator/Blocks/TEs/MegaPlasmaTurbine.java)2
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/MetalVaporTurbine.java5
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java (renamed from src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java)20
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java (renamed from src/main/java/GoodGenerator/Blocks/TEs/NeutronActivator.java)26
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java (renamed from src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java)8
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java (renamed from src/main/java/GoodGenerator/Blocks/TEs/YottaFluidTank.java)18
-rw-r--r--src/main/java/goodgenerator/client/ClientProxy.java (renamed from src/main/java/GoodGenerator/Client/ClientProxy.java)4
-rw-r--r--src/main/java/goodgenerator/client/GUI/NeutronActivatorGUIClient.java (renamed from src/main/java/GoodGenerator/Client/GUI/NeutronActivatorGUIClient.java)4
-rw-r--r--src/main/java/goodgenerator/client/GUI/NeutronSensorGUIClient.java (renamed from src/main/java/GoodGenerator/Client/GUI/NeutronSensorGUIClient.java)8
-rw-r--r--src/main/java/goodgenerator/client/GUI/YOTTankGUIClient.java (renamed from src/main/java/GoodGenerator/Client/GUI/YOTTankGUIClient.java)6
-rw-r--r--src/main/java/goodgenerator/common/CommonProxy.java (renamed from src/main/java/GoodGenerator/Common/CommonProxy.java)2
-rw-r--r--src/main/java/goodgenerator/common/container/NeutronActivatorGUIContainer.java (renamed from src/main/java/GoodGenerator/Common/Container/NeutronActivatorGUIContainer.java)4
-rw-r--r--src/main/java/goodgenerator/common/container/NeutronSensorGUIContainer.java (renamed from src/main/java/GoodGenerator/Common/Container/NeutronSensorGUIContainer.java)2
-rw-r--r--src/main/java/goodgenerator/common/container/YOTTankGUIContainer.java (renamed from src/main/java/GoodGenerator/Common/Container/YOTTankGUIContainer.java)4
-rw-r--r--src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java (renamed from src/main/java/GoodGenerator/CrossMod/NEI/IMCForNEI.java)4
-rw-r--r--src/main/java/goodgenerator/crossmod/nei/NEI_Config.java (renamed from src/main/java/GoodGenerator/CrossMod/NEI/NEI_Config.java)6
-rw-r--r--src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java (renamed from src/main/java/GoodGenerator/CrossMod/NEI/NeutronActivatorHandler.java)2
-rw-r--r--src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java (renamed from src/main/java/GoodGenerator/CrossMod/Thaumcraft/LargeEssentiaEnergyData.java)2
-rw-r--r--src/main/java/goodgenerator/crossmod/thaumcraft/Research.java (renamed from src/main/java/GoodGenerator/CrossMod/Thaumcraft/Research.java)9
-rw-r--r--src/main/java/goodgenerator/items/FuelRod.java (renamed from src/main/java/GoodGenerator/Items/FuelRod.java)4
-rw-r--r--src/main/java/goodgenerator/items/MyItemBlocks.java (renamed from src/main/java/GoodGenerator/Items/MyItemBlocks.java)17
-rw-r--r--src/main/java/goodgenerator/items/MyItems.java (renamed from src/main/java/GoodGenerator/Items/MyItems.java)4
-rw-r--r--src/main/java/goodgenerator/items/MyMaterial.java (renamed from src/main/java/GoodGenerator/Items/MyMaterial.java)4
-rw-r--r--src/main/java/goodgenerator/items/RadioactiveItem.java (renamed from src/main/java/GoodGenerator/Items/RadioactiveItem.java)2
-rw-r--r--src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java55
-rw-r--r--src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java16
-rw-r--r--src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java103
-rw-r--r--src/main/java/goodgenerator/items/nuclear/NuclearTextures.java31
-rw-r--r--src/main/java/goodgenerator/loader/AchievementLoader.java (renamed from src/main/java/GoodGenerator/Loader/AchievementLoader.java)2
-rw-r--r--src/main/java/goodgenerator/loader/FuelRecipeLoader.java (renamed from src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java)12
-rw-r--r--src/main/java/goodgenerator/loader/FuelRodLoader.java (renamed from src/main/java/GoodGenerator/Loader/FuelRodLoader.java)10
-rw-r--r--src/main/java/goodgenerator/loader/Loaders.java (renamed from src/main/java/GoodGenerator/Loader/Loaders.java)39
-rw-r--r--src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java (renamed from src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java)12
-rw-r--r--src/main/java/goodgenerator/loader/NeutronActivatorLoader.java (renamed from src/main/java/GoodGenerator/Loader/NeutronActivatorLoader.java)9
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader.java (renamed from src/main/java/GoodGenerator/Loader/RecipeLoader.java)10
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader_02.java (renamed from src/main/java/GoodGenerator/Loader/RecipeLoader_02.java)8
-rw-r--r--src/main/java/goodgenerator/main/GG_Config_Loader.java (renamed from src/main/java/GoodGenerator/Main/GG_Config_Loader.java)2
-rw-r--r--src/main/java/goodgenerator/main/GoodGenerator.java (renamed from src/main/java/GoodGenerator/Main/GoodGenerator.java)20
-rw-r--r--src/main/java/goodgenerator/network/MessageMTEBase.java (renamed from src/main/java/GoodGenerator/Network/MessageMTEBase.java)2
-rw-r--r--src/main/java/goodgenerator/network/MessageOpenNeutronSensorGUI.java (renamed from src/main/java/GoodGenerator/Network/MessageOpenNeutronSensorGUI.java)4
-rw-r--r--src/main/java/goodgenerator/network/MessageSetNeutronSensorData.java (renamed from src/main/java/GoodGenerator/Network/MessageSetNeutronSensorData.java)4
-rw-r--r--src/main/java/goodgenerator/tabs/MyTabs.java (renamed from src/main/java/GoodGenerator/Tabs/MyTabs.java)4
-rw-r--r--src/main/java/goodgenerator/tabs/NuclearTab.java16
-rw-r--r--src/main/java/goodgenerator/util/CharExchanger.java (renamed from src/main/java/GoodGenerator/util/CharExchanger.java)2
-rw-r--r--src/main/java/goodgenerator/util/CrackRecipeAdder.java (renamed from src/main/java/GoodGenerator/util/CrackRecipeAdder.java)2
-rw-r--r--src/main/java/goodgenerator/util/DescTextLocalization.java (renamed from src/main/java/GoodGenerator/util/DescTextLocalization.java)2
-rw-r--r--src/main/java/goodgenerator/util/ItemRefer.java (renamed from src/main/java/GoodGenerator/util/ItemRefer.java)6
-rw-r--r--src/main/java/goodgenerator/util/MaterialFix.java (renamed from src/main/java/GoodGenerator/util/MaterialFix.java)2
-rw-r--r--src/main/java/goodgenerator/util/MyRecipeAdder.java (renamed from src/main/java/GoodGenerator/util/MyRecipeAdder.java)2
-rw-r--r--src/main/java/goodgenerator/util/StructureHelper.java (renamed from src/main/java/GoodGenerator/util/StructureHelper.java)2
-rw-r--r--src/main/resources/assets/goodgenerator/lang/en_US.lang1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1.pngbin0 -> 456 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1tiny.pngbin0 -> 577 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/icons/isotope/stable2.pngbin0 -> 618 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/icons/isotope/stable2tiny.pngbin0 -> 748 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1.pngbin0 -> 500 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1tiny.pngbin0 -> 634 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable2.pngbin0 -> 469 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable2tiny.pngbin0 -> 590 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable3.pngbin0 -> 560 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable3tiny.pngbin0 -> 704 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable4.pngbin0 -> 479 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable4tiny.pngbin0 -> 588 bytes
75 files changed, 417 insertions, 202 deletions
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MetalVaporTurbine.java b/src/main/java/GoodGenerator/Blocks/TEs/MetalVaporTurbine.java
deleted file mode 100644
index 0ae306fe8b..0000000000
--- a/src/main/java/GoodGenerator/Blocks/TEs/MetalVaporTurbine.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package GoodGenerator.Blocks.TEs;
-
-public class MetalVaporTurbine{
-
-}
diff --git a/src/main/java/GoodGenerator/Blocks/MyFluids/BaseFluid.java b/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java
index e12f54928c..9ccbd27e70 100644
--- a/src/main/java/GoodGenerator/Blocks/MyFluids/BaseFluid.java
+++ b/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java
@@ -1,4 +1,4 @@
-package GoodGenerator.Blocks.MyFluids;
+package goodgenerator.blocks.myFluids;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -9,7 +9,7 @@ import net.minecraftforge.fluids.BlockFluidClassic;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
-import static GoodGenerator.Main.GoodGenerator.MOD_ID;
+import static goodgenerator.main.GoodGenerator.MOD_ID;
public class BaseFluid extends BlockFluidClassic{
@SideOnly( Side.CLIENT )
diff --git a/src/main/java/GoodGenerator/Blocks/MyFluids/FluidsBuilder.java b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
index 72888310b4..94857b73f6 100644
--- a/src/main/java/GoodGenerator/Blocks/MyFluids/FluidsBuilder.java
+++ b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java
@@ -1,9 +1,8 @@
-package GoodGenerator.Blocks.MyFluids;
+package goodgenerator.blocks.myFluids;
-import GoodGenerator.CrossMod.NEI.NEI_Config;
+import goodgenerator.crossmod.nei.NEI_Config;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.material.Material;
-import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
public class FluidsBuilder {
diff --git a/src/main/java/GoodGenerator/Blocks/RegularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
index b450bc5cac..7a1db3278d 100644
--- a/src/main/java/GoodGenerator/Blocks/RegularBlock/Casing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
@@ -1,6 +1,6 @@
-package GoodGenerator.Blocks.RegularBlock;
+package goodgenerator.blocks.regularBlock;
-import GoodGenerator.Main.GoodGenerator;
+import goodgenerator.main.GoodGenerator;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTech_API;
diff --git a/src/main/java/GoodGenerator/Blocks/RegularBlock/ComplexTextureCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
index b741233cab..18a1629cbf 100644
--- a/src/main/java/GoodGenerator/Blocks/RegularBlock/ComplexTextureCasing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
@@ -1,4 +1,4 @@
-package GoodGenerator.Blocks.RegularBlock;
+package goodgenerator.blocks.regularBlock;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/GoodGenerator/Blocks/RegularBlock/Frame.java b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
index 771a0818bf..90c38c4cce 100644
--- a/src/main/java/GoodGenerator/Blocks/RegularBlock/Frame.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
@@ -1,4 +1,4 @@
-package GoodGenerator.Blocks.RegularBlock;
+package goodgenerator.blocks.regularBlock;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/GoodGenerator/Blocks/RegularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
index d549a82a4c..b33dbffdec 100644
--- a/src/main/java/GoodGenerator/Blocks/RegularBlock/TEBlock.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
@@ -1,7 +1,7 @@
-package GoodGenerator.Blocks.RegularBlock;
+package goodgenerator.blocks.regularBlock;
-import GoodGenerator.Blocks.TEs.EssentiaHatch;
-import GoodGenerator.Main.GoodGenerator;
+import goodgenerator.blocks.tileEntity.EssentiaHatch;
+import goodgenerator.main.GoodGenerator;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTech_API;
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/EssentiaHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java
index c173cb7982..c8a4b1c713 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/EssentiaHatch.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java
@@ -1,7 +1,6 @@
-package GoodGenerator.Blocks.TEs;
+package goodgenerator.blocks.tileEntity;
-import GoodGenerator.CrossMod.Thaumcraft.LargeEssentiaEnergyData;
-import gregtech.api.util.GT_Log;
+import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.NetworkManager;
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java
index 69d6990153..e68c92f8e8 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/FuelRefineFactory.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java
@@ -1,10 +1,9 @@
-package GoodGenerator.Blocks.TEs;
+package goodgenerator.blocks.tileEntity;
-import GoodGenerator.Loader.Loaders;
-import GoodGenerator.util.DescTextLocalization;
-import GoodGenerator.util.MyRecipeAdder;
+import goodgenerator.loader.Loaders;
+import goodgenerator.util.DescTextLocalization;
+import goodgenerator.util.MyRecipeAdder;
import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
-import com.github.technus.tectech.TecTech;
import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
@@ -34,7 +33,7 @@ import org.lwjgl.input.Keyboard;
import java.util.ArrayList;
import java.util.List;
-import static GoodGenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
+import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
import static gregtech.api.util.GT_StructureUtility.*;
import static gregtech.api.enums.GT_Values.V;
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MetaTE/NeutronAccelerator.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java
index b4145ae297..1ee64e26c4 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MetaTE/NeutronAccelerator.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java
@@ -1,4 +1,4 @@
-package GoodGenerator.Blocks.TEs.MetaTE;
+package goodgenerator.blocks.tileEntity.GTMetaTileEntity;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MetaTE/NeutronSensor.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java
index 593b3b738c..d69f0b75f8 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MetaTE/NeutronSensor.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java
@@ -1,9 +1,9 @@
-package GoodGenerator.Blocks.TEs.MetaTE;
+package goodgenerator.blocks.tileEntity.GTMetaTileEntity;
-import GoodGenerator.Client.GUI.NeutronSensorGUIClient;
-import GoodGenerator.Common.Container.NeutronSensorGUIContainer;
-import GoodGenerator.Main.GoodGenerator;
-import GoodGenerator.Network.MessageOpenNeutronSensorGUI;
+import goodgenerator.client.GUI.NeutronSensorGUIClient;
+import goodgenerator.common.container.NeutronSensorGUIContainer;
+import goodgenerator.main.GoodGenerator;
+import goodgenerator.network.MessageOpenNeutronSensorGUI;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.interfaces.ITexture;
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java
index c887496e6b..6acbb86ed1 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/LargeEssentiaGenerator.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java
@@ -1,15 +1,12 @@
-package GoodGenerator.Blocks.TEs;
+package goodgenerator.blocks.tileEntity;
-import GoodGenerator.CrossMod.Thaumcraft.LargeEssentiaEnergyData;
-import GoodGenerator.Items.MyMaterial;
-import GoodGenerator.Loader.Loaders;
-import GoodGenerator.util.DescTextLocalization;
-import GoodGenerator.util.ItemRefer;
+import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData;
+import goodgenerator.items.MyMaterial;
+import goodgenerator.loader.Loaders;
+import goodgenerator.util.DescTextLocalization;
+import goodgenerator.util.ItemRefer;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti;
-import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
-import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
@@ -38,9 +35,8 @@ import thaumcraft.api.aspects.AspectList;
import thaumcraft.common.config.ConfigBlocks;
import java.util.ArrayList;
-import java.util.List;
-import static GoodGenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
+import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MegaPlasmaTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java
index f811d9c5f1..0e2dda7389 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MegaPlasmaTurbine.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java
@@ -1,4 +1,4 @@
-package GoodGenerator.Blocks.TEs;
+package goodgenerator.blocks.tileEntity;
import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MetalVaporTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/MetalVaporTurbine.java
new file mode 100644
index 0000000000..29aa1f3e1c
--- /dev/null
+++ b/src/main/java/goodgenerator/blocks/tileEntity/MetalVaporTurbine.java
@@ -0,0 +1,5 @@
+package goodgenerator.blocks.tileEntity;
+
+public class MetalVaporTurbine{
+
+}
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java
index 4168c4accb..3fd83472d8 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java
@@ -1,10 +1,10 @@
-package GoodGenerator.Blocks.TEs;
+package goodgenerator.blocks.tileEntity;
-import GoodGenerator.Items.MyMaterial;
-import GoodGenerator.Loader.Loaders;
-import GoodGenerator.util.CrackRecipeAdder;
-import GoodGenerator.util.DescTextLocalization;
-import GoodGenerator.util.MyRecipeAdder;
+import goodgenerator.items.MyMaterial;
+import goodgenerator.loader.Loaders;
+import goodgenerator.util.CrackRecipeAdder;
+import goodgenerator.util.DescTextLocalization;
+import goodgenerator.util.MyRecipeAdder;
import com.github.bartimaeusnek.bartworks.util.Pair;
import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
import com.github.technus.tectech.thing.metaTileEntity.hatch.*;
@@ -35,10 +35,10 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import static GoodGenerator.Main.GG_Config_Loader.LiquidAirConsumptionPerSecond;
-import static GoodGenerator.Main.GG_Config_Loader.CoolantEfficiency;
-import static GoodGenerator.Main.GG_Config_Loader.ExcitedLiquidCoe;
-import static GoodGenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
+import static goodgenerator.main.GG_Config_Loader.LiquidAirConsumptionPerSecond;
+import static goodgenerator.main.GG_Config_Loader.CoolantEfficiency;
+import static goodgenerator.main.GG_Config_Loader.ExcitedLiquidCoe;
+import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/NeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java
index 7ad537a5da..6c809bb676 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/NeutronActivator.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java
@@ -1,14 +1,14 @@
-package GoodGenerator.Blocks.TEs;
-
-import GoodGenerator.Blocks.TEs.MetaTE.NeutronAccelerator;
-import GoodGenerator.Blocks.TEs.MetaTE.NeutronSensor;
-import GoodGenerator.Client.GUI.NeutronActivatorGUIClient;
-import GoodGenerator.Common.Container.NeutronActivatorGUIContainer;
-import GoodGenerator.Loader.Loaders;
-import GoodGenerator.util.CharExchanger;
-import GoodGenerator.util.DescTextLocalization;
-import GoodGenerator.util.ItemRefer;
-import GoodGenerator.util.MyRecipeAdder;
+package goodgenerator.blocks.tileEntity;
+
+import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronAccelerator;
+import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor;
+import goodgenerator.client.GUI.NeutronActivatorGUIClient;
+import goodgenerator.common.container.NeutronActivatorGUIContainer;
+import goodgenerator.loader.Loaders;
+import goodgenerator.util.CharExchanger;
+import goodgenerator.util.DescTextLocalization;
+import goodgenerator.util.ItemRefer;
+import goodgenerator.util.MyRecipeAdder;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
@@ -38,8 +38,8 @@ import org.lwjgl.input.Keyboard;
import java.util.ArrayList;
import java.util.Collection;
-import static GoodGenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
-import static GoodGenerator.util.StructureHelper.addFrame;
+import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
+import static goodgenerator.util.StructureHelper.addFrame;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
import static org.apache.commons.lang3.RandomUtils.nextInt;
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java
index 1afc131c5f..4cd0476b4a 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/UniversalChemicalFuelEngine.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java
@@ -1,7 +1,7 @@
-package GoodGenerator.Blocks.TEs;
+package goodgenerator.blocks.tileEntity;
-import GoodGenerator.Loader.Loaders;
-import GoodGenerator.util.DescTextLocalization;
+import goodgenerator.loader.Loaders;
+import goodgenerator.util.DescTextLocalization;
import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti;
import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel;
@@ -28,7 +28,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import static GoodGenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
+import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
import static gregtech.api.enums.Textures.BlockIcons.*;
import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
diff --git a/src/main/java/GoodGenerator/Blocks/TEs/YottaFluidTank.java b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java
index 51082b13d2..c2ac9ae885 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/YottaFluidTank.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java
@@ -1,10 +1,10 @@
-package GoodGenerator.Blocks.TEs;
+package goodgenerator.blocks.tileEntity;
-import GoodGenerator.Client.GUI.YOTTankGUIClient;
-import GoodGenerator.Common.Container.YOTTankGUIContainer;
-import GoodGenerator.Loader.Loaders;
-import GoodGenerator.util.CharExchanger;
-import GoodGenerator.util.DescTextLocalization;
+import goodgenerator.client.GUI.YOTTankGUIClient;
+import goodgenerator.common.container.YOTTankGUIContainer;
+import goodgenerator.loader.Loaders;
+import goodgenerator.util.CharExchanger;
+import goodgenerator.util.DescTextLocalization;
import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
@@ -35,9 +35,9 @@ import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
-import static GoodGenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
-import static GoodGenerator.util.StructureHelper.addFrame;
-import static GoodGenerator.util.StructureHelper.addTieredBlock;
+import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
+import static goodgenerator.util.StructureHelper.addFrame;
+import static goodgenerator.util.StructureHelper.addTieredBlock;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
import static gregtech.api.util.GT_StructureUtility.*;
diff --git a/src/main/java/GoodGenerator/Client/ClientProxy.java b/src/main/java/goodgenerator/client/ClientProxy.java
index 837f7fdcc6..e97cbd6e86 100644
--- a/src/main/java/GoodGenerator/Client/ClientProxy.java
+++ b/src/main/java/goodgenerator/client/ClientProxy.java
@@ -1,6 +1,6 @@
-package GoodGenerator.Client;
+package goodgenerator.client;
-import GoodGenerator.Common.CommonProxy;
+import goodgenerator.common.CommonProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
diff --git a/src/main/java/GoodGenerator/Client/GUI/NeutronActivatorGUIClient.java b/src/main/java/goodgenerator/client/GUI/NeutronActivatorGUIClient.java
index 35ec8d88b5..c3f7992a17 100644
--- a/src/main/java/GoodGenerator/Client/GUI/NeutronActivatorGUIClient.java
+++ b/src/main/java/goodgenerator/client/GUI/NeutronActivatorGUIClient.java
@@ -1,6 +1,6 @@
-package GoodGenerator.Client.GUI;
+package goodgenerator.client.GUI;
-import GoodGenerator.Common.Container.NeutronActivatorGUIContainer;
+import goodgenerator.common.container.NeutronActivatorGUIContainer;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/GoodGenerator/Client/GUI/NeutronSensorGUIClient.java b/src/main/java/goodgenerator/client/GUI/NeutronSensorGUIClient.java
index 174a0b2a37..5070d80ead 100644
--- a/src/main/java/GoodGenerator/Client/GUI/NeutronSensorGUIClient.java
+++ b/src/main/java/goodgenerator/client/GUI/NeutronSensorGUIClient.java
@@ -1,8 +1,8 @@
-package GoodGenerator.Client.GUI;
+package goodgenerator.client.GUI;
-import GoodGenerator.Main.GoodGenerator;
-import GoodGenerator.Network.MessageSetNeutronSensorData;
-import GoodGenerator.util.CharExchanger;
+import goodgenerator.main.GoodGenerator;
+import goodgenerator.network.MessageSetNeutronSensorData;
+import goodgenerator.util.CharExchanger;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
diff --git a/src/main/java/GoodGenerator/Client/GUI/YOTTankGUIClient.java b/src/main/java/goodgenerator/client/GUI/YOTTankGUIClient.java
index a185b1a801..82d8b19e35 100644
--- a/src/main/java/GoodGenerator/Client/GUI/YOTTankGUIClient.java
+++ b/src/main/java/goodgenerator/client/GUI/YOTTankGUIClient.java
@@ -1,7 +1,7 @@
-package GoodGenerator.Client.GUI;
+package goodgenerator.client.GUI;
-import GoodGenerator.Common.Container.YOTTankGUIContainer;
-import GoodGenerator.util.CharExchanger;
+import goodgenerator.common.container.YOTTankGUIContainer;
+import goodgenerator.util.CharExchanger;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import net.minecraft.entity.player.InventoryPlayer;
diff --git a/src/main/java/GoodGenerator/Common/CommonProxy.java b/src/main/java/goodgenerator/common/CommonProxy.java
index 28e9063294..7a270b9550 100644
--- a/src/main/java/GoodGenerator/Common/CommonProxy.java
+++ b/src/main/java/goodgenerator/common/CommonProxy.java
@@ -1,4 +1,4 @@
-package GoodGenerator.Common;
+package goodgenerator.common;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
diff --git a/src/main/java/GoodGenerator/Common/Container/NeutronActivatorGUIContainer.java b/src/main/java/goodgenerator/common/container/NeutronActivatorGUIContainer.java
index 27e82fb48d..772557957e 100644
--- a/src/main/java/GoodGenerator/Common/Container/NeutronActivatorGUIContainer.java
+++ b/src/main/java/goodgenerator/common/container/NeutronActivatorGUIContainer.java
@@ -1,6 +1,6 @@
-package GoodGenerator.Common.Container;
+package goodgenerator.common.container;
-import GoodGenerator.Blocks.TEs.NeutronActivator;
+import goodgenerator.blocks.tileEntity.NeutronActivator;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_Container_MultiMachineEM;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/GoodGenerator/Common/Container/NeutronSensorGUIContainer.java b/src/main/java/goodgenerator/common/container/NeutronSensorGUIContainer.java
index 0c243b0a69..ebfcd10bda 100644
--- a/src/main/java/GoodGenerator/Common/Container/NeutronSensorGUIContainer.java
+++ b/src/main/java/goodgenerator/common/container/NeutronSensorGUIContainer.java
@@ -1,4 +1,4 @@
-package GoodGenerator.Common.Container;
+package goodgenerator.common.container;
import gregtech.api.gui.GT_ContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/main/java/GoodGenerator/Common/Container/YOTTankGUIContainer.java b/src/main/java/goodgenerator/common/container/YOTTankGUIContainer.java
index 9d0a980d83..0a425e358e 100644
--- a/src/main/java/GoodGenerator/Common/Container/YOTTankGUIContainer.java
+++ b/src/main/java/goodgenerator/common/container/YOTTankGUIContainer.java
@@ -1,6 +1,6 @@
-package GoodGenerator.Common.Container;
+package goodgenerator.common.container;
-import GoodGenerator.Blocks.TEs.YottaFluidTank;
+import goodgenerator.blocks.tileEntity.YottaFluidTank;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_Container_MultiMachineEM;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/GoodGenerator/CrossMod/NEI/IMCForNEI.java b/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java
index e4514df282..f93fdfa6eb 100644
--- a/src/main/java/GoodGenerator/CrossMod/NEI/IMCForNEI.java
+++ b/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java
@@ -1,4 +1,4 @@
-package GoodGenerator.CrossMod.NEI;
+package goodgenerator.crossmod.nei;
import cpw.mods.fml.common.event.FMLInterModComms;
import net.minecraft.nbt.NBTTagCompound;
@@ -13,7 +13,7 @@ public class IMCForNEI {
private static void setNBTInfo(NBTTagCompound aNBT, String aName, String aBlock) {
aNBT.setString("handler", aName);
aNBT.setString("modName", "Good Generator");
- aNBT.setString("modId", "GoodGenerator");
+ aNBT.setString("modId", "goodgenerator");
aNBT.setBoolean("modRequired", true);
aNBT.setString("itemName", aBlock);
aNBT.setInteger("handlerHeight", 135);
diff --git a/src/main/java/GoodGenerator/CrossMod/NEI/NEI_Config.java b/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java
index aebfe6102c..d5c71bc197 100644
--- a/src/main/java/GoodGenerator/CrossMod/NEI/NEI_Config.java
+++ b/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java
@@ -1,7 +1,7 @@
-package GoodGenerator.CrossMod.NEI;
+package goodgenerator.crossmod.nei;
-import GoodGenerator.Main.GoodGenerator;
-import GoodGenerator.util.MyRecipeAdder;
+import goodgenerator.main.GoodGenerator;
+import goodgenerator.util.MyRecipeAdder;
import codechicken.nei.api.API;
import codechicken.nei.api.IConfigureNEI;
import net.minecraft.block.Block;
diff --git a/src/main/java/GoodGenerator/CrossMod/NEI/NeutronActivatorHandler.java b/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java
index 1a8f9db723..ea7cf56cf9 100644
--- a/src/main/java/GoodGenerator/CrossMod/NEI/NeutronActivatorHandler.java
+++ b/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java
@@ -1,4 +1,4 @@
-package GoodGenerator.CrossMod.NEI;
+package goodgenerator.crossmod.nei;
import codechicken.nei.recipe.GuiCraftingRecipe;
import codechicken.nei.recipe.GuiUsageRecipe;
diff --git a/src/main/java/GoodGenerator/CrossMod/Thaumcraft/LargeEssentiaEnergyData.java b/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java
index 60ef46e8ba..0328b5906d 100644
--- a/src/main/java/GoodGenerator/CrossMod/Thaumcraft/LargeEssentiaEnergyData.java
+++ b/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java
@@ -1,4 +1,4 @@
-package GoodGenerator.CrossMod.Thaumcraft;
+package goodgenerator.crossmod.thaumcraft;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
diff --git a/src/main/java/GoodGenerator/CrossMod/Thaumcraft/Research.java b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java
index 08aa1e4409..2eb3a4dbc0 100644
--- a/src/main/java/GoodGenerator/CrossMod/Thaumcraft/Research.java
+++ b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java
@@ -1,8 +1,8 @@
-package GoodGenerator.CrossMod.Thaumcraft;
+package goodgenerator.crossmod.thaumcraft;
-import GoodGenerator.Items.MyMaterial;
-import GoodGenerator.util.DescTextLocalization;
-import GoodGenerator.util.ItemRefer;
+import goodgenerator.items.MyMaterial;
+import goodgenerator.util.DescTextLocalization;
+import goodgenerator.util.ItemRefer;
import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import cpw.mods.fml.common.Loader;
@@ -16,7 +16,6 @@ import gregtech.api.util.GT_OreDictUnificator;
import ic2.core.Ic2Items;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
-import net.minecraft.item.ItemCoal;
import net.minecraft.item.ItemStack;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
diff --git a/src/main/java/GoodGenerator/Items/FuelRod.java b/src/main/java/goodgenerator/items/FuelRod.java
index 9bcaae5cc0..9a0becf8b1 100644
--- a/src/main/java/GoodGenerator/Items/FuelRod.java
+++ b/src/main/java/goodgenerator/items/FuelRod.java
@@ -1,4 +1,4 @@
-package GoodGenerator.Items;
+package goodgenerator.items;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -16,7 +16,7 @@ import net.minecraft.nbt.NBTTagCompound;
import java.util.ArrayList;
import java.util.List;
-import static GoodGenerator.util.DescTextLocalization.addText;
+import static goodgenerator.util.DescTextLocalization.addText;
public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxable {
private final int numberOfCells;
diff --git a/src/main/java/GoodGenerator/Items/MyItemBlocks.java b/src/main/java/goodgenerator/items/MyItemBlocks.java
index 151401708a..2136c6a9c4 100644
--- a/src/main/java/GoodGenerator/Items/MyItemBlocks.java
+++ b/src/main/java/goodgenerator/items/MyItemBlocks.java
@@ -1,26 +1,25 @@
-package GoodGenerator.Items;
+package goodgenerator.items;
-import GoodGenerator.Blocks.RegularBlock.TEBlock;
-import GoodGenerator.util.CharExchanger;
-import GoodGenerator.util.DescTextLocalization;
+import goodgenerator.blocks.regularBlock.TEBlock;
+import goodgenerator.util.CharExchanger;
+import goodgenerator.util.DescTextLocalization;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.util.GT_LanguageManager;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
-import GoodGenerator.Main.GoodGenerator;
+import goodgenerator.main.GoodGenerator;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
-import static GoodGenerator.Loader.Loaders.essentiaCell;
-import static GoodGenerator.Loader.Loaders.yottaFluidTankCell;
-import static GoodGenerator.util.CharExchanger.tierName;
+import static goodgenerator.loader.Loaders.essentiaCell;
+import static goodgenerator.loader.Loaders.yottaFluidTankCell;
+import static goodgenerator.util.CharExchanger.tierName;
public class MyItemBlocks extends ItemBlock {
private final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");
diff --git a/src/main/java/GoodGenerator/Items/MyItems.java b/src/main/java/goodgenerator/items/MyItems.java
index 4f13ee14e1..58203953db 100644
--- a/src/main/java/GoodGenerator/Items/MyItems.java
+++ b/src/main/java/goodgenerator/items/MyItems.java
@@ -1,6 +1,6 @@
-package GoodGenerator.Items;
+package goodgenerator.items;
-import GoodGenerator.Main.GoodGenerator;
+import goodgenerator.main.GoodGenerator;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java
index 281a961533..5e2a5e2a0d 100644
--- a/src/main/java/GoodGenerator/Items/MyMaterial.java
+++ b/src/main/java/goodgenerator/items/MyMaterial.java
@@ -1,6 +1,6 @@
-package GoodGenerator.Items;
+package goodgenerator.items;
-import GoodGenerator.util.CharExchanger;
+import goodgenerator.util.CharExchanger;
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import gregtech.api.enums.TextureSet;
diff --git a/src/main/java/GoodGenerator/Items/RadioactiveItem.java b/src/main/java/goodgenerator/items/RadioactiveItem.java
index 8be42f94e8..81ed7aa98a 100644
--- a/src/main/java/GoodGenerator/Items/RadioactiveItem.java
+++ b/src/main/java/goodgenerator/items/RadioactiveItem.java
@@ -1,4 +1,4 @@
-package GoodGenerator.Items;
+package goodgenerator.items;
import gregtech.api.util.GT_Utility;
import ic2.core.IC2Potion;
diff --git a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java
new file mode 100644
index 0000000000..3d3d36cee0
--- /dev/null
+++ b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java
@@ -0,0 +1,55 @@
+package goodgenerator.items.nuclear;
+
+import goodgenerator.loader.Loaders;
+import net.minecraft.item.ItemStack;
+
+import java.util.HashMap;
+import java.util.HashSet;
+
+public class IsotopeMaterial {
+
+ public static final HashSet<IsotopeMaterial> mIsotopeMaterial = new HashSet<>();
+ public static final HashMap<Integer, IsotopeMaterial> mIDMap = new HashMap<>();
+ public static final HashMap<String, IsotopeMaterial> mNameMap = new HashMap<>();
+
+ public final int mID;
+ public final int mNeutron;
+ public final String mName;
+ public final String mLocalizedName;
+ public final String mMaterialName;
+ public final short[] mRGB;
+ public final NuclearTextures mTexture;
+
+ public IsotopeMaterial(int aID, String aName, String aMaterialName, String aLocalizedName, NuclearTextures aTexture, int aR, int aG, int aB, int aNeutron) {
+ this.mID = aID;
+ this.mNeutron = aNeutron;
+ this.mName = aName;
+ this.mMaterialName = aMaterialName;
+ this.mLocalizedName = aLocalizedName;
+ this.mRGB = new short[] {(short) aR,(short) aG,(short) aB, 0};
+ this.mTexture = aTexture;
+ mIsotopeMaterial.add(this);
+ mIDMap.put(this.mID, this);
+ mNameMap.put(this.mName, this);
+ }
+
+ public ItemStack getFull(int aAmount) {
+ if (aAmount > 64) aAmount = 64;
+ return new ItemStack(Loaders.Isotope, aAmount, mID + 1000);
+ }
+
+ public ItemStack getTiny(int aAmount) {
+ if (aAmount > 64) aAmount = 64;
+ return new ItemStack(Loaders.Isotope, aAmount, mID + 2000);
+ }
+
+ public ItemStack getFullOxide(int aAmount) {
+ if (aAmount > 64) aAmount = 64;
+ return new ItemStack(Loaders.Isotope, aAmount, mID + 3000);
+ }
+
+ public ItemStack getTinyOxide(int aAmount) {
+ if (aAmount > 64) aAmount = 64;
+ return new ItemStack(Loaders.Isotope, aAmount, mID + 4000);
+ }
+}
diff --git a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java
new file mode 100644
index 0000000000..75c2dba39c
--- /dev/null
+++ b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java
@@ -0,0 +1,16 @@
+package goodgenerator.items.nuclear;
+
+public class IsotopeMaterialLoader implements Runnable {
+
+ protected static final int OffsetID = 0;
+
+ public static final IsotopeMaterial Thorium232 = new IsotopeMaterial(
+ OffsetID,
+ "Thorium232", "Thorium", "Thorium-232",
+ NuclearTextures.STABLE1, 59, 59, 59,
+ 232
+ );
+
+ @Override
+ public void run() { }
+}
diff --git a/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java b/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java
new file mode 100644
index 0000000000..bd530699b3
--- /dev/null
+++ b/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java
@@ -0,0 +1,103 @@
+package goodgenerator.items.nuclear;
+
+import com.github.bartimaeusnek.bartworks.util.Pair;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import goodgenerator.main.GoodGenerator;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Item;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_OreDictUnificator;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+import java.util.List;
+
+import static goodgenerator.items.nuclear.IsotopeMaterial.mIDMap;
+import static goodgenerator.items.nuclear.IsotopeMaterial.mIsotopeMaterial;
+
+public class NuclearMetaItemGenerator extends GT_MetaGenerated_Item {
+
+ /**
+ * <p>Full ingot - 1000
+ * <p>Tiny ingot - 2000
+ * <p>Full-Oxide - 3000
+ * <p>Tiny-Oxide - 4000
+ */
+ public static final Pair<Integer, String>[] TYPE_OFFSET = new Pair[] {
+ new Pair<>(1000, "%s"),
+ new Pair<>(2000, "Tiny of %s"),
+ new Pair<>(3000, "%s Oxide"),
+ new Pair<>(4000, "Tiny of %s Oxide"),
+ };
+ public static final Pair<Integer, String>[] OREPREFIX = new Pair[] {
+ new Pair<>(1000, "item%s"),
+ new Pair<>(2000, "itemTiny%s"),
+ new Pair<>(3000, "item%sOxide"),
+ new Pair<>(4000, "itemTiny%sOxide"),
+ };
+
+ public NuclearMetaItemGenerator() {
+ super("nuclearIsotopeMaterial", (short) 32766, (short) 0);
+ this.setCreativeTab(GoodGenerator.GG);
+ for (IsotopeMaterial tIsotope : mIsotopeMaterial) {
+ for (Pair<Integer, String> tType : TYPE_OFFSET) {
+ int tOffset = tType.getKey();
+ String tOreName = tType.getValue();
+ ItemStack tStack = new ItemStack(this, 1, tIsotope.mID + tOffset);
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(tStack) + ".name", String.format(tOreName, tIsotope.mLocalizedName));
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(tStack) + ".tooltip", String.format("§b%s's Isotope.§r", tIsotope.mMaterialName));
+ }
+ for (Pair<Integer, String> tOreDict : OREPREFIX) {
+ int tOffset = tOreDict.getKey();
+ String tOreName = tOreDict.getValue();
+ ItemStack tStack = new ItemStack(this, 1, tIsotope.mID + tOffset);
+ GT_OreDictUnificator.registerOre(String.format(tOreName, tIsotope.mName), tStack);
+ }
+ }
+ }
+
+ @Override
+ public String getItemStackDisplayName(ItemStack aStack) {
+ return GT_LanguageManager.getTranslation(this.getUnlocalizedName(aStack) + ".name");
+ }
+
+ @Override
+ public IIconContainer getIconContainer(int aMetaData) {
+ int tID = aMetaData % 1000;
+ int tType = aMetaData / 1000 - 1;
+ IsotopeMaterial tMaterial = mIDMap.get(tID);
+ if (tMaterial != null) {
+ return tMaterial.mTexture.mTextures[tType];
+ }
+ return null;
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
+ for (IsotopeMaterial tIsotope : mIsotopeMaterial) {
+ for (int i = 1; i <= 4; i ++) {
+ ItemStack tStack = new ItemStack(this, 1, tIsotope.mID + i * 1000);
+ aList.add(tStack);
+ }
+ }
+ }
+
+ @Override
+ public short[] getRGBa(ItemStack aStack) {
+ int tID = aStack.getItemDamage() % 1000;
+ IsotopeMaterial tMaterial = mIDMap.get(tID);
+ if (tMaterial != null) {
+ return tMaterial.mRGB;
+ }
+ return null;
+ }
+
+ @Override
+ public final IIcon getIconFromDamage(int aMetaData) {
+ return this.getIconContainer(aMetaData).getIcon();
+ }
+}
diff --git a/src/main/java/goodgenerator/items/nuclear/NuclearTextures.java b/src/main/java/goodgenerator/items/nuclear/NuclearTextures.java
new file mode 100644
index 0000000000..b68c31a014
--- /dev/null
+++ b/src/main/java/goodgenerator/items/nuclear/NuclearTextures.java
@@ -0,0 +1,31 @@
+package goodgenerator.items.nuclear;
+
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.IIconContainer;
+
+public class NuclearTextures {
+ public static final NuclearTextures
+ STABLE1 = new NuclearTextures("stable1"),
+ STABLE2 = new NuclearTextures("stable2"),
+ UNSTABLE1 = new NuclearTextures("unstable1"),
+ UNSTABLE2 = new NuclearTextures("unstable2"),
+ UNSTABLE3 = new NuclearTextures("unstable3"),
+ UNSTABLE4 = new NuclearTextures("unstable4");
+
+ public final IIconContainer[] mTextures = new IIconContainer[4];
+ public final String mSetName;
+ public static final String mTextureDir = "icons/isotope/";
+ public static final int
+ FULL = 0,
+ TINY = 1,
+ FULL_OXIDE = 2,
+ TINY_OXIDE = 3;
+
+ public NuclearTextures(String aName) {
+ mSetName = aName;
+ mTextures[0] = new Textures.ItemIcons.CustomIcon(mTextureDir + aName);
+ mTextures[1] = new Textures.ItemIcons.CustomIcon(mTextureDir + aName + "tiny");
+ mTextures[2] = new Textures.ItemIcons.CustomIcon(mTextureDir + aName);
+ mTextures[3] = new Textures.ItemIcons.CustomIcon(mTextureDir + aName + "tiny");
+ }
+}
diff --git a/src/main/java/GoodGenerator/Loader/AchievementLoader.java b/src/main/java/goodgenerator/loader/AchievementLoader.java
index f4174597b0..2df30c8752 100644
--- a/src/main/java/GoodGenerator/Loader/AchievementLoader.java
+++ b/src/main/java/goodgenerator/loader/AchievementLoader.java
@@ -1,4 +1,4 @@
-package GoodGenerator.Loader;
+package goodgenerator.loader;
public class AchievementLoader {
}
diff --git a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java
index ac2123d930..73e97830a2 100644
--- a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java
@@ -1,8 +1,8 @@
-package GoodGenerator.Loader;
+package goodgenerator.loader;
-import GoodGenerator.Items.MyMaterial;
-import GoodGenerator.util.ItemRefer;
-import GoodGenerator.util.MyRecipeAdder;
+import goodgenerator.items.MyMaterial;
+import goodgenerator.util.ItemRefer;
+import goodgenerator.util.MyRecipeAdder;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
-import static GoodGenerator.Main.GG_Config_Loader.NaquadahFuelTime;
-import static GoodGenerator.Main.GG_Config_Loader.NaquadahFuelVoltage;
+import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime;
+import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage;
public class FuelRecipeLoader {
public static void RegisterFuel(){
diff --git a/src/main/java/GoodGenerator/Loader/FuelRodLoader.java b/src/main/java/goodgenerator/loader/FuelRodLoader.java
index 7badc5e8fa..ead118983d 100644
--- a/src/main/java/GoodGenerator/Loader/FuelRodLoader.java
+++ b/src/main/java/goodgenerator/loader/FuelRodLoader.java
@@ -1,13 +1,13 @@
-package GoodGenerator.Loader;
+package goodgenerator.loader;
-import GoodGenerator.Items.FuelRod;
-import GoodGenerator.Items.RadioactiveItem;
-import GoodGenerator.Main.GoodGenerator;
+import goodgenerator.items.FuelRod;
+import goodgenerator.items.RadioactiveItem;
+import goodgenerator.main.GoodGenerator;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import static GoodGenerator.util.DescTextLocalization.addText;
+import static goodgenerator.util.DescTextLocalization.addText;
public class FuelRodLoader {
diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java
index b25846117b..95c956a85a 100644
--- a/src/main/java/GoodGenerator/Loader/Loaders.java
+++ b/src/main/java/goodgenerator/loader/Loaders.java
@@ -1,20 +1,21 @@
-package GoodGenerator.Loader;
-
-import GoodGenerator.Blocks.MyFluids.FluidsBuilder;
-import GoodGenerator.Blocks.RegularBlock.Casing;
-import GoodGenerator.Blocks.RegularBlock.ComplexTextureCasing;
-import GoodGenerator.Blocks.RegularBlock.Frame;
-import GoodGenerator.Blocks.RegularBlock.TEBlock;
-import GoodGenerator.Blocks.TEs.*;
-import GoodGenerator.Blocks.TEs.MetaTE.NeutronAccelerator;
-import GoodGenerator.Blocks.TEs.MetaTE.NeutronSensor;
-import GoodGenerator.CrossMod.NEI.IMCForNEI;
-import GoodGenerator.CrossMod.NEI.NEI_Config;
-import GoodGenerator.CrossMod.Thaumcraft.LargeEssentiaEnergyData;
-import GoodGenerator.Items.MyItemBlocks;
-import GoodGenerator.Items.MyItems;
-import GoodGenerator.Items.RadioactiveItem;
-import GoodGenerator.Main.GoodGenerator;
+package goodgenerator.loader;
+
+import goodgenerator.blocks.myFluids.FluidsBuilder;
+import goodgenerator.blocks.regularBlock.Casing;
+import goodgenerator.blocks.regularBlock.ComplexTextureCasing;
+import goodgenerator.blocks.regularBlock.Frame;
+import goodgenerator.blocks.regularBlock.TEBlock;
+import goodgenerator.blocks.tileEntity.*;
+import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronAccelerator;
+import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor;
+import goodgenerator.crossmod.nei.IMCForNEI;
+import goodgenerator.crossmod.nei.NEI_Config;
+import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData;
+import goodgenerator.items.MyItemBlocks;
+import goodgenerator.items.MyItems;
+import goodgenerator.items.RadioactiveItem;
+import goodgenerator.items.nuclear.NuclearMetaItemGenerator;
+import goodgenerator.main.GoodGenerator;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.GT_Values;
@@ -26,7 +27,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
-import static GoodGenerator.util.DescTextLocalization.addText;
+import static goodgenerator.util.DescTextLocalization.addText;
public class Loaders {
@@ -92,6 +93,8 @@ public class Loaders {
public static ItemStack[] NeutronAccelerators = new ItemStack[9];
+ public static Item Isotope = new NuclearMetaItemGenerator();
+
public static void GTMetaTileRegister(){
Loaders.MAR = new MultiNqGenerator(12732, "NaG", "Large Naquadah Reactor").getStackForm(1L);
Loaders.FRF = new FuelRefineFactory(16999, "FRF", "Naquadah Fuel Refinery").getStackForm(1L);
diff --git a/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
index 4d37156adf..7c3361eac4 100644
--- a/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
@@ -1,8 +1,8 @@
-package GoodGenerator.Loader;
+package goodgenerator.loader;
-import GoodGenerator.Main.GoodGenerator;
-import GoodGenerator.util.ItemRefer;
-import GoodGenerator.util.MyRecipeAdder;
+import goodgenerator.main.GoodGenerator;
+import goodgenerator.util.ItemRefer;
+import goodgenerator.util.MyRecipeAdder;
import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import cpw.mods.fml.common.Loader;
@@ -29,8 +29,8 @@ import org.apache.commons.lang3.reflect.FieldUtils;
import java.lang.reflect.*;
import java.util.HashSet;
-import static GoodGenerator.Items.MyMaterial.*;
-import static GoodGenerator.Main.GG_Config_Loader.EnableNaquadahRework;
+import static goodgenerator.items.MyMaterial.*;
+import static goodgenerator.main.GG_Config_Loader.EnableNaquadahRework;
import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor;
public class NaquadahReworkRecipeLoader {
diff --git a/src/main/java/GoodGenerator/Loader/NeutronActivatorLoader.java b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java
index 97477963c7..176976d77b 100644
--- a/src/main/java/GoodGenerator/Loader/NeutronActivatorLoader.java
+++ b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java
@@ -1,12 +1,9 @@
-package GoodGenerator.Loader;
+package goodgenerator.loader;
-import GoodGenerator.util.MyRecipeAdder;
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-import gregtech.api.enums.OrePrefixes;
-import net.minecraft.item.ItemStack;
+import goodgenerator.util.MyRecipeAdder;
import net.minecraftforge.fluids.FluidStack;
-import static GoodGenerator.Items.MyMaterial.*;
+import static goodgenerator.items.MyMaterial.*;
public class NeutronActivatorLoader {
public static void NARecipeLoad() {
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java
index 6c9e709955..297f43c3d2 100644
--- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader.java
@@ -1,9 +1,9 @@
-package GoodGenerator.Loader;
+package goodgenerator.loader;
-import GoodGenerator.Items.MyMaterial;
-import GoodGenerator.util.CrackRecipeAdder;
-import GoodGenerator.util.ItemRefer;
-import GoodGenerator.util.MaterialFix;
+import goodgenerator.items.MyMaterial;
+import goodgenerator.util.CrackRecipeAdder;
+import goodgenerator.util.ItemRefer;
+import goodgenerator.util.MaterialFix;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import cpw.mods.fml.common.Loader;
import gregtech.api.enums.*;
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
index 96f31f98da..220afaaa43 100644
--- a/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
@@ -1,8 +1,8 @@
-package GoodGenerator.Loader;
+package goodgenerator.loader;
-import GoodGenerator.Items.MyMaterial;
-import GoodGenerator.util.CrackRecipeAdder;
-import GoodGenerator.util.ItemRefer;
+import goodgenerator.items.MyMaterial;
+import goodgenerator.util.CrackRecipeAdder;
+import goodgenerator.util.ItemRefer;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
diff --git a/src/main/java/GoodGenerator/Main/GG_Config_Loader.java b/src/main/java/goodgenerator/main/GG_Config_Loader.java
index 1fbab02516..a93256c27d 100644
--- a/src/main/java/GoodGenerator/Main/GG_Config_Loader.java
+++ b/src/main/java/goodgenerator/main/GG_Config_Loader.java
@@ -1,4 +1,4 @@
-package GoodGenerator.Main;
+package goodgenerator.main;
import cpw.mods.fml.relauncher.FMLInjectionData;
import net.minecraftforge.common.config.Configuration;
diff --git a/src/main/java/GoodGenerator/Main/GoodGenerator.java b/src/main/java/goodgenerator/main/GoodGenerator.java
index 7e28234127..e9cde96edc 100644
--- a/src/main/java/GoodGenerator/Main/GoodGenerator.java
+++ b/src/main/java/goodgenerator/main/GoodGenerator.java
@@ -1,12 +1,13 @@
-package GoodGenerator.Main;
+package goodgenerator.main;
-import GoodGenerator.Common.CommonProxy;
-import GoodGenerator.CrossMod.Thaumcraft.Research;
-import GoodGenerator.Items.MyMaterial;
-import GoodGenerator.Loader.*;
-import GoodGenerator.Network.MessageOpenNeutronSensorGUI;
-import GoodGenerator.Network.MessageSetNeutronSensorData;
-import GoodGenerator.Tabs.MyTabs;
+import goodgenerator.common.CommonProxy;
+import goodgenerator.crossmod.thaumcraft.Research;
+import goodgenerator.items.MyMaterial;
+import goodgenerator.items.nuclear.IsotopeMaterialLoader;
+import goodgenerator.loader.*;
+import goodgenerator.network.MessageOpenNeutronSensorGUI;
+import goodgenerator.network.MessageSetNeutronSensorData;
+import goodgenerator.tabs.MyTabs;
import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.SidedProxy;
@@ -30,7 +31,7 @@ public final class GoodGenerator {
public static final CreativeTabs GG = new MyTabs("Good Generator");
- @SidedProxy(clientSide = "GoodGenerator.Client.ClientProxy",serverSide = "GoodGenerator.Common.CommonProxy")
+ @SidedProxy(clientSide = "goodgenerator.client.ClientProxy",serverSide = "goodgenerator.common.CommonProxy")
public static CommonProxy proxy;
public static SimpleNetworkWrapper CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel(MOD_ID);
@@ -46,6 +47,7 @@ public final class GoodGenerator {
public static void preInit(FMLPreInitializationEvent event) {
GG_Config_Loader.run();
WerkstoffAdderRegistry.addWerkstoffAdder(new MyMaterial());
+ WerkstoffAdderRegistry.addWerkstoffAdder(new IsotopeMaterialLoader());
Loaders.preInitLoad();
proxy.preInit(event);
}
diff --git a/src/main/java/GoodGenerator/Network/MessageMTEBase.java b/src/main/java/goodgenerator/network/MessageMTEBase.java
index e54249e545..65a86573d6 100644
--- a/src/main/java/GoodGenerator/Network/MessageMTEBase.java
+++ b/src/main/java/goodgenerator/network/MessageMTEBase.java
@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-package GoodGenerator.Network;
+package goodgenerator.network;
import com.github.technus.tectech.TecTech;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
diff --git a/src/main/java/GoodGenerator/Network/MessageOpenNeutronSensorGUI.java b/src/main/java/goodgenerator/network/MessageOpenNeutronSensorGUI.java
index 0b3c045ece..ec0c40d4e1 100644
--- a/src/main/java/GoodGenerator/Network/MessageOpenNeutronSensorGUI.java
+++ b/src/main/java/goodgenerator/network/MessageOpenNeutronSensorGUI.java
@@ -1,6 +1,6 @@
-package GoodGenerator.Network;
+package goodgenerator.network;
-import GoodGenerator.Blocks.TEs.MetaTE.NeutronSensor;
+import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor;
import com.github.technus.tectech.TecTech;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
diff --git a/src/main/java/GoodGenerator/Network/MessageSetNeutronSensorData.java b/src/main/java/goodgenerator/network/MessageSetNeutronSensorData.java
index 39d08d92c3..e802e9477e 100644
--- a/src/main/java/GoodGenerator/Network/MessageSetNeutronSensorData.java
+++ b/src/main/java/goodgenerator/network/MessageSetNeutronSensorData.java
@@ -1,6 +1,6 @@
-package GoodGenerator.Network;
+package goodgenerator.network;
-import GoodGenerator.Blocks.TEs.MetaTE.NeutronSensor;
+import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor;
import com.github.technus.tectech.TecTech;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
diff --git a/src/main/java/GoodGenerator/Tabs/MyTabs.java b/src/main/java/goodgenerator/tabs/MyTabs.java
index 75bc1fcc66..52320703d5 100644
--- a/src/main/java/GoodGenerator/Tabs/MyTabs.java
+++ b/src/main/java/goodgenerator/tabs/MyTabs.java
@@ -1,6 +1,6 @@
-package GoodGenerator.Tabs;
+package goodgenerator.tabs;
-import GoodGenerator.Loader.Loaders;
+import goodgenerator.loader.Loaders;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
diff --git a/src/main/java/goodgenerator/tabs/NuclearTab.java b/src/main/java/goodgenerator/tabs/NuclearTab.java
new file mode 100644
index 0000000000..867e1c9141
--- /dev/null
+++ b/src/main/java/goodgenerator/tabs/NuclearTab.java
@@ -0,0 +1,16 @@
+package goodgenerator.tabs;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+
+public class NuclearTab extends CreativeTabs {
+
+ public NuclearTab() {
+ super("Nuclear Items");
+ }
+
+ @Override
+ public Item getTabIconItem() {
+ return null;
+ }
+}
diff --git a/src/main/java/GoodGenerator/util/CharExchanger.java b/src/main/java/goodgenerator/util/CharExchanger.java
index 7c77dcae6c..e92eea548f 100644
--- a/src/main/java/GoodGenerator/util/CharExchanger.java
+++ b/src/main/java/goodgenerator/util/CharExchanger.java
@@ -1,4 +1,4 @@
-package GoodGenerator.util;
+package goodgenerator.util;
import net.minecraft.util.EnumChatFormatting;
diff --git a/src/main/java/GoodGenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java
index 8717579d53..dacae721e9 100644
--- a/src/main/java/GoodGenerator/util/CrackRecipeAdder.java
+++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java
@@ -1,4 +1,4 @@
-package GoodGenerator.util;
+package goodgenerator.util;
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
import gregtech.api.enums.GT_Values;
diff --git a/src/main/java/GoodGenerator/util/DescTextLocalization.java b/src/main/java/goodgenerator/util/DescTextLocalization.java
index b3bdb8cbd2..755397a864 100644
--- a/src/main/java/GoodGenerator/util/DescTextLocalization.java
+++ b/src/main/java/goodgenerator/util/DescTextLocalization.java
@@ -1,4 +1,4 @@
-package GoodGenerator.util;
+package goodgenerator.util;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
diff --git a/src/main/java/GoodGenerator/util/ItemRefer.java b/src/main/java/goodgenerator/util/ItemRefer.java
index 500cd128f2..5ffec9e7eb 100644
--- a/src/main/java/GoodGenerator/util/ItemRefer.java
+++ b/src/main/java/goodgenerator/util/ItemRefer.java
@@ -1,12 +1,12 @@
-package GoodGenerator.util;
+package goodgenerator.util;
import gregtech.api.util.GT_Utility;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import static GoodGenerator.Loader.FuelRodLoader.*;
-import static GoodGenerator.Loader.Loaders.*;
+import static goodgenerator.loader.FuelRodLoader.*;
+import static goodgenerator.loader.Loaders.*;
public final class ItemRefer {
diff --git a/src/main/java/GoodGenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java
index 8247d49c12..ad3468dd98 100644
--- a/src/main/java/GoodGenerator/util/MaterialFix.java
+++ b/src/main/java/goodgenerator/util/MaterialFix.java
@@ -1,4 +1,4 @@
-package GoodGenerator.util;
+package goodgenerator.util;
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
import gregtech.api.enums.GT_Values;
diff --git a/src/main/java/GoodGenerator/util/MyRecipeAdder.java b/src/main/java/goodgenerator/util/MyRecipeAdder.java
index 8f80256b49..056d220275 100644
--- a/src/main/java/GoodGenerator/util/MyRecipeAdder.java
+++ b/src/main/java/goodgenerator/util/MyRecipeAdder.java
@@ -1,4 +1,4 @@
-package GoodGenerator.util;
+package goodgenerator.util;
import gregtech.api.util.GT_Recipe;
import net.minecraft.item.ItemStack;
diff --git a/src/main/java/GoodGenerator/util/StructureHelper.java b/src/main/java/goodgenerator/util/StructureHelper.java
index bce7402035..e1f5b69981 100644
--- a/src/main/java/GoodGenerator/util/StructureHelper.java
+++ b/src/main/java/goodgenerator/util/StructureHelper.java
@@ -1,4 +1,4 @@
-package GoodGenerator.util;
+package goodgenerator.util;
import com.gtnewhorizon.structurelib.StructureLibAPI;
import com.gtnewhorizon.structurelib.structure.IStructureElement;
diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang
index 4c1f478cd1..e8a511828e 100644
--- a/src/main/resources/assets/goodgenerator/lang/en_US.lang
+++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang
@@ -180,6 +180,7 @@ tile.combustionPromotor.name=Combustion Promoter
#Tab Name
itemGroup.Good Generator=Good Generator
+itemGroup.Nuclear Items=[GG] Multi Nuclear Reactor
#Scanner Info
scanner.info.FRF=Coil Tier:
diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1.png
new file mode 100644
index 0000000000..b31aa41fd0
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1tiny.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1tiny.png
new file mode 100644
index 0000000000..89d09ea4f4
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1tiny.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable2.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable2.png
new file mode 100644
index 0000000000..8ea085b73c
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable2.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable2tiny.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable2tiny.png
new file mode 100644
index 0000000000..b75fc700e4
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable2tiny.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1.png
new file mode 100644
index 0000000000..695afd0b8a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1tiny.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1tiny.png
new file mode 100644
index 0000000000..543ee6db73
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1tiny.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable2.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable2.png
new file mode 100644
index 0000000000..81d7b350cd
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable2.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable2tiny.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable2tiny.png
new file mode 100644
index 0000000000..d0291d81eb
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable2tiny.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable3.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable3.png
new file mode 100644
index 0000000000..c2377efe04
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable3.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable3tiny.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable3tiny.png
new file mode 100644
index 0000000000..e7b65c0895
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable3tiny.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable4.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable4.png
new file mode 100644
index 0000000000..184819817d
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable4.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable4tiny.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable4tiny.png
new file mode 100644
index 0000000000..0699e4ef39
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable4tiny.png
Binary files differ