diff --git a/gradle.properties b/gradle.properties index 5c431eea0..cb505068b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ mcversion=1.7.10 -forgeversion=10.13.4.1541-1.7.10 +forgeversion=10.13.4.1566-1.7.10 version_major=4 version_minor=2 -version_patch=2 +version_patch=3 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index ff97381b7..5183081a1 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -59,7 +59,7 @@ import forestry.plugins.PluginManager; name = "Forestry", version = Version.VERSION, guiFactory = "forestry.core.config.ForestryGuiConfigFactory", - dependencies = "required-after:Forge@[10.13.4.1448,);" + dependencies = "required-after:Forge@[10.13.4.1566,);" + "after:Buildcraft|Core@[6.1.7,);" + "after:ExtrabiomesXL;" + "after:BiomesOPlenty;" diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java index a4fa21f11..1a831b7c7 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java @@ -113,4 +113,9 @@ public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implement public Object getContainer(EntityPlayer player, int data) { return new ContainerMinecartBeehouse(player.inventory, this, true); } + + @Override + public int getIdOfEntity() { + return getEntityId(); + } } diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java index b7714189e..813e2fb2e 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java @@ -98,4 +98,9 @@ public class EntityMinecartBeehouse extends EntityMinecartBeeHousingBase { public Object getContainer(EntityPlayer player, int data) { return new ContainerMinecartBeehouse(player.inventory, this, false); } + + @Override + public int getIdOfEntity() { + return getEntityId(); + } } diff --git a/src/main/java/forestry/core/genetics/BreedingTracker.java b/src/main/java/forestry/core/genetics/BreedingTracker.java index 3acb54292..78679c067 100755 --- a/src/main/java/forestry/core/genetics/BreedingTracker.java +++ b/src/main/java/forestry/core/genetics/BreedingTracker.java @@ -113,7 +113,7 @@ public abstract class BreedingTracker extends WorldSavedData implements IBreedin } private void syncToPlayer(Collection discoveredSpecies, Collection discoveredMutations, Collection researchedMutations) { - if (world != null && username != null) { + if (world != null && username != null && username.getName() != null) { EntityPlayer player = world.getPlayerEntityByName(username.getName()); if (player instanceof EntityPlayerMP && !(player instanceof FakePlayer)) { IBreedingTracker breedingTracker = getBreedingTracker(player); diff --git a/src/main/java/forestry/core/gui/GuiHandler.java b/src/main/java/forestry/core/gui/GuiHandler.java index cddb73233..1ef367d6e 100644 --- a/src/main/java/forestry/core/gui/GuiHandler.java +++ b/src/main/java/forestry/core/gui/GuiHandler.java @@ -29,7 +29,7 @@ public class GuiHandler implements IGuiHandler { public static void openGui(EntityPlayer entityplayer, IGuiHandlerEntity guiHandler, short data) { int guiData = encodeGuiData(guiHandler, data); - entityplayer.openGui(ForestryAPI.instance, guiData, entityplayer.worldObj, guiHandler.getEntityId(), 0, 0); + entityplayer.openGui(ForestryAPI.instance, guiData, entityplayer.worldObj, guiHandler.getIdOfEntity(), 0, 0); } public static void openGui(EntityPlayer entityplayer, IGuiHandlerItem guiHandler) { diff --git a/src/main/java/forestry/core/gui/IGuiHandlerEntity.java b/src/main/java/forestry/core/gui/IGuiHandlerEntity.java index f7473d873..a44f4639d 100644 --- a/src/main/java/forestry/core/gui/IGuiHandlerEntity.java +++ b/src/main/java/forestry/core/gui/IGuiHandlerEntity.java @@ -17,5 +17,6 @@ public interface IGuiHandlerEntity extends IGuiHandlerForestry { Object getContainer(EntityPlayer player, int data); - int getEntityId(); + // can't be named getEntityId() for obfuscation reasons + int getIdOfEntity(); } diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 7414d73e7..3e1cff402 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -21,11 +21,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.FuelBurnTimeEvent; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import cpw.mods.fml.common.eventhandler.Event; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.VillagerRegistry; @@ -38,6 +42,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; +import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.VillageHandlerArboriculture; import forestry.arboriculture.WoodItemAccess; import forestry.arboriculture.blocks.BlockArboricultureType; @@ -119,6 +124,9 @@ public class PluginArboriculture extends ForestryPlugin { public void preInit() { super.preInit(); + // register for FuelBurnTimeEvent + MinecraftForge.EVENT_BUS.register(this); + for (EnumWoodType woodType : EnumWoodType.VALUES) { WoodItemAccess.registerLog(blocks.logs, woodType, false); WoodItemAccess.registerPlanks(blocks.planks, woodType, false); @@ -411,11 +419,24 @@ public class PluginArboriculture extends ForestryPlugin { return 100; } - if (blocks.slabs == Block.getBlockFromItem(item)) { - return 150; - } - return 0; } } + + @SubscribeEvent + public void fuelBurnTimeEvent(FuelBurnTimeEvent fuelBurnTimeEvent) { + Item item = fuelBurnTimeEvent.fuel.getItem(); + Block block = Block.getBlockFromItem(item); + + if (block instanceof IWoodTyped) { + IWoodTyped woodTypedBlock = (IWoodTyped) block; + if (woodTypedBlock.isFireproof()) { + fuelBurnTimeEvent.burnTime = 0; + fuelBurnTimeEvent.setResult(Event.Result.DENY); + } else if (blocks.slabs == block) { + fuelBurnTimeEvent.burnTime = 150; + fuelBurnTimeEvent.setResult(Event.Result.DENY); + } + } + } }