diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-06-02 00:13:32 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-06-02 00:13:32 +1000 |
| commit | ecff67654aac93b33907a0784d9c0b88648cfd1a (patch) | |
| tree | 728ab9131bacd866313c65c37e3f37a53e73520a /src/Java/miscutil | |
| parent | e6d4747d4cb4e648f2b6f8f88ad0aceca59d3d8b (diff) | |
| download | GT5-Unofficial-ecff67654aac93b33907a0784d9c0b88648cfd1a.tar.gz GT5-Unofficial-ecff67654aac93b33907a0784d9c0b88648cfd1a.tar.bz2 GT5-Unofficial-ecff67654aac93b33907a0784d9c0b88648cfd1a.zip | |
~Changed Coke Oven Recipes
~Cleaned up a handful of classes (ModItems.java, RECIPES_Machines.java, Utils.java & UtilsItems.java)
+Added a handful of DEBUG classes (To resolve multiblock shaping issues)
+Added GregtechMetaTileEntityIndustrialPlatePress.java
+Added textures for itemStickyRubber, itemIngotBatteryAlloy & itemPlateBatteryAlloy.
+Added a basic wrapper for direct MineTweaker script usage (Ultra W.I.P.)
>This will probably be changed to preload .zs scripts, regex and handle appropriately, but undecided.
Diffstat (limited to 'src/Java/miscutil')
21 files changed, 1903 insertions, 197 deletions
diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java index 2b286a28b3..2ddd6bf8cb 100644 --- a/src/Java/miscutil/MiscUtils.java +++ b/src/Java/miscutil/MiscUtils.java @@ -12,7 +12,7 @@ import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; import miscutil.core.util.PlayerCache; import miscutil.core.util.Utils; -import miscutil.core.util.debug.DEBUG_ScreenOverlay; +import miscutil.core.util.debug.DEBUG_INIT; import miscutil.gregtech.common.GregtechRecipeAdder; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; @@ -29,7 +29,7 @@ import cpw.mods.fml.common.event.FMLServerStoppingEvent; public class MiscUtils implements ActionListener { - + @Mod.Instance(CORE.MODID) public static MiscUtils instance; @@ -43,15 +43,15 @@ implements ActionListener { LoadedMods.checkLoaded(); Utils.LOG_INFO("Doing some house cleaning."); - + if (LoadedMods.Gregtech){ try { CORE.sRecipeAdder = CORE.RA = new GregtechRecipeAdder(); } catch (NullPointerException e){ - + } } - + AddToCreativeTab.initialiseTabs(); proxy.registerTileEntities(); proxy.registerRenderThings(); @@ -65,8 +65,9 @@ implements ActionListener proxy.init(event); MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(new PickaxeBlockBreakEventHandler()); + //Debug Loading if (CORE.DEBUG){ - MinecraftForge.EVENT_BUS.register(new DEBUG_ScreenOverlay()); + DEBUG_INIT.registerHandlers(); } FMLCommonHandler.instance().bus().register(this); proxy.registerNetworkStuff(); @@ -79,7 +80,7 @@ implements ActionListener COMPAT_HANDLER.ServerStartedEvent(); PlayerCache.initCache(); proxy.postInit(event); - + } @EventHandler diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_GREGTECH.java b/src/Java/miscutil/core/handler/registration/RECIPES_GREGTECH.java index f433632163..75ea04e1e6 100644 --- a/src/Java/miscutil/core/handler/registration/RECIPES_GREGTECH.java +++ b/src/Java/miscutil/core/handler/registration/RECIPES_GREGTECH.java @@ -43,7 +43,7 @@ public class RECIPES_GREGTECH { CORE.RA.addCokeOvenRecipe( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 2L), //Input 1 GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2 - Materials.SulfuricAcid.getFluid(80L), //Fluid Input + Materials.SulfuricAcid.getFluid(60L), //Fluid Input Materials.Creosote.getFluid(250L), //Fluid Output UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output 600, //Time in ticks @@ -56,7 +56,7 @@ public class RECIPES_GREGTECH { CORE.RA.addCokeOvenRecipe( GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 2L), //Input 1 GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1L), //Input 2 - Materials.Water.getFluid(160L), //Fluid Input + Materials.SaltWater.getFluid(85L), //Fluid Input Materials.Creosote.getFluid(145L), //Fluid Output GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 2L), //Item Output 1200, //Time in ticks @@ -69,7 +69,7 @@ public class RECIPES_GREGTECH { CORE.RA.addCokeOvenRecipe( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 2L), //Input 1 GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1L), //Input 2 - null, //Fluid Input + Materials.SaltWater.getFluid(185L), //Fluid Input Materials.Creosote.getFluid(200L), //Fluid Output UtilsItems.getItemStack("Railcraft:fuel.coke", 2), //Item Output 900, //Time in ticks diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_MTWRAPPER.java b/src/Java/miscutil/core/handler/registration/RECIPES_MTWRAPPER.java new file mode 100644 index 0000000000..16ba377b07 --- /dev/null +++ b/src/Java/miscutil/core/handler/registration/RECIPES_MTWRAPPER.java @@ -0,0 +1,113 @@ +package miscutil.core.handler.registration; + +import java.util.ArrayList; + +import miscutil.core.util.Utils; +import miscutil.core.util.UtilsItems; +import miscutil.core.util.wrapper.var; +import net.minecraft.item.ItemStack; + +public class RECIPES_MTWRAPPER { + + public static int MT_RECIPES_LOADED = 0; + public static int MT_RECIPES_FAILED = 0; + + static var chestWood = new var("minecraft:chest>"); + static var slabWood = new var("ore:slabWood>"); + static var gemNetherQuartz = new var("ore:gemNetherQuartz>"); + static var glass = new var("ore:blockGlass>"); + static var sensorDaylight = new var("minecraft:daylight_detector>"); + static var blazeRod = new var("minecraft:blaze_rod>"); + static var saw = new var("ore:craftingToolSaw>"); + static var logWood = new var("ore:logWood>"); + static var button = new var("minecraft:stone_button>"); + static var stoneBlock = new var("minecraft:stone>"); + + public static void run(){ + /*addShaped(button.getStack(2), + null, stoneBlock, null, + null, stoneBlock, null, + null, null, null);*/ + /*addShaped(stoneStick.getStack(1), + stoneBlock, null, null, + stoneBlock, null, null, + null, null, null);*/ + addShaped(chestWood.getStack(2), + logWood, logWood, logWood, + logWood, null, logWood, + logWood, logWood, logWood); + addShaped(chestWood.getStack(4), + logWood, logWood, logWood, + logWood, saw, logWood, + logWood, logWood, logWood); + //Recipe Fixes + //remove(sensorDaylight); + addShaped(sensorDaylight.getStack(1), + glass, glass, glass, + gemNetherQuartz, gemNetherQuartz, gemNetherQuartz, + slabWood, slabWood, slabWood); + /*addShaped(ironBars .getStack( 8), + null, "<ore:craftingToolWrench>", null, + "<ore:stickAnyIron>", "<ore:stickAnyIron>", "<ore:stickAnyIron>", + "<ore:stickAnyIron>", "<ore:stickAnyIron>", "<ore:stickAnyIron>");*/ + } + + + public static void addShaped(Object item_Output, + Object item_1, Object item_2, Object item_3, + Object item_4, Object item_5, Object item_6, + Object item_7, Object item_8, Object item_9){ + + + /* + * + * var item_1, var item_2, var item_3, + var item_4, var item_5, var item_6, + var item_7, var item_8, var item_9 + * + * + */ + + ItemStack outputItem = UtilsItems.getCorrectStacktype(item_Output, 1); + + ArrayList<Object> validSlots = new ArrayList<Object>(); + String a,b,c,d,e,f,g,h,i; + if (item_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(item_1);} + if (item_2 == null){ b = " ";} else { b = "2";validSlots.add('2');validSlots.add(item_2);} + if (item_3 == null){ c = " ";} else { c = "3";validSlots.add('3');validSlots.add(item_3);} + if (item_4 == null){ d = " ";} else { d = "4";validSlots.add('4');validSlots.add(item_4);} + if (item_5 == null){ e = " ";} else { e = "5";validSlots.add('5');validSlots.add(item_5);} + if (item_6 == null){ f = " ";} else { f = "6";validSlots.add('6');validSlots.add(item_6);} + if (item_7 == null){ g = " ";} else { g = "7";validSlots.add('7');validSlots.add(item_7);} + if (item_8 == null){ h = " ";} else { h = "8";validSlots.add('8');validSlots.add(item_8);} + if (item_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(item_9);} + + String lineOne = a+b+c; + String lineTwo = d+e+f; + String lineThree = g+h+i; + validSlots.add(0, lineOne); + validSlots.add(1, lineTwo); + validSlots.add(2, lineThree); + + try { + UtilsItems.recipeBuilder((Object[]) validSlots.toArray(), outputItem.copy()); + MT_RECIPES_LOADED++; + } + catch(NullPointerException | ClassCastException k){ + k.getMessage(); + k.getClass(); + k.printStackTrace(); + k.getLocalizedMessage(); + Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+((var) item_Output).getsanitizedName()); + MT_RECIPES_FAILED++; + } + } + + public static void addShapeless(){ + + } + + + +} + diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java index 995a77f6c8..dc544be0fb 100644 --- a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java +++ b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java @@ -1,6 +1,7 @@ package miscutil.core.handler.registration; import gregtech.api.enums.ItemList; +import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; import miscutil.core.util.UtilsItems; import miscutil.gregtech.api.enums.GregtechItemList; @@ -23,9 +24,14 @@ public class RECIPES_Machines { static ItemStack RECIPE_Buffer_ZPM = GregtechItemList.Energy_Buffer_1by1_ZPM.get(1); static ItemStack RECIPE_Buffer_UV = GregtechItemList.Energy_Buffer_1by1_UV.get(1); static ItemStack RECIPE_Buffer_MAX = GregtechItemList.Energy_Buffer_1by1_MAX.get(1); - static ItemStack RECIPE_IndustrialCentrifuge = GregtechItemList.Industrial_Centrifuge.get(1); + //Industrial Centrifuge + static ItemStack RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1); static ItemStack RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1); + //Industrial Coke Oven + static ItemStack RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1); static ItemStack RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1); + static ItemStack RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1); + static ItemStack RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1); //Buffer Cores @@ -79,6 +85,19 @@ public class RECIPES_Machines { static String plateTier10 = "plateNaquadah"; static String plateTier11 = "plateNeutronium"; + //rods + static String rodTier1 = "stickLead"; + static String rodTier2 = "stickTin"; + static String rodTier3 = "stickCopper"; + static String rodTier4 = "stickGold"; + static String rodTier5 = "stickAluminium"; + static String rodTier6 = "stickThorium"; + static String rodTier7 = "stickTungsten"; + static String rodTier8 = "stickTungstenSteel"; + static String rodTier9 = "stickOsmium"; + static String rodTier10 = "stickNaquadah"; + static String rodTier11 = "stickNeutronium"; + //Machine Casings static ItemStack machineCasing_ULV = ItemList.Casing_ULV.get(1); @@ -91,6 +110,12 @@ public class RECIPES_Machines { static ItemStack machineCasing_ZPM = ItemList.Casing_ZPM.get(1); static ItemStack machineCasing_UV = ItemList.Casing_UV.get(1); static ItemStack machineCasing_MAX = ItemList.Casing_MAX.get(1); + + //Gearbox Casings + static ItemStack gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); + static ItemStack gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1); + static ItemStack gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1); + static ItemStack gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1); //Cables static String cableGt02Electrum = "cableGt02Electrum"; @@ -99,6 +124,9 @@ public class RECIPES_Machines { //Plates static String plateElectricalSteel= "plateElectricalSteel"; static String plateEnergeticAlloy= "plateEnergeticAlloy"; + static String plateCobalt = "plateCobalt"; + static String plateBronze = "plateBronze"; + static String plateSteel = "plateSteel"; //Pipes static String pipeLargeCopper="pipeLargeCopper"; @@ -126,7 +154,7 @@ public class RECIPES_Machines { static String circuitElite = "circuitElite"; static String circuitMaster = "circuitMaster"; static String circuitUltimate = "circuitUltimate"; - + //Machine Components static ItemStack electricMotor_LV = ItemList.Electric_Motor_LV.get(1); static ItemStack electricMotor_MV = ItemList.Electric_Motor_MV.get(1); @@ -169,8 +197,11 @@ public class RECIPES_Machines { static ItemStack sensor_EV = ItemList.Sensor_EV.get(1); static ItemStack sensor_IV = ItemList.Sensor_IV.get(1); - - + //Misc + static ItemStack INPUT_RCCokeOvenBlock = UtilsItems.getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1); + + + //RobotArm, Conveyor, Emitter, Sensor, Field Generator @@ -328,23 +359,70 @@ public class RECIPES_Machines { "plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron", RECIPE_IronPlatedBricks); - - - + + + //Industrial Centrifuge UtilsItems.recipeBuilder( circuitElite, pipeHugeStainlessSteel, circuitElite, plateTier6, electricPump_EV, plateTier6, plateTier8, machineCasing_EV, plateTier8, - RECIPE_IndustrialCentrifuge); + RECIPE_IndustrialCentrifugeController); - //Steam Condenser + //Centrifuge Casing UtilsItems.recipeBuilder( plateTier6, "stickElectrum", plateTier6, plateTier8, "stickElectrum", plateTier8, plateTier6, "stickElectrum", plateTier6, RECIPE_IndustrialCentrifugeCasing); + //Industrial Coke Oven + UtilsItems.recipeBuilder( + plateCobalt, circuitAdvanced, plateCobalt, + machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV, + plateCobalt, circuitAdvanced, plateCobalt, + RECIPE_IndustrialCokeOvenController); + + //Coke Oven Frame Casing + UtilsItems.recipeBuilder( + plateTier8, rodTier8, plateTier8, + rodTier8, "frameGtCobalt", rodTier8, + plateTier8, rodTier8, plateTier8, + RECIPE_IndustrialCokeOvenFrame); + + //Coke Oven Coil 1 + UtilsItems.recipeBuilder( + plateBronze, plateBronze, plateBronze, + "frameGtBronze", gearboxCasing_Tier_1, "frameGtBronze", + plateBronze, plateBronze, plateBronze, + RECIPE_IndustrialCokeOvenCasingA); + + //Coke Oven Coil 2 + UtilsItems.recipeBuilder( + plateSteel, plateSteel, plateSteel, + "frameGtSteel", gearboxCasing_Tier_2, "frameGtSteel", + plateSteel, plateSteel, plateSteel, + RECIPE_IndustrialCokeOvenCasingB); + + + + + + + + + + + + + + + + + + + + Utils.LOG_INFO("Done loading recipes for the Various machine blocks."); diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java b/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java new file mode 100644 index 0000000000..c249bb9d77 --- /dev/null +++ b/src/Java/miscutil/core/handler/registration/RECIPES_Shapeless.java @@ -0,0 +1,41 @@ +package miscutil.core.handler.registration; + +import gregtech.api.enums.ItemList; +import miscutil.core.lib.LoadedMods; +import miscutil.core.util.Utils; +import miscutil.core.util.UtilsItems; +import net.minecraft.item.ItemStack; + +public class RECIPES_Shapeless { + + static ItemStack dustStaballoy = UtilsItems.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 1); + + //Circuits + static String circuitPrimitive = "circuitPrimitive"; + static String circuitBasic = "circuitBasic"; + static String circuitGood = "circuitGood"; + static String circuitAdvanced = "circuitAdvanced"; + static String circuitData = "circuitData"; + static String circuitElite = "circuitElite"; + static String circuitMaster = "circuitMaster"; + static String circuitUltimate = "circuitUltimate"; + static ItemStack gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); + + public static final void RECIPES_LOAD(){ + run(); + Utils.LOG_INFO("Loading Shapeless Recipes."); + } + + private static void run(){ + UtilsItems.shapelessBuilder(dustStaballoy, + "dustTitanium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium"); + + UtilsItems.shapelessBuilder(gearboxCasing_Tier_1, + circuitPrimitive, circuitPrimitive, circuitPrimitive, + circuitPrimitive, circuitPrimitive, circuitPrimitive, + circuitPrimitive, circuitPrimitive, circuitPrimitive); + } + +} diff --git a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java index 8c66bb1cc9..9f100117fc 100644 --- a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java +++ b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java @@ -14,12 +14,15 @@ public class RegistrationHandler { private final static void init(){ RECIPES_Tools.RECIPES_LOAD(); RECIPES_Machines.RECIPES_LOAD(); + RECIPES_Shapeless.RECIPES_LOAD(); + //RECIPES_MTWRAPPER.run(); try { Thread.sleep(10); } catch (InterruptedException e) { Utils.LOG_INFO(e.toString()); } Utils.LOG_INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed); + Utils.LOG_INFO("MT Loaded: "+RECIPES_MTWRAPPER.MT_RECIPES_LOADED+" MT Failed: "+RECIPES_MTWRAPPER.MT_RECIPES_FAILED); } } diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 49abc71cbc..e704ac0365 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -10,6 +10,7 @@ import miscutil.core.item.tool.staballoy.StaballoyPickaxe; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; +import miscutil.core.util.debug.DEBUG_INIT; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraftforge.common.util.EnumHelper; @@ -54,6 +55,8 @@ Gold Tool: 22*/ //public static ToolMaterial TUTORIAL = EnumHelper.addToolMaterial("TUTORIAL", harvestLevel, durability, miningSpeed, damageVsEntities, enchantability); public static ToolMaterial STABALLOY = EnumHelper.addToolMaterial("Staballoy", 3, 2500, 7, 1.0F, 18); + public static Item itemDebugShapeSpawner; + //EnderIO public static Item itemPlateSoularium; public static Item itemPlateRedstoneAlloy; @@ -97,6 +100,11 @@ Gold Tool: 22*/ public static Item item_PLEASE_FACTOR_ME_4; //@SuppressWarnings("unused") public static final void init(){ + + //Debug Loading + if (CORE.DEBUG){ + DEBUG_INIT.registerItems(); + } //EnderIO Resources if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){ @@ -231,16 +239,17 @@ Gold Tool: 22*/ System.out.println("Buffer Core registration count is: "+i); } //Dev Items - itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault"); + itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemStickyRubber"); GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber"); //Battery Alloy For cheap Niggers - itemIngotBatteryAlloy = new Item().setUnlocalizedName("itemIngotBatteryAlloy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault"); + itemIngotBatteryAlloy = new Item().setUnlocalizedName("itemIngotBatteryAlloy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotBatteryAlloy"); GameRegistry.registerItem(itemIngotBatteryAlloy, "itemIngotBatteryAlloy"); - itemPlateBatteryAlloy = new Item().setUnlocalizedName("itemPlateBatteryAlloy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault"); + itemPlateBatteryAlloy = new Item().setUnlocalizedName("itemPlateBatteryAlloy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateBatteryAlloy"); GameRegistry.registerItem(itemPlateBatteryAlloy, "itemPlateBatteryAlloy"); itemHeliumBlob = new Item().setUnlocalizedName("itemHeliumBlob").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob"); GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob"); + /* item_PLEASE_FACTOR_ME_4 = new Item().setUnlocalizedName("unlocalName4").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault"); GameRegistry.registerItem(item_PLEASE_FACTOR_ME_4, "localName4");*/ diff --git a/src/Java/miscutil/core/item/base/BaseItemGeneric.java b/src/Java/miscutil/core/item/base/BaseItemGeneric.java index 55d98528ce..56b9c9d7fe 100644 --- a/src/Java/miscutil/core/item/base/BaseItemGeneric.java +++ b/src/Java/miscutil/core/item/base/BaseItemGeneric.java @@ -1,18 +1,29 @@ package miscutil.core.item.base; +import java.util.List; + import miscutil.core.lib.CORE; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; -@Deprecated public class BaseItemGeneric extends Item { - public BaseItemGeneric(String s, CreativeTabs c, int stackSize, int maxDmg) + public BaseItemGeneric(String unlocalizedName, CreativeTabs c, int stackSize, int maxDmg) { - setUnlocalizedName(CORE.MODID + "_" + s); - setTextureName(CORE.MODID + ":" + s); + setUnlocalizedName(CORE.MODID + "_" + unlocalizedName); + setTextureName(CORE.MODID + ":" + unlocalizedName); setCreativeTab(c); setMaxStackSize(stackSize); setMaxDamage(maxDmg); } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + list.add(EnumChatFormatting.GOLD+""); + super.addInformation(stack, aPlayer, list, bool); + } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index 3f38cd9180..f2be1776bd 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -15,7 +15,7 @@ public class CORE { public static final String name = "Misc. Utils"; public static final String MODID = "miscutils"; public static final String VERSION = "1.0.4"; - public static final boolean DEBUG = false; + public static final boolean DEBUG = true; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; public static Map PlayerCache; diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java index 394f96a6fc..896108052c 100644 --- a/src/Java/miscutil/core/lib/LoadedMods.java +++ b/src/Java/miscutil/core/lib/LoadedMods.java @@ -5,6 +5,7 @@ import cpw.mods.fml.common.Loader; public class LoadedMods { + //Initialize Variables public static boolean Gregtech = false; public static boolean EnderIO = false; @@ -18,6 +19,8 @@ public class LoadedMods { public static boolean MorePlanets = false; public static boolean ForbiddenMagic = false; public static boolean CompactWindmills = false; + public static boolean Railcraft = false; + public static boolean MiscUtils = true; //Dummy For MetaData Lookups in MT Wrapper private static int totalMods; @@ -71,6 +74,10 @@ public class LoadedMods { CompactWindmills = true; totalMods++; } + if (Loader.isModLoaded("Railcraft") == true){ + Railcraft = true; + totalMods++; + } Utils.LOG_INFO("Content found for "+totalMods+" mods"); diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java index 4e303c8e39..37a4b5bb56 100644 --- a/src/Java/miscutil/core/util/Utils.java +++ b/src/Java/miscutil/core/util/Utils.java @@ -5,6 +5,8 @@ import static gregtech.api.enums.GT_Values.F; import java.awt.Color; import java.awt.Graphics; import java.util.Random; +import java.util.Timer; +import java.util.TimerTask; import miscutil.core.lib.CORE; import net.minecraft.block.Block; @@ -18,6 +20,13 @@ import cpw.mods.fml.common.FMLLog; public class Utils { public static final int WILDCARD_VALUE = Short.MAX_VALUE; + + static class ShortTimerTask extends TimerTask { + @Override + public void run() { + Utils.LOG_WARNING("Timer expired."); + } + } /** * Returns a psuedo-random number between min and max, inclusive. @@ -193,4 +202,15 @@ public class Utils { double f = i + 273.15F; return (int)decimalRoundingToWholes(f); } + + public static Timer ShortTimer(int seconds) { + Timer timer; + timer = new Timer(); + timer.schedule(new ShortTimerTask(), seconds * 1000); + return timer; + } + + } + + diff --git a/src/Java/miscutil/core/util/UtilsItems.java b/src/Java/miscutil/core/util/UtilsItems.java index c2bf2823fc..d939f2a9bc 100644 --- a/src/Java/miscutil/core/util/UtilsItems.java +++ b/src/Java/miscutil/core/util/UtilsItems.java @@ -7,12 +7,16 @@ import java.util.Iterator; import java.util.List; 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 net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; public class UtilsItems { @@ -44,16 +48,16 @@ public class UtilsItems { } return null; } - + public static ItemStack getSimpleStack(Item x){ try { - ItemStack r = new ItemStack(x, 1); - return r; + 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 { @@ -76,14 +80,64 @@ public class UtilsItems { } } + @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 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>(); - //, String lineFirst, String lineSecond, String lineThird Utils.LOG_INFO("Trying to add a recipe for "+resultItem.toString()); - String a,b,c,d,e,f,g,h,i; - //ItemStack empty = new ItemStack(Blocks.air); + 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);} Utils.LOG_WARNING(a); if (slot_2 == null){ b = " ";} else { b = "2";validSlots.add('2');validSlots.add(slot_2);} @@ -118,8 +172,11 @@ public class UtilsItems { validSlots.add(0, lineOne); validSlots.add(1, lineTwo); validSlots.add(2, lineThree); - Boolean AadvancedLog = true; - if (AadvancedLog){ + boolean advancedLog = false; + if (CORE.DEBUG){ + advancedLog = true; + } + if (advancedLog){ int j = 0; int l = validSlots.size(); Utils.LOG_WARNING("l:"+l); @@ -152,40 +209,9 @@ public class UtilsItems { } try { - /*Utils.LOG_WARNING("validSlots to array: "+validSlots.toArray()); - Object[] validSlotsArray = (Object[]) validSlots.toArray(); - - for(int j = 0; j < validSlotsArray.length; j++) - { - Utils.LOG_ERROR(""+validSlotsArray[j]); - }*/ - GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), (Object[]) validSlots.toArray())); Utils.LOG_INFO("Success! Added a recipe for "+resultItem.toString()); - RegistrationHandler.recipesSuccess++; |
