diff --git a/build.gradle b/build.gradle index 2743e8b8b..5f65e1b9f 100644 --- a/build.gradle +++ b/build.gradle @@ -87,15 +87,15 @@ configurations { //End of the SCP config dependencies { - minecraft 'net.minecraftforge:forge:1.14.4-28.0.40' + minecraft 'net.minecraftforge:forge:1.14.4-28.0.49' //deobfCompile "com.mod-buildcraft:buildcraft-api:7.99.17" //deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" - compileOnly fg.deobf("mezz.jei:jei-1.14.3:6.0.0.8:api") - runtimeOnly fg.deobf("mezz.jei:jei-1.14.3:6.0.0.8") + compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.10:api") + runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.10") - compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.3-0.14:api") - runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.3-0.14") + compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.4-0.22:api") + runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.4-0.22") //deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" //and a bit more for SCP diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 17ff582fb..c673528f8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -15,11 +15,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent; import net.minecraftforge.api.distmarker.Dist; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.TileSignature; @@ -50,8 +48,8 @@ public final class ClientTickHandler { } @SubscribeEvent - public static void renderTick(RenderTickEvent event) { - if(event.phase == Phase.START) + public static void renderTick(TickEvent.RenderTickEvent event) { + if(event.phase == TickEvent.Phase.START) partialTicks = event.renderTickTime; else { calcDelta(); @@ -59,8 +57,8 @@ public final class ClientTickHandler { } @SubscribeEvent - public static void clientTickEnd(ClientTickEvent event) { - if(event.phase == Phase.END) { + public static void clientTickEnd(TickEvent.ClientTickEvent event) { + if(event.phase == TickEvent.Phase.END) { RedStringRenderer.tick(); ItemsRemainingRenderHandler.tick(); diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index 0341d3dd4..444ef1ac8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -24,9 +24,8 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.registry.Registry; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.StringTextComponent; +import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.registries.ForgeRegistries; import org.lwjgl.glfw.GLFW; import vazkii.botania.api.corporea.CorporeaHelper; @@ -68,8 +67,8 @@ public class CorporeaAutoCompleteHandler { } @SubscribeEvent - public void onTick(ClientTickEvent event) { - if(event.phase != Phase.END) + public void onTick(TickEvent.ClientTickEvent event) { + if(event.phase != TickEvent.Phase.END) return; Screen screen = Minecraft.getInstance().currentScreen; if(!(screen instanceof ChatScreen)) { diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 9785cd4a4..11e538036 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -34,11 +34,9 @@ import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.storage.WorldSavedData; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.common.gameevent.TickEvent.Type; import net.minecraftforge.fml.server.ServerLifecycleHooks; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -182,7 +180,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl @SubscribeEvent public void tickEnd(TickEvent.ServerTickEvent event) { - if(event.type == Type.SERVER && event.phase == Phase.END) { + if(event.type == TickEvent.Type.SERVER && event.phase == TickEvent.Phase.END) { for(DimWithPos s : coordsToCheck.keySet()) { decrCoords(s); if(checkedCoords.contains(s)) diff --git a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java index 0517806a3..98572473e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -10,10 +10,9 @@ */ package vazkii.botania.common.core.handler; +import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.common.lib.LibMisc; @@ -23,8 +22,8 @@ public final class CommonTickHandler { private CommonTickHandler() {} @SubscribeEvent - public static void onTick(WorldTickEvent event) { - if(event.phase == Phase.END) { + public static void onTick(TickEvent.WorldTickEvent event) { + if(event.phase == TickEvent.Phase.END) { CorporeaHelper.clearCache(); } } diff --git a/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java b/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java index e094048d3..3ffe04d00 100644 --- a/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java @@ -19,8 +19,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.InvWrapper; diff --git a/src/main/java/vazkii/botania/common/crafting/ReloadListener.java b/src/main/java/vazkii/botania/common/crafting/ReloadListener.java index a6c74e275..a6853a930 100644 --- a/src/main/java/vazkii/botania/common/crafting/ReloadListener.java +++ b/src/main/java/vazkii/botania/common/crafting/ReloadListener.java @@ -50,7 +50,5 @@ public class ReloadListener implements IResourceManagerReloadListener { BotaniaAPI.runeAltarRecipes = ImmutableMap.copyOf(runeAltar); PacketHandler.HANDLER.send(PacketDistributor.ALL.noArg(), new PacketSyncRecipes(brew, elvenTrade, manaInfusion, apothecary, pureDaisy, runeAltar)); - - LexiconData.reload(); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 43674292e..a62063cac 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -62,9 +62,9 @@ import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.network.NetworkHooks; @@ -333,7 +333,7 @@ public class ItemCraftingHalo extends ItemMod { ItemNBTHelper.setCompound(stack, TAG_STORED_RECIPE_PREFIX + pos, getLastCraftingCompound(stack, false)); } - private void onItemCrafted(ItemCraftedEvent event) { + private void onItemCrafted(PlayerEvent.ItemCraftedEvent event) { if(!(event.getPlayer().openContainer instanceof ContainerCraftingHalo) || !(event.getInventory() instanceof CraftingInventory)) return; @@ -344,7 +344,7 @@ public class ItemCraftingHalo extends ItemMod { } } - private void saveRecipeToStack(ItemCraftedEvent event, ItemStack stack) { + private void saveRecipeToStack(PlayerEvent.ItemCraftedEvent event, ItemStack stack) { CompoundNBT cmp = new CompoundNBT(); if(event.getInventory() instanceof CraftingInventory) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 88742ac12..d4c120638 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -27,11 +27,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.LogicalSide; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.gameevent.TickEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IFloatingFlower.IslandType; @@ -122,7 +121,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { @SubscribeEvent public static void onTickEnd(TickEvent.WorldTickEvent event) { - if(event.side == LogicalSide.SERVER && event.phase == Phase.END) { + if(event.side == LogicalSide.SERVER && event.phase == TickEvent.Phase.END) { DimensionType dim = event.world.getDimension().getType(); if(blockSwappers.containsKey(dim)) { blockSwappers.get(dim).removeIf(next -> next == null || !next.tick()); diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 1a3f2fb95..83800b76a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -18,9 +18,9 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -77,7 +77,7 @@ public class ItemKeepIvy extends ItemMod { } @SubscribeEvent - public static void onPlayerRespawn(PlayerRespawnEvent event) { + public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) { CompoundNBT data = event.getPlayer().getEntityData(); if(data.contains(PlayerEntity.PERSISTED_NBT_TAG)) { CompoundNBT cmp = data.getCompound(PlayerEntity.PERSISTED_NBT_TAG); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 92bb6061c..118c66f8f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -39,8 +39,8 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.mana.IManaUsingItem; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index df5300400..6c500423d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -23,8 +23,8 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index 3c492965c..470f45877 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -24,9 +24,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.common.item.ItemTemperanceStone; @@ -126,7 +125,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker if(event.world.isRemote) return; - if(event.phase == Phase.END) { + if(event.phase == TickEvent.Phase.END) { DimensionType dim = event.world.getDimension().getType(); if(blockSwappers.containsKey(dim)) { Set swappers = blockSwappers.get(dim); diff --git a/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java b/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java index d6b24f37e..c03316b69 100644 --- a/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java +++ b/src/main/java/vazkii/botania/common/network/PacketSyncRecipes.java @@ -10,6 +10,7 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.common.lexicon.LexiconData; import java.util.Map; import java.util.function.Supplier; @@ -96,6 +97,7 @@ public class PacketSyncRecipes { BotaniaAPI.petalRecipes = petal; BotaniaAPI.pureDaisyRecipes = pureDaisy; BotaniaAPI.runeAltarRecipes = runeAltar; + LexiconData.reload(); }); ctx.get().setPacketHandled(true); } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index a1565a176..243a72f62 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -12,4 +12,16 @@ version="${version}" displayName="Botania" description=''' Botania is a mod that adds nature magic to Minecraft -''' \ No newline at end of file +''' + +[[dependencies.botania]] + modId="forge" #mandatory + mandatory=false #mandatory + versionRange="[28.0.45,)" #mandatory + ordering="NONE" + side="BOTH" + +[[dependencies.botania]] + modId="curios" + mandatory=false + ordering="AFTER" \ No newline at end of file