From 3185adc6131aa708f14e849c047f9119977aa8f3 Mon Sep 17 00:00:00 2001 From: TheDarkDnKTv Date: Sat, 13 Mar 2021 08:33:19 +0200 Subject: [PATCH] Fixed crops --- src/main/java/gregtechmod/GT_Mod.java | 17 ++++--- .../java/gregtechmod/api/GregTech_API.java | 2 +- .../gregtechmod/api/util/GT_BaseCrop.java | 16 +++++++ .../loaders/postload/GT_CropLoader.java | 45 +++++++++--------- .../assets/gregtech_addon/lang/en_US.lang | 19 ++++++++ .../blocks/crop/blockCrop.Argentia.1.png | Bin 195 -> 0 bytes .../blocks/crop/blockCrop.Argentia.2.png | Bin 276 -> 0 bytes .../blocks/crop/blockCrop.Argentia.3.png | Bin 523 -> 0 bytes .../blocks/crop/blockCrop.Argentia.4.png | Bin 500 -> 0 bytes .../crop/blockCrop.Brown Mushrooms.1.png | Bin 159 -> 0 bytes .../crop/blockCrop.Brown Mushrooms.2.png | Bin 198 -> 0 bytes .../crop/blockCrop.Brown Mushrooms.3.png | Bin 212 -> 0 bytes .../blocks/crop/blockCrop.Coppon.1.png | Bin 229 -> 0 bytes .../blocks/crop/blockCrop.Coppon.2.png | Bin 476 -> 0 bytes .../blocks/crop/blockCrop.Coppon.3.png | Bin 473 -> 0 bytes .../blocks/crop/blockCrop.Plumbilia.1.png | Bin 195 -> 0 bytes .../blocks/crop/blockCrop.Plumbilia.2.png | Bin 276 -> 0 bytes .../blocks/crop/blockCrop.Plumbilia.3.png | Bin 523 -> 0 bytes .../blocks/crop/blockCrop.Plumbilia.4.png | Bin 503 -> 0 bytes .../blocks/crop/blockCrop.Red Mushrooms.1.png | Bin 159 -> 0 bytes .../blocks/crop/blockCrop.Red Mushrooms.2.png | Bin 247 -> 0 bytes .../blocks/crop/blockCrop.Red Mushrooms.3.png | Bin 312 -> 0 bytes 22 files changed, 68 insertions(+), 31 deletions(-) delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.1.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.2.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.3.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.4.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Brown Mushrooms.1.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Brown Mushrooms.2.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Brown Mushrooms.3.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Coppon.1.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Coppon.2.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Coppon.3.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.1.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.2.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.3.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.4.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Red Mushrooms.1.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Red Mushrooms.2.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Red Mushrooms.3.png diff --git a/src/main/java/gregtechmod/GT_Mod.java b/src/main/java/gregtechmod/GT_Mod.java index a821461..cb15560 100644 --- a/src/main/java/gregtechmod/GT_Mod.java +++ b/src/main/java/gregtechmod/GT_Mod.java @@ -264,12 +264,15 @@ public class GT_Mod implements IGT_Mod { File tFile = new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "GregTech.cfg"); Configuration tConfig1 = new Configuration(tFile); tConfig1.load(); - GregTech_API.sRecipeFile = new GT_Config(new Configuration(new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "DynamicConfig.cfg"))); - GregTech_API.sMachineFile = new GT_Config(new Configuration(new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "MachineStats.cfg"))); - GregTech_API.sWorldgenFile = new GT_Config(new Configuration(new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "WorldGeneration.cfg"))); - GregTech_API.sMaterialProperties = new GT_Config(new Configuration(new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "MaterialProperties.cfg"))); - GregTech_API.sUnification = new GT_Config(new Configuration(new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "Unification.cfg"))); - GregTech_API.sSpecialFile = new GT_Config(new Configuration(new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "Other.cfg"))); + + File gtDir = new File(aEvent.getModConfigurationDirectory(), "GregTech"); + GregTech_API.sRecipeFile = new GT_Config(new Configuration(new File(gtDir, "DynamicConfig.cfg"))); + GregTech_API.sMachineFile = new GT_Config(new Configuration(new File(gtDir, "MachineStats.cfg"))); + GregTech_API.sWorldgenFile = new GT_Config(new Configuration(new File(gtDir, "WorldGeneration.cfg"))); + GregTech_API.sMaterialProperties = new GT_Config(new Configuration(new File(gtDir, "MaterialProperties.cfg"))); + GregTech_API.sUnification = new GT_Config(new Configuration(new File(gtDir, "Unification.cfg"))); + GregTech_API.sSpecialFile = new GT_Config(new Configuration(new File(gtDir, "Other.cfg"))); + GregTech_API.sIDFile = new GT_Config(GT_Config.sConfigFileIDs = new Configuration(new File(gtDir, "IDs.cfg"))); mDoNotInit = (!tFile.getAbsolutePath().toLowerCase().contains("voltz")) && (tFile.getAbsolutePath().toLowerCase().contains(".technic") || tFile.getAbsolutePath().toLowerCase().contains("tekkit")); if (mDoNotInit) { @@ -294,7 +297,7 @@ public class GT_Mod implements IGT_Mod { return; } - GT_Log.mOreDictLogFile = new File(aEvent.getModConfigurationDirectory().getParentFile(), "OreDict.log"); + GT_Log.mOreDictLogFile = new File(aEvent.getModConfigurationDirectory().getParentFile(), "logs/GT_OreDict.log"); if(!GT_Log.mOreDictLogFile.exists()) { try { GT_Log.mOreDictLogFile.createNewFile(); diff --git a/src/main/java/gregtechmod/api/GregTech_API.java b/src/main/java/gregtechmod/api/GregTech_API.java index 55b260f..b6d2d0d 100644 --- a/src/main/java/gregtechmod/api/GregTech_API.java +++ b/src/main/java/gregtechmod/api/GregTech_API.java @@ -77,7 +77,7 @@ public class GregTech_API { public static boolean DEBUG_MODE = false, SECONDARY_DEBUG_MODE = false, IC_ENERGY_COMPATIBILITY = true, RF_ENERGY_COMPATIBILITY = true; /** The Configuration Objects */ - public static GT_Config sMachineFile = null, sWorldgenFile = null, sMaterialProperties = null, sUnification = null, sSpecialFile = null, sRecipeFile = null; + public static GT_Config sMachineFile = null, sWorldgenFile = null, sMaterialProperties = null, sUnification = null, sSpecialFile = null, sRecipeFile = null, sIDFile = null; /** Because Minecraft changed it from -1 to that Value */ public static final short ITEM_WILDCARD_DAMAGE = OreDictionary.WILDCARD_VALUE; diff --git a/src/main/java/gregtechmod/api/util/GT_BaseCrop.java b/src/main/java/gregtechmod/api/util/GT_BaseCrop.java index 099a82e..5fbe454 100644 --- a/src/main/java/gregtechmod/api/util/GT_BaseCrop.java +++ b/src/main/java/gregtechmod/api/util/GT_BaseCrop.java @@ -7,9 +7,13 @@ import ic2.api.crops.ICropTile; import java.util.ArrayList; import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; public class GT_BaseCrop extends CropCard { private String mName = "", mDiscoveredBy = "Gregorius Techneticies", mAttributes[]; @@ -51,6 +55,7 @@ public class GT_BaseCrop extends CropCard { mAttributes = aAttributes; if (!Crops.instance.registerCrop(this, aID)) throw new GT_ItsNotMyFaultException("Make sure the Crop ID is valid!"); if (aBaseSeed != null) Crops.instance.registerBaseSeed(aBaseSeed, aID, 1, 1, 1, 1); + sCropList.add(this); } } @@ -129,7 +134,18 @@ public class GT_BaseCrop extends CropCard { } return false; } + + @Override + @SideOnly(Side.CLIENT) + public void registerSprites(IIconRegister iconRegister) { + textures = new IIcon[maxSize()]; + for (int i = 1; i <= textures.length; i++) { + String name = GT_Utility.capitalizeString(mName.substring(9)); + textures[i - 1] = iconRegister.registerIcon("ic2:crop/blockCrop." + name + "."+i); + } + } + @Override public int getOptimalHavestSize(ICropTile crop) { return (byte)mAfterHarvestSize; diff --git a/src/main/java/gregtechmod/loaders/postload/GT_CropLoader.java b/src/main/java/gregtechmod/loaders/postload/GT_CropLoader.java index bf22bf6..bcfbe70 100644 --- a/src/main/java/gregtechmod/loaders/postload/GT_CropLoader.java +++ b/src/main/java/gregtechmod/loaders/postload/GT_CropLoader.java @@ -1,5 +1,6 @@ package gregtechmod.loaders.postload; +import gregtechmod.api.GregTech_API; import gregtechmod.api.util.GT_BaseCrop; import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_OreDictUnificator; @@ -13,31 +14,29 @@ public class GT_CropLoader implements Runnable { public void run() { GT_Log.log.info("GT_Mod: Register Crops to IC2."); try { - new GT_BaseCrop(124, "Indigo" , "Eloraam" , GT_MetaItem_Material.instance.getStack(8, 1) , null , GT_MetaItem_Material.instance.getStack(8, 4) , 2, 4, 0, 1, 4, 1, 1, 0, 4, 0, new String[] {"Flower", "Color", "Ingredient"}); - new GT_BaseCrop(125, "Flax" , "Eloraam" , new ItemStack(Items.string, 1) , null , null , 2, 4, 0, 1, 4, 1, 1, 2, 0, 1, new String[] {"Silk", "Vine", "Addictive"}); - new GT_BaseCrop(126, "Oilberries" , "Spacetoad" , GT_MetaItem_Material.instance.getStack(7, 1) , null , null , 9, 4, 0, 1, 4, 6, 1, 2, 1,12, new String[] {"Fire", "Dark", "Reed", "Rotten", "Coal", "Oil"}); - new GT_BaseCrop(127, "Bobsyeruncleranks", "GenerikB" , GT_OreDictUnificator.get("dustSmallEmerald",1), new ItemStack[] {new ItemStack(Items.emerald, 1)} , null ,11, 4, 0, 1, 4, 4, 0, 8, 2, 9, new String[] {"Shiny", "Vine", "Emerald", "Berylium", "Crystal"}); - new GT_BaseCrop(128, "Diareed" , "Direwolf20" , GT_OreDictUnificator.get("dustSmallDiamond",1), new ItemStack[] {new ItemStack(Items.diamond, 1)} , null ,12, 4, 0, 1, 4, 5, 0,10, 2,10, new String[] {"Fire", "Shiny", "Reed", "Coal", "Diamond", "Crystal"}); - new GT_BaseCrop(129, "Withereed" , "CovertJaguar" , GT_OreDictUnificator.get("dustCoal", 1) , new ItemStack[] {new ItemStack(Items.coal, 1), new ItemStack(Items.coal, 1)} , null , 8, 4, 0, 1, 4, 2, 0, 4, 1, 3, new String[] {"Fire", "Undead", "Reed", "Coal", "Rotten", "Wither"}); - new GT_BaseCrop(130, "Blazereed" , "Mr. Brain" , new ItemStack(Items.blaze_powder, 1) , new ItemStack[] {new ItemStack(Items.blaze_rod, 1)} , null , 6, 4, 0, 1, 4, 0, 4, 1, 0, 0, new String[] {"Fire", "Blaze", "Reed", "Sulfur"}); - new GT_BaseCrop(131, "Eggplant" , "Link" , new ItemStack(Items.egg, 1) , new ItemStack[] {new ItemStack(Items.chicken, 1), new ItemStack(Items.feather , 1), new ItemStack(Items.feather , 1), new ItemStack(Items.feather , 1)} , null , 6, 3, 900, 2, 3, 0, 4, 1, 0, 0, new String[] {"Chicken", "Egg", "Edible", "Feather", "Flower", "Addictive"}); - new GT_BaseCrop(132, "Corium" , "Gregorius Techneticies" , new ItemStack(Items.leather, 1) , null , null , 6, 4, 0, 1, 4, 0, 2, 3, 1, 0, new String[] {"Cow", "Silk", "Vine"}); - new GT_BaseCrop(133, "Corpseplant" , "Mr. Kenny" , new ItemStack(Items.rotten_flesh, 1) , new ItemStack[] {new ItemStack(Items.dye, 1, 15), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone, 1)} , null , 5, 4, 0, 1, 4, 0, 2, 1, 0, 3, new String[] {"Toxic", "Undead", "Vine", "Edible", "Rotten"}); - new GT_BaseCrop(134, "Creeperweed" , "General Spaz" , GT_OreDictUnificator.get("dustGunpowder", 1) , null , null , 7, 4, 0, 1, 4, 3, 0, 5, 1, 3, new String[] {"Creeper", "Vine", "Explosive", "Fire", "Sulfur", "Saltpeter", "Coal"}); - new GT_BaseCrop(135, "Enderbloom" , "RichardG" , GT_OreDictUnificator.get("dustEnderPearl", 1) , new ItemStack[] {new ItemStack(Items.ender_pearl, 1), new ItemStack(Items.ender_pearl , 1), new ItemStack(Items.ender_eye , 1)} , null ,10, 4, 0, 1, 4, 5, 0, 2, 1, 6, new String[] {"Ender", "Flower", "Shiny"}); - new GT_BaseCrop(136, "Meatrose" , "VintageBeef" , new ItemStack(Items.dye, 1, 9) , new ItemStack[] {new ItemStack(Items.beef, 1), new ItemStack(Items.porkchop , 1), new ItemStack(Items.chicken , 1), new ItemStack(Items.fish , 1)} , null , 7, 4, 1500, 1, 4, 0, 4, 1, 3, 0, new String[] {"Edible", "Flower", "Cow", "Fish", "Chicken", "Pig"}); - new GT_BaseCrop(137, "Milkwart" , "Mr. Brain" , new ItemStack(Items.milk_bucket, 1) , null , null , 6, 3, 900, 1, 3, 0, 3, 0, 1, 0, new String[] {"Edible", "Milk", "Cow"}); - new GT_BaseCrop(138, "Slimeplant" , "Neowulf" , new ItemStack(Items.slime_ball, 1) , null , null , 6, 4, 0, 3, 4, 3, 0, 0, 0, 2, new String[] {"Slime", "Bouncy", "Sticky", "Bush"}); - new GT_BaseCrop(139, "Spidernip" , "Mr. Kenny" , new ItemStack(Items.string, 1) , new ItemStack[] {new ItemStack(Items.spider_eye, 1), new ItemStack(Blocks.web , 1)} , null , 4, 4, 600, 1, 4, 2, 1, 4, 1, 3, new String[] {"Toxic", "Silk", "Spider", "Flower", "Ingredient", "Addictive"}); - new GT_BaseCrop(140, "Tearstalks" , "Neowulf" , new ItemStack(Items.ghast_tear, 1) , null , null , 8, 4, 0, 1, 4, 1, 2, 0, 0, 0, new String[] {"Healing", "Nether", "Ingredient", "Reed", "Ghast"}); - new GT_BaseCrop(141, "Tine" , "Gregorius Techneticies" , GT_OreDictUnificator.get("nuggetTin", 1) , null , null , 5, 3, 0, 2, 3, 2, 0, 3, 0, 0, new String[] {"Shiny", "Metal", "Pine", "Tin", "Bush"}); - new GT_BaseCrop(142, "Coppon" , "Mr. Brain" , GT_OreDictUnificator.get("nuggetCopper", 1) , null , null , 6, 3, 0, 2, 3, 2, 0, 1, 1, 1, new String[] {"Shiny", "Metal", "Cotton", "Copper", "Bush"}); - new GT_BaseCrop(143, "Brown Mushrooms" , "Mr. Brain" , new ItemStack(Blocks.brown_mushroom, 1) , null , new ItemStack(Blocks.brown_mushroom, 4) , 1, 3, 0, 1, 3, 0, 2, 0, 0, 2, new String[] {"Edible", "Mushroom", "Ingredient"}); - new GT_BaseCrop(144, "Red Mushrooms" , "Mr. Kenny" , new ItemStack(Blocks.red_mushroom, 1) , null , new ItemStack(Blocks.red_mushroom , 4) , 1, 3, 0, 1, 3, 0, 1, 3, 0, 2, new String[] {"Toxic", "Mushroom", "Ingredient"}); - new GT_BaseCrop(145, "Argentia" , "Eloraam" , GT_OreDictUnificator.get("nuggetSilver", 1) , null , null , 7, 4, 0, 3, 4, 2, 0, 1, 0, 0, new String[] {"Shiny", "Metal", "Silver", "Reed"}); - new GT_BaseCrop(146, "Plumbilia" , "KingLemming" , GT_OreDictUnificator.get("nuggetLead", 1) , null , null , 6, 4, 0, 3, 4, 2, 0, 3, 1, 1, new String[] {"Heavy", "Metal", "Lead", "Reed"}); + new GT_BaseCrop(124, "gt_crops.indigo" , "Eloraam" , GT_MetaItem_Material.instance.getStack(8, 1) , null , GT_MetaItem_Material.instance.getStack(8, 4) , 2, 4, 0, 1, 4, 1, 1, 0, 4, 0, new String[] {"Flower", "Color", "Ingredient"}); + new GT_BaseCrop(125, "gt_crops.flax" , "Eloraam" , new ItemStack(Items.string, 1) , null , null , 2, 4, 0, 1, 4, 1, 1, 2, 0, 1, new String[] {"Silk", "Vine", "Addictive"}); + new GT_BaseCrop(126, "gt_crops.oilberries" , "Spacetoad" , GT_MetaItem_Material.instance.getStack(7, 1) , null , null , 9, 4, 0, 1, 4, 6, 1, 2, 1,12, new String[] {"Fire", "Dark", "Reed", "Rotten", "Coal", "Oil"}); + new GT_BaseCrop(127, "gt_crops.bobsyeruncleranks" , "GenerikB" , GT_OreDictUnificator.get("dustSmallEmerald",1), new ItemStack[] {new ItemStack(Items.emerald, 1)} , null ,11, 4, 0, 1, 4, 4, 0, 8, 2, 9, new String[] {"Shiny", "Vine", "Emerald", "Berylium", "Crystal"}); + new GT_BaseCrop(128, "gt_crops.diareed" , "Direwolf20" , GT_OreDictUnificator.get("dustSmallDiamond",1), new ItemStack[] {new ItemStack(Items.diamond, 1)} , null ,12, 4, 0, 1, 4, 5, 0,10, 2,10, new String[] {"Fire", "Shiny", "Reed", "Coal", "Diamond", "Crystal"}); + new GT_BaseCrop(129, "gt_crops.withereed" , "CovertJaguar" , GT_OreDictUnificator.get("dustCoal", 1) , new ItemStack[] {new ItemStack(Items.coal, 1), new ItemStack(Items.coal, 1)} , null , 8, 4, 0, 1, 4, 2, 0, 4, 1, 3, new String[] {"Fire", "Undead", "Reed", "Coal", "Rotten", "Wither"}); + new GT_BaseCrop(130, "gt_crops.blazereed" , "Mr. Brain" , new ItemStack(Items.blaze_powder, 1) , new ItemStack[] {new ItemStack(Items.blaze_rod, 1)} , null , 6, 4, 0, 1, 4, 0, 4, 1, 0, 0, new String[] {"Fire", "Blaze", "Reed", "Sulfur"}); + new GT_BaseCrop(131, "gt_crops.eggplant" , "Link" , new ItemStack(Items.egg, 1) , new ItemStack[] {new ItemStack(Items.chicken, 1), new ItemStack(Items.feather , 1), new ItemStack(Items.feather , 1), new ItemStack(Items.feather , 1)} , null , 6, 3, 900, 2, 3, 0, 4, 1, 0, 0, new String[] {"Chicken", "Egg", "Edible", "Feather", "Flower", "Addictive"}); + new GT_BaseCrop(132, "gt_crops.corium" , "Gregorius Techneticies" , new ItemStack(Items.leather, 1) , null , null , 6, 4, 0, 1, 4, 0, 2, 3, 1, 0, new String[] {"Cow", "Silk", "Vine"}); + new GT_BaseCrop(133, "gt_crops.corpseplant" , "Mr. Kenny" , new ItemStack(Items.rotten_flesh, 1) , new ItemStack[] {new ItemStack(Items.dye, 1, 15), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone, 1)} , null , 5, 4, 0, 1, 4, 0, 2, 1, 0, 3, new String[] {"Toxic", "Undead", "Vine", "Edible", "Rotten"}); + new GT_BaseCrop(134, "gt_crops.creeperweed" , "General Spaz" , GT_OreDictUnificator.get("dustGunpowder", 1) , null , null , 7, 4, 0, 1, 4, 3, 0, 5, 1, 3, new String[] {"Creeper", "Vine", "Explosive", "Fire", "Sulfur", "Saltpeter", "Coal"}); + new GT_BaseCrop(135, "gt_crops.enderbloom" , "RichardG" , GT_OreDictUnificator.get("dustEnderPearl", 1) , new ItemStack[] {new ItemStack(Items.ender_pearl, 1), new ItemStack(Items.ender_pearl , 1), new ItemStack(Items.ender_eye , 1)} , null ,10, 4, 0, 1, 4, 5, 0, 2, 1, 6, new String[] {"Ender", "Flower", "Shiny"}); + new GT_BaseCrop(136, "gt_crops.meatrose" , "VintageBeef" , new ItemStack(Items.dye, 1, 9) , new ItemStack[] {new ItemStack(Items.beef, 1), new ItemStack(Items.porkchop , 1), new ItemStack(Items.chicken , 1), new ItemStack(Items.fish , 1)} , null , 7, 4, 1500, 1, 4, 0, 4, 1, 3, 0, new String[] {"Edible", "Flower", "Cow", "Fish", "Chicken", "Pig"}); + new GT_BaseCrop(137, "gt_crops.milkwart" , "Mr. Brain" , new ItemStack(Items.milk_bucket, 1) , null , null , 6, 3, 900, 1, 3, 0, 3, 0, 1, 0, new String[] {"Edible", "Milk", "Cow"}); + new GT_BaseCrop(138, "gt_crops.slimeplant" , "Neowulf" , new ItemStack(Items.slime_ball, 1) , null , null , 6, 4, 0, 3, 4, 3, 0, 0, 0, 2, new String[] {"Slime", "Bouncy", "Sticky", "Bush"}); + new GT_BaseCrop(139, "gt_crops.spidernip" , "Mr. Kenny" , new ItemStack(Items.string, 1) , new ItemStack[] {new ItemStack(Items.spider_eye, 1), new ItemStack(Blocks.web , 1)} , null , 4, 4, 600, 1, 4, 2, 1, 4, 1, 3, new String[] {"Toxic", "Silk", "Spider", "Flower", "Ingredient", "Addictive"}); + new GT_BaseCrop(140, "gt_crops.tearstalks" , "Neowulf" , new ItemStack(Items.ghast_tear, 1) , null , null , 8, 4, 0, 1, 4, 1, 2, 0, 0, 0, new String[] {"Healing", "Nether", "Ingredient", "Reed", "Ghast"}); + new GT_BaseCrop(141, "gt_crops.tine" , "Gregorius Techneticies" , GT_OreDictUnificator.get("nuggetTin", 1) , null , null , 5, 3, 0, 2, 3, 2, 0, 3, 0, 0, new String[] {"Shiny", "Metal", "Pine", "Tin", "Bush"}); } catch(Throwable e) { GT_Log.log.error("GT_Mod: Failed to register Crops to IC2."); + if (GregTech_API.DEBUG_MODE) { + GT_Log.log.catching(e); + } } } } \ No newline at end of file diff --git a/src/main/resources/assets/gregtech_addon/lang/en_US.lang b/src/main/resources/assets/gregtech_addon/lang/en_US.lang index ab1ed2a..225df0f 100644 --- a/src/main/resources/assets/gregtech_addon/lang/en_US.lang +++ b/src/main/resources/assets/gregtech_addon/lang/en_US.lang @@ -1416,6 +1416,25 @@ item.GT_SensorCard_Item.tooltip.info.1=Device at: item.GT_SensorCard_Item.tooltip.info.2=x: %d y: %d z: %d item.GT_SensorCard_Item.tooltip.info.missing=Missing Coordinates! +gt_crops.indigo=Indigo +gt_crops.flax=Flax +gt_crops.oilberries=Oilberries +gt_crops.bobsyeruncleranks=Bobsyeruncleranks +gt_crops.diareed=Diareed +gt_crops.withereed=Withereed +gt_crops.blazereed=Blazereed +gt_crops.eggplant=Eggplant +gt_crops.corium=Corium +gt_crops.corpseplant=Corpseplant +gt_crops.creeperweed=Creeperweed +gt_crops.enderbloom=Enderbloom +gt_crops.meatrose=Meatrose +gt_crops.milkwart=Milkwart +gt_crops.slimeplant=Slimeplant +gt_crops.spidernip=Spidernip +gt_crops.tearstalks=Tearstalks +gt_crops.tine=Tine + metatileentity.GT_MetaTileEntity_BasicGenerator.tooltip=Generating: %d EU metatileentity.machines.input_allow=Input from Output Side allowed metatileentity.machines.input_deny=Input from Output Side forbidden diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.1.png deleted file mode 100644 index 17d81669447c453b533289843b981a29a941008a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggq7Ir~Bxo78(DFB56JY5_^EKVmUNU%yM9QJ=_uUX_X zCCVb}zyf21uU^0YyS|Yx(7LzwyyJ}{Uy5h`*G-G~e|+kMDcM*5J^tD>YnRsH)$aNy k`J0W?&l?&T3Co)>%(f8QG4;Lp4xrf#p00i_>zopr0Oia>(*OVf diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.2.png deleted file mode 100644 index 113e6ba0efe46c97f18d3e65295f3ad08b8ab6ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggq7Ir~BQ?FwC1fbADPZ!4!i_^&o608ymhyCB#YZm!T ziLyAs`k+FIQ{&$JkImDT-eL!Mx1O)o21snZJ3eRds(2wl85=o(j$`Z z?(A#6{Ifjoexks1q2sv>_WJV7^49u(%s*~aO8%()Ss?x4-*a}hOy0~nY#!Mj#(Vz% zWZceJzWz>fMcHplKjwLN>&_K?KV^G|ZNujc#x~a9dA2h?pJxc<9RA60&(V1ON~ZbS QfR1JGboFyt=akR{03h~gJOBUy diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.3.png deleted file mode 100644 index 85f00bed5df12b827cc92cadc30928416de61b4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 523 zcmV+m0`&cfP)JLCW1>- z|A3e@l;I=}g@RCiM1IuMKq7C0yw`hbgwfsZ@7{aPx##i&{xh5>9F01ok|(T(g?3d> ze+FpP+gS82jHFZn5O>8GcAoulaA(CrCVrAE4(o6QVl16H2i6D`d3xPZGn}!06 zO=tlCYgg+OD)J-_my1;Zz^ua#0LUeB;G*t9zYZ%$Wa1~OA4FV%i@GV?j!186k)d6C z2LK2k0*pEXUQk8c6=US!7tQIrVbm9&G&=tDy2YvYb=ngf}s58JYuE%5j z2?_VBE|YyqW*GV;gwjNBhK!%{ArL!;Bg^X^EDXV?SA*(bIv{Y1O78Yr(x=MW`Iq&1rFvl zEBzUu-Rxj?X{IlwDuAo`O9MB}{W`dRazT!ylRSZOeFbs^&q6(G@PbH*SX7nk0t}9r z0RV+^mEoypDUbjl-`)3O-zYDoy1pwd~8$~8xB9=t1>6#d? zY|zBvB(Y3|a+M0@DuuHVI%pn|?oX5(wYO*ekshA#c;8SF8s!VfvP^R(NHs}mV5PIl q6acLUiQ2Z(q^(Ic38qz(3g8D%*}?x-aWB~b0000UB4*S2e*DUgx x5@nHfU22WQ%mvv4FO#o7BEr$RA diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Brown Mushrooms.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Brown Mushrooms.2.png deleted file mode 100644 index 4578bce9425d399b285cf77a36e34d7ccc92d6ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggq7Iq<3)?SH>IG|9lr;B5V#p&b(304V(!~XB=HH&Y=6bo{=Te~Y44$rjF6*2UngHkiKzjfH diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Brown Mushrooms.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Brown Mushrooms.3.png deleted file mode 100644 index 203a833935417b2cd69fdff214ea8f19d06bd650..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggq7Iq<3k>@Ks)&PYPJzX3_EKVmUNU%yM9QJ=_uUX_X zCCVa;fti`Rr!Xyz)uzSt>HB}@=kJ*{QNq$Kh1Grioz~fZK0LK<+ZS3b`SIkz*ajWW zUUB4*S2e*DUgx z5@nIau$SjTe%cTJO^ji+Z~jY4NJz|C&i&{A&&iDk^Mt4i~u Q63})APgg&ebxsLQ01uT>LI3~& diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Coppon.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Coppon.2.png deleted file mode 100644 index 5dfc060efe3b11e3bb15f1a55efa1c2eec879187..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 476 zcmV<20VDp2P)*AO)HcGuQ3J})1>--qV`{&i%EQR>vw=Vtgf&=wOfgD*J|A|=m!#9_pxf;tdpJY`0WTtvh&u)Kx{Af}F!lTWz_yLf#senkEE6z!G_K`P6#vx1`~o!GVwd#i{2`D-GI0yvICHLbw1 zEW}FQF97CqLRD{JP6E^U0cscqbo~W94``Z(euSJYj9BN&W#X(Hd=iOf3x= z05d@J#1Ysa3fds}K5~C zPCZw!T7kipmLDE!AD0@QL99m$5;8UTQz+~R2n7@2D2{+%XR1d3!FWP7#5<-<08gnmdKI;Vst0G~8NEC2ui diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.2.png deleted file mode 100644 index b5c2580b3bfa9e1394ced138a35a6b19acc04651..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggq7Ir~BLtnYyl|Z3|o-U3d7N?UFBv>UB4*S2e*DUgx z5@m6M$7AoLfAxaD*_&qVaQgXgd7S5Qxv-bdjX2qqHc73C+b|=s_p(5VB@gqFrAH*+ z-PzZC`Dc0F{X~K3LdSC%?DgfD<*oJon19@;l>AZovq1X8zvt|1nY@{E*gUd5jQ9Ni z$+(@deEpr|in8C9e$4ak)}1T(e#-U^+lJ2@jBTvH^K55)KF<)yIsB91o}=;ll}z)u Q0UgWW>FVdQ&MBb@0DVVjy8r+H diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.3.png deleted file mode 100644 index 3280ff2d94d9f571c81baceb30933fd034503816..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 523 zcmV+m0`&cfP)JLCW1>- z|A3e@l;I=}g@RCiM1IuMKq7C0yw`hbgwfsZ@7{aPx##i&{xh5>9F01ok|(T(g?3d> ze+FpP+gS82jHFZn5O>8GcAoulaA(CrCVrAE4(o6QVl16H2i6D`d3xPZGn}!06 zO=tlCYgg+OD)J-_my1;Zz^ua#0LUeB;G*t9zYZ%$Wa1~OA4FV%i@GV?j!186k)d6C z2LK2k0*pEXUQk8c6=US!7tQIrVbm9&G&=tDy2YvYb=ngf}s58JYuE%5j z2?_VBE|YyqW*GV;gwjNBhK!%{ArL!;Bg^eM0fb3J zK~y-)t&+`40#Ovje=mlN)Fh2uOeGPNxftmK45Xlq1g#RmnDfwptyWM4D zf9+RJJp`9K7b0b(eq3CPW#!CCTrQ*&qaE~X>n!U#!_f0GJQ4TwBME}BNdQ*jIoSsp zdR{uNjpN#^rjr1)tTKscM*0XsfiTrdl~S`H9M{Is^YX5KB}&bL=($}0HaFI3bc*7k zeIqng0l<2*m<~mFq)Dk+5GuKKRAo1J>=D!qJuhEg>j3oJE_2a6-rqh(hBzIH5D8Cl zzI^>n0PxVhQI(_`lH=L~Cn|COH0`c_<+1tXJfkOds#Y0*aVuZ*XW~4T3 zvsS#vtTbqJ%0kU&C7zSBNrxxrnMS85JSPkXslKWCxRoBY;=Mma$F&Ex0-<@#TXO(V ttuL|c`(VBdATt0B&&*qsz(K%+{sh8rwb4x}G=~5H002ovPDHLkV1m_J*>V5? diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Red Mushrooms.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Red Mushrooms.1.png deleted file mode 100644 index 9b8d122faa7b1e8c0f7796c6dbc71b2b496a5669..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggq7IqUB4*S2e*DUgx x5@nHfUUB4*S2e*DUgx z5@nIaAoXMU(y#v~PPkAX^kl{aQJcz-O%DaPa~#$wocaI7tiqEAc`H6WVr2$_>&HYT zwjF-L(ROgQZMDR?ieHJLKhn<2wPo+$XZRvFrdjD6N3zVs(BJiMubc01xpi9I<>bN! lDfZ?6AMV=q-*X}}gV!Ucl|~kgmO%F~c)I$ztaD0e0svAqTyOvY diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Red Mushrooms.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Red Mushrooms.3.png deleted file mode 100644 index f297f1374c5d6fd4b0e4c69ec0738fa5d5a12739..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggq7Iq;Op11cO?gk1S^>lFzu{iy9(n7970U~Ytb$6Mu zi*4UwaAA+erliQPyhqXn4t_U~<`LUncroD?^O;u8O&J0=4NuJN)6}^3_hrGp;{D9+ z+`d^e+xq?-`cf}$#&jVhup+MVp~>ljPk*$-_*9l@c4l^Uc%e)fh}ET>t%>c70O$QLbe7E1Js;fgWP;boFyt=akR{ E0PHb;E&u=k