diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-11-28 20:35:13 +0100 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-11-28 20:35:20 +0100 |
| commit | 4fd0a7f47340b496ae2c24c0e43e8fead0407f50 (patch) | |
| tree | 4c302af11a6a900b1e1cc6788648e8fac61289c6 /src/main/java/gregtech/loaders/misc | |
| parent | aeff64f9356b85224ce76f9175f0475c04395738 (diff) | |
| download | GT5-Unofficial-4fd0a7f47340b496ae2c24c0e43e8fead0407f50.tar.gz GT5-Unofficial-4fd0a7f47340b496ae2c24c0e43e8fead0407f50.tar.bz2 GT5-Unofficial-4fd0a7f47340b496ae2c24c0e43e8fead0407f50.zip | |
Fix forestry compatibility and add luber ability to chainsaw
Diffstat (limited to 'src/main/java/gregtech/loaders/misc')
| -rw-r--r-- | src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 690a1ba655..1f186d2ed3 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -9,10 +9,13 @@ import forestry.apiculture.genetics.Bee; import forestry.apiculture.genetics.BeeDefinition; import forestry.apiculture.genetics.BeeVariation; import forestry.apiculture.genetics.IBeeDefinition; -import forestry.core.config.ForestryItem; +//import forestry.apiculture.items.EnumHoneyComb; import forestry.core.genetics.alleles.AlleleHelper; +//import forestry.plugins.PluginApiculture; import gregtech.api.GregTech_API; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; +import gregtech.api.util.GT_ModHandler; import gregtech.common.items.CombType; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -26,7 +29,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { CLAY(GT_BranchDefinition.ORGANIC, "Clay", true, 0x19d0ec, 0xffdc16) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 0), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f); beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -45,7 +48,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { SLIMEBALL(GT_BranchDefinition.ORGANIC, "SlimeBall", true, 0x4E9E55, 0x00FF15) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 15), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.30f); beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -65,7 +68,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LIGNIE), 0.30f); - beeSpecies.addProduct(ForestryItem.peat.getItemStack(1), 0.15f); + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); } @@ -83,7 +86,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { STICKYRESIN(GT_BranchDefinition.ORGANIC, "StickyResin", true, 0x2E8F5B, 0xDCC289) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 0), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); beeSpecies.addProduct(ItemList.IC2_Resin.get(1, new Object[0]), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -121,7 +124,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { OIL(GT_BranchDefinition.ORGANIC, "Oil", true, 0x4C4C4C, 0x333333) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(ForestryItem.beeComb.getItemStack(1, 0), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OIL), 0.15f); beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); |