diff --git a/build.gradle b/build.gradle index c1f462b42..2743e8b8b 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ archivesBaseName = config.mod_name sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - mappings channel: 'snapshot', version: '20190709-1.14.3' + mappings channel: 'snapshot', version: '20190801-1.14.3' accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { client { @@ -87,7 +87,7 @@ configurations { //End of the SCP config dependencies { - minecraft 'net.minecraftforge:forge:1.14.3-27.0.57' + minecraft 'net.minecraftforge:forge:1.14.4-28.0.40' //deobfCompile "com.mod-buildcraft:buildcraft-api:7.99.17" //deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index c91eed8c7..1112960f6 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -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 { diff --git a/src/main/java/vazkii/botania/api/recipe/IModRecipe.java b/src/main/java/vazkii/botania/api/recipe/IModRecipe.java new file mode 100644 index 000000000..878317d0c --- /dev/null +++ b/src/main/java/vazkii/botania/api/recipe/IModRecipe.java @@ -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 getInputs(); + ItemStack getOutput(); +} diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index 4a2bbf805..d8a6a3e44 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -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 inputs; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java b/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java index 27cbc2243..189b80e0d 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeRuneAltar.java @@ -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 inputs; diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index 660c0db10..38df8cffa 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -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); } } diff --git a/src/main/java/vazkii/botania/common/advancements/AlfPortalTrigger.java b/src/main/java/vazkii/botania/common/advancements/AlfPortalTrigger.java index b1cfef58a..6930d97a4 100644 --- a/src/main/java/vazkii/botania/common/advancements/AlfPortalTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/AlfPortalTrigger.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java b/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java index b2fe47116..fb1a4ddc4 100644 --- a/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java b/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java index 86ffdac9a..9594b8347 100644 --- a/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 43f9bd1f8..12a774e0e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 0cdb7adf7..264f1c443 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index a7a8fb157..9785cd4a4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index c37107758..57d92a5a9 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 77bfc6a56..574d343c1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -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; } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index a1da2f293..28ea0e8b5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index fe212e4dc..32b27f672 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -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) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 2f54ec057..6185a7bf0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java index c3a5b7515..4bc6ed370 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index 67b12c12f..9c1370e4a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java index 895713f1c..76f1e190d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index faf038ec9..897969c88 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -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); } } diff --git a/src/main/java/vazkii/botania/common/core/handler/SleepingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SleepingHandler.java index f3aedfd0f..c7b03435e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SleepingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SleepingHandler.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java index 6220ec1bf..d831d8120 100644 --- a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index f53822efd..0873c51c7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index a7b0356ca..ee3c4f739 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index c23e377d3..df20faae1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 20e1d0840..c588afb55 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 81767d1fb..39ac12b88 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index d50ebda07..01637e60f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 5ef47ce08..f17373710 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index c4ab85a4b..263a7ea11 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMine.java b/src/main/java/vazkii/botania/common/item/lens/LensMine.java index 75983bec2..0f50bb0cc 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java index 3e1517f39..436cec685 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index 15bde9cfa..444ded73c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -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 extends PageRecipe { +public class PagePetalRecipe extends PageRecipe { private static final ResourceLocation petalOverlay = new ResourceLocation(LibResources.GUI_PETAL_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index d71b87e6e..9d9b36fe0 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 3926d1193..2086a743a 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -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;