bump forge

This commit is contained in:
Vincent Lee committed 2019-08-15 20:12:55 -07:00
1 parent af740b634f
commit 7003ba52ee
15 files changed
+45 -41

No files matched your search

@@ -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();
@@ -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)) {
@@ -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))
@@ -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();
}
}
@@ -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;
@@ -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();
}
}
@@ -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) {
@@ -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());
@@ -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);
@@ -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;
@@ -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;
@@ -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<BlockSwapper> swappers = blockSwappers.get(dim);
@@ -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);
}