diff options
10 files changed, 24 insertions, 14 deletions
diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java index b9a74a08c4..589f8f42d4 100644 --- a/src/Java/miscutil/core/block/ModBlocks.java +++ b/src/Java/miscutil/core/block/ModBlocks.java @@ -1,8 +1,9 @@ package miscutil.core.block; import miscutil.core.block.fluids.BlocktestFluid; +import miscutil.core.block.heliumgen.block.HeliumGenerator; +import miscutil.core.block.heliumgen.tileentity.TileEntityHeliumGenerator; import miscutil.core.lib.CORE; -import miscutil.core.tileentities.TileEntityHeliumGenerator; import miscutil.core.util.Utils; import miscutil.gregtech.common.blocks.GregtechMetaCasingBlocks; import net.minecraft.block.Block; diff --git a/src/Java/miscutil/core/block/HeliumGenerator.java b/src/Java/miscutil/core/block/heliumgen/block/HeliumGenerator.java index 227f485079..0a0253a384 100644 --- a/src/Java/miscutil/core/block/HeliumGenerator.java +++ b/src/Java/miscutil/core/block/heliumgen/block/HeliumGenerator.java @@ -1,11 +1,11 @@ -package miscutil.core.block; +package miscutil.core.block.heliumgen.block; import java.util.Random; import miscutil.MiscUtils; +import miscutil.core.block.heliumgen.tileentity.TileEntityHeliumGenerator; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; -import miscutil.core.tileentities.TileEntityHeliumGenerator; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java b/src/Java/miscutil/core/block/heliumgen/container/ContainerHeliumGenerator.java index b62bf2fff0..d7e612b9f6 100644 --- a/src/Java/miscutil/core/gui/ContainerHeliumGenerator.java +++ b/src/Java/miscutil/core/block/heliumgen/container/ContainerHeliumGenerator.java @@ -1,11 +1,11 @@ -package miscutil.core.gui; +package miscutil.core.block.heliumgen.container; import ic2.core.ContainerBase; import ic2.core.slot.SlotInvSlot; import java.util.List; -import miscutil.core.tileentities.TileEntityHeliumGenerator; +import miscutil.core.block.heliumgen.tileentity.TileEntityHeliumGenerator; import miscutil.core.util.Utils; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; diff --git a/src/Java/miscutil/core/gui/GUIHeliumGenerator.java b/src/Java/miscutil/core/block/heliumgen/gui/GUIHeliumGenerator.java index 2564aa33f7..6939d1d8f8 100644 --- a/src/Java/miscutil/core/gui/GUIHeliumGenerator.java +++ b/src/Java/miscutil/core/block/heliumgen/gui/GUIHeliumGenerator.java @@ -1,7 +1,8 @@ -package miscutil.core.gui; +package miscutil.core.block.heliumgen.gui; +import miscutil.core.block.heliumgen.container.ContainerHeliumGenerator; +import miscutil.core.block.heliumgen.tileentity.TileEntityHeliumGenerator; import miscutil.core.lib.CORE; -import miscutil.core.tileentities.TileEntityHeliumGenerator; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/Java/miscutil/core/handler/InvSlotRadiation.java b/src/Java/miscutil/core/block/heliumgen/slots/InvSlotRadiation.java index 8dd918f7e3..22491e6cf2 100644 --- a/src/Java/miscutil/core/handler/InvSlotRadiation.java +++ b/src/Java/miscutil/core/block/heliumgen/slots/InvSlotRadiation.java @@ -1,7 +1,7 @@ -package miscutil.core.handler; +package miscutil.core.block.heliumgen.slots; import ic2.core.block.invslot.InvSlot; -import miscutil.core.tileentities.TileEntityHeliumGenerator; +import miscutil.core.block.heliumgen.tileentity.TileEntityHeliumGenerator; import net.minecraft.item.ItemStack; public class InvSlotRadiation extends InvSlot diff --git a/src/Java/miscutil/core/tileentities/TileEntityHeliumGenerator.java b/src/Java/miscutil/core/block/heliumgen/tileentity/TileEntityHeliumGenerator.java index f862db8c15..88fc44339a 100644 --- a/src/Java/miscutil/core/tileentities/TileEntityHeliumGenerator.java +++ b/src/Java/miscutil/core/block/heliumgen/tileentity/TileEntityHeliumGenerator.java @@ -1,4 +1,4 @@ -package miscutil.core.tileentities; +package miscutil.core.block.heliumgen.tileentity; import ic2.api.Direction; import ic2.api.reactor.IReactor; @@ -16,7 +16,7 @@ import ic2.core.util.ConfigUtil; import java.util.List; import miscutil.core.block.ModBlocks; -import miscutil.core.handler.InvSlotRadiation; +import miscutil.core.block.heliumgen.slots.InvSlotRadiation; import miscutil.core.item.ModItems; import miscutil.core.util.Utils; import miscutil.core.util.UtilsItems; diff --git a/src/Java/miscutil/core/gui/ModGUI.java b/src/Java/miscutil/core/gui/ModGUI.java index 1e4d172637..b9ecf00134 100644 --- a/src/Java/miscutil/core/gui/ModGUI.java +++ b/src/Java/miscutil/core/gui/ModGUI.java @@ -1,7 +1,9 @@ package miscutil.core.gui; import miscutil.MiscUtils; -import miscutil.core.tileentities.TileEntityHeliumGenerator; +import miscutil.core.block.heliumgen.container.ContainerHeliumGenerator; +import miscutil.core.block.heliumgen.gui.GUIHeliumGenerator; +import miscutil.core.block.heliumgen.tileentity.TileEntityHeliumGenerator; import miscutil.core.util.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java index dc544be0fb..b51e41b5ab 100644 --- a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java +++ b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java @@ -211,6 +211,12 @@ public class RECIPES_Machines { } private static void run(){ + //Staballoy Dust - TEMP + UtilsItems.recipeBuilder("dustTitanium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium", + RECIPES_Shapeless.dustStaballoy); + //Buffer Core UtilsItems.recipeBuilder( plateTier1, cableTier1, plateTier1, diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java b/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java index c249bb9d77..34eefffea3 100644 --- a/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java +++ b/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java @@ -22,7 +22,7 @@ public class RECIPES_Shapeless { static ItemStack gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); public static final void RECIPES_LOAD(){ - run(); + //run(); Utils.LOG_INFO("Loading Shapeless Recipes."); } diff --git a/src/Java/miscutil/core/tileentities/TILE_ENTITY_BASE.java b/src/Java/miscutil/core/tileentities/base/TILE_ENTITY_BASE.java index 790312a182..20bee0b07c 100644 --- a/src/Java/miscutil/core/tileentities/TILE_ENTITY_BASE.java +++ b/src/Java/miscutil/core/tileentities/base/TILE_ENTITY_BASE.java @@ -1,4 +1,4 @@ -package miscutil.core.tileentities; +package miscutil.core.tileentities.base; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; |