diff --git a/build.gradle b/build.gradle index 77c9e09..58a759c 100644 --- a/build.gradle +++ b/build.gradle @@ -29,14 +29,13 @@ group= "magicbees" // http://maven.apache.org/guides/mini/guide-naming-conventio archivesBaseName = "magicbees" minecraft { - version = "1.7.10-10.13.0.1188" + version = "1.7.10-10.13.0.1208" assetDir = "eclipse/assets" } dependencies { - - compile files("/libs/Thaumcraft-1.7.2-4.1.1.14.jar") - compile 'net.sengir.forestry:forestry_1.7.10:2.4.2.31:dev' + compile files("/libs/Thaumcraft-1.7.10-4.2.0.0.jar") + compile 'net.sengir.forestry:forestry_1.7.10:3.0.0.90:dev' compile files("/libs/Blood Magic-v1.1.0(1.7.10).jar") } diff --git a/src/main/java/magicbees/bees/Allele.java b/src/main/java/magicbees/bees/Allele.java index 537ac6f..435f122 100644 --- a/src/main/java/magicbees/bees/Allele.java +++ b/src/main/java/magicbees/bees/Allele.java @@ -260,4 +260,9 @@ public class Allele implements IAllele return LocalizationManager.getLocalizedString(getUID()); } + @Override + public String getUnlocalizedName() { + return this.uid; + } + } diff --git a/src/main/java/magicbees/bees/BeeMutation.java b/src/main/java/magicbees/bees/BeeMutation.java index 9935fac..7a7e035 100644 --- a/src/main/java/magicbees/bees/BeeMutation.java +++ b/src/main/java/magicbees/bees/BeeMutation.java @@ -52,7 +52,7 @@ public class BeeMutation implements IBeeMutation { for (String str : binnieMundane) { - LogHelper.info("Registering %s" + str); + LogHelper.info("Registering " + str); try { new BeeMutation(species, Allele.getExtraSpecies(str), ForestryHelper.getTemplateForestryForSpecies("Common"), 15); } catch (Exception e) { @@ -374,10 +374,10 @@ public class BeeMutation implements IBeeMutation if (this.requiredBlockOreDictEntry != null) { - int dicId = OreDictionary.getOreID(new ItemStack(blockBelow, 1, blockMeta)); - if (dicId != -1) + int[] dicId = OreDictionary.getOreIDs(new ItemStack(blockBelow, 1, blockMeta)); + if (dicId.length != 0) { - if (!OreDictionary.getOreName(dicId).equals(this.requiredBlockOreDictEntry)) + if (!OreDictionary.getOreName(dicId[1]).equals(this.requiredBlockOreDictEntry)) { chance = 0; } diff --git a/src/main/java/magicbees/bees/BeeSpecies.java b/src/main/java/magicbees/bees/BeeSpecies.java index af2895c..7ba08d0 100644 --- a/src/main/java/magicbees/bees/BeeSpecies.java +++ b/src/main/java/magicbees/bees/BeeSpecies.java @@ -1788,6 +1788,12 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider return LocalizationManager.getLocalizedString(getUID() + ".description"); } + @Override + public String getUnlocalizedName() + { + return getUID(); + } + @Override public EnumTemperature getTemperature() { diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index d937fcb..988cbcc 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -207,6 +207,7 @@ public class Config this.doMiscConfig(); this.ForestryDebugEnabled = (new File("./config/forestry/DEBUG.ON")).exists(); + this.configuration.save(); } @SubscribeEvent @@ -231,7 +232,8 @@ public class Config { if (ThaumcraftHelper.isActive()) { - planksWood = new BlockPlanks(); + /** + planksWood = new BlockPlanks(); planksWood.setBlockName("planks"); //Item.itemsList[planksWood.blockID] = null; @@ -255,8 +257,9 @@ public class Config Item.itemsList[slabWoodFull.blockID] = new ItemSlab(slabWoodFull.blockID - 256, slabWoodHalf, slabWoodFull, true);*/ - OreDictionary.registerOre("plankWood", new ItemStack(planksWood, 1, -1)); - OreDictionary.registerOre("slabWood", new ItemStack(slabWoodHalf, 1, -1)); + //OreDictionary.registerOre("plankWood", new ItemStack(planksWood, 1, -1)); + //OreDictionary.registerOre("slabWood", new ItemStack(slabWoodHalf, 1, -1)); + } } diff --git a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java index 97f278e..89059cb 100644 --- a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java @@ -3,12 +3,15 @@ package magicbees.main.utils.compat; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.core.config.ForestryBlock; +import forestry.core.config.ForestryItem; import magicbees.main.utils.BlockInterface; import magicbees.main.utils.ItemInterface; import forestry.api.genetics.IAllele; import magicbees.bees.BeeManager; import magicbees.main.Config; import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; public class ForestryHelper diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index c21ee60..c32f156 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -2,6 +2,8 @@ package magicbees.main.utils.compat; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; +import forestry.core.config.ForestryBlock; +import forestry.core.config.ForestryItem; import magicbees.main.utils.ItemInterface; import magicbees.main.utils.BlockInterface; import magicbees.item.types.PollenType; @@ -11,6 +13,7 @@ import magicbees.item.types.WaxType; import magicbees.main.CommonProxy; import magicbees.main.Config; import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.LogHelper; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -521,40 +524,40 @@ public class ThaumcraftHelper item = new ItemStack(Config.fHiveBlock); ThaumcraftApi.registerObjectTag(item, list); ThaumcraftApi.registerObjectTag(new ItemStack(Config.hive), list); - + list = new AspectList().add(Aspect.LIGHT, 1); - item = ItemInterface.getItemStack("candle"); + item = ForestryBlock.candle.getItemStack(); ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); list = new AspectList().add(Aspect.DARKNESS, 1); - item = ItemInterface.getItemStack("stump"); + item = ForestryBlock.stump.getItemStack(); ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); list = new AspectList(new ItemStack(Blocks.glass)).add(Aspect.SENSES, 1); - item = ItemInterface.getItemStack("glass"); + item = ForestryBlock.glass.getItemStack(); ThaumcraftApi.registerObjectTag(item, list); list = new AspectList().add(Aspect.EARTH, 2).add(Aspect.WATER, 2); - item = ItemInterface.getItemStack("soil"); + item = ForestryBlock.soil.getItemStack(); ThaumcraftApi.registerObjectTag(item, new int[]{1}, list); list = new AspectList(new ItemStack(Blocks.leaves)); - item = ItemInterface.getItemStack("leaves"); + item = ForestryBlock.leaves.getItemStack(); ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list); list = new AspectList(new ItemStack(Blocks.sapling)); - item = ItemInterface.getItemStack("saplingGE"); + item = ForestryBlock.saplingGE.getItemStack(); ThaumcraftApi.registerObjectTag(item, list); list = new AspectList()/*.add(Aspect.SEED, 1)*/.add(Aspect.PLANT, 1); - item = ItemInterface.getItemStack("pollenFertile"); + item = ForestryItem.pollenFertile.getItemStack(); ThaumcraftApi.registerObjectTag(item, list); list = new AspectList().add(Aspect.CRYSTAL, 1).add(Aspect.EARTH, 2); - item = ItemInterface.getItemStack("resources"); + item = ForestryItem.apatite.getItemStack(); ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.BlockResource.APATITE.ordinal()), list.copy()/*.add(Aspect.STONE, 2)*/); - item = ItemInterface.getItemStack("apatite"); + item = ForestryItem.apatite.getItemStack(); ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, item.getItemDamage()), list.copy().add(Aspect.CRYSTAL, 2)); diff --git a/src/main/java/magicbees/storage/BackpackDefinition.java b/src/main/java/magicbees/storage/BackpackDefinition.java index 35e49db..998a079 100644 --- a/src/main/java/magicbees/storage/BackpackDefinition.java +++ b/src/main/java/magicbees/storage/BackpackDefinition.java @@ -39,7 +39,12 @@ public class BackpackDefinition implements IBackpackDefinition return this.name; } - @Override + @Override + public String getName(ItemStack backpack) { + return backpack.getDisplayName(); + } + + @Override public int getPrimaryColour() { return this.colour; @@ -60,12 +65,6 @@ public class BackpackDefinition implements IBackpackDefinition } } - @Override - public Collection getValidItems(EntityPlayer player) - { - return this.items; - } - @Override public boolean isValidItem(EntityPlayer player, ItemStack itemStack) {