Bump to 1.14.4 and fix compile

This commit is contained in:
Vincent Lee committed 2019-08-04 09:46:04 -07:00
1 parent ea84b87c0d
commit df4d1f9826
36 files changed
+65 -51

No files matched your search

@@ -15,8 +15,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.World;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.chunk.ServerChunkProvider;
import net.minecraft.world.server.ServerChunkProvider;
import net.minecraft.world.server.ServerWorld;
public final class VanillaPacketDispatcher {
@@ -0,0 +1,14 @@
package vazkii.botania.api.recipe;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import java.util.List;
/**
* Implementation detail, you shouldn't need to use this.
*/
public interface IModRecipe {
List<Ingredient> getInputs();
ItemStack getOutput();
}
@@ -22,7 +22,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper;
import java.util.ArrayList;
import java.util.List;
public class RecipePetals {
public class RecipePetals implements IModRecipe {
private final ResourceLocation id;
private final ItemStack output;
private final ImmutableList<Ingredient> inputs;
@@ -21,7 +21,7 @@ import net.minecraftforge.items.IItemHandler;
import java.util.ArrayList;
import java.util.List;
public class RecipeRuneAltar {
public class RecipeRuneAltar implements IModRecipe {
private final ResourceLocation id;
private final ItemStack output;
private final ImmutableList<Ingredient> inputs;
@@ -186,7 +186,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile
IFloatingFlower.IslandType oldType = floatingData.getIslandType();
super.onDataPacket(net, packet);
if(oldType != floatingData.getIslandType() && isFloating()) {
world.markForRerender(pos);
// todo 1.14 world.markForRerender(pos);
}
}
@@ -12,8 +12,8 @@ import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
@@ -10,7 +10,7 @@ import net.minecraft.advancements.criterion.MinMaxBounds;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
@@ -11,8 +11,8 @@ import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
@@ -26,7 +26,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
@@ -27,7 +27,7 @@ import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorldReader;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
@@ -29,7 +29,7 @@ import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.World;
import net.minecraft.world.dimension.DimensionType;
import net.minecraft.world.storage.WorldSavedData;
@@ -30,7 +30,7 @@ import net.minecraft.block.BlockRenderType;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -77,10 +77,10 @@ public class SubTileHeiseiDream extends TileEntityFunctionalFlower {
// Move any EntityAIHurtByTarget to highest priority
for (PrioritizedGoal entry : entity.targetSelector.goals) {
if (entry.func_220772_j() instanceof HurtByTargetGoal) {
if (entry.getGoal() instanceof HurtByTargetGoal) {
// Concurrent modification OK since we break out of the loop
entity.targetSelector.removeGoal(entry.func_220772_j());
entity.targetSelector.addGoal(-1, entry.func_220772_j());
entity.targetSelector.removeGoal(entry.getGoal());
entity.targetSelector.addGoal(-1, entry.getGoal());
break;
}
}
@@ -47,7 +47,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.storage.loot.LootContext;
import net.minecraft.world.storage.loot.LootParameterSet;
import net.minecraft.world.storage.loot.LootParameterSets;
@@ -66,11 +66,11 @@ public class SubTileTigerseye extends TileEntityFunctionalFlower {
boolean avoidsOcelots = false;
if(shouldAfffect)
for(PrioritizedGoal entry : entries) {
if(entry.func_220772_j() instanceof AvoidEntityGoal)
avoidsOcelots = messWithRunAwayAI((AvoidEntityGoal) entry.func_220772_j()) || avoidsOcelots;
if(entry.getGoal() instanceof AvoidEntityGoal)
avoidsOcelots = messWithRunAwayAI((AvoidEntityGoal) entry.getGoal()) || avoidsOcelots;
if(entry.func_220772_j() instanceof NearestAttackableTargetGoal)
messWithGetTargetAI((NearestAttackableTargetGoal) entry.func_220772_j());
if(entry.getGoal() instanceof NearestAttackableTargetGoal)
messWithGetTargetAI((NearestAttackableTargetGoal) entry.getGoal());
}
if(entity instanceof CreeperEntity) {
@@ -23,8 +23,8 @@ import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
@@ -15,9 +15,9 @@ import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.World;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
@@ -25,7 +25,7 @@ import net.minecraft.particles.ItemParticleData;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.registries.ObjectHolder;
@@ -52,7 +52,7 @@ public class TileCamo extends TileMod {
public void onDataPacket(NetworkManager manager, SUpdateTileEntityPacket packet) {
super.onDataPacket(manager, packet);
requestModelDataUpdate();
world.markForRerender(pos);
// todo 1.14 world.markForRerender(pos);
}
@Nonnull
@@ -79,7 +79,7 @@ public class TileFloatingFlower extends TileMod {
IFloatingFlower.IslandType oldType = floatingData.getIslandType();
super.onDataPacket(net, packet);
if(oldType != floatingData.getIslandType()) {
world.markForRerender(pos);
// todo 1.14 world.markForRerender(pos);
}
}
@@ -2,7 +2,7 @@ package vazkii.botania.common.core.handler;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.World;
import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -14,7 +14,7 @@ import net.minecraft.util.Hand;
import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import java.util.function.Predicate;
@@ -60,7 +60,7 @@ import net.minecraft.world.BossInfo;
import net.minecraft.world.Difficulty;
import net.minecraft.world.ServerBossInfo;
import net.minecraft.world.World;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.util.FakePlayer;
@@ -42,11 +42,11 @@ public class EntityPinkWither extends WitherEntity {
super(TYPE, world);
// Remove firing wither skulls
goalSelector.goals.removeIf(entry -> entry.func_220772_j() instanceof RangedAttackGoal);
goalSelector.goals.removeIf(entry -> entry.getGoal() instanceof RangedAttackGoal);
// Remove revenge and aggro
targetSelector.goals.removeIf(entry -> entry.func_220772_j() instanceof HurtByTargetGoal
|| entry.func_220772_j() instanceof NearestAttackableTargetGoal);
targetSelector.goals.removeIf(entry -> entry.getGoal() instanceof HurtByTargetGoal
|| entry.getGoal() instanceof NearestAttackableTargetGoal);
}
@Override
@@ -22,7 +22,7 @@ import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.RayTraceContext;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -33,7 +33,7 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.world.World;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.internal.IManaBurst;
@@ -38,7 +38,7 @@ import net.minecraft.util.text.StringTextComponent;
import net.minecraft.util.text.Style;
import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -30,7 +30,7 @@ import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -31,9 +31,9 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.World;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.common.advancements.UseItemSuccessTrigger;
@@ -37,9 +37,9 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.World;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.registries.ForgeRegistries;
@@ -22,7 +22,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.EntityRayTraceResult;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.World;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.mana.IManaBlock;
@@ -21,7 +21,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.EntityRayTraceResult;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -32,13 +32,14 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.internal.IGuiLexiconEntry;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
import vazkii.botania.api.recipe.IModRecipe;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.handler.ConfigHandler;
public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
public class PagePetalRecipe<T extends IModRecipe> extends PageRecipe {
private static final ResourceLocation petalOverlay = new ResourceLocation(LibResources.GUI_PETAL_OVERLAY);
@@ -7,9 +7,8 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.World;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.fml.network.NetworkDirection;
import net.minecraftforge.fml.network.NetworkRegistry;
import net.minecraftforge.fml.network.PacketDistributor;
@@ -15,7 +15,7 @@ import net.minecraft.world.biome.Biomes;
import net.minecraft.block.Blocks;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.WorldType;
import net.minecraft.world.biome.provider.BiomeProvider;
import net.minecraft.world.biome.provider.BiomeProviderType;