diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 6331eea5c..fee960f10 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -9,6 +9,7 @@ package vazkii.botania.api.internal; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 43b8792d1..89658fe4d 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -9,6 +9,7 @@ package vazkii.botania.api.internal; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; diff --git a/src/main/java/vazkii/botania/api/recipe/IBrewRecipe.java b/src/main/java/vazkii/botania/api/recipe/IBrewRecipe.java index f0fc11b0d..8c69eabc9 100644 --- a/src/main/java/vazkii/botania/api/recipe/IBrewRecipe.java +++ b/src/main/java/vazkii/botania/api/recipe/IBrewRecipe.java @@ -8,6 +8,7 @@ */ package vazkii.botania.api.recipe; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; @@ -20,7 +21,7 @@ import vazkii.botania.api.brew.Brew; import javax.annotation.Nonnull; -public interface IBrewRecipe extends IRecipe { +public interface IBrewRecipe extends IRecipe { ResourceLocation TYPE_ID = new ResourceLocation(BotaniaAPI.MODID, "brew"); Brew getBrew(); @@ -43,7 +44,7 @@ public interface IBrewRecipe extends IRecipe { @Nonnull @Override - default ItemStack getCraftingResult(@Nonnull RecipeWrapper inv) { + default ItemStack getCraftingResult(@Nonnull IInventory inv) { return ItemStack.EMPTY; } diff --git a/src/main/java/vazkii/botania/api/recipe/IPetalRecipe.java b/src/main/java/vazkii/botania/api/recipe/IPetalRecipe.java index 8f309c0b9..69f6eb5e2 100644 --- a/src/main/java/vazkii/botania/api/recipe/IPetalRecipe.java +++ b/src/main/java/vazkii/botania/api/recipe/IPetalRecipe.java @@ -8,6 +8,7 @@ */ package vazkii.botania.api.recipe; +import net.minecraft.inventory.IInventory; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.util.ResourceLocation; @@ -18,7 +19,7 @@ import vazkii.botania.api.BotaniaAPI; import javax.annotation.Nonnull; -public interface IPetalRecipe extends IRecipe { +public interface IPetalRecipe extends IRecipe { ResourceLocation TYPE_ID = new ResourceLocation(BotaniaAPI.MODID, "petal_apothecary"); @Nonnull diff --git a/src/main/java/vazkii/botania/api/recipe/IRuneAltarRecipe.java b/src/main/java/vazkii/botania/api/recipe/IRuneAltarRecipe.java index 430fea2e6..6ff686a97 100644 --- a/src/main/java/vazkii/botania/api/recipe/IRuneAltarRecipe.java +++ b/src/main/java/vazkii/botania/api/recipe/IRuneAltarRecipe.java @@ -8,6 +8,7 @@ */ package vazkii.botania.api.recipe; +import net.minecraft.inventory.IInventory; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.util.ResourceLocation; @@ -18,7 +19,7 @@ import vazkii.botania.api.BotaniaAPI; import javax.annotation.Nonnull; -public interface IRuneAltarRecipe extends IRecipe { +public interface IRuneAltarRecipe extends IRecipe { ResourceLocation TYPE_ID = new ResourceLocation(BotaniaAPI.MODID, "runic_altar"); int getManaUsage(); diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java index b427b0d09..dc73d830d 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java @@ -9,6 +9,7 @@ package vazkii.botania.api.subtile; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java index 7bb9e87ef..196e87fc3 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java @@ -9,6 +9,7 @@ package vazkii.botania.api.subtile; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index cf70b8dbb..c35cf0591 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -9,6 +9,7 @@ package vazkii.botania.api.subtile; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/vazkii/botania/api/wand/IWandHUD.java b/src/main/java/vazkii/botania/api/wand/IWandHUD.java index 0d16147a5..09dfd51d6 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandHUD.java +++ b/src/main/java/vazkii/botania/api/wand/IWandHUD.java @@ -9,6 +9,7 @@ package vazkii.botania.api.wand; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.client.Minecraft; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 47f3fea31..88aebed85 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -23,7 +23,6 @@ import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Effects; - import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.api.item.ICosmeticAttachable; @@ -56,21 +55,21 @@ public final class BaubleRenderHandler extends LayerRenderer { Map curios = handler.getCurioMap(); - + for (Map.Entry e : curios.entrySet()) { for (int i = 0; i < e.getValue().getSlots(); i++) { ItemStack stack = e.getValue().getStackInSlot(i); if (!stack.isEmpty()) { Item item = stack.getItem(); ItemStack toRender = stack; - + if (item instanceof IPhantomInkable) { IPhantomInkable inkable = (IPhantomInkable) item; if (inkable.hasPhantomInk(stack)) { continue; } } - + if (item instanceof ICosmeticAttachable) { ICosmeticAttachable attachable = (ICosmeticAttachable) item; ItemStack cosmetic = attachable.getCosmeticItem(stack); @@ -78,7 +77,7 @@ public final class BaubleRenderHandler extends LayerRenderer { if (c.hasRender(e.getKey(), player) && c instanceof CurioIntegration.Wrapper) { ms.push(); diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 3833a4efc..abb141b8e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -83,12 +83,12 @@ public final class ItemsRemainingRenderHandler { ITextComponent maxText = new StringTextComponent(Integer.toString(max)).func_240699_a_(TextFormatting.GRAY); ITextComponent remText = new StringTextComponent(Integer.toString(rem)).func_240699_a_(TextFormatting.YELLOW); text = new StringTextComponent(count + " (") - .func_230529_a_(stacksText) - .func_240702_b_("*") - .func_230529_a_(maxText) - .func_240702_b_("+") - .func_230529_a_(remText) - .func_240702_b_(")"); + .func_230529_a_(stacksText) + .func_240702_b_("*") + .func_230529_a_(maxText) + .func_240702_b_("+") + .func_230529_a_(remText) + .func_240702_b_(")"); } } else if (count == -1) { text = new StringTextComponent("\u221E"); diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 24d64de4e..384934763 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -173,9 +173,9 @@ public class ClientProxy implements IProxy { private static void registerPropertyGetters() { registerPropertyGetter(ModItems.blackHoleTalisman, prefix("active"), - (stack, world, entity) -> ItemNBTHelper.getBoolean(stack, ItemBlackHoleTalisman.TAG_ACTIVE, false) ? 1 : 0); + (stack, world, entity) -> ItemNBTHelper.getBoolean(stack, ItemBlackHoleTalisman.TAG_ACTIVE, false) ? 1 : 0); registerPropertyGetter(ModItems.manaBottle, prefix("swigs_taken"), - (stack, world, entity) -> ItemBottledMana.SWIGS - ItemBottledMana.getSwigsLeft(stack)); + (stack, world, entity) -> ItemBottledMana.SWIGS - ItemBottledMana.getSwigsLeft(stack)); ResourceLocation vuvuzelaId = prefix("vuvuzela"); IItemPropertyGetter isVuvuzela = (stack, world, entity) -> stack.getDisplayName().getString().toLowerCase(Locale.ROOT).contains("vuvuzela") ? 1 : 0; @@ -185,15 +185,15 @@ public class ClientProxy implements IProxy { registerPropertyGetter(ModItems.lexicon, prefix("elven"), (stack, world, living) -> ModItems.lexicon.isElvenItem(stack) ? 1 : 0); registerPropertyGetter(ModItems.manaCookie, prefix("totalbiscuit"), - (stack, world, entity) -> stack.getDisplayName().getString().toLowerCase(Locale.ROOT).contains("totalbiscuit") ? 1F : 0F); + (stack, world, entity) -> stack.getDisplayName().getString().toLowerCase(Locale.ROOT).contains("totalbiscuit") ? 1F : 0F); registerPropertyGetter(ModItems.slimeBottle, prefix("active"), - (stack, world, entity) -> stack.hasTag() && stack.getTag().getBoolean(ItemSlimeBottle.TAG_ACTIVE) ? 1.0F : 0.0F); + (stack, world, entity) -> stack.hasTag() && stack.getTag().getBoolean(ItemSlimeBottle.TAG_ACTIVE) ? 1.0F : 0.0F); registerPropertyGetter(ModItems.spawnerMover, prefix("full"), - (stack, world, entity) -> ItemSpawnerMover.hasData(stack) ? 1 : 0); + (stack, world, entity) -> ItemSpawnerMover.hasData(stack) ? 1 : 0); registerPropertyGetter(ModItems.temperanceStone, prefix("active"), - (stack, world, entity) -> ItemNBTHelper.getBoolean(stack, ItemTemperanceStone.TAG_ACTIVE, false) ? 1 : 0); + (stack, world, entity) -> ItemNBTHelper.getBoolean(stack, ItemTemperanceStone.TAG_ACTIVE, false) ? 1 : 0); registerPropertyGetter(ModItems.twigWand, prefix("bindmode"), - (stack, world, entity) -> ItemTwigWand.getBindMode(stack) ? 1 : 0); + (stack, world, entity) -> ItemTwigWand.getBindMode(stack) ? 1 : 0); ResourceLocation poolFullId = prefix("full"); IItemPropertyGetter poolFull = (stack, world, entity) -> { @@ -225,19 +225,19 @@ public class ClientProxy implements IProxy { registerPropertyGetter(ModItems.magnetRingGreater, prefix("on"), ringOnGetter); registerPropertyGetter(ModItems.elementiumShears, prefix("reddit"), - (stack, world, entity) -> stack.getDisplayName().getString().equalsIgnoreCase("dammit reddit") ? 1F : 0F); + (stack, world, entity) -> stack.getDisplayName().getString().equalsIgnoreCase("dammit reddit") ? 1F : 0F); registerPropertyGetter(ModItems.manasteelSword, prefix("elucidator"), - (stack, world, entity) -> "the elucidator".equals(stack.getDisplayName().getString().toLowerCase().trim()) ? 1 : 0); + (stack, world, entity) -> "the elucidator".equals(stack.getDisplayName().getString().toLowerCase().trim()) ? 1 : 0); registerPropertyGetter(ModItems.terraAxe, prefix("terraaxe_on"), - (stack, world, entity) -> entity instanceof PlayerEntity && !ItemTerraAxe.shouldBreak((PlayerEntity) entity) ? 0 : 1); + (stack, world, entity) -> entity instanceof PlayerEntity && !ItemTerraAxe.shouldBreak((PlayerEntity) entity) ? 0 : 1); registerPropertyGetter(ModItems.terraPick, prefix("tipped"), - (stack, world, entity) -> ItemTerraPick.isTipped(stack) ? 1 : 0); + (stack, world, entity) -> ItemTerraPick.isTipped(stack) ? 1 : 0); registerPropertyGetter(ModItems.terraPick, prefix("enabled"), - (stack, world, entity) -> ItemTerraPick.isEnabled(stack) ? 1 : 0); + (stack, world, entity) -> ItemTerraPick.isEnabled(stack) ? 1 : 0); registerPropertyGetter(ModItems.infiniteFruit, prefix("boot"), - (stack, worldIn, entity) -> ItemInfiniteFruit.isBoot(stack) ? 1F : 0F); + (stack, worldIn, entity) -> ItemInfiniteFruit.isBoot(stack) ? 1F : 0F); registerPropertyGetter(ModItems.tornadoRod, prefix("flying"), - (stack, world, living) -> ItemTornadoRod.isFlying(stack) ? 1 : 0); + (stack, world, living) -> ItemTornadoRod.isFlying(stack) ? 1 : 0); IItemPropertyGetter pulling = ItemModelsProperties.func_239417_a_(Items.BOW, new ResourceLocation("pulling")); IItemPropertyGetter pull = (stack, worldIn, entity) -> { @@ -246,8 +246,8 @@ public class ClientProxy implements IProxy { } else { ItemLivingwoodBow item = ((ItemLivingwoodBow) stack.getItem()); return entity.getActiveItemStack() != stack - ? 0.0F - : (stack.getUseDuration() - entity.getItemInUseCount()) * item.chargeVelocityMultiplier() / 20.0F; + ? 0.0F + : (stack.getUseDuration() - entity.getItemInUseCount()) * item.chargeVelocityMultiplier() / 20.0F; } }; registerPropertyGetter(ModItems.livingwoodBow, new ResourceLocation("pulling"), pulling); diff --git a/src/main/java/vazkii/botania/client/fx/SparkleParticleData.java b/src/main/java/vazkii/botania/client/fx/SparkleParticleData.java index fc5c8b742..84f319639 100644 --- a/src/main/java/vazkii/botania/client/fx/SparkleParticleData.java +++ b/src/main/java/vazkii/botania/client/fx/SparkleParticleData.java @@ -10,9 +10,9 @@ package vazkii.botania.client.fx; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; - import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; + import net.minecraft.network.PacketBuffer; import net.minecraft.particles.IParticleData; import net.minecraft.particles.ParticleType; @@ -24,14 +24,14 @@ import java.util.Locale; public class SparkleParticleData implements IParticleData { public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( - Codec.FLOAT.fieldOf("size").forGetter(d -> d.size), - Codec.FLOAT.fieldOf("r").forGetter(d -> d.r), - Codec.FLOAT.fieldOf("g").forGetter(d -> d.g), - Codec.FLOAT.fieldOf("b").forGetter(d -> d.b), - Codec.INT.fieldOf("m").forGetter(d -> d.m), - Codec.BOOL.fieldOf("noClip").forGetter(d -> d.noClip), - Codec.BOOL.fieldOf("fake").forGetter(d -> d.fake), - Codec.BOOL.fieldOf("corrupt").forGetter(d -> d.corrupt) + Codec.FLOAT.fieldOf("size").forGetter(d -> d.size), + Codec.FLOAT.fieldOf("r").forGetter(d -> d.r), + Codec.FLOAT.fieldOf("g").forGetter(d -> d.g), + Codec.FLOAT.fieldOf("b").forGetter(d -> d.b), + Codec.INT.fieldOf("m").forGetter(d -> d.m), + Codec.BOOL.fieldOf("noClip").forGetter(d -> d.noClip), + Codec.BOOL.fieldOf("fake").forGetter(d -> d.fake), + Codec.BOOL.fieldOf("corrupt").forGetter(d -> d.corrupt) ).apply(instance, SparkleParticleData::new)); public final float size; public final float r, g, b; diff --git a/src/main/java/vazkii/botania/client/fx/SparkleParticleType.java b/src/main/java/vazkii/botania/client/fx/SparkleParticleType.java index cec524c22..80da296d8 100644 --- a/src/main/java/vazkii/botania/client/fx/SparkleParticleType.java +++ b/src/main/java/vazkii/botania/client/fx/SparkleParticleType.java @@ -9,6 +9,7 @@ package vazkii.botania.client.fx; import com.mojang.serialization.Codec; + import net.minecraft.client.particle.IAnimatedSprite; import net.minecraft.client.particle.IParticleFactory; import net.minecraft.client.particle.Particle; diff --git a/src/main/java/vazkii/botania/client/fx/WispParticleData.java b/src/main/java/vazkii/botania/client/fx/WispParticleData.java index eccff1078..712625224 100644 --- a/src/main/java/vazkii/botania/client/fx/WispParticleData.java +++ b/src/main/java/vazkii/botania/client/fx/WispParticleData.java @@ -10,9 +10,9 @@ package vazkii.botania.client.fx; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; - import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; + import net.minecraft.network.PacketBuffer; import net.minecraft.particles.IParticleData; import net.minecraft.particles.ParticleType; @@ -24,15 +24,15 @@ import java.util.Locale; public class WispParticleData implements IParticleData { public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( - Codec.FLOAT.fieldOf("size").forGetter(d -> d.size), - Codec.FLOAT.fieldOf("r").forGetter(d -> d.r), - Codec.FLOAT.fieldOf("g").forGetter(d -> d.g), - Codec.FLOAT.fieldOf("b").forGetter(d -> d.b), - Codec.FLOAT.fieldOf("maxAgeMul").forGetter(d -> d.maxAgeMul), - Codec.BOOL.fieldOf("depthTest").forGetter(d -> d.depthTest), - Codec.BOOL.fieldOf("noClip").forGetter(d -> d.noClip) - ) - .apply(instance, WispParticleData::new)); + Codec.FLOAT.fieldOf("size").forGetter(d -> d.size), + Codec.FLOAT.fieldOf("r").forGetter(d -> d.r), + Codec.FLOAT.fieldOf("g").forGetter(d -> d.g), + Codec.FLOAT.fieldOf("b").forGetter(d -> d.b), + Codec.FLOAT.fieldOf("maxAgeMul").forGetter(d -> d.maxAgeMul), + Codec.BOOL.fieldOf("depthTest").forGetter(d -> d.depthTest), + Codec.BOOL.fieldOf("noClip").forGetter(d -> d.noClip) + ) + .apply(instance, WispParticleData::new)); public final float size; public final float r, g, b; public final float maxAgeMul; diff --git a/src/main/java/vazkii/botania/client/fx/WispParticleType.java b/src/main/java/vazkii/botania/client/fx/WispParticleType.java index 57efcfa2b..3b66f29c7 100644 --- a/src/main/java/vazkii/botania/client/fx/WispParticleType.java +++ b/src/main/java/vazkii/botania/client/fx/WispParticleType.java @@ -10,6 +10,7 @@ package vazkii.botania.client.fx; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; + import net.minecraft.client.particle.IAnimatedSprite; import net.minecraft.client.particle.IParticleFactory; import net.minecraft.client.particle.Particle; diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 9bed52abd..a8c4e2369 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -27,8 +27,8 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.BlockTags; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; - import net.minecraft.util.text.TranslationTextComponent; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.recipe.IElvenTradeRecipe; diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index e080080be..aaec2ff5d 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -31,8 +31,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; - import net.minecraft.util.text.TranslationTextComponent; + import org.lwjgl.opengl.GL11; import vazkii.botania.api.recipe.IElvenTradeRecipe; diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 840dafec3..02370565a 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -19,8 +19,8 @@ import net.minecraft.client.renderer.model.Model; import net.minecraft.client.renderer.model.ModelRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.tile.TileBrewery; diff --git a/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java index e7727ecb3..d4aedebe8 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java @@ -9,12 +9,13 @@ package vazkii.botania.client.patchouli.component; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; - import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; + import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.patchouli.api.IComponentRenderContext; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java index abc8d1adb..0fc537181 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -20,9 +20,9 @@ import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.util.ResourceLocation; - import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityBabylonWeapon; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index f9a754120..71185429a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -15,8 +15,8 @@ import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.entity.EntityCorporeaSpark; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index b7c84645f..84189ce60 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -17,9 +17,9 @@ import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; - import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.RenderHelper; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index 383b13810..e97aedb6e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -15,10 +15,10 @@ import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; - import net.minecraft.util.math.vector.Matrix3f; import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index ac7cc6ae3..7408ad09e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -21,9 +21,9 @@ import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; - import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.TileAltar; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java index 3e31fb19a..94d9794c5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java @@ -17,8 +17,8 @@ import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.TileAnimatedTorch; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index f5fe5ecef..de9d58842 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -21,8 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 3973f269d..6404b010c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -16,8 +16,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.ResourceLocation; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBellows; import vazkii.botania.common.block.tile.mana.TileBellows; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java index 2be94aa75..b14442fcc 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -18,8 +18,8 @@ import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.common.block.tile.TileCocoon; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index 8b1495e75..2dd3b2cb2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -22,8 +22,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 878d895d8..e4d8d5a9b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -17,9 +17,9 @@ import net.minecraft.client.renderer.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.ResourceLocation; - import net.minecraft.util.math.vector.Quaternion; import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index e7e9ed5b6..b4ace1ea8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -16,8 +16,8 @@ import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.entity.item.ItemEntity; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index 2049e96bd..56b6b97c8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -16,8 +16,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelHourglass; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 9beb8c89b..7a810afd0 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -19,8 +19,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.common.block.tile.TileIncensePlate; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index 66ce32fab..79d786d16 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -17,9 +17,9 @@ import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; - import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 5de1bf59a..c84776447 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -21,8 +21,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.math.MathHelper; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index 626b3437e..afb01f07d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -17,8 +17,8 @@ import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.mana.TilePrism; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index 9c57b91c4..e534a7581 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -18,8 +18,8 @@ import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.state.properties.BlockStateProperties; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.common.block.tile.mana.TilePump; public class RenderTilePump extends TileEntityRenderer { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index 89916552d..c11eadb90 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -21,8 +21,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.util.LazyValue; import net.minecraft.util.ResourceLocation; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index 163ef5de5..12b0ffa28 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -18,8 +18,8 @@ import net.minecraft.client.renderer.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.block.tile.TileRuneAltar; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 598d4be54..8e380952a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -16,8 +16,8 @@ import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.common.block.tile.TileSparkChanger; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 9e2b40311..225d206a7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -21,9 +21,9 @@ import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; - import net.minecraft.util.math.vector.Quaternion; import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.mana.BlockSpreader; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java index 10582432f..004995acc 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -14,8 +14,8 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index a4a3d0521..ed64c3f2a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -15,8 +15,8 @@ import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.ResourceLocation; - import net.minecraft.util.math.vector.Vector3f; + import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelTeruTeruBozu; diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 78711b28d..d3a2d026b 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -227,13 +227,13 @@ public class Botania { } GlobalEntityTypeAttributes.put(ModEntities.DOPPLEGANGER, MobEntity.func_233666_p_() - .func_233815_a_(Attributes.field_233821_d_, 0.4) - .func_233815_a_(Attributes.field_233818_a_, EntityDoppleganger.MAX_HP) - .func_233815_a_(Attributes.field_233820_c_, 1.0) - .func_233813_a_()); + .func_233815_a_(Attributes.field_233821_d_, 0.4) + .func_233815_a_(Attributes.field_233818_a_, EntityDoppleganger.MAX_HP) + .func_233815_a_(Attributes.field_233820_c_, 1.0) + .func_233813_a_()); GlobalEntityTypeAttributes.put(ModEntities.PIXIE, MobEntity.func_233666_p_() - .func_233815_a_(Attributes.field_233818_a_, 2.0) - .func_233813_a_()); + .func_233815_a_(Attributes.field_233818_a_, 2.0) + .func_233813_a_()); ModBanners.init(); ColorHelper.init(); ModLootModifiers.init(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index ef45a4268..c58b4976e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.ITileEntityProvider; diff --git a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java index c932cd4a0..e79f2dc7a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index d5f4f16e8..ac78832f6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index ee6a1470f..7904e4fa3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 8eaa2c65f..3332ad71c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.FlowerBlock; @@ -26,9 +27,9 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index ffcb1cbc9..321d3537a 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -147,7 +147,7 @@ public final class ModBlocks { public static Block spectralPlatform = new BlockPlatform(BlockPlatform.Variant.SPECTRAL, Block.Properties.from(abstrusePlatform)); public static Block infrangiblePlatform = new BlockPlatform(BlockPlatform.Variant.INFRANGIBLE, Block.Properties.create(Material.WOOD).hardnessAndResistance(-1, Float.MAX_VALUE).sound(SoundType.WOOD)); public static Block alfPortal = new BlockAlfPortal(Block.Properties.create(Material.WOOD).hardnessAndResistance(10).sound(SoundType.WOOD) - .func_235838_a_(s -> s.get(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0)); + .func_235838_a_(s -> s.get(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0)); public static Block dreamwood = new BlockMod(Block.Properties.from(livingwood)); public static Block dreamwoodPlanks = new BlockMod(Block.Properties.from(livingwood)); public static Block dreamwoodPlanksMossy = new BlockMod(Block.Properties.from(livingwood)); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index ebff38758..f0fd2bde3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.mana; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 75d1b302a..b02706d94 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.mana; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ITileEntityProvider; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 51af305fd..0848d8784 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -25,8 +25,8 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; - import net.minecraftforge.common.IForgeShearable; + import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.common.block.BlockModWaterloggable; @@ -83,7 +83,7 @@ public class BlockForestDrum extends BlockModWaterloggable implements IManaTrigg for (MobEntity entity : entities) { if (entity instanceof IShearable && ((IShearable) entity).func_230262_K__() - || entity instanceof IForgeShearable && ((IForgeShearable) entity).isShearable(stack, world, entity.func_233580_cy_()) ) { + || entity instanceof IForgeShearable && ((IForgeShearable) entity).isShearable(stack, world, entity.func_233580_cy_())) { shearables.add(entity); } else if (entity instanceof CowEntity) { List items = world.getEntitiesWithinAABB(ItemEntity.class, entity.getBoundingBox()); @@ -120,9 +120,9 @@ public class BlockForestDrum extends BlockModWaterloggable implements IManaTrigg for (ItemStack wool : stacks) { ItemEntity ent = entity.entityDropItem(wool, 1.0F); ent.setMotion(ent.getMotion().add( - world.rand.nextFloat() * 0.05F, - (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F, - (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F + world.rand.nextFloat() * 0.05F, + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F, + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F )); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index e7eed8ef2..2e4c2fe91 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.mana; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.ITileEntityProvider; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 2665b9439..f34a568e4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -9,8 +9,8 @@ package vazkii.botania.common.block.mana; import com.google.common.collect.ImmutableList; - import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index 07cc5114c..76a95c27e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -19,9 +19,9 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index 478760da3..b1c1efc09 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.mana; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 32aa252ef..889591c2a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.subtile.functional; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java index 7cc690713..7bbcd5fa1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.tile; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index ee3d4f703..0e81d78a1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.tile; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.client.Minecraft; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 1dbe9e2f2..bf810cda2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -9,8 +9,8 @@ package vazkii.botania.common.block.tile; import com.google.common.base.Predicates; - import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index b47964e38..1e8a911ac 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.tile; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 6bf82d53f..78cad197d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -9,6 +9,7 @@ package vazkii.botania.common.block.tile.mana; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index 162757cf6..2da4b27bd 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -18,8 +18,8 @@ import net.minecraft.command.Commands; import net.minecraft.command.arguments.EntityArgument; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; - import net.minecraft.world.server.ServerWorld; + import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.world.SkyblockWorldEvents; diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 282bf233f..783ba6204 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -9,6 +9,7 @@ package vazkii.botania.common.core.handler; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; diff --git a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java index eb2d4c4f3..5032c5c4b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -24,8 +24,8 @@ import net.minecraft.util.Util; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; - import net.minecraftforge.registries.IForgeRegistry; + import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java index 80514a5ee..14a941582 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java @@ -9,9 +9,9 @@ package vazkii.botania.common.core.helper; import com.google.gson.JsonObject; - import com.mojang.serialization.Dynamic; import com.mojang.serialization.JsonOps; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.INBT; diff --git a/src/main/java/vazkii/botania/common/core/loot/ModLootModifiers.java b/src/main/java/vazkii/botania/common/core/loot/ModLootModifiers.java index c11850d79..a4edd09d7 100644 --- a/src/main/java/vazkii/botania/common/core/loot/ModLootModifiers.java +++ b/src/main/java/vazkii/botania/common/core/loot/ModLootModifiers.java @@ -1,3 +1,11 @@ +/* + * This class is distributed as part of the Botania Mod. + * Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.common.core.loot; import net.minecraft.loot.LootConditionType; diff --git a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java index c98983188..66c0be161 100644 --- a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java +++ b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java @@ -39,8 +39,7 @@ public class TrueGuardianKiller implements ILootCondition { public static class Serializer implements ILootSerializer { @Override - public void func_230424_a_(JsonObject json, TrueGuardianKiller condition, JsonSerializationContext ctx) { - } + public void func_230424_a_(JsonObject json, TrueGuardianKiller condition, JsonSerializationContext ctx) {} @Override public TrueGuardianKiller func_230423_a_(JsonObject json, JsonDeserializationContext ctx) { diff --git a/src/main/java/vazkii/botania/common/crafting/RecipeBrew.java b/src/main/java/vazkii/botania/common/crafting/RecipeBrew.java index 4fae745e6..f8c7dbcdd 100644 --- a/src/main/java/vazkii/botania/common/crafting/RecipeBrew.java +++ b/src/main/java/vazkii/botania/common/crafting/RecipeBrew.java @@ -13,6 +13,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.IRecipeSerializer; @@ -49,7 +50,7 @@ public class RecipeBrew implements IBrewRecipe { } @Override - public boolean matches(RecipeWrapper inv, @Nonnull World world) { + public boolean matches(IInventory inv, @Nonnull World world) { List inputsMissing = new ArrayList<>(inputs); for (int i = 0; i < inv.getSizeInventory(); i++) { diff --git a/src/main/java/vazkii/botania/common/crafting/RecipePetals.java b/src/main/java/vazkii/botania/common/crafting/RecipePetals.java index 8ac267792..11d7eb172 100644 --- a/src/main/java/vazkii/botania/common/crafting/RecipePetals.java +++ b/src/main/java/vazkii/botania/common/crafting/RecipePetals.java @@ -12,6 +12,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; @@ -44,7 +45,7 @@ public class RecipePetals implements IPetalRecipe { } @Override - public boolean matches(RecipeWrapper inv, @Nonnull World world) { + public boolean matches(IInventory inv, @Nonnull World world) { List ingredientsMissing = new ArrayList<>(inputs); for (int i = 0; i < inv.getSizeInventory(); i++) { @@ -81,7 +82,7 @@ public class RecipePetals implements IPetalRecipe { @Nonnull @Override - public ItemStack getCraftingResult(@Nonnull RecipeWrapper inv) { + public ItemStack getCraftingResult(@Nonnull IInventory inv) { return getRecipeOutput().copy(); } diff --git a/src/main/java/vazkii/botania/common/crafting/RecipeRuneAltar.java b/src/main/java/vazkii/botania/common/crafting/RecipeRuneAltar.java index 55400892d..9d3a069d3 100644 --- a/src/main/java/vazkii/botania/common/crafting/RecipeRuneAltar.java +++ b/src/main/java/vazkii/botania/common/crafting/RecipeRuneAltar.java @@ -13,6 +13,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; @@ -49,7 +50,7 @@ public class RecipeRuneAltar implements IRuneAltarRecipe { } @Override - public boolean matches(RecipeWrapper inv, @Nonnull World world) { + public boolean matches(IInventory inv, @Nonnull World world) { List ingredientsMissing = new ArrayList<>(inputs); for (int i = 0; i < inv.getSizeInventory(); i++) { @@ -86,7 +87,7 @@ public class RecipeRuneAltar implements IRuneAltarRecipe { @Nonnull @Override - public ItemStack getCraftingResult(@Nonnull RecipeWrapper inv) { + public ItemStack getCraftingResult(@Nonnull IInventory inv) { return getRecipeOutput().copy(); } diff --git a/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java b/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java index 336ddf424..4a398c272 100644 --- a/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java +++ b/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java @@ -11,9 +11,9 @@ package vazkii.botania.common.crafting; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; - import com.mojang.serialization.Dynamic; import com.mojang.serialization.JsonOps; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java index d6e0ed134..1642588d0 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java @@ -12,6 +12,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.IRecipeSerializer; @@ -41,7 +42,7 @@ public class HeadRecipe extends RecipeRuneAltar { } @Override - public boolean matches(RecipeWrapper inv, @Nonnull World world) { + public boolean matches(IInventory inv, @Nonnull World world) { boolean matches = super.matches(inv, world); if (matches) { @@ -65,7 +66,7 @@ public class HeadRecipe extends RecipeRuneAltar { @Nonnull @Override - public ItemStack getCraftingResult(@Nonnull RecipeWrapper inv) { + public ItemStack getCraftingResult(@Nonnull IInventory inv) { ItemStack stack = getRecipeOutput().copy(); for (int i = 0; i < inv.getSizeInventory(); i++) { ItemStack ingr = inv.getStackInSlot(i); diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index bcb37c79c..d2dfa954d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -150,7 +150,7 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { RayTraceResult raytraceresult = ProjectileHelper.func_234618_a_(this, this::func_230298_a_, RayTraceContext.BlockMode.OUTLINE); boolean flag = false; if (raytraceresult.getType() == RayTraceResult.Type.BLOCK) { - BlockPos blockpos = ((BlockRayTraceResult)raytraceresult).getPos(); + BlockPos blockpos = ((BlockRayTraceResult) raytraceresult).getPos(); BlockState blockstate = this.world.getBlockState(blockpos); if (blockstate.isIn(Blocks.NETHER_PORTAL)) { this.setPortal(blockpos); @@ -158,7 +158,7 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { } else if (blockstate.isIn(Blocks.END_GATEWAY)) { TileEntity tileentity = this.world.getTileEntity(blockpos); if (tileentity instanceof EndGatewayTileEntity) { - ((EndGatewayTileEntity)tileentity).teleportEntity(this); + ((EndGatewayTileEntity) tileentity).teleportEntity(this); } flag = true; @@ -176,7 +176,7 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { this.func_234617_x_(); float f; if (this.isInWater()) { - for(int i = 0; i < 4; ++i) { + for (int i = 0; i < 4; ++i) { float f1 = 0.25F; this.world.addParticle(ParticleTypes.BUBBLE, d2 - vector3d.x * 0.25D, d0 - vector3d.y * 0.25D, d1 - vector3d.z * 0.25D, vector3d.x, vector3d.y, vector3d.z); } @@ -189,7 +189,7 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { // Botania: no drag this.setMotion(vector3d.scale((double)f)); if (!this.hasNoGravity()) { Vector3d vector3d1 = this.getMotion(); - this.setMotion(vector3d1.x, vector3d1.y - (double)this.getGravityVelocity(), vector3d1.z); + this.setMotion(vector3d1.x, vector3d1.y - (double) this.getGravityVelocity(), vector3d1.z); } this.setPosition(d2, d0, d1); diff --git a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java index 7a6addae7..8d9228c78 100644 --- a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java +++ b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java @@ -6,40 +6,9 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -/* todo 1.16 curios package vazkii.botania.common.integration.curios; -import com.google.common.collect.Multimap; -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.fml.InterModComms; -import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; -import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.wrapper.CombinedInvWrapper; - -import org.apache.commons.lang3.tuple.ImmutableTriple; - -import top.theillusivec4.curios.api.CuriosAPI; -import top.theillusivec4.curios.api.capability.CuriosCapability; -import top.theillusivec4.curios.api.capability.ICurio; -import top.theillusivec4.curios.api.event.LivingCurioDropRulesEvent; -import top.theillusivec4.curios.api.imc.CurioIMCMessage; - -import vazkii.botania.client.core.handler.BaubleRenderHandler; -import vazkii.botania.common.capability.SimpleCapProvider; -import vazkii.botania.common.core.handler.EquipmentHandler; -import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.item.ItemKeepIvy; -import vazkii.botania.common.item.equipment.bauble.ItemBauble; - -import java.util.function.Predicate; +/* // Classloading-safe way to attach curio behaviour to our items public class CurioIntegration extends EquipmentHandler { @@ -159,5 +128,4 @@ public class CurioIntegration extends EquipmentHandler { getItem().doRender(layer, stack, player, ms, buffers, light, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch); } } -} -*/ +}*/ diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index bacdffc64..11df13d87 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -9,8 +9,8 @@ package vazkii.botania.common.item.brew; import com.google.common.collect.Lists; - import com.mojang.datafixers.util.Pair; + import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.attributes.Attribute; @@ -136,12 +136,12 @@ public class ItemBrewBase extends Item implements IBrewItem { if (list.isEmpty()) { lores.add((new TranslationTextComponent("effect.none")).func_240699_a_(TextFormatting.GRAY)); } else { - for(EffectInstance effectinstance : list) { + for (EffectInstance effectinstance : list) { IFormattableTextComponent iformattabletextcomponent = new TranslationTextComponent(effectinstance.getEffectName()); Effect effect = effectinstance.getPotion(); Map map = effect.getAttributeModifierMap(); if (!map.isEmpty()) { - for(Map.Entry entry : map.entrySet()) { + for (Map.Entry entry : map.entrySet()) { AttributeModifier attributemodifier = entry.getValue(); AttributeModifier attributemodifier1 = new AttributeModifier(attributemodifier.getName(), effect.getAttributeModifierAmount(effectinstance.getAmplifier(), attributemodifier), attributemodifier.getOperation()); list1.add(new Pair<>(entry.getKey(), attributemodifier1)); @@ -164,7 +164,7 @@ public class ItemBrewBase extends Item implements IBrewItem { lores.add(StringTextComponent.field_240750_d_); lores.add((new TranslationTextComponent("potion.whenDrank")).func_240699_a_(TextFormatting.DARK_PURPLE)); - for(Pair pair : list1) { + for (Pair pair : list1) { AttributeModifier attributemodifier2 = pair.getSecond(); double d0 = attributemodifier2.getAmount(); double d1; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index bce4a8691..76be81969 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -9,6 +9,7 @@ package vazkii.botania.common.item.relic; import com.mojang.datafixers.util.Pair; + import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -33,6 +34,7 @@ import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; + import java.util.Optional; public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUsingItem { @@ -139,8 +141,8 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs INBT nbt = ItemNBTHelper.get(stack, TAG_LOCATION); if (nbt != null) { return GlobalPos.field_239645_a_.decode(NBTDynamicOps.INSTANCE, nbt).result() - .map(Pair::getFirst) - .map(GlobalPos::getPos).orElse(null); + .map(Pair::getFirst) + .map(GlobalPos::getPos).orElse(null); } return null; } diff --git a/src/main/java/vazkii/botania/common/lib/ModTags.java b/src/main/java/vazkii/botania/common/lib/ModTags.java index 5e0cc309f..024797ca0 100644 --- a/src/main/java/vazkii/botania/common/lib/ModTags.java +++ b/src/main/java/vazkii/botania/common/lib/ModTags.java @@ -14,6 +14,7 @@ import net.minecraft.item.DyeColor; import net.minecraft.item.Item; import net.minecraft.tags.*; import net.minecraft.util.ResourceLocation; + import vazkii.botania.client.lib.LibResources; import java.lang.invoke.MethodHandle; diff --git a/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java b/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java index a786c830d..8f7f5b8d3 100644 --- a/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java +++ b/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java @@ -8,21 +8,21 @@ */ package vazkii.botania.common.world; - import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; + import net.minecraft.world.gen.feature.IFeatureConfig; import vazkii.botania.common.core.handler.ConfigHandler; public class MysticalFlowerConfig implements IFeatureConfig { public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( - Codec.INT.fieldOf("flower_patch_size").forGetter(MysticalFlowerConfig::getFlowerPatchSize), - Codec.INT.fieldOf("mushroom_patch_size").forGetter(MysticalFlowerConfig::getMushroomPatchSize), - Codec.INT.fieldOf("patch_count").forGetter(MysticalFlowerConfig::getPatchCount), - Codec.INT.fieldOf("patch_density").forGetter(MysticalFlowerConfig::getPatchDensity), - Codec.INT.fieldOf("patch_chance").forGetter(MysticalFlowerConfig::getPatchChance), - Codec.DOUBLE.fieldOf("tall_chance").forGetter(MysticalFlowerConfig::getTallChance) + Codec.INT.fieldOf("flower_patch_size").forGetter(MysticalFlowerConfig::getFlowerPatchSize), + Codec.INT.fieldOf("mushroom_patch_size").forGetter(MysticalFlowerConfig::getMushroomPatchSize), + Codec.INT.fieldOf("patch_count").forGetter(MysticalFlowerConfig::getPatchCount), + Codec.INT.fieldOf("patch_density").forGetter(MysticalFlowerConfig::getPatchDensity), + Codec.INT.fieldOf("patch_chance").forGetter(MysticalFlowerConfig::getPatchChance), + Codec.DOUBLE.fieldOf("tall_chance").forGetter(MysticalFlowerConfig::getTallChance) ).apply(instance, MysticalFlowerConfig::new)); private final int flowerPatchSize; @@ -34,12 +34,12 @@ public class MysticalFlowerConfig implements IFeatureConfig { public static MysticalFlowerConfig fromConfig() { return new MysticalFlowerConfig( - ConfigHandler.COMMON.flowerPatchSize.get(), - ConfigHandler.COMMON.mushroomQuantity.get(), - ConfigHandler.COMMON.flowerPatchSize.get(), - ConfigHandler.COMMON.flowerDensity.get(), - ConfigHandler.COMMON.flowerPatchChance.get(), - ConfigHandler.COMMON.flowerTallChance.get() + ConfigHandler.COMMON.flowerPatchSize.get(), + ConfigHandler.COMMON.mushroomQuantity.get(), + ConfigHandler.COMMON.flowerPatchSize.get(), + ConfigHandler.COMMON.flowerDensity.get(), + ConfigHandler.COMMON.flowerPatchChance.get(), + ConfigHandler.COMMON.flowerTallChance.get() ); } diff --git a/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java b/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java index a947f4d11..22f741fdd 100644 --- a/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java +++ b/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java @@ -17,8 +17,8 @@ import net.minecraft.world.ISeedReader; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.Heightmap; import net.minecraft.world.gen.feature.Feature; - import net.minecraft.world.gen.feature.structure.StructureManager; + import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/world/MysticalMushroomFeature.java b/src/main/java/vazkii/botania/common/world/MysticalMushroomFeature.java index 2d7dcb774..3911aaaa5 100644 --- a/src/main/java/vazkii/botania/common/world/MysticalMushroomFeature.java +++ b/src/main/java/vazkii/botania/common/world/MysticalMushroomFeature.java @@ -9,6 +9,7 @@ package vazkii.botania.common.world; import com.mojang.serialization.Dynamic; + import net.minecraft.block.BlockState; import net.minecraft.item.DyeColor; import net.minecraft.util.math.BlockPos; @@ -16,8 +17,8 @@ import net.minecraft.world.ISeedReader; import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.feature.Feature; - import net.minecraft.world.gen.feature.structure.StructureManager; + import vazkii.botania.common.block.ModBlocks; import java.util.Random; diff --git a/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java b/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java index 18807cfaf..bfa5f7353 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java @@ -10,6 +10,7 @@ package vazkii.botania.common.world; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; + import net.minecraft.block.BlockState; import net.minecraft.world.Blockreader; import net.minecraft.world.IBlockReader; @@ -23,10 +24,10 @@ import net.minecraft.world.gen.settings.DimensionStructuresSettings; public class SkyblockChunkGenerator extends ChunkGenerator { private static final Codec CODEC = RecordCodecBuilder.create( - instance -> instance.group( - BiomeProvider.field_235202_a_.fieldOf("biome_source").forGetter(scg -> scg.biomeProvider), - DimensionStructuresSettings.field_236190_a_.fieldOf("structures").forGetter(ChunkGenerator::func_235957_b_) - ).apply(instance, instance.stable(SkyblockChunkGenerator::new))); + instance -> instance.group( + BiomeProvider.field_235202_a_.fieldOf("biome_source").forGetter(scg -> scg.biomeProvider), + DimensionStructuresSettings.field_236190_a_.fieldOf("structures").forGetter(ChunkGenerator::func_235957_b_) + ).apply(instance, instance.stable(SkyblockChunkGenerator::new))); public SkyblockChunkGenerator(BiomeProvider provider, DimensionStructuresSettings settings) { super(provider, settings); @@ -53,13 +54,10 @@ public class SkyblockChunkGenerator extends ChunkGenerator { } @Override - public void func_230350_a_(long seed, BiomeManager biomes, IChunk chunk, GenerationStage.Carving stage) { - } + public void func_230350_a_(long seed, BiomeManager biomes, IChunk chunk, GenerationStage.Carving stage) {} @Override - public void func_230351_a_(WorldGenRegion region, StructureManager structureManager) { - } - + public void func_230351_a_(WorldGenRegion region, StructureManager structureManager) {} @Override public int func_222529_a(int x, int z, Heightmap.Type heightmapType) { diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 6faff9f7e..95d4ddd07 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -23,22 +23,22 @@ public class WorldTypeSkyblock extends BiomeGeneratorTypeScreens { public static boolean isWorldSkyblock(World world) { return world.getChunkProvider() instanceof ServerChunkProvider - && ((ServerChunkProvider) world.getChunkProvider()).getChunkGenerator() instanceof SkyblockChunkGenerator; + && ((ServerChunkProvider) world.getChunkProvider()).getChunkGenerator() instanceof SkyblockChunkGenerator; } /* todo 1.16 impossible now? - + @Override public float getCloudHeight() { return 260f; } - + // In skyblock worlds, do not darken the sky until player hits y=0 @Override public double getHorizon(World world) { return 0.0D; } - + @Override public double voidFadeMagnitude() { return 1.0D; diff --git a/src/main/java/vazkii/botania/data/BlockTagProvider.java b/src/main/java/vazkii/botania/data/BlockTagProvider.java index 1b0630f69..2b731781c 100644 --- a/src/main/java/vazkii/botania/data/BlockTagProvider.java +++ b/src/main/java/vazkii/botania/data/BlockTagProvider.java @@ -71,7 +71,7 @@ public class BlockTagProvider extends BlockTagsProvider { ); func_240522_a_(ModTags.Blocks.FLOATING_FLOWERS).func_240531_a_(ModTags.Blocks.MUNDANE_FLOATING_FLOWERS) - .func_240531_a_(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS); + .func_240531_a_(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS); func_240522_a_(ModTags.Blocks.MYSTICAL_FLOWERS).func_240534_a_( Arrays.stream(DyeColor.values())