diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index 884501954..14e1d3921 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -14,9 +14,11 @@ import net.minecraft.util.LazyValue; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import org.apache.logging.log4j.LogManager; import javax.annotation.Nullable; + import java.util.Collections; import java.util.List; import java.util.Map; @@ -25,7 +27,7 @@ import java.util.function.Function; public interface CorporeaHelper { LazyValue INSTANCE = new LazyValue<>(() -> { try { - return (CorporeaHelper) Class.forName("vazkii.botania.common.impl.CorporeaHelperImpl").newInstance(); + return (CorporeaHelper) Class.forName("vazkii.botania.common.impl.corporea.CorporeaHelperImpl").newInstance(); } catch (ReflectiveOperationException e) { LogManager.getLogger().warn("Unable to find CorporeaHelperImpl, using a dummy"); return new CorporeaHelper() {}; @@ -124,6 +126,7 @@ public interface CorporeaHelper { *
* When requesting counting of items, individual stacks may exceed maxStackSize for * purposes of counting huge amounts. + * * @return Triple of stacks extracted, number of items matched, and number of items extracted */ default ICorporeaResult requestItem(ICorporeaRequestMatcher matcher, int itemCount, ICorporeaSpark spark, boolean doit) { diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaRequest.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaRequest.java index a82054184..488da8b51 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaRequest.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaRequest.java @@ -13,7 +13,8 @@ public interface ICorporeaRequest { ICorporeaRequestMatcher getMatcher(); /** - * @return The amount still wanted by the request, -1 if the request wants everything matched by {@link #getMatcher}. + * @return The amount still wanted by the request, -1 if the request wants everything matched by + * {@link #getMatcher}. */ int getStillNeeded(); diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaRequestor.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaRequestor.java index d85890807..a36fb989d 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaRequestor.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaRequestor.java @@ -16,8 +16,8 @@ package vazkii.botania.api.corporea; public interface ICorporeaRequestor { /** - * Executes the passed in request. - */ + * Executes the passed in request. + */ void doCorporeaRequest(ICorporeaRequestMatcher request, int count, ICorporeaSpark spark); } diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaResult.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaResult.java index 1bf663aa5..6207e6853 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaResult.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaResult.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.api.corporea; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index ccc1dc28d..33eaff661 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -20,8 +20,8 @@ import net.minecraftforge.fml.common.Mod; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.helper.ShaderCallback; import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.core.helper.ShaderCallback; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityDoppleganger; @@ -77,18 +77,17 @@ public final class BossBarHandler { } private static void drawBar(EntityDoppleganger currentBoss, int x, int y, int u, int v, int w, int h, boolean bg) { - int program = currentBoss.getBossBarShaderProgram(bg); - boolean useShader = program > 0; + ShaderHelper.BotaniaShader program = currentBoss.getBossBarShaderProgram(bg); - if (useShader) { - ShaderCallback callback = currentBoss.getBossBarShaderCallback(bg, program); + if (program != null) { + ShaderCallback callback = currentBoss.getBossBarShaderCallback(bg); barUniformCallback.set(u, v, callback); ShaderHelper.useShader(program, barUniformCallback); } RenderHelper.drawTexturedModalRect(x, y, u, v, w, h); - if (useShader) { + if (program != null) { ShaderHelper.releaseShader(); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/LayerTerraHelmet.java b/src/main/java/vazkii/botania/client/core/handler/LayerTerraHelmet.java index 648da8b7d..ddd8f45c9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LayerTerraHelmet.java +++ b/src/main/java/vazkii/botania/client/core/handler/LayerTerraHelmet.java @@ -9,8 +9,8 @@ package vazkii.botania.client.core.handler; import com.mojang.blaze3d.matrix.MatrixStack; - import com.mojang.blaze3d.vertex.IVertexBuilder; + import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.AbstractClientPlayerEntity; import net.minecraft.client.renderer.Atlases; @@ -45,7 +45,7 @@ public class LayerTerraHelmet extends LayerRenderer { int grainIntensityUniform = GlStateManager.getUniformLocation(shader1, "grainIntensity"); diff --git a/src/main/java/vazkii/botania/common/impl/ManaItemHandlerImpl.java b/src/main/java/vazkii/botania/common/impl/ManaItemHandlerImpl.java index 56bc4acde..003f68694 100644 --- a/src/main/java/vazkii/botania/common/impl/ManaItemHandlerImpl.java +++ b/src/main/java/vazkii/botania/common/impl/ManaItemHandlerImpl.java @@ -1,11 +1,21 @@ +/* + * 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.impl; import com.google.common.collect.Iterables; + import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.*; diff --git a/src/main/java/vazkii/botania/common/impl/corporea/CorporeaHelperImpl.java b/src/main/java/vazkii/botania/common/impl/corporea/CorporeaHelperImpl.java index 0fb00e627..0a8801374 100644 --- a/src/main/java/vazkii/botania/common/impl/corporea/CorporeaHelperImpl.java +++ b/src/main/java/vazkii/botania/common/impl/corporea/CorporeaHelperImpl.java @@ -1,6 +1,15 @@ +/* + * 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.impl.corporea; import com.google.common.base.Predicates; + import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -11,6 +20,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.corporea.*; import vazkii.botania.common.block.tile.corporea.TileCorporeaRetainer; diff --git a/src/main/java/vazkii/botania/common/impl/corporea/CorporeaItemStackMatcher.java b/src/main/java/vazkii/botania/common/impl/corporea/CorporeaItemStackMatcher.java index 8b4fa2247..5bbb21df8 100644 --- a/src/main/java/vazkii/botania/common/impl/corporea/CorporeaItemStackMatcher.java +++ b/src/main/java/vazkii/botania/common/impl/corporea/CorporeaItemStackMatcher.java @@ -1,8 +1,17 @@ +/* + * 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.impl.corporea; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.text.ITextComponent; + import vazkii.botania.api.corporea.ICorporeaRequestMatcher; import vazkii.botania.common.core.helper.ItemNBTHelper; diff --git a/src/main/java/vazkii/botania/common/impl/corporea/CorporeaRequest.java b/src/main/java/vazkii/botania/common/impl/corporea/CorporeaRequest.java index 041254637..cc790a6a3 100644 --- a/src/main/java/vazkii/botania/common/impl/corporea/CorporeaRequest.java +++ b/src/main/java/vazkii/botania/common/impl/corporea/CorporeaRequest.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.impl.corporea; import vazkii.botania.api.corporea.ICorporeaRequest; diff --git a/src/main/java/vazkii/botania/common/impl/corporea/CorporeaResult.java b/src/main/java/vazkii/botania/common/impl/corporea/CorporeaResult.java index 38bded23c..edce89733 100644 --- a/src/main/java/vazkii/botania/common/impl/corporea/CorporeaResult.java +++ b/src/main/java/vazkii/botania/common/impl/corporea/CorporeaResult.java @@ -1,6 +1,15 @@ +/* + * 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.impl.corporea; import net.minecraft.item.ItemStack; + import vazkii.botania.api.corporea.ICorporeaResult; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/impl/corporea/CorporeaStringMatcher.java b/src/main/java/vazkii/botania/common/impl/corporea/CorporeaStringMatcher.java index 541755fca..471f70a99 100644 --- a/src/main/java/vazkii/botania/common/impl/corporea/CorporeaStringMatcher.java +++ b/src/main/java/vazkii/botania/common/impl/corporea/CorporeaStringMatcher.java @@ -1,10 +1,20 @@ +/* + * 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.impl.corporea; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; + import org.apache.commons.lang3.text.WordUtils; + import vazkii.botania.api.corporea.ICorporeaRequestMatcher; import java.util.regex.Pattern; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index b539556bb..f505ba97f 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -22,8 +22,8 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.common.core.helper.ColorHelper; import vazkii.botania.api.mana.IManaPool; +import vazkii.botania.common.core.helper.ColorHelper; import vazkii.botania.common.item.Item16Colors; import javax.annotation.Nonnull; diff --git a/src/test/java/vazkii/botania/test/APITest.java b/src/test/java/vazkii/botania/test/APITest.java index 59a173401..ceab95fe0 100644 --- a/src/test/java/vazkii/botania/test/APITest.java +++ b/src/test/java/vazkii/botania/test/APITest.java @@ -1,6 +1,15 @@ +/* + * 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.test; import org.junit.jupiter.api.Test; + import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.impl.ManaItemHandlerImpl;