diff options
Diffstat (limited to 'src/Java/miscutil/core')
27 files changed, 418 insertions, 408 deletions
diff --git a/src/Java/miscutil/core/block/heliumgen/tileentity/TileEntityHeliumGenerator.java b/src/Java/miscutil/core/block/heliumgen/tileentity/TileEntityHeliumGenerator.java index 75b1de7f5c..8793e06d4b 100644 --- a/src/Java/miscutil/core/block/heliumgen/tileentity/TileEntityHeliumGenerator.java +++ b/src/Java/miscutil/core/block/heliumgen/tileentity/TileEntityHeliumGenerator.java @@ -19,7 +19,7 @@ import miscutil.core.block.ModBlocks; import miscutil.core.block.heliumgen.slots.InvSlotRadiation; import miscutil.core.item.ModItems; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java index 0c772aa6bb..7c6b9b2d4f 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -10,9 +10,9 @@ import miscutil.core.item.ModItems; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; import miscutil.core.tileentities.ModTileEntities; -import miscutil.core.util.PlayerCache; import miscutil.core.util.Utils; import miscutil.core.util.debug.DEBUG_INIT; +import miscutil.core.util.player.PlayerCache; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; diff --git a/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java index 247463e975..0760696e86 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java @@ -2,8 +2,8 @@ package miscutil.core.common.compat; import static miscutil.core.handler.COMPAT_HANDLER.AddRecipeQueue; import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; -import miscutil.core.util.UtilsItems; -import miscutil.core.util.recipe.ShapedRecipeObject; +import miscutil.core.recipe.ShapedRecipeObject; +import miscutil.core.util.item.UtilsItems; import net.minecraft.item.ItemStack; @@ -11,32 +11,32 @@ import net.minecraft.item.ItemStack; public class COMPAT_CompactWindmills { //Change IC2 Upgrades - public static ItemStack kineticWind = UtilsItems.getItemStack("IC2:blockKineticGenerator", 1); - public static ItemStack shaftIron = UtilsItems.getItemStack("IC2:itemRecipePart:11", 1); - public static ItemStack cableCopper = UtilsItems.getItemStack("gregtech:gt.blockmachines:1367", 1); - public static String plateRubber ="ore:plateRubber"; + public static ItemStack kineticWind = UtilsItems.simpleMetaStack("IC2:blockKineticGenerator", 0, 1); + public static ItemStack shaftIron = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 11, 1); + public static ItemStack cableCopper = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 1367, 1); + public static String plateRubber = "ore:plateRubber"; //Machine Casings - public static ItemStack elvCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings", 1); - public static ItemStack lvCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:1", 1); - public static ItemStack mvCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:2", 1); - public static ItemStack hvCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:3", 1); - public static ItemStack evCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:4", 1); - public static ItemStack ivCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:5", 1); + public static ItemStack elvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 0, 1); + public static ItemStack lvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 1, 1); + public static ItemStack mvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 2, 1); + public static ItemStack hvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 3, 1); + public static ItemStack evCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 4, 1); + public static ItemStack ivCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 5, 1); //GT Transformers - public static ItemStack elvTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:20", 1); - public static ItemStack lvTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:21", 1); - public static ItemStack mvTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:22", 1); - public static ItemStack hvTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:23", 1); - public static ItemStack evTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:24", 1); + public static ItemStack elvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 20, 1); + public static ItemStack lvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 21, 1); + public static ItemStack mvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 22, 1); + public static ItemStack hvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 23, 1); + public static ItemStack evTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 24, 1); //Compact Windmills - public static ItemStack elvWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill", 1); - public static ItemStack lvWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill:1", 1); - public static ItemStack mvWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill:2", 1); - public static ItemStack hvWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill:3", 1); - public static ItemStack evWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill:4", 1); + public static ItemStack elvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 0, 1); + public static ItemStack lvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 1, 1); + public static ItemStack mvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 2, 1); + public static ItemStack hvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 3, 1); + public static ItemStack evWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 4, 1); //Compact Rotors public static ItemStack rotor2 = UtilsItems.getItemStack("CompactWindmills:WOOL", 1); @@ -50,10 +50,10 @@ public class COMPAT_CompactWindmills { public static ItemStack rotorIC2 = UtilsItems.getItemStack("IC2:itemironrotor", 1); public static ItemStack rotorIC3 = UtilsItems.getItemStack("IC2:itemsteelrotor", 1); public static ItemStack rotorIC4 = UtilsItems.getItemStack("IC2:itemwcarbonrotor", 1); - public static ItemStack rotorBlade1 = UtilsItems.getItemStack("IC2:itemRecipePart:7", 1); - public static ItemStack rotorBlade2 = UtilsItems.getItemStack("IC2:itemRecipePart:8", 1); - public static ItemStack rotorBlade3 = UtilsItems.getItemStack("IC2:itemRecipePart:10", 1); - public static ItemStack rotorBlade4 = UtilsItems.getItemStack("IC2:itemRecipePart:9", 1); + public static ItemStack rotorBlade1 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 7, 1); + public static ItemStack rotorBlade2 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 8, 1); + public static ItemStack rotorBlade3 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 10, 1); + public static ItemStack rotorBlade4 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 9, 1); //Plates public static String plateTier1 = "ore:plateMagnalium"; diff --git a/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java b/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java index 1e87907358..8c0f1f72bc 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java @@ -2,7 +2,7 @@ package miscutil.core.common.compat; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.item.ModItems; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; import net.minecraft.item.ItemStack; public class COMPAT_EnderIO { diff --git a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java index b719085006..04fa966f0d 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java @@ -2,7 +2,7 @@ package miscutil.core.common.compat; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.item.ModItems; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; import net.minecraft.item.ItemStack; public class COMPAT_ExtraUtils { diff --git a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java index 7b5dcc670a..c0b52c5250 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java @@ -3,18 +3,16 @@ package miscutil.core.common.compat; import static miscutil.core.handler.COMPAT_HANDLER.AddRecipeQueue; import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; -import miscutil.core.util.UtilsItems; -import miscutil.core.util.recipe.ShapedRecipeObject; +import miscutil.core.recipe.ShapedRecipeObject; +import miscutil.core.util.item.UtilsItems; import net.minecraft.item.ItemStack; public class COMPAT_IC2 { - private static ItemStack itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1); - private static ItemStack itemSolarHelmet = UtilsItems.getItemStack("IC2:itemSolarHelmet", 1); - private static ItemStack temp_3; - private static ItemStack temp_4; - private static ItemStack temp_5; + private static ItemStack itemCropnalyzer = UtilsItems.simpleMetaStack("IC2:itemCropnalyzer", 0, 1); + private static ItemStack itemSolarHelmet = UtilsItems.simpleMetaStack("IC2:itemSolarHelmet", 0, 1); + public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject( "ore:cableGt02Copper", "ore:cableGt02Copper", null, "minecraft:redstone", "ore:blockGlass", "minecraft:redstone", diff --git a/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java b/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java index 69fefd3f52..855a5d8fc2 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java @@ -1,6 +1,6 @@ package miscutil.core.common.compat; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; public class COMPAT_MorePlanets { diff --git a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java index 17741af194..3fbf3e409e 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java @@ -3,8 +3,7 @@ package miscutil.core.common.compat; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.item.ModItems; import miscutil.core.lib.LoadedMods; -import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; import net.minecraft.item.ItemStack; public class COMPAT_Thaumcraft { @@ -18,22 +17,22 @@ public class COMPAT_Thaumcraft { GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal)); for(int i=0; i<=6; i++){ - Utils.LOG_INFO(""+i); + //Utils.LOG_INFO(""+i); UtilsItems.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard "+i, i); GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1)); UtilsItems.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard "+i, i); GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1)); - System.out.println("TC Shard registration count is: "+i); + //System.out.println("TC Shard registration count is: "+i); } if (LoadedMods.ForbiddenMagic){ for(int i=0; i<=6; i++){ - Utils.LOG_INFO(""+i); + //Utils.LOG_INFO(""+i); UtilsItems.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard "+i, i); GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("ForbiddenMagic:NetherShard:"+i, 1)); UtilsItems.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard "+i, i); GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("ForbiddenMagic:NetherShard:"+i, 1)); - System.out.println("TC Shard registration count is: "+i); + //System.out.println("TC Shard registration count is: "+i); } UtilsItems.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0); GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("ForbiddenMagic:GluttonyShard", 1)); diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java index 49b7121465..9035039cdf 100644 --- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java +++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java @@ -1,7 +1,6 @@ package miscutil.core.handler; import static miscutil.core.lib.LoadedMods.Gregtech; -import static miscutil.core.util.UtilsItems.removeCraftingRecipe; import gregtech.api.util.GT_OreDictUnificator; import java.util.LinkedList; @@ -30,10 +29,11 @@ import miscutil.core.handler.registration.gregtech.GregtechSteamCondenser; import miscutil.core.item.ModItems; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; +import miscutil.core.recipe.RECIPES_GREGTECH; +import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; -import miscutil.core.util.recipe.RECIPES_GREGTECH; -import miscutil.core.util.recipe.ShapedRecipeObject; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -120,7 +120,7 @@ public class COMPAT_HANDLER { public static void RemoveRecipesFromOtherMods(){ //Removal of Recipes for(Object item : RemoveRecipeQueue){ - removeCraftingRecipe(item); + UtilsRecipe.removeCraftingRecipe(item); } } diff --git a/src/Java/miscutil/core/handler/InitGregtech.java b/src/Java/miscutil/core/handler/InitGregtech.java deleted file mode 100644 index 13321b2b7b..0000000000 --- a/src/Java/miscutil/core/handler/InitGregtech.java +++ /dev/null @@ -1,7 +0,0 @@ -package miscutil.core.handler; - - -public class InitGregtech { - - -} diff --git a/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java b/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java index 207e3589c6..9fc339f512 100644 --- a/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java +++ b/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java @@ -1,8 +1,8 @@ package miscutil.core.handler.registration; import miscutil.core.handler.COMPAT_HANDLER; +import miscutil.core.recipe.ShapedRecipeObject; import miscutil.core.util.Utils; -import miscutil.core.util.recipe.ShapedRecipeObject; public class LateRegistrationHandler { @@ -22,7 +22,7 @@ public class LateRegistrationHandler { } catch (InterruptedException e) { Utils.LOG_INFO(e.toString()); } - Utils.LOG_INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed); + Utils.LOG_INFO("Late Recipes Loaded: "+recipesSuccess+" Failed: "+recipesFailed); } } diff --git a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java index 5a5be61933..ce7f24c2aa 100644 --- a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java +++ b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java @@ -1,10 +1,10 @@ package miscutil.core.handler.registration; import miscutil.core.handler.COMPAT_HANDLER; +import miscutil.core.recipe.RECIPES_Machines; +import miscutil.core.recipe.RECIPES_Shapeless; +import miscutil.core.recipe.RECIPES_Tools; import miscutil.core.util.Utils; -import miscutil.core.util.recipe.RECIPES_Machines; -import miscutil.core.util.recipe.RECIPES_Shapeless; -import miscutil.core.util.recipe.RECIPES_Tools; public class RegistrationHandler { diff --git a/src/Java/miscutil/core/item/general/fuelrods/FuelRod_Base.java b/src/Java/miscutil/core/item/general/fuelrods/FuelRod_Base.java index 56fe598a3b..20d6fcd08e 100644 --- a/src/Java/miscutil/core/item/general/fuelrods/FuelRod_Base.java +++ b/src/Java/miscutil/core/item/general/fuelrods/FuelRod_Base.java @@ -43,11 +43,11 @@ public class FuelRod_Base extends Item{ tempvar = 2500; } - if (fuelType == "Uranium"){ + else if (fuelType == "Uranium"){ tempvar = 5000; } - if (fuelType == "Plutonium"){ + else if (fuelType == "Plutonium"){ tempvar = 10000; } @@ -193,9 +193,9 @@ public class FuelRod_Base extends Item{ @Override public void onUpdate(ItemStack itemStack, World par2World, Entity par3Entity, int par4, boolean par5) { itemStack.stackTagCompound = new NBTTagCompound(); - itemStack.stackTagCompound.setInteger("fuelRemaining", fuelRemaining); + itemStack.stackTagCompound.setInteger("fuelRemaining", getFuelRemaining()); itemStack.stackTagCompound.setInteger("maximumFuel", maximumFuel); - itemStack.stackTagCompound.setFloat("heat", heat); + itemStack.stackTagCompound.setFloat("heat", getHeat()); itemStack.stackTagCompound.setFloat("maxHeat", getMaxHeat()); itemStack.stackTagCompound.setString("fuelType", fuelType); diff --git a/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java b/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java index 7f050a76f1..4ade1914d9 100644 --- a/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java @@ -3,8 +3,8 @@ package miscutil.core.item.tool.staballoy; import java.util.List; import miscutil.core.lib.CORE; -import miscutil.core.util.UtilsMining; import miscutil.core.util.Utils; +import miscutil.core.util.player.UtilsMining; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/Java/miscutil/core/util/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java index b6f6e778de..3f3338b1d1 100644 --- a/src/Java/miscutil/core/util/recipe/RECIPES_GREGTECH.java +++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java @@ -1,11 +1,11 @@ -package miscutil.core.util.recipe; +package miscutil.core.recipe; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; public class RECIPES_GREGTECH { diff --git a/src/Java/miscutil/core/util/recipe/RECIPES_MTWRAPPER.java b/src/Java/miscutil/core/recipe/RECIPES_MTWRAPPER.java index e30b3f1c04..2f31d133db 100644 --- a/src/Java/miscutil/core/util/recipe/RECIPES_MTWRAPPER.java +++ b/src/Java/miscutil/core/recipe/RECIPES_MTWRAPPER.java @@ -1,9 +1,10 @@ -package miscutil.core.util.recipe; +package miscutil.core.recipe; import java.util.ArrayList; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; import miscutil.core.util.wrapper.var; import net.minecraft.item.ItemStack; @@ -90,7 +91,7 @@ public class RECIPES_MTWRAPPER { validSlots.add(2, lineThree); try { - UtilsItems.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy()); + UtilsRecipe.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy()); MT_RECIPES_LOADED++; } catch(NullPointerException | ClassCastException k){ diff --git a/src/Java/miscutil/core/util/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java index 9d324e69f0..ef57d44f44 100644 --- a/src/Java/miscutil/core/util/recipe/RECIPES_Machines.java +++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java @@ -1,9 +1,10 @@ -package miscutil.core.util.recipe; +package miscutil.core.recipe; import gregtech.api.enums.ItemList; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; import miscutil.gregtech.api.enums.GregtechItemList; import net.minecraft.item.ItemStack; @@ -212,59 +213,59 @@ public class RECIPES_Machines { private static void run(){ //Staballoy Dust - TEMP - UtilsItems.recipeBuilder("dustTitanium", "dustUranium", "dustUranium", + UtilsRecipe.recipeBuilder("dustTitanium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", RECIPES_Shapeless.dustStaballoy); //Buffer Core - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier1, cableTier1, plateTier1, circuitPrimitive, batteryBasic, circuitPrimitive, plateTier1, cableTier1, plateTier1, RECIPE_BufferCore_ULV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier2, cableTier2, plateTier2, circuitBasic, batteryBasic, circuitBasic, plateTier2, cableTier2, plateTier2, RECIPE_BufferCore_LV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier3, cableTier3, plateTier3, circuitGood, batteryAdvanced, circuitGood, plateTier3, cableTier3, plateTier3, RECIPE_BufferCore_MV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier4, cableTier4, plateTier4, circuitAdvanced, batteryAdvanced, circuitAdvanced, plateTier4, cableTier4, plateTier4, RECIPE_BufferCore_HV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier5, cableTier5, plateTier5, circuitData, batteryElite, circuitData, plateTier5, cableTier5, plateTier5, RECIPE_BufferCore_EV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier6, cableTier6, plateTier6, circuitData, batteryElite, circuitElite, plateTier6, cableTier6, plateTier6, RECIPE_BufferCore_IV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier7, cableTier7, plateTier7, circuitElite, batteryMaster, circuitElite, plateTier7, cableTier7, plateTier7, RECIPE_BufferCore_LuV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier8, cableTier8, plateTier8, circuitMaster, batteryMaster, circuitMaster, plateTier8, cableTier8, plateTier8, RECIPE_BufferCore_ZPM); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier9, cableTier9, plateTier9, circuitMaster, batteryUltimate, circuitUltimate, plateTier9, cableTier9, plateTier9, RECIPE_BufferCore_UV); - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier10, cableTier10, plateTier10, circuitUltimate, batteryUltimate, circuitUltimate, plateTier10, cableTier10, plateTier10, @@ -282,62 +283,62 @@ public class RECIPES_Machines { //Battery Buffer #1 - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier1, RECIPE_BufferCore_ULV, wireTier1, wireTier1, machineCasing_ULV, wireTier1, circuitPrimitive, null, circuitPrimitive, RECIPE_Buffer_ULV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier2, RECIPE_BufferCore_LV, wireTier2, wireTier2, machineCasing_LV, wireTier2, circuitPrimitive, circuitBasic, circuitPrimitive, RECIPE_Buffer_LV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier3, RECIPE_BufferCore_MV, wireTier3, wireTier3, machineCasing_MV, wireTier3, circuitBasic, circuitGood, circuitBasic, RECIPE_Buffer_MV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier4, RECIPE_BufferCore_HV, wireTier4, wireTier4, machineCasing_HV, wireTier4, circuitGood, circuitAdvanced, circuitGood, RECIPE_Buffer_HV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier5, RECIPE_BufferCore_EV, wireTier5, wireTier5, machineCasing_EV, wireTier5, circuitAdvanced, circuitElite, circuitAdvanced, RECIPE_Buffer_EV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier6, RECIPE_BufferCore_IV, wireTier6, wireTier6, machineCasing_IV, wireTier6, circuitElite, circuitMaster, circuitElite, RECIPE_Buffer_IV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier7, RECIPE_BufferCore_LuV, wireTier7, wireTier7, machineCasing_LuV, wireTier7, circuitMaster, circuitElite, circuitMaster, RECIPE_Buffer_LuV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier8, RECIPE_BufferCore_ZPM, wireTier8, wireTier8, machineCasing_ZPM, wireTier8, circuitMaster, circuitUltimate, circuitMaster, RECIPE_Buffer_ZPM); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier9, RECIPE_BufferCore_UV, wireTier9, wireTier9, machineCasing_UV, wireTier9, circuitUltimate, circuitMaster, circuitUltimate, RECIPE_Buffer_UV); //Battery Buffer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( wireTier10, RECIPE_BufferCore_MAX, wireTier10, wireTier10, machineCasing_MAX, wireTier10, circuitUltimate, plateTier11, circuitUltimate, @@ -345,21 +346,21 @@ public class RECIPES_Machines { //Steam Condenser - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( pipeLargeCopper, pipeHugeSteel, pipeLargeCopper, plateEnergeticAlloy, electricPump_HV, plateEnergeticAlloy, plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy, RECIPE_SteamCondenser); //Iron BF - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( "plateDoubleAnyIron", "craftingFurnace", "plateDoubleAnyIron", boiler_Coal, machineCasing_ULV, boiler_Coal, "plateDoubleAnyIron", "bucketLava", "plateDoubleAnyIron", RECIPE_IronBlastFurnace); //Iron plated Bricks - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( "plateAnyIron", RECIPES_Tools.craftingToolHardHammer, "plateAnyIron", "plateAnyIron", blockBricks, "plateAnyIron", "plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron", @@ -369,42 +370,42 @@ public class RECIPES_Machines { //Industrial Centrifuge - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( circuitElite, pipeHugeStainlessSteel, circuitElite, plateTier6, electricPump_EV, plateTier6, plateTier8, machineCasing_EV, plateTier8, RECIPE_IndustrialCentrifugeController); //Centrifuge Casing - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier6, "stickElectrum", plateTier6, plateTier8, "stickElectrum", plateTier8, plateTier6, "stickElectrum", plateTier6, RECIPE_IndustrialCentrifugeCasing); //Industrial Coke Oven - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateCobalt, circuitAdvanced, plateCobalt, machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV, plateCobalt, circuitAdvanced, plateCobalt, RECIPE_IndustrialCokeOvenController); //Coke Oven Frame Casing - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateTier8, rodTier8, plateTier8, rodTier8, "frameGtCobalt", rodTier8, plateTier8, rodTier8, plateTier8, RECIPE_IndustrialCokeOvenFrame); //Coke Oven Coil 1 - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateBronze, plateBronze, plateBronze, "frameGtBronze", gearboxCasing_Tier_1, "frameGtBronze", plateBronze, plateBronze, plateBronze, RECIPE_IndustrialCokeOvenCasingA); //Coke Oven Coil 2 - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateSteel, plateSteel, plateSteel, "frameGtSteel", gearboxCasing_Tier_2, "frameGtSteel", plateSteel, plateSteel, plateSteel, diff --git a/src/Java/miscutil/core/util/recipe/RECIPES_Shapeless.java b/src/Java/miscutil/core/recipe/RECIPES_Shapeless.java index 5b09f9a3a0..756955bb1a 100644 --- a/src/Java/miscutil/core/util/recipe/RECIPES_Shapeless.java +++ b/src/Java/miscutil/core/recipe/RECIPES_Shapeless.java @@ -1,9 +1,10 @@ -package miscutil.core.util.recipe; +package miscutil.core.recipe; import gregtech.api.enums.ItemList; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.item.ItemStack; public class RECIPES_Shapeless { @@ -27,12 +28,12 @@ public class RECIPES_Shapeless { } private static void run(){ - UtilsItems.shapelessBuilder(dustStaballoy, + UtilsRecipe.shapelessBuilder(dustStaballoy, "dustTitanium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium"); - UtilsItems.shapelessBuilder(gearboxCasing_Tier_1, + UtilsRecipe.shapelessBuilder(gearboxCasing_Tier_1, circuitPrimitive, circuitPrimitive, circuitPrimitive, circuitPrimitive, circuitPrimitive, circuitPrimitive, circuitPrimitive, circuitPrimitive, circuitPrimitive); diff --git a/src/Java/miscutil/core/util/recipe/RECIPES_Tools.java b/src/Java/miscutil/core/recipe/RECIPES_Tools.java index c4db32fc3f..80919c961f 100644 --- a/src/Java/miscutil/core/util/recipe/RECIPES_Tools.java +++ b/src/Java/miscutil/core/recipe/RECIPES_Tools.java @@ -1,7 +1,8 @@ -package miscutil.core.util.recipe; +package miscutil.core.recipe; import miscutil.core.item.ModItems; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -129,42 +130,42 @@ public class RECIPES_Tools { private static void run(){ //Staballoy Pickaxe - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateStaballoy, plateStaballoy, ingotStaballoy, craftingToolFile, stickTungsten, craftingToolHardHammer, craftingToolWrench, stickTungsten, craftingToolHardHammer, RECIPE_StaballoyPickaxe); //Staballoy Axe - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateStaballoy, ingotStaballoy, craftingToolHardHammer, plateStaballoy, stickTungsten, craftingToolHardHammer, craftingToolFile, stickTungsten, craftingToolWrench, RECIPE_StaballoyAxe); //Cobble to Sand - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( CobbleStone, CobbleStone, CobbleStone, CobbleStone, sandHammer, CobbleStone, CobbleStone, CobbleStone, CobbleStone, RECIPE_Sand); //Sand to Sandstone - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( Sand, Sand, Sand, Sand, sandHammer, Sand, Sand, Sand, Sand, RECIPE_SandStone); //Sandstone Hammer - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( plateElectrum, ingotElectrum, plateElectrum, craftingToolScrewdriver, stickBronze, craftingToolHardHammer, null, stickSteel, null, RECIPE_SandstoneHammer); //Division Sigil - UtilsItems.recipeBuilder( + UtilsRecipe.recipeBuilder( "plateNetherStar", "gemIridium", "plateNetherStar", "plateIridium", craftingToolHardHammer, "plateIridium", "plateNetherStar", "gemIridium", "plateNetherStar", diff --git a/src/Java/miscutil/core/util/recipe/ShapedRecipeObject.java b/src/Java/miscutil/core/recipe/ShapedRecipeObject.java index 5a7bd9719f..bde574b3e6 100644 --- a/src/Java/miscutil/core/util/recipe/ShapedRecipeObject.java +++ b/src/Java/miscutil/core/recipe/ShapedRecipeObject.java @@ -1,7 +1,7 @@ -package miscutil.core.util.recipe; +package miscutil.core.recipe; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.item.ItemStack; public class ShapedRecipeObject { @@ -21,7 +21,7 @@ public class ShapedRecipeObject { Object input_A,Object input_B,Object input_C, Object input_D,Object input_E,Object input_F, Object input_G,Object input_H,Object input_I, - Object input_Output){ + ItemStack input_Output){ this.object_A = input_A; this.object_B = input_B; this.object_C = input_C; @@ -31,13 +31,12 @@ public class ShapedRecipeObject { this.object_G = input_G; this.object_H = input_H; this.object_I = input_I; - ItemStack output_A = (ItemStack) input_Output; - this.object_OUTPUT = output_A; + this.object_OUTPUT = input_Output; Utils.LOG_SPECIFIC_WARNING("ShapedRecipeObject", "New object created.", 36); } public void buildRecipe(){ - UtilsItems.recipeBuilder(object_A, object_B, object_C, object_D, object_E, object_F, object_G, object_H, object_I, object_OUTPUT); + UtilsRecipe.recipeBuilder(object_A, object_B, object_C, object_D, object_E, object_F, object_G, object_H, object_I, object_OUTPUT); } } diff --git a/src/Java/miscutil/core/tileentities/TileEntityNHG.java b/src/Java/miscutil/core/tileentities/TileEntityNHG.java index 6775fe515b..17dd8d4216 100644 --- a/src/Java/miscutil/core/tileentities/TileEntityNHG.java +++ b/src/Java/miscutil/core/tileentities/TileEntityNHG.java @@ -15,8 +15,8 @@ public class TileEntityNHG extends TileEntity implements IInventory { private ItemStack[] items = new ItemStack[19]; //18 private int progress = 1; - private int maxProgress = 1800; - private int heatCycleProgress = 120; + private int maxProgress = 180; + private int heatCycleProgress = 12; public float coreTemp; public float maxTemp = 10000; private boolean fuelrod_1 = false; @@ -49,7 +49,7 @@ public class TileEntityNHG extends TileEntity implements IInventory public boolean isValidFuelRod(ItemStack input){ if(!this.worldObj.isRemote){ if (input != null){ - if (input.getItem() instanceof FuelRod_Base){ + if (input.copy().getItem() instanceof FuelRod_Base){ int fuelRodFuelLevel = getRodFuelValue(input); float fuelRodHeatLevel = getRodHeatValue(input); Utils.LOG_WARNING("Fuel Left: "+fuelRodFuelLevel+" Current Temp: "+fuelRodHeatLevel); @@ -64,10 +64,10 @@ public class TileEntityNHG extends TileEntity implements IInventory public ItemStack doFuelRodHeatDamage(ItemStack input){ if(!this.worldObj.isRemote){ - if (input != null){ - if (isValidFuelRod(input)){ - int fuelRodFuelLevel = getRodFuelValue(input); - float fuelRodHeatLevel = getRodHeatValue(input); + if (input.copy() != null){ + if (isValidFuelRod(input.copy())){ + int fuelRodFuelLevel = getRodFuelValue(input.copy()); + float fuelRodHeatLevel = getRodHeatValue(input.copy()); if((fuelRodHeatLevel <= 0 || fuelRodHeatLevel == 0) && fuelRodFuelLevel > 0){ if(fuelRodFuelLevel <= 0 || fuelRodFuelLevel == 0){ @@ -100,21 +100,20 @@ public class TileEntityNHG extends TileEntity implements IInventory } public float getRodHeatValue(ItemStack value){ - if (value != null){ - if (value.stackTagCompound.getFloat("heat") != 0){ - return value.stackTagCompound.getFloat("heat"); + if (value.copy() != null){ + if (value.copy().stackTagCompound != null){ + return value.copy().stackTagCompound.getFloat("heat"); } - return 0f; } return 0f; } public int getRodFuelValue(ItemStack value){ - if (value != null){ - if (value.stackTagCompound.getInteger("fuelRemaining") != 0){ - return value.stackTagCompound.getInteger("fuelRemaining"); + if (value.copy() != null){ + if (value.copy().stackTagCompound != null){ + int tempInt = value.copy().stackTagCompound.getInteger("fuelRemaining"); + return tempInt; } - return 0; } return 0; } @@ -124,83 +123,101 @@ public class TileEntityNHG extends TileEntity implements IInventory if(!this.worldObj.isRemote){ for (int i = 0; i < getSizeInventory(); i++){ if (items[i] != null){ - if (items[i].getItem() instanceof FuelRod_Base){ - ItemStack fuelRodStack = getStackInSlot(i); + if (items[i].copy().getItem() instanceof FuelRod_Base){ + ItemStack fuelRodStack = getStackInSlot(i).copy(); //setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); if (i == 0){ fuelrod_1 = true; FuelRod_Base x = (FuelRod_Base) fuelRodStack.getItem(); x.addHeat(5); x.addFuel(-5); - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 1){ fuelrod_2 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 2){ fuelrod_3 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 3){ fuelrod_4 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 4){ fuelrod_5 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 5){ fuelrod_6 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 6){ fuelrod_7 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 7){ fuelrod_8 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 8){ fuelrod_9 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 9){ fuelrod_10 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 10){ fuelrod_11 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 11){ fuelrod_12 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 12){ fuelrod_13 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 13){ fuelrod_14 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 14){ fuelrod_15 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 15){ fuelrod_16 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 16){ fuelrod_17 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } else if (i == 17){ fuelrod_18 = true; - setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); + ItemStack r = doFuelRodHeatDamage(fuelRodStack); + setInventorySlotContents(i, r); } @@ -220,8 +237,8 @@ public class TileEntityNHG extends TileEntity implements IInventory if(!this.worldObj.isRemote){ for (int i = 0; i < getSizeInventory(); i++){ if (items[i] != null){ - if (items[i].getItem() instanceof FuelRod_Base){ - ItemStack fuelRodStack = getStackInSlot(i); + if (items[i].copy().getItem() instanceof FuelRod_Base){ + ItemStack fuelRodStack = getStackInSlot(i).copy(); //if (fuelRodStack.stackTagCompound.getFloat("heat") != 0){ doFuelRodHeatDamage(fuelRodStack); coreTemp = coreTemp+fuelRodStack.stackTagCompound.getFloat("heat"); diff --git a/src/Java/miscutil/core/util/VanillaChatCommandSender.java b/src/Java/miscutil/core/util/VanillaChatCommandSender.java deleted file mode 100644 index 76e80204de..0000000000 --- a/src/Java/miscutil/core/util/VanillaChatCommandSender.java +++ /dev/null @@ -1,35 +0,0 @@ -package miscutil.core.util; - -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.IChatComponent; -import net.minecraft.world.World; - -public interface VanillaChatCommandSender { - - /** - * Gets the name of this command sender (usually username, but possibly "Rcon") - */ - String getCommandSenderName(); - - IChatComponent func_145748_c_(); - - /** - * Notifies this sender of some sort of information. This is for messages intended to display to the user. Used - * for typical output (like "you asked for whether or not this game rule is set, so here's your answer"), warnings - * (like "I fetched this block for you by ID, but I'd like you to know that every time you do this, I die a little - * inside"), and errors (like "it's not called iron_pixacke, silly"). - */ - void addChatMessage(IChatComponent p_145747_1_); - - /** - * Returns true if the command sender is allowed to use the given command. - */ - boolean canCommandSenderUseCommand(int p_70003_1_, String p_70003_2_); - - /** - * Return the position for this command sender. - */ - ChunkCoordinates getPlayerCoordinates(); - - World getEntityWorld(); - } diff --git a/src/Java/miscutil/core/util/item/UtilsItems.java b/src/Java/miscutil/core/util/item/UtilsItems.java new file mode 100644 index 0000000000..590b0167be --- /dev/null +++ b/src/Java/miscutil/core/util/item/UtilsItems.java @@ -0,0 +1,179 @@ +package miscutil.core.util.item; + +import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.lib.LoadedMods; +import miscutil.core.util.Utils; +import miscutil.core.util.wrapper.var; +import net.minecraft.client.Minecraft; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.registry.GameRegistry; + +public class UtilsItems { + + public static ItemStack getItemStackOfItem(Boolean modToCheck, String mod_itemname_meta){ + if (modToCheck){ + try{ + Item em = null; + + Item em1 = getItem(mod_itemname_meta); + Utils.LOG_WARNING("Found: "+em1.toString()); + if (em1 != null){ + em = em1; + } + if (em != null ){ + ItemStack returnStack = new ItemStack(em,1); + return returnStack; + } + Utils.LOG_WARNING(mod_itemname_meta+" not found."); + return null; + } catch (NullPointerException e) { + Utils.LOG_ERROR(mod_itemname_meta+" not found. [NULL]"); + return null; + } + } + return null; + } + + public static ItemStack getSimpleStack(Item x){ + try { + ItemStack r = new ItemStack(x, 1); + return r; + } catch(Throwable e){ + return null; + } + } + + + public static void getItemForOreDict(String FQRN, String oreDictName, String itemName, int meta){ + try { + Item em = null; + Item em1 = getItem(FQRN); + Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); + if (em1 != null){ + em = em1; + } + if (em != null){ + + ItemStack metaStack = new ItemStack(em,1,meta); + GT_OreDictUnificator.registerOre(oreDictName, metaStack); + + /*ItemStack itemStackWithMeta = new ItemStack(em,1,meta); + GT_OreDictUnificator.registerOre(oreDictName, new ItemStack(itemStackWithMeta.getItem()));*/ + } + } catch (NullPointerException e) { + Utils.LOG_ERROR(itemName+" not found. [NULL]"); + } + } + + @SuppressWarnings("unused") + public static ItemStack getItemStackWithMeta(boolean MOD, String FQRN, String itemName, int meta, int itemstackSize){ + if (MOD){ + try { + Item em = null; + Item em1 = getItem(FQRN); + Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); + if (em1 != null){ + if (null == em){ + em = em1; + } + if (em != null){ + ItemStack metaStack = new ItemStack(em,itemstackSize,meta); + return metaStack; + } + } + return null; + } catch (NullPointerException e) { + Utils.LOG_ERROR(itemName+" not found. [NULL]"); + return null; + } + } + return null; + } + + @SuppressWarnings("unused") + public static ItemStack simpleMetaStack(String FQRN, int meta, int itemstackSize){ + try { + Item em = null; + Item em1 = getItem(FQRN); + Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); + if (em1 != null){ + if (null == em){ + em = em1; + } + if (em != null){ + ItemStack metaStack = new ItemStack(em,itemstackSize,meta); + return metaStack; + } + } + return null; + } catch (NullPointerException e) { + Utils.LOG_ERROR(FQRN+" not found. [NULL]"); + return null; + } + } + + public static ItemStack getCorrectStacktype(String fqrn, int stackSize){ + String oreDict = "ore:"; + ItemStack temp; + if (fqrn.toLowerCase().contains(oreDict.toLowerCase())){ + String sanitizedName = fqrn.replace(oreDict, ""); + temp = UtilsItems.getItemStack(sanitizedName, stackSize); + return temp; + } + String[] fqrnSplit = fqrn.split(":"); + if(fqrnSplit[2] == null){fqrnSplit[2] = "0";} + temp = UtilsItems.getItemStackWithMeta(LoadedMods.MiscUtils, fqrn, fqrnSplit[1], Integer.parseInt(fqrnSplit[2]), stackSize); + return temp; + } + + public static ItemStack getCorrectStacktype(Object item_Input, int stackSize) { + if (item_Input instanceof String){ + return getCorrectStacktype(item_Input, stackSize); + } + else if (item_Input instanceof ItemStack){ + return (ItemStack) item_Input; + } + if (item_Input instanceof var){ + return ((var) item_Input).getStack(stackSize); + } + return null; + } + + public static Item getItem(String fqrn) // fqrn = fully qualified resource name + { + String[] fqrnSplit = fqrn.split(":"); + return GameRegistry.findItem(fqrnSplit[0], fqrnSplit[1]); + } + + public static ItemStack getItemStack(String fqrn, int Size) // fqrn = fully qualified resource name + { + String[] fqrnSplit = fqrn.split(":"); + return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size); + } + + // TODO + /*public static FluidStack getFluidStack(Materials m, int Size) // fqrn = fully qualified resource name + { + String[] fqrnSplit = fqrn.split(":"); + + FluidStack x = (FluidStack) "Materials."+m+".getFluid"(Size); + + return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size); + }*/ + + public static Item getItemInPlayersHand(){ + Minecraft mc = Minecraft.getMinecraft(); + Item heldItem = null; + + try{heldItem = mc.thePlayer.getHeldItem().getItem(); + }catch(NullPointerException e){return null;} + + if (heldItem != null){ + return heldItem; + } + + return null; + } + +} diff --git a/src/Java/miscutil/core/util/PlayerCache.java b/src/Java/miscutil/core/util/player/PlayerCache.java index a1474bf07a..5969766556 100644 --- a/src/Java/miscutil/core/util/PlayerCache.java +++ b/src/Java/miscutil/core/util/player/PlayerCache.java @@ -1,4 +1,4 @@ -package miscutil.core.util; +package miscutil.core.util.player; import java.io.BufferedReader; import java.io.File; @@ -14,6 +14,7 @@ import java.util.Objects; import java.util.Properties; import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; public class PlayerCache { diff --git a/src/Java/miscutil/core/util/UtilsMining.java b/src/Java/miscutil/core/util/player/UtilsMining.java index 4c6ef7cda9..81e69c1aff 100644 --- a/src/Java/miscutil/core/util/UtilsMining.java +++ b/src/Java/miscutil/core/util/player/UtilsMining.java @@ -1,5 +1,6 @@ -package miscutil.core.util; +package miscutil.core.util.player; +import miscutil.core.util.Utils; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/Java/miscutil/core/util/UtilsItems.java b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java index 7f80534804..50392e1fd9 100644 --- a/src/Java/miscutil/core/util/UtilsItems.java +++ b/src/Java/miscutil/core/util/recipe/UtilsRecipe.java @@ -1,6 +1,4 @@ -package miscutil.core.util; - -import gregtech.api.util.GT_OreDictUnificator; +package miscutil.core.util.recipe; import java.util.ArrayList; import java.util.Iterator; @@ -10,9 +8,8 @@ import miscutil.core.handler.COMPAT_HANDLER; import miscutil.core.handler.registration.LateRegistrationHandler; import miscutil.core.handler.registration.RegistrationHandler; import miscutil.core.lib.CORE; -import miscutil.core.lib.LoadedMods; -import miscutil.core.util.wrapper.var; -import net.minecraft.client.Minecraft; +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -21,119 +18,12 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; -public class UtilsItems { - - public static ItemStack getItemStackOfItem(Boolean modToCheck, String mod_itemname_meta){ - if (modToCheck){ - try{ - Item em = null; - - Item em1 = getItem(mod_itemname_meta); - Utils.LOG_WARNING("Found: "+em1.toString()); - if (em1 != null){ - em = em1; - } - if (em != null ){ - ItemStack returnStack = new ItemStack(em,1); - return returnStack; - } - Utils.LOG_WARNING(mod_itemname_meta+" not found."); - return null; - } catch (NullPointerException e) { - Utils.LOG_ERROR(mod_itemname_meta+" not found. [NULL]"); - return null; - } - } - return null; - } - - public static ItemStack getSimpleStack(Item x){ - try { - ItemStack r = new ItemStack(x, 1); - return r; - } catch(Throwable e){ - return null; - } - } - - - public static void getItemForOreDict(String FQRN, String oreDictName, String itemName, int meta){ - try { - Item em = null; - Item em1 = getItem(FQRN); - Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); - if (em1 != null){ - em = em1; - } - if (em != null){ - - ItemStack metaStack = new ItemStack(em,1,meta); - GT_OreDictUnificator.registerOre(oreDictName, metaStack); - - /*ItemStack itemStackWithMeta = new ItemStack(em,1,meta); - GT_OreDictUnificator.registerOre(oreDictName, new ItemStack(itemStackWithMeta.getItem()));*/ - } - } catch (NullPointerException e) { - Utils.LOG_ERROR(itemName+" not found. [NULL]"); - } - } - - @SuppressWarnings("unused") - public static ItemStack getItemStackWithMeta(boolean MOD, String FQRN, String itemName, int meta, int itemstackSize){ - if (MOD){ - try { - Item em = null; - Item em1 = getItem(FQRN); - Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); - if (em1 != null){ - if (null == em){ - em = em1; - } - if (em != null){ - ItemStack metaStack = new ItemStack(em,itemstackSize,meta); - return metaStack; - } - } - return null; - } catch (NullPointerException e) { - Utils.LOG_ERROR(itemName+" not found. [NULL]"); - return null; - } - } - return null; - } - - public static ItemStack getCorrectStacktype(String fqrn, int stackSize){ - String oreDict = "ore:"; - ItemStack temp; - if (fqrn.toLowerCase().contains(oreDict.toLowerCase())){ - String sanitizedName = fqrn.replace(oreDict, ""); - temp = UtilsItems.getItemStack(sanitizedName, stackSize); - return temp; - } - String[] fqrnSplit = fqrn.split(":"); - if(fqrnSplit[2] == null){fqrnSplit[2] = "0";} - temp = UtilsItems.getItemStackWithMeta(LoadedMods.MiscUtils, fqrn, fqrnSplit[1], Integer.parseInt(fqrnSplit[2]), stackSize); - return temp; - } - - public static ItemStack getCorrectStacktype(Object item_Input, int stackSize) { - if (item_Input instanceof String){ - return getCorrectStacktype(item_Input, stackSize); - } - else if (item_Input instanceof ItemStack){ - return (ItemStack) item_Input; - } - if (item_Input instanceof var){ - return ((var) item_Input).getStack(stackSize); - } - return null; - } +public class UtilsRecipe { public static void recipeBuilder(Object slot_1, Object slot_2, Object slot_3, Object slot_4, Object slot_5, Object slot_6, Object slot_7, Object slot_8, Object slot_9, ItemStack resultItem){ - + ArrayList<Object> validSlots = new ArrayList<Object>(); - + Utils.LOG_INFO("Trying to add a recipe for "+resultItem.toString()); String a,b,c,d,e,f,g,h,i; if (slot_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(slot_1);} @@ -154,8 +44,8 @@ public class UtilsItems { Utils.LOG_WARNING(h); if (slot_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(slot_9);} Utils.LOG_WARNING(i); - - + + Utils.LOG_ERROR("_______"); String lineOne = a+b+c; Utils.LOG_ERROR("|"+a+"|"+b+"|"+c+"|"); @@ -166,7 +56,7 @@ public class UtilsItems { String lineThree = g+h+i; Utils.LOG_ERROR("|"+g+"|"+h+"|"+i+"|"); Utils.LOG_ERROR("_______"); - + validSlots.add(0, lineOne); validSlots.add(1, lineTwo); validSlots.add(2, lineThree); @@ -205,7 +95,7 @@ public class UtilsItems { } } } - + try { GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), (Object[]) validSlots.toArray())); Utils.LOG_INFO("Success! Added a recipe for "+resultItem.toString()); @@ -233,9 +123,9 @@ public class UtilsItems { public static void shapelessBuilder(ItemStack Output, Object slot_1, Object slot_2, Object slot_3, Object slot_4, Object slot_5, Object slot_6, Object slot_7, Object slot_8, Object slot_9){ //Item output_ITEM = Output.getItem(); - + ArrayList<Object> validSlots = new ArrayList<Object>(); - + Utils.LOG_INFO("Trying to add a recipe for "+Output.toString()); String a,b,c,d,e,f,g,h,i; if (slot_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(slot_1);} @@ -256,8 +146,8 @@ public class UtilsItems { Utils.LOG_WARNING(h); if (slot_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(slot_9);} Utils.LOG_WARNING(i); - - + + Utils.LOG_ERROR("_______"); Utils.LOG_ERROR("|"+a+"|"+b+"|"+c+"|"); Utils.LOG_ERROR("_______"); @@ -265,7 +155,7 @@ public class UtilsItems { Utils.LOG_ERROR("_______"); Utils.LOG_ERROR("|"+g+"|"+h+"|"+i+"|"); Utils.LOG_ERROR("_______"); - + validSlots.add(0, a); validSlots.add(1, b); validSlots.add(2, c); @@ -275,7 +165,7 @@ public class UtilsItems { validSlots.add(6, g); validSlots.add(7, h); validSlots.add(8, i); - + try { //GameRegistry.addRecipe(new ShapelessOreRecipe(Output, outputAmount), (Object[]) validSlots.toArray()); GameRegistry.addRecipe(new ShapelessOreRecipe(Output, (Object[]) validSlots.toArray())); @@ -291,51 +181,64 @@ public class UtilsItems { Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+Output.getUnlocalizedName()); RegistrationHandler.recipesFailed++; } - - + + //GameRegistry.addShapelessRecipe(new ItemStack(output_ITEM, 1), new Object[] {slot_1, slot_2}); } - public static Item getItem(String fqrn) // fqrn = fully qualified resource name - { - String[] fqrnSplit = fqrn.split(":"); - return GameRegistry.findItem(fqrnSplit[0], fqrnSplit[1]); - } - - public static ItemStack getItemStack(String fqrn, int Size) // fqrn = fully qualified resource name - { - String[] fqrnSplit = fqrn.split(":"); - return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size); - } - - // TODO - /*public static FluidStack getFluidStack(Materials m, int Size) // fqrn = fully qualified resource name - { - String[] fqrnSplit = fqrn.split(":"); - - FluidStack x = (FluidStack) "Materials."+m+".getFluid"(Size); - - return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size); - }*/ - - public static Item getItemInPlayersHand(){ - Minecraft mc = Minecraft.getMinecraft(); - Item heldItem = null; - - try{heldItem = mc.thePlayer.getHeldItem().getItem(); - }catch(NullPointerException e){return null;} - - if (heldItem != null){ - return heldItem; + public static void recipeBuilder(Object[] array, ItemStack outPut) { + Utils.LOG_SPECIFIC_WARNING("object Array - recipeBuilder", "Attempting to build a recipe using an object array as an input, splitting it, then running the normal recipeBuilder() method.", 396); + Object a=null; + Object b=null; + Object c=null; + Object d=null; + Object e=null; + Object f=null; + Object g=null; + Object h=null; + Object i=null; + for(int z =0; z <= array.length; z++){ + array[z].toString(); + switch(z) + { + case 0: + a = array[z]; + break; + case 1: + b = array[z]; + break; + case 2: + c = array[z]; + break; + case 3: + d = array[z]; + break; + case 4: + e = array[z]; + break; + case 5: + f = array[z]; + break; + case 6: + g = array[z]; + break; + case 7: + h = array[z]; + break; + case 8: + i = array[z]; + break; + default: + break; + } + recipeBuilder(a, b, c, d, e, f, g, h, i, outPut); } - - return null; } public static boolean removeCraftingRecipe(Object x){ if (null == x){return false;} if (x instanceof String){ - Item R = getItem((String) x); + Item R = UtilsItems.getItem((String) x); if (R != null){ x = R; } @@ -361,7 +264,7 @@ public class UtilsItems { return false; } } - if (attemptRecipeRemoval((Item) x)){ + if (UtilsRecipe.attemptRecipeRemoval((Item) x)){ Utils.LOG_INFO("Recipe removal successful"); return true; } @@ -403,53 +306,4 @@ public class UtilsItems { return false; } - public static void recipeBuilder(Object[] array, ItemStack outPut) { - Utils.LOG_SPECIFIC_WARNING("object Array - recipeBuilder", "Attempting to build a recipe using an object array as an input, splitting it, then running the normal recipeBuilder() method.", 396); - Object a=null; - Object b=null; - Object c=null; - Object d=null; - Object e=null; - Object f=null; - Object g=null; - Object h=null; - Object i=null; - for(int z =0; z <= array.length; z++){ - array[z].toString(); - switch(z) - { - case 0: - a = array[z]; - break; - case 1: - b = array[z]; - break; - case 2: - c = array[z]; - break; - case 3: - d = array[z]; - break; - case 4: - e = array[z]; - break; - case 5: - f = array[z]; - break; - case 6: - g = array[z]; - break; - case 7: - h = array[z]; - break; - case 8: - i = array[z]; - break; - default: - break; - } - recipeBuilder(a, b, c, d, e, f, g, h, i, outPut); - } - } - } diff --git a/src/Java/miscutil/core/util/wrapper/var.java b/src/Java/miscutil/core/util/wrapper/var.java index bae0e020f4..7f24b26646 100644 --- a/src/Java/miscutil/core/util/wrapper/var.java +++ b/src/Java/miscutil/core/util/wrapper/var.java @@ -2,7 +2,7 @@ package miscutil.core.util.wrapper; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; -import miscutil.core.util.UtilsItems; +import miscutil.core.util.item.UtilsItems; import net.minecraft.item.ItemStack; public class var{ |