diff options
Diffstat (limited to 'src')
14 files changed, 297 insertions, 25 deletions
diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java index 93ab19f731..103eae53da 100644 --- a/src/Java/miscutil/MiscUtils.java +++ b/src/Java/miscutil/MiscUtils.java @@ -8,6 +8,7 @@ import java.io.File; import miscutil.core.commands.CommandMath; import miscutil.core.common.CommonProxy; +import miscutil.core.handler.events.LoginEventHandler; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.xmod.gregtech.HANDLER_GT; @@ -57,11 +58,10 @@ implements ActionListener public void preInit(FMLPreInitializationEvent event) { Utils.LOG_INFO("Loading "+CORE.name+" V"+CORE.VERSION); - /*Configuration Config = new Configuration(event.getSuggestedConfigurationFile()); - Config.load(); - CORE.Config = Config; - CORE.disableEnderIOIntegration = Config.get(Configuration.CATEGORY_GENERAL, "disableEnderIOIntegration", false).getBoolean(false); - CORE.disableStaballoyBlastFurnaceRecipe = Config.get(Configuration.CATEGORY_GENERAL, "disableStaballoyBlastFurnaceRecipe", false).getBoolean(false);*/ + + FMLCommonHandler.instance().bus().register(new LoginEventHandler()); + System.out.println("Login Handler Initialized"); + handleConfigFile(event); proxy.registerTileEntities(); proxy.registerRenderThings(); diff --git a/src/Java/miscutil/core/handler/events/LoginEventHandler.java b/src/Java/miscutil/core/handler/events/LoginEventHandler.java new file mode 100644 index 0000000000..4e8ac318ba --- /dev/null +++ b/src/Java/miscutil/core/handler/events/LoginEventHandler.java @@ -0,0 +1,84 @@ +package miscutil.core.handler.events; + +import java.util.UUID; + +import miscutil.core.item.ModItems; +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; + +public class LoginEventHandler { + + public String localPlayersName; + public UUID localPlayersUUID; + private EntityPlayer localPlayerRef; + + @SubscribeEvent + public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { + + this.localPlayerRef = event.player; + this.localPlayersName = event.player.getDisplayName(); + this.localPlayersUUID = event.player.getUniqueID(); + + try { + + + if (localPlayerRef instanceof EntityPlayerMP && localPlayerRef != null){ + /*Utils.LOG_INFO("Engaging Log in protection."); + localPlayerRef.*/ + + if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009") || localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){ + + + Utils.LOG_INFO("Spawning a new Santa Thread."); + + Thread t = new Thread() { + UUID threadHandlerIDthing = localPlayersUUID; + @Override + public void run() { + while(true && Minecraft.getMinecraft().getIntegratedServer() != null) { + try { + if(localPlayerRef == null){ + localPlayerRef = Utils.getPlayerOnServerFromUUID(threadHandlerIDthing); + } + + + //ImQ009 is a legend. + if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009")){ + Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread."); + localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.itemIngotRaisinBread, Utils.randInt(1, 5))); + } + + + if (localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){ + Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread."); + localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems.itemIngotRaisinBread, Utils.randInt(1, 5))); + } + Thread.sleep(1000*60*1); + } catch (InterruptedException ie) { + Utils.LOG_INFO("Santa Mode Disabled."); + } + } + + Utils.LOG_INFO("Thread Stopped. Handler Closed."); + + } + }; + t.start(); + + + } + + + } + } catch (Throwable errr){ + Utils.LOG_INFO("Login Handler encountered an error."); + + } + } + +}
\ No newline at end of file diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index db6b081fd1..5c5902206e 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -4,8 +4,10 @@ import static miscutil.core.creative.AddToCreativeTab.tabMisc; import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.creative.AddToCreativeTab; +import miscutil.core.item.base.BaseItemHotFood; import miscutil.core.item.base.CoreItem; import miscutil.core.item.base.dusts.BaseItemDust; +import miscutil.core.item.base.foods.BaseItemFood; import miscutil.core.item.base.ingots.BaseItemIngot; import miscutil.core.item.base.ingots.BaseItemIngotHot; import miscutil.core.item.effects.RarityUncommon; @@ -21,6 +23,8 @@ import miscutil.core.util.debug.DEBUG_INIT; import miscutil.core.util.item.UtilsItems; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.common.registry.GameRegistry; public final class ModItems { @@ -64,7 +68,7 @@ Gold Tool: 22*/ public static ToolMaterial STABALLOY = EnumHelper.addToolMaterial("Staballoy", 3, 2500, 7, 1.0F, 18); public static Item AAA_Broken; - + public static Item itemDebugShapeSpawner; public static Item itemBaseSpawnEgg; @@ -130,11 +134,16 @@ Gold Tool: 22*/ public static Item itemIngotRaisinBread; public static Item itemHotIngotRaisinBread; + public static BaseItemIngot itemIngotTantalloy60; + public static BaseItemIngotHot itemHotIngotTantalloy60; + public static BaseItemIngot itemIngotTantalloy61; + public static BaseItemIngotHot itemHotIngotTantalloy61; + //@SuppressWarnings("unused") public static final void init(){ AAA_Broken = new BaseItemIngot("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 0)); - + //Debug Loading if (CORE.DEBUG){ DEBUG_INIT.registerItems(); @@ -275,7 +284,7 @@ Gold Tool: 22*/ GameRegistry.registerItem(itemStaballoyPickaxe, itemStaballoyPickaxe.getUnlocalizedName()); itemStaballoyAxe = new StaballoyAxe("itemStaballoyAxe", STABALLOY).setCreativeTab(AddToCreativeTab.tabTools); GameRegistry.registerItem(itemStaballoyAxe, itemStaballoyAxe.getUnlocalizedName()); - + //Staballoy Ingot/Plate itemIngotStaballoy = new BaseItemIngot("itemIngotStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66)); GT_OreDictUnificator.registerOre("ingotStaballoy", UtilsItems.getItemStack(CORE.MODID+":itemIngotStaballoy", 1)); @@ -284,8 +293,8 @@ Gold Tool: 22*/ GT_OreDictUnificator.registerOre("plateStaballoy", UtilsItems.getItemStack(CORE.MODID+":itemPlateStaballoy", 1)); /*itemIngotStaballoy = new Item().setUnlocalizedName("itemIngotStaballoy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotStaballoy"); GameRegistry.registerItem(itemIngotStaballoy, "itemIngotStaballoy"); - */ - + */ + //Staballoy Dusts itemDustStaballoy = new BaseItemDust("itemDustStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Dust").setCreativeTab(tabMisc); @@ -310,18 +319,30 @@ Gold Tool: 22*/ itemDustSmallBloodSteel = new BaseItemDust("itemDustSmallBloodSteel", "BloodSteel", Utils.rgbtoHexValue(142, 28, 0), "Small").setCreativeTab(tabMisc); GT_OreDictUnificator.registerOre("dustSmallBloodSteel", UtilsItems.getItemStack(CORE.MODID+":itemDustSmallBloodSteel", 1)); - //Hot Staballoy Ingot itemHotIngotStaballoy = new BaseItemIngotHot("itemHotIngotStaballoy", "Staballoy", UtilsItems.getItemStack(CORE.MODID+":itemIngotStaballoy", 1)); GT_OreDictUnificator.registerOre("ingotHotStaballoy", UtilsItems.getItemStack(CORE.MODID+":itemHotIngotStaballoy", 1)); - //Raisin Bread Ingot - itemIngotRaisinBread = new BaseItemIngot("itemIngotRaisinBread", "Raisin Bread", Utils.rgbtoHexValue(255, 255, 255)); + //Raisin Bread + itemIngotRaisinBread = new BaseItemFood("itemIngotRaisinBread", 3, 1.5f, false, new PotionEffect(Potion.weakness.id, 40, 1)).setAlwaysEdible(); GT_OreDictUnificator.registerOre("itemIngotRaisinBread", UtilsItems.getItemStack(CORE.MODID+":itemIngotRaisinBread", 1)); - //Hot Raisin Bread Ingot - itemHotIngotRaisinBread = new BaseItemIngotHot("itemHotIngotRaisinBread", "Raisin Bread", UtilsItems.getItemStack(CORE.MODID+":itemIngotStaballoy", 1)); + //Hot Raisin Bread + itemHotIngotRaisinBread = new BaseItemHotFood("itemHotIngotRaisinBread", 1, 0.5f, "Raisin Bread", 120, itemIngotRaisinBread); GT_OreDictUnificator.registerOre("itemHotIngotRaisinBread", UtilsItems.getItemStack(CORE.MODID+":itemHotIngotRaisinBread", 1)); + //Tantalloy Ingot/Plate + itemIngotTantalloy60 = new BaseItemIngot("itemIngotTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166)); + GT_OreDictUnificator.registerOre("ingotTantalloy-60", UtilsItems.getItemStack(CORE.MODID+":itemIngotTantalloy60", 1)); + //Hot Tantalloy Ingot + itemHotIngotTantalloy60 = new BaseItemIngotHot("itemHotIngotTantalloy60", "Tantalloy-60", UtilsItems.getItemStack(CORE.MODID+":itemIngotTantalloy60", 1)); + GT_OreDictUnificator.registerOre("ingotHotTantalloy-60", UtilsItems.getItemStack(CORE.MODID+":itemHotIngotTantalloy60", 1)); + + //Tantalloy Ingot/Plate + itemIngotTantalloy61 = new BaseItemIngot("itemIngotTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196)); + GT_OreDictUnificator.registerOre("ingotTantalloy-61", UtilsItems.getItemStack(CORE.MODID+":itemIngotTantalloy61", 1)); + //Hot Tantalloy Ingot + itemHotIngotTantalloy61 = new BaseItemIngotHot("itemHotIngotTantalloy61", "Tantalloy-61", UtilsItems.getItemStack(CORE.MODID+":itemIngotTantalloy61", 1)); + GT_OreDictUnificator.registerOre("ingotHotTantalloy-61", UtilsItems.getItemStack(CORE.MODID+":itemHotIngotTantalloy61", 1)); //Sandstone Hammer itemSandstoneHammer = new SandstoneHammer("itemSandstoneHammer").setCreativeTab(AddToCreativeTab.tabTools); diff --git a/src/Java/miscutil/core/item/base/BaseItemHotFood.java b/src/Java/miscutil/core/item/base/BaseItemHotFood.java new file mode 100644 index 0000000000..1f60059fd9 --- /dev/null +++ b/src/Java/miscutil/core/item/base/BaseItemHotFood.java @@ -0,0 +1,77 @@ +package miscutil.core.item.base; + +import java.util.List; + +import miscutil.core.item.base.foods.BaseItemFood; +import miscutil.core.util.Utils; +import miscutil.core.util.item.UtilsItems; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; + +public class BaseItemHotFood extends BaseItemFood{ + + protected String materialName; + protected String unlocalName; + protected int cooldownTime; + protected Item output; + + public BaseItemHotFood(String unlocalizedName, int healAmount, float healSaturation, String foodName, int timeToCoolInSeconds, Item cooledFood) { + super(unlocalizedName, healAmount, healSaturation, false); + this.unlocalName = unlocalizedName; + this.cooldownTime = timeToCoolInSeconds * 20; + this.materialName = foodName; + this.output = cooledFood; + this.setMaxStackSize(1); + } + + @Override + public ItemStack onEaten(ItemStack iStack, World world, EntityPlayer player) { + return super.onEaten(iStack, world, player); + } + + @Override + public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { + //Utils.LOG_INFO("Item Damage: "+iStack.getItemDamage()+" Max Damage: "+iStack.getMaxDamage()); + if (!world.isRemote){ + if(iStack.getItemDamage() == cooldownTime) { + if (entityHolding instanceof EntityPlayer){ + Utils.LOG_INFO("Foods Done."); + ((EntityPlayer) entityHolding).inventory.addItemStackToInventory(UtilsItems.getSimpleStack(output)); + ((EntityPlayer) entityHolding).inventory.consumeInventoryItem(this); + } + }else if(iStack.getItemDamage() < cooldownTime){ + iStack.setItemDamage(iStack.getItemDamage() + 1); + } + if(Utils.divideXintoY(iStack.getItemDamage(), 150)){ + entityHolding.attackEntityFrom(DamageSource.onFire, 1); + } + + + } + super.onUpdate(iStack, world, entityHolding, p_77663_4_, p_77663_5_); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + if (materialName != null && materialName != "" && !materialName.equals("")){ + list.add(EnumChatFormatting.GRAY+"Warning: Very hot! Avoid direct handling.."); + list.add(EnumChatFormatting.GRAY+"This food has "+(((int) stack.getMaxDamage()-(int) stack.getItemDamage())/20)+" seconds left."); + } + super.addInformation(stack, aPlayer, list, bool); + } + + public final String getMaterialName() { + return materialName; + } + + @Override + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + return Utils.rgbtoHexValue(255, 128, 128); + + } +} diff --git a/src/Java/miscutil/core/item/base/foods/BaseItemFood.java b/src/Java/miscutil/core/item/base/foods/BaseItemFood.java new file mode 100644 index 0000000000..1b67fce1ae --- /dev/null +++ b/src/Java/miscutil/core/item/base/foods/BaseItemFood.java @@ -0,0 +1,39 @@ +package miscutil.core.item.base.foods; + +import miscutil.core.creative.AddToCreativeTab; +import miscutil.core.lib.CORE; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; + +public class BaseItemFood extends ItemFood { + + private PotionEffect[] effects; + + public BaseItemFood(String unlocalizedName, int healAmount, float saturationModifier, boolean wolvesFavorite, PotionEffect... effects) { + super(healAmount, saturationModifier, wolvesFavorite); + this.setUnlocalizedName(unlocalizedName); + this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabMisc); + this.effects = effects; + GameRegistry.registerItem(this, unlocalizedName); + } + + @Override + protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { + super.onFoodEaten(stack, world, player); + + for (int i = 0; i < effects.length; i ++) { + if (!world.isRemote && effects[i] != null && effects[i].getPotionID() > 0) + player.addPotionEffect(new PotionEffect(this.effects[i].getPotionID(), + this.effects[i].getDuration(), this.effects[i].getAmplifier(), + this.effects[i].getIsAmbient() + ) + ); + } + } + +}
\ No newline at end of file diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java index 95da94db62..dee7786f6f 100644 --- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java +++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java @@ -41,6 +41,12 @@ public class BaseItemIngot extends Item{ } @Override + public String getItemStackDisplayName(ItemStack p_77653_1_) { + + return (materialName+ " Ingot"); + } + + @Override public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { if (materialName != null && materialName != "" && !materialName.equals("") && !unlocalName.contains("HotIngot") && !unlocalName.toLowerCase().contains("raisinbread")){ list.add(EnumChatFormatting.GRAY+"A solid ingot of " + materialName + "."); diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java index 89ceebe922..4ec6e9891d 100644 --- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java @@ -1,20 +1,25 @@ package miscutil.core.item.base.ingots; import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_Utility; import java.util.List; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.UtilsText; +import miscutil.core.util.item.UtilsItems; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; public class BaseItemIngotHot extends BaseItemIngot{ - + private ItemStack outputIngot; + private int tickCounter = 0; + private int tickCounterMax = 200; public BaseItemIngotHot(String unlocalizedName, String materialName, ItemStack coldIngot) { super(unlocalizedName, materialName, Utils.rgbtoHexValue(225, 225, 225)); @@ -22,21 +27,43 @@ public class BaseItemIngotHot extends BaseItemIngot{ this.outputIngot = coldIngot; generateRecipe(); } + + @Override + public String getItemStackDisplayName(ItemStack p_77653_1_) { + + return ("Hot "+materialName+ " Ingot"); + } @Override public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { if (materialName != null && materialName != "" && !materialName.equals("")){ - list.add(EnumChatFormatting.GRAY+"A "+UtilsText.red.colour()+"burning hot"+UtilsText.lightGray.colour()+" ingot of " + materialName + "."); + list.add(EnumChatFormatting.GRAY+"A "+UtilsText.red.colour()+"burning hot"+UtilsText.lightGray.colour()+" ingot of " + materialName + "."); } super.addInformation(stack, aPlayer, list, bool); } - + @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { return Utils.rgbtoHexValue(225, 225, 225); } - + private void generateRecipe(){ - GT_Values.RA.addVacuumFreezerRecipe(GT_Utility.copyAmount(1L, new Object[]{this}), GT_Utility.copyAmount(1L, new Object[]{outputIngot}), 500); + GT_Values.RA.addVacuumFreezerRecipe(UtilsItems.getSimpleStack(this), outputIngot.copy(), 500); + } + + @Override + public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { + if (!world.isRemote){ + if(tickCounter < tickCounterMax){ + tickCounter++; + } + else if(tickCounter == tickCounterMax){ + entityHolding.attackEntityFrom(DamageSource.onFire, 1); + tickCounter = 0; + } + super.onUpdate(iStack, world, entityHolding, p_77663_4_, p_77663_5_); + } } + + } diff --git a/src/Java/miscutil/core/proxy/ClientProxy.java b/src/Java/miscutil/core/proxy/ClientProxy.java index aa1ab99ced..5e088b47b4 100644 --- a/src/Java/miscutil/core/proxy/ClientProxy.java +++ b/src/Java/miscutil/core/proxy/ClientProxy.java @@ -9,6 +9,7 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; public class ClientProxy extends CommonProxy{ @@ -74,6 +75,12 @@ public class ClientProxy extends CommonProxy{ Minecraft.getMinecraft().effectRenderer.addEffect(particleMysterious); } + @Override + public void serverStarting(FMLServerStartingEvent e) + { + + } + } diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java index 9ee31ac587..b3dbccd129 100644 --- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java @@ -90,7 +90,13 @@ public enum GregtechItemList implements GregtechItemContainer { Industrial_MassFab, //Solar Generators - GT_Solar_ULV, GT_Solar_LV, GT_Solar_MV, GT_Solar_HV, GT_Solar_EV, GT_Solar_IV, GT_Solar_LuV, GT_Solar_ZPM, GT_Solar_UV, GT_Solar_MAX; + GT_Solar_ULV, GT_Solar_LV, GT_Solar_MV, + GT_Solar_HV, GT_Solar_EV, GT_Solar_IV, + GT_Solar_LuV, GT_Solar_ZPM, GT_Solar_UV, GT_Solar_MAX, + + + + Food_Baked_Raisin_Bread; public static final GregtechItemList[] DYE_ONLY_ITEMS = { diff --git a/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index f483cc02f4..aa82c9496d 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -8,15 +8,18 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_MultiTexture; import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_FoodStat; import gregtech.common.covers.GT_Cover_Arm; import gregtech.common.covers.GT_Cover_Conveyor; import gregtech.common.covers.GT_Cover_Pump; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; +import miscutil.core.util.UtilsText; import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes; import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import miscutil.core.xmod.gregtech.api.items.Gregtech_MetaItem_X32; +import net.minecraft.item.EnumAction; public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { public MetaGeneratedGregtechItems INSTANCE; @@ -27,7 +30,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { int tLastID = 0; if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - Utils.LOG_INFO("Gregtech 5.09 not found, using fallback components. (I like how I have to add compat to something I added first and had stolen."); + Utils.LOG_INFO("Gregtech 5.09 not found, using fallback components. (I like how I have to add compat to something I added first and had stolen.)"); GregtechItemList.Electric_Pump_LuV.set(addItem(tLastID = 0, "Electric Pump (LuV)", "163920 L/sec (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L)})); GregtechItemList.Electric_Pump_ZPM.set(addItem(tLastID = 1, "Electric Pump (ZPM)", "655680 L/sec (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)})); GregtechItemList.Electric_Pump_UV.set(addItem(tLastID = 2, "Electric Pump (UV)", "2622720 L/sec (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 4L)})); @@ -132,7 +135,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { GregtechItemList.Circuit_Parts_Wiring_ZPM.set(addItem(tLastID = 721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards", new Object[0])); - + //FOOOOOOOOOOOOOOD + GregtechItemList.Food_Baked_Raisin_Bread.set(addItem(tLastID = 60, "Raisin Bread", "Extra Raisins, Just for "+UtilsText.purple.colour()+"ImQ009", new Object[]{new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + //Extruder Shape GregtechItemList.Shape_Extruder_WindmillShaft.set(addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts", new Object[0])); diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java index 92d8d23372..63185dee9d 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java @@ -133,7 +133,7 @@ public class GregtechMetaTileEntityMassFabricator extends GT_MetaTileEntity_Mult ArrayUtils.reverse(mOutputFluids); recipeCounter++; updateSlots(); - Utils.LOG_INFO("Recipes Finished: "+recipeCounter); + //Utils.LOG_INFO("Recipes Finished: "+recipeCounter); return true; } } diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/60.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/60.png Binary files differnew file mode 100644 index 0000000000..e2b05916a5 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/60.png diff --git a/src/resources/assets/miscutils/textures/items/itemHotIngotRaisinBread.png b/src/resources/assets/miscutils/textures/items/itemHotIngotRaisinBread.png Binary files differnew file mode 100644 index 0000000000..e2b05916a5 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/itemHotIngotRaisinBread.png diff --git a/src/resources/assets/miscutils/textures/items/itemIngotRaisinBread.png b/src/resources/assets/miscutils/textures/items/itemIngotRaisinBread.png Binary files differnew file mode 100644 index 0000000000..e2b05916a5 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/itemIngotRaisinBread.png |
