This commit is contained in:
Vincent Lee committed 2016-05-26 23:08:53 -05:00
1 parent 7f759c1b88
commit e3e6f8996f
158 files changed
+393 -477

No files matched your search

@@ -11,9 +11,7 @@
package vazkii.botania.api.boss;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.BossInfo;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.internal.ShaderCallback;
@@ -10,8 +10,8 @@
package vazkii.botania.api.corporea;
public class CorporeaRequest {
public Object matcher;
public boolean checkNBT;
public final Object matcher;
public final boolean checkNBT;
public int count;
public int foundItems = 0;
public int extractedItems = 0;
@@ -25,7 +25,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandlerModifiable;
import vazkii.botania.api.boss.IBotaniaBoss;
import vazkii.botania.api.corporea.IWrappedInventory;
import vazkii.botania.api.corporea.InvWithLocation;
import vazkii.botania.api.lexicon.LexiconPage;
@@ -26,7 +26,6 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.items.IItemHandlerModifiable;
import vazkii.botania.api.boss.IBotaniaBoss;
import vazkii.botania.api.corporea.IWrappedInventory;
import vazkii.botania.api.corporea.InvWithLocation;
import vazkii.botania.api.lexicon.LexiconPage;
@@ -13,7 +13,6 @@ package vazkii.botania.api.internal;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.server.management.PlayerChunkMapEntry;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -23,7 +23,7 @@ public interface IFloatingFlower {
public void setIslandType(IslandType type);
public class IslandType {
private static HashMap<String, IslandType> registry = new HashMap<>();
private static final HashMap<String, IslandType> registry = new HashMap<>();
public static final IslandType GRASS = new IslandType("GRASS");
public static final IslandType PODZOL = new IslandType("PODZOL");
@@ -28,11 +28,11 @@ public class LexiconEntry implements Comparable<LexiconEntry> {
private KnowledgeType type = BotaniaAPI.basicKnowledge;
public List<LexiconPage> pages = new ArrayList<>();
public final List<LexiconPage> pages = new ArrayList<>();
private boolean priority = false;
private ItemStack icon = null;
private List<ItemStack> extraDisplayedRecipes = new ArrayList<>();
private final List<ItemStack> extraDisplayedRecipes = new ArrayList<>();
/**
* @param unlocalizedName The unlocalized name of this entry. This will be localized by the client display.
@@ -23,7 +23,7 @@ import java.util.Map;
*/
public final class LexiconRecipeMappings {
private static Map<String, EntryData> mappings = new HashMap<>();
private static final Map<String, EntryData> mappings = new HashMap<>();
/**
* Maps the given stack to the given page of the entry.
@@ -29,14 +29,14 @@ import java.util.Map;
*/
public class Multiblock {
public List<MultiblockComponent> components = new ArrayList<>();
public List<ItemStack> materials = new ArrayList<>();
public final List<MultiblockComponent> components = new ArrayList<>();
public final List<ItemStack> materials = new ArrayList<>();
public BlockPos minPos = BlockPos.ORIGIN;
public BlockPos maxPos = BlockPos.ORIGIN;
public BlockPos offPos = BlockPos.ORIGIN;
public HashMap<BlockPos, MultiblockComponent> locationCache = new HashMap<>();
public final HashMap<BlockPos, MultiblockComponent> locationCache = new HashMap<>();
/**
* Adds a multiblock component to this multiblock. The component's x y z
@@ -27,7 +27,7 @@ public class MultiblockComponent {
protected BlockPos relPos;
protected final IBlockState state;
protected final TileEntity tileEntity;
private boolean doFancyRender;
private final boolean doFancyRender;
public MultiblockComponent(BlockPos relPos, IBlockState state) {
this(relPos, state, null);
@@ -145,7 +145,7 @@ public final class ManaItemHandler {
if(stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canExportManaToItem(stack, stackInSlot))
continue;
int received = 0;
int received;
if(manaItemSlot.getMana(stackInSlot) + manaToSend <= manaItemSlot.getMaxMana(stackInSlot))
received = manaToSend;
else received = manaToSend - (manaItemSlot.getMana(stackInSlot) + manaToSend - manaItemSlot.getMaxMana(stackInSlot));
@@ -17,7 +17,7 @@ public enum EnumChallengeLevel {
HARD("botania.challengelevel.hard"),
LUNATIC("botania.challengelevel.lunatic");
String name;
final String name;
private EnumChallengeLevel(String name) {
this.name = name;
@@ -25,7 +25,6 @@ import vazkii.botania.client.lib.LibResources;
import java.awt.*;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import java.util.WeakHashMap;
@@ -40,7 +40,7 @@ public class CorporeaAutoCompleteHandler {
private List<CompletionData> completions = new ArrayList<>();
private int position;
static TreeSet<String> itemNames = new TreeSet<>(String::compareToIgnoreCase);
static final TreeSet<String> itemNames = new TreeSet<>(String::compareToIgnoreCase);
private boolean tabLastTick = false;
@@ -165,8 +165,8 @@ public class CorporeaAutoCompleteHandler {
private static class CompletionData implements Comparable<CompletionData> {
private String string;
private int prefixLength;
private final String string;
private final int prefixLength;
public CompletionData(String string, int prefixLength) {
this.string = string;
@@ -37,7 +37,6 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.ILexicon;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
public final class ItemsRemainingRenderHandler {
private static int maxTicks = 30;
private static int leaveTicks = 20;
private static final int maxTicks = 30;
private static final int leaveTicks = 20;
private static ItemStack stack;
private static int ticks, count;
@@ -38,7 +38,6 @@ import java.awt.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Random;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -115,7 +114,7 @@ public class LightningHandler {
private void renderBolt(LightningBolt bolt, Tessellator tessellator, float partialframe, float cosyaw, float cospitch, float sinyaw, float cossinpitch, int pass, boolean inner) {
ParticleRenderDispatcher.lightningCount++;
float boltage = bolt.particleAge < 0 ? 0 : (float) bolt.particleAge / (float) bolt.particleMaxAge;
float mainalpha = 1;
float mainalpha;
if(pass == 0)
mainalpha = (1 - boltage) * 0.4F;
else mainalpha = 1 - boltage * 0.5F;
@@ -173,24 +172,24 @@ public class LightningHandler {
public static class LightningBolt {
public ArrayList<Segment> segments = new ArrayList<>();
public Vector3 start;
public Vector3 end;
public final Vector3 start;
public final Vector3 end;
BlockPos target;
TIntIntHashMap splitparents = new TIntIntHashMap();
final TIntIntHashMap splitparents = new TIntIntHashMap();
public double length;
public final double length;
public int numsegments0;
private int numsplits;
private boolean finalized;
private Random rand;
public long seed;
private final Random rand;
public final long seed;
public int particleAge;
public int particleMaxAge;
public final int particleMaxAge;
public boolean isDead;
private AxisAlignedBB boundingBox;
private World world;
private final World world;
private Entity source;
public static final ConcurrentLinkedQueue<LightningBolt> boltlist = new ConcurrentLinkedQueue<>();
@@ -201,8 +200,8 @@ public class LightningHandler {
public static int playerdamage = 1;
public static int entitydamage = 1;
public int colorOuter;
public int colorInner;
public final int colorOuter;
public final int colorInner;
public static class BoltPoint {
@@ -212,9 +211,9 @@ public class LightningHandler {
this.offsetvec = offsetvec;
}
public Vector3 point;
Vector3 basepoint;
Vector3 offsetvec;
public final Vector3 point;
final Vector3 basepoint;
final Vector3 offsetvec;
}
private static final Comparator<Segment> SEGMENT_SORTER = (o1, o2) -> {
@@ -274,8 +273,8 @@ public class LightningHandler {
return startpoint.point.toString() + " " + endpoint.point.toString();
}
public BoltPoint startpoint;
public BoltPoint endpoint;
public final BoltPoint startpoint;
public final BoltPoint endpoint;
public Vector3 diff;
@@ -287,10 +286,10 @@ public class LightningHandler {
public float sinprev;
public float sinnext;
public float light;
public final float light;
public int segmentno;
public int splitno;
public final int segmentno;
public final int splitno;
}
public LightningBolt(World world, Vector3 sourcevec, Vector3 targetvec, float ticksPerMeter, long seed, int colorOuter, int colorInner) {
@@ -338,7 +337,7 @@ public class LightningHandler {
ArrayList<Segment> oldsegments = segments;
segments = new ArrayList<>();
Segment prev = null;
Segment prev;
for(Segment segment : oldsegments) {
prev = segment.prev;
@@ -63,7 +63,7 @@ public class MiscellaneousIcons {
public TextureAtlasSprite[] sparkUpgradeIcons;
public TextureAtlasSprite[] kingKeyWeaponIcons;
public Map<TriggerManaLevel.State, TextureAtlasSprite> manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class);
public final Map<TriggerManaLevel.State, TextureAtlasSprite> manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class);
public TextureAtlasSprite[] tiaraWingIcons;
// begin dank_memes
@@ -16,11 +16,9 @@ import net.minecraft.block.BlockFlower;
import net.minecraft.block.BlockSkull;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.BlockWall;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.StateMap;
import net.minecraft.client.resources.IReloadableResourceManager;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -52,7 +50,6 @@ import vazkii.botania.api.state.enums.PrismarineVariant;
import vazkii.botania.api.state.enums.PylonVariant;
import vazkii.botania.api.state.enums.SpreaderVariant;
import vazkii.botania.api.state.enums.StorageVariant;
import vazkii.botania.client.model.FloatingFlowerModel;
import vazkii.botania.client.model.SpecialFlowerModel;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
@@ -40,7 +40,7 @@ import vazkii.botania.common.block.ModBlocks;
public final class MultiblockRenderHandler {
private static MultiblockBlockAccess blockAccess = new MultiblockBlockAccess();
private static final MultiblockBlockAccess blockAccess = new MultiblockBlockAccess();
private static int dimension;
public static boolean rendering = false;
@@ -30,12 +30,12 @@ import vazkii.botania.common.item.ModItems;
// Hacky way to render 3D lexicon, will be reevaluated in the future.
public class RenderLexicon {
ModelBook model = new ModelBook();
ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA);
final ModelBook model = new ModelBook();
final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA);
@SubscribeEvent
public void renderItem(RenderHandEvent evt) {
Minecraft mc = Minecraft.getMinecraft();
Minecraft mc;
if(true || !ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 || !PlayerHelper.hasHeldItem(mc.thePlayer, ModItems.lexicon))
return;
evt.setCanceled(true);
@@ -127,8 +127,8 @@ public class RenderLexicon {
private void doRender() {
GlStateManager.pushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
float opening = 0F;
float pageFlip = 0F;
float opening;
float pageFlip;
float ticks = ClientTickHandler.ticksWithLexicaOpen;
if(ticks > 0 && ticks < 10) {
@@ -92,7 +92,7 @@ public final class ShaderHelper {
// http://lwjgl.org/wiki/index.php?title=GLSL_Shaders_with_LWJGL
private static int createProgram(String vert, String frag) {
int vertId = 0, fragId = 0, program = 0;
int vertId = 0, fragId = 0, program;
if(vert != null)
vertId = createShader(vert, VERT);
if(frag != null)
@@ -36,8 +36,8 @@ public class FXSparkle extends Particle {
public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES);
private static Queue<FXSparkle> queuedRenders = new ArrayDeque<>();
private static Queue<FXSparkle> queuedCorruptRenders = new ArrayDeque<>();
private static final Queue<FXSparkle> queuedRenders = new ArrayDeque<>();
private static final Queue<FXSparkle> queuedCorruptRenders = new ArrayDeque<>();
// Queue values
private float f;
@@ -212,7 +212,6 @@ public class FXSparkle extends Particle {
}
if (var21 && 1.0D - var14 < var23) {
var23 = 1.0D - var14;
var22 = 5;
}
@@ -256,9 +255,9 @@ public class FXSparkle extends Particle {
public boolean corrupt = false;
public boolean fake = false;
private int multiplier = 2;
private boolean shrink = true;
public int particle = 16;
private final boolean shrink = true;
public final int particle = 16;
public boolean tinkle = false;
public boolean slowdown = true;
public final boolean slowdown = true;
public int currentColor = 0;
}
@@ -34,8 +34,8 @@ public class FXWisp extends Particle {
public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE);
private static Queue<FXWisp> queuedRenders = new ArrayDeque<>();
private static Queue<FXWisp> queuedDepthIgnoringRenders = new ArrayDeque<>();
private static final Queue<FXWisp> queuedRenders = new ArrayDeque<>();
private static final Queue<FXWisp> queuedDepthIgnoringRenders = new ArrayDeque<>();
// Queue values
private float f;
@@ -171,8 +171,8 @@ public class FXWisp extends Particle {
private boolean depthTest = true;
public boolean distanceLimit = true;
private float moteParticleScale;
private int moteHalfLife;
private final float moteParticleScale;
private final int moteHalfLife;
public boolean tinkle = false;
public int blendmode = 1;
}
@@ -21,7 +21,7 @@ import javax.annotation.Nonnull;
public class ContainerFlowerBag extends Container {
InventoryFlowerBag flowerBagInv;
final InventoryFlowerBag flowerBagInv;
public ContainerFlowerBag(EntityPlayer player) {
int i;
@@ -26,8 +26,8 @@ public class InventoryFlowerBag implements IInventory {
private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16];
EntityPlayer player;
int slot;
final EntityPlayer player;
final int slot;
ItemStack[] stacks = null;
boolean invPushed = false;
@@ -17,8 +17,8 @@ import vazkii.botania.common.block.ModBlocks;
public class SlotFlower extends Slot {
InventoryFlowerBag inv;
int color;
final InventoryFlowerBag inv;
final int color;
public SlotFlower(InventoryFlowerBag p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_, int color) {
super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_);
@@ -27,8 +27,8 @@ import javax.annotation.Nonnull;
public class ContainerBaubleBox extends Container {
InventoryBaubleBox baubleBoxInv;
InventoryBaubles baubles;
final InventoryBaubleBox baubleBoxInv;
final InventoryBaubles baubles;
public ContainerBaubleBox(EntityPlayer player) {
int i;
@@ -26,8 +26,8 @@ public class InventoryBaubleBox implements IInventory {
private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16];
EntityPlayer player;
int slot;
final EntityPlayer player;
final int slot;
ItemStack[] stacks = null;
boolean invPushed = false;
@@ -17,7 +17,7 @@ import vazkii.botania.api.mana.IManaItem;
public class SlotAnyBauble extends Slot {
InventoryBaubleBox inv;
final InventoryBaubleBox inv;
public SlotAnyBauble(InventoryBaubleBox p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_) {
super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_);
@@ -110,8 +110,8 @@ public class GuiLexicon extends GuiScreen {
List<LexiconCategory> allCategories;
String title;
int guiWidth = 146;
int guiHeight = 180;
final int guiWidth = 146;
final int guiHeight = 180;
int left, top;
@Override
@@ -155,7 +155,7 @@ public class GuiLexicon extends GuiScreen {
} else if(isCategoryIndex()) {
int categories = allCategories.size();
for(int i = 0; i < categories + 1; i++) {
LexiconCategory category = null;
LexiconCategory category;
category = i >= categories ? null : allCategories.get(i);
int perline = 5;
int x = i % perline;
@@ -54,7 +54,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
LexiconEntry currentEntry;
float infoTime;
List<LexiconEntry> entriesToDisplay = new ArrayList<>();
final List<LexiconEntry> entriesToDisplay = new ArrayList<>();
public GuiLexiconIndex() {
parent = new GuiLexicon();
@@ -206,8 +206,8 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
infoTime = Math.max(0, infoTime - timeDelta);
if(currentButton != null && infoTime == 0) {
int x = par1 + 10;
int y = par2;
int x;
int y;
x = currentButton.xPosition - 20;
y = currentButton.yPosition;
@@ -12,7 +12,7 @@ import java.util.List;
public class GuiButtonBookmark extends GuiButtonLexicon {
GuiLexicon gui;
final GuiLexicon gui;
public GuiButtonBookmark(int par1, int par2, int par3, GuiLexicon gui, String str) {
super(par1, par2, par3, gui.bookmarkWidth(str) + 5, 11, str);
@@ -36,13 +36,13 @@ public class GuiButtonCategory extends GuiButtonLexicon {
private static boolean boundStencil = false;
GuiLexicon gui;
private LexiconCategory category;
final GuiLexicon gui;
private final LexiconCategory category;
private ResourceLocation resource = null;
private float ticksHovered = 0F;
private float time = 12F;
private final float time = 12F;
private ShaderCallback shaderCallback = shader -> {
private final ShaderCallback shaderCallback = shader -> {
TextureManager r = Minecraft.getMinecraft().renderEngine;
int heightMatchUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "heightMatch");
int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image");
@@ -23,7 +23,7 @@ import java.util.List;
public class GuiButtonChallengeIcon extends GuiButtonLexicon {
public Challenge challenge;
public final Challenge challenge;
public GuiButtonChallengeIcon(int id, int x, int y, Challenge challenge) {
super(id, x, y, 16, 16, "");
@@ -21,7 +21,7 @@ import java.util.List;
public class GuiButtonChallengeInfo extends GuiButtonLexicon {
GuiLexicon gui;
final GuiLexicon gui;
public GuiButtonChallengeInfo(int par1, int par2, int par3, String str, GuiLexicon gui) {
super(par1, par2, par3, gui.bookmarkWidth(str) + 5, 11, str);
@@ -22,7 +22,7 @@ import java.util.List;
public class GuiButtonHistory extends GuiButtonLexicon {
GuiLexicon gui;
final GuiLexicon gui;
public GuiButtonHistory(int par1, int par2, int par3, String str, GuiLexicon gui) {
super(par1, par2, par3, gui.bookmarkWidth(str) + 5, 11, str);
@@ -30,7 +30,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon {
private static final ResourceLocation dogResource = new ResourceLocation(LibResources.GUI_DOG);
GuiLexiconIndex gui;
final GuiLexiconIndex gui;
public ItemStack displayStack = null;
public boolean dog = false;
float timeHover = 0;
@@ -23,7 +23,7 @@ import java.util.List;
public class GuiButtonNotes extends GuiButtonLexicon {
GuiLexicon parent;
final GuiLexicon parent;
public GuiButtonNotes(GuiLexicon parent, int id, int x, int y) {
super(id, x, y, 11, 11, "");
@@ -21,7 +21,7 @@ import java.util.Collections;
public class GuiButtonPage extends GuiButtonLexicon {
boolean right;
final boolean right;
public GuiButtonPage(int par1, int par2, int par3, boolean right) {
super(par1, par2, par3, 18, 10, "");
@@ -33,7 +33,6 @@ import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeCategory
import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeHandler;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import javax.annotation.Nonnull;
@@ -15,12 +15,12 @@ import net.minecraft.client.model.ModelRenderer;
public class ModelAvatar extends ModelBase {
public ModelRenderer body;
public ModelRenderer rightarm;
public ModelRenderer leftarm;
public ModelRenderer rightleg;
public ModelRenderer leftleg;
public ModelRenderer head;
public final ModelRenderer body;
public final ModelRenderer rightarm;
public final ModelRenderer leftarm;
public final ModelRenderer rightleg;
public final ModelRenderer leftleg;
public final ModelRenderer head;
public ModelAvatar() {
textureWidth = 32;
@@ -16,13 +16,13 @@ import net.minecraft.client.renderer.GlStateManager;
public class ModelBellows extends ModelBase {
ModelRenderer Base;
ModelRenderer Top;
ModelRenderer Funnel;
ModelRenderer Pipe;
ModelRenderer Handle1;
ModelRenderer Handle2;
ModelRenderer Handle3;
final ModelRenderer Base;
final ModelRenderer Top;
final ModelRenderer Funnel;
final ModelRenderer Pipe;
final ModelRenderer Handle1;
final ModelRenderer Handle2;
final ModelRenderer Handle3;
public ModelBellows() {
textureWidth = 64;
@@ -15,18 +15,18 @@ import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelBlackHoleCube extends ModelBase {
public ModelRenderer shape1;
public ModelRenderer shape1_1;
public ModelRenderer shape1_2;
public ModelRenderer shape1_3;
public ModelRenderer shape1_4;
public ModelRenderer shape1_5;
public ModelRenderer shape1_6;
public ModelRenderer shape1_7;
public ModelRenderer shape1_8;
public ModelRenderer shape1_9;
public ModelRenderer shape1_10;
public ModelRenderer shape1_11;
public final ModelRenderer shape1;
public final ModelRenderer shape1_1;
public final ModelRenderer shape1_2;
public final ModelRenderer shape1_3;
public final ModelRenderer shape1_4;
public final ModelRenderer shape1_5;
public final ModelRenderer shape1_6;
public final ModelRenderer shape1_7;
public final ModelRenderer shape1_8;
public final ModelRenderer shape1_9;
public final ModelRenderer shape1_10;
public final ModelRenderer shape1_11;
public ModelBlackHoleCube() {
textureWidth = 36;
@@ -17,10 +17,10 @@ import vazkii.botania.client.render.tile.RenderTileBrewery;
public class ModelBrewery extends ModelBase {
ModelRenderer Pole;
ModelRenderer Top;
ModelRenderer Bottom;
ModelRenderer Plate;
final ModelRenderer Pole;
final ModelRenderer Top;
final ModelRenderer Bottom;
final ModelRenderer Plate;
public ModelBrewery() {
textureWidth = 64;
@@ -14,9 +14,9 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
public class ModelCrystalCube extends ModelBase {
public ModelRenderer cube;
public ModelRenderer base1;
public ModelRenderer base2;
public final ModelRenderer cube;
public final ModelRenderer base1;
public final ModelRenderer base2;
public ModelCrystalCube() {
textureWidth = 48;
@@ -19,13 +19,13 @@ import java.awt.*;
public class ModelHourglass extends ModelBase {
public ModelRenderer ring;
public ModelRenderer base1;
public ModelRenderer base2;
public ModelRenderer glass1;
public ModelRenderer sand1;
public ModelRenderer glass2;
public ModelRenderer sand2;
public final ModelRenderer ring;
public final ModelRenderer base1;
public final ModelRenderer base2;
public final ModelRenderer glass1;
public final ModelRenderer sand1;
public final ModelRenderer glass2;
public final ModelRenderer sand2;
public ModelHourglass() {
textureWidth = 48;
@@ -17,9 +17,9 @@ import net.minecraft.util.math.MathHelper;
public class ModelPixie extends ModelBase {
ModelRenderer Body;
ModelRenderer LeftWing;
ModelRenderer RightWing;
final ModelRenderer Body;
final ModelRenderer LeftWing;
final ModelRenderer RightWing;
public ModelPixie() {
textureWidth = 64;
@@ -16,22 +16,22 @@ import vazkii.botania.api.state.enums.PylonVariant;
public class ModelPylonOld extends ModelBase implements IPylonModel {
ModelRenderer crystal1;
ModelRenderer crystal2;
ModelRenderer crystal3;
ModelRenderer crystal4;
ModelRenderer crystal5;
ModelRenderer crystal6;
ModelRenderer crystal7;
ModelRenderer crystal8;
ModelRenderer outside1;
ModelRenderer outside2;
ModelRenderer outside3;
ModelRenderer outside4;
ModelRenderer outside5;
ModelRenderer outside6;
ModelRenderer outside7;
ModelRenderer outside8;
final ModelRenderer crystal1;
final ModelRenderer crystal2;
final ModelRenderer crystal3;
final ModelRenderer crystal4;
final ModelRenderer crystal5;
final ModelRenderer crystal6;
final ModelRenderer crystal7;
final ModelRenderer crystal8;
final ModelRenderer outside1;
final ModelRenderer outside2;
final ModelRenderer outside3;
final ModelRenderer outside4;
final ModelRenderer outside5;
final ModelRenderer outside6;
final ModelRenderer outside7;
final ModelRenderer outside8;
public ModelPylonOld() {
textureWidth = 64;
@@ -19,7 +19,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler;
public class ModelSpinningCubes extends ModelBase {
ModelRenderer spinningCube;
final ModelRenderer spinningCube;
public ModelSpinningCubes() {
spinningCube = new ModelRenderer(this, 42, 0);
@@ -15,16 +15,16 @@ import net.minecraft.client.model.ModelRenderer;
public class ModelSpreader extends ModelBase {
ModelRenderer cubeSide1;
ModelRenderer cubeSide2;
ModelRenderer cubeSide3;
ModelRenderer cubeSide4;
ModelRenderer cubeSide5;
ModelRenderer cubeHole1;
ModelRenderer cubeHole2;
ModelRenderer cubeHole3;
ModelRenderer cubeHole4;
ModelRenderer cubeInside;
final ModelRenderer cubeSide1;
final ModelRenderer cubeSide2;
final ModelRenderer cubeSide3;
final ModelRenderer cubeSide4;
final ModelRenderer cubeSide5;
final ModelRenderer cubeHole1;
final ModelRenderer cubeHole2;
final ModelRenderer cubeHole3;
final ModelRenderer cubeHole4;
final ModelRenderer cubeInside;
public ModelSpreader() {
textureWidth = 64;
@@ -16,10 +16,10 @@ import net.minecraft.client.model.ModelRenderer;
public class ModelTeruTeruBozu extends ModelBase {
public ModelRenderer thread;
public ModelRenderer cloth;
public ModelRenderer happyFace;
public ModelRenderer sadFace;
public final ModelRenderer thread;
public final ModelRenderer cloth;
public final ModelRenderer happyFace;
public final ModelRenderer sadFace;
public ModelTeruTeruBozu() {
textureWidth = 64;
@@ -15,7 +15,7 @@ import net.minecraft.client.model.ModelRenderer;
public class ModelTinyPotato extends ModelBase {
ModelRenderer potato;
final ModelRenderer potato;
public ModelTinyPotato() {
textureWidth = 64;
@@ -22,36 +22,36 @@ import javax.annotation.Nonnull;
public class ModelArmorElementium extends ModelBiped {
public ModelRenderer helm;
public ModelRenderer body;
public ModelRenderer armR;
public ModelRenderer armL;
public ModelRenderer belt;
public ModelRenderer bootR;
public ModelRenderer bootL;
public ModelRenderer helm1;
public ModelRenderer helm2;
public ModelRenderer helm3;
public ModelRenderer fairy;
public ModelRenderer helmWing1;
public ModelRenderer helmWing2;
public ModelRenderer helmWing3;
public ModelRenderer helmWing4;
public ModelRenderer body2;
public ModelRenderer armRpauldron;
public ModelRenderer wing1;
public ModelRenderer wing2;
public ModelRenderer armLpauldron;
public ModelRenderer wing1_1;
public ModelRenderer wing2_1;
public ModelRenderer legR;
public ModelRenderer legL;
public ModelRenderer bootR1;
public ModelRenderer wing1_2;
public ModelRenderer wing2_2;
public ModelRenderer bootL1;
public ModelRenderer wing1_3;
public ModelRenderer wing2_3;
public final ModelRenderer helm;
public final ModelRenderer body;
public final ModelRenderer armR;
public final ModelRenderer armL;
public final ModelRenderer belt;
public final ModelRenderer bootR;
public final ModelRenderer bootL;
public final ModelRenderer helm1;
public final ModelRenderer helm2;
public final ModelRenderer helm3;
public final ModelRenderer fairy;
public final ModelRenderer helmWing1;
public final ModelRenderer helmWing2;
public final ModelRenderer helmWing3;
public final ModelRenderer helmWing4;
public final ModelRenderer body2;
public final ModelRenderer armRpauldron;
public final ModelRenderer wing1;
public final ModelRenderer wing2;
public final ModelRenderer armLpauldron;
public final ModelRenderer wing1_1;
public final ModelRenderer wing2_1;
public final ModelRenderer legR;
public final ModelRenderer legL;
public final ModelRenderer bootR1;
public final ModelRenderer wing1_2;
public final ModelRenderer wing2_2;
public final ModelRenderer bootL1;
public final ModelRenderer wing1_3;
public final ModelRenderer wing2_3;
private final EntityEquipmentSlot slot;
@@ -23,25 +23,25 @@ import javax.annotation.Nonnull;
public class ModelArmorManasteel extends ModelBiped {
public ModelRenderer helm;
public ModelRenderer body;
public ModelRenderer armR;
public ModelRenderer armL;
public ModelRenderer belt;
public ModelRenderer bootR;
public ModelRenderer bootL;
public ModelRenderer helm1;
public ModelRenderer helm2;
public ModelRenderer helm3;
public ModelRenderer helm4;
public ModelRenderer helm5;
public ModelRenderer helm6;
public ModelRenderer helm7;
public ModelRenderer body2;
public ModelRenderer armRpauldron;
public ModelRenderer armLpauldron;
public ModelRenderer legR;
public ModelRenderer legL;
public final ModelRenderer helm;
public final ModelRenderer body;
public final ModelRenderer armR;
public final ModelRenderer armL;
public final ModelRenderer belt;
public final ModelRenderer bootR;
public final ModelRenderer bootL;
public final ModelRenderer helm1;
public final ModelRenderer helm2;
public final ModelRenderer helm3;
public final ModelRenderer helm4;
public final ModelRenderer helm5;
public final ModelRenderer helm6;
public final ModelRenderer helm7;
public final ModelRenderer body2;
public final ModelRenderer armRpauldron;
public final ModelRenderer armLpauldron;
public final ModelRenderer legR;
public final ModelRenderer legL;
private final EntityEquipmentSlot slot;
@@ -22,26 +22,26 @@ import javax.annotation.Nonnull;
public class ModelArmorManaweave extends ModelBiped {
public ModelRenderer helm;
public ModelRenderer body;
public ModelRenderer armR;
public ModelRenderer armL;
public ModelRenderer legR;
public ModelRenderer legL;
public ModelRenderer bootR;
public ModelRenderer bootL;
public ModelRenderer helm2;
public ModelRenderer helm3;
public ModelRenderer helm4;
public ModelRenderer helmSeam1;
public ModelRenderer helmSeam2;
public ModelRenderer helmSeam3;
public ModelRenderer helmSeam4;
public ModelRenderer body2;
public ModelRenderer armRpauldron;
public ModelRenderer armLpauldron;
public ModelRenderer skirtR;
public ModelRenderer skirtL;
public final ModelRenderer helm;
public final ModelRenderer body;
public final ModelRenderer armR;
public final ModelRenderer armL;
public final ModelRenderer legR;
public final ModelRenderer legL;
public final ModelRenderer bootR;
public final ModelRenderer bootL;
public final ModelRenderer helm2;
public final ModelRenderer helm3;
public final ModelRenderer helm4;
public final ModelRenderer helmSeam1;
public final ModelRenderer helmSeam2;
public final ModelRenderer helmSeam3;
public final ModelRenderer helmSeam4;
public final ModelRenderer body2;
public final ModelRenderer armRpauldron;
public final ModelRenderer armLpauldron;
public final ModelRenderer skirtR;
public final ModelRenderer skirtL;
private final EntityEquipmentSlot slot;
@@ -22,39 +22,39 @@ import javax.annotation.Nonnull;
public class ModelArmorTerrasteel extends ModelBiped {
public ModelRenderer helm;
public ModelRenderer body;
public ModelRenderer armr;
public ModelRenderer armL;
public ModelRenderer belt;
public ModelRenderer bootR;
public ModelRenderer bootL;
public ModelRenderer helm2;
public ModelRenderer helm3;
public ModelRenderer helm4;
public ModelRenderer helmLeaf1;
public ModelRenderer helmLeaf2;
public ModelRenderer helmLeaf3;
public ModelRenderer helmLeaf4;
public ModelRenderer helmLeaf5;
public ModelRenderer helmLeaf6;
public ModelRenderer helmbranch1;
public ModelRenderer helmbranch2;
public ModelRenderer helmbranch3;
public ModelRenderer helmbranch4;
public ModelRenderer body2;
public ModelRenderer armRpauldron;
public ModelRenderer armRbranch1;
public ModelRenderer armRbranch2;
public ModelRenderer armLpauldron;
public ModelRenderer armLbranch1;
public ModelRenderer armLbranch2;
public ModelRenderer legR;
public ModelRenderer legL;
public ModelRenderer bootR1;
public ModelRenderer bootRbranch;
public ModelRenderer bootL2;
public ModelRenderer bootLbranch;
public final ModelRenderer helm;
public final ModelRenderer body;
public final ModelRenderer armr;
public final ModelRenderer armL;
public final ModelRenderer belt;
public final ModelRenderer bootR;
public final ModelRenderer bootL;
public final ModelRenderer helm2;
public final ModelRenderer helm3;
public final ModelRenderer helm4;
public final ModelRenderer helmLeaf1;
public final ModelRenderer helmLeaf2;
public final ModelRenderer helmLeaf3;
public final ModelRenderer helmLeaf4;
public final ModelRenderer helmLeaf5;
public final ModelRenderer helmLeaf6;
public final ModelRenderer helmbranch1;
public final ModelRenderer helmbranch2;
public final ModelRenderer helmbranch3;
public final ModelRenderer helmbranch4;
public final ModelRenderer body2;
public final ModelRenderer armRpauldron;
public final ModelRenderer armRbranch1;
public final ModelRenderer armRbranch2;
public final ModelRenderer armLpauldron;
public final ModelRenderer armLbranch1;
public final ModelRenderer armLbranch2;
public final ModelRenderer legR;
public final ModelRenderer legL;
public final ModelRenderer bootR1;
public final ModelRenderer bootRbranch;
public final ModelRenderer bootL2;
public final ModelRenderer bootLbranch;
private final EntityEquipmentSlot slot;
@@ -17,7 +17,6 @@ import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.ARBShaderObjects;
import vazkii.botania.api.internal.ShaderCallback;
import vazkii.botania.client.core.handler.BossBarHandler;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.common.entity.EntityDoppleganger;
@@ -14,9 +14,6 @@ import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderWither;
import net.minecraft.entity.boss.EntityWither;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import vazkii.botania.client.lib.LibResources;
import javax.annotation.Nonnull;
@@ -27,7 +27,7 @@ import javax.annotation.Nonnull;
public class RenderPixie extends RenderLiving<EntityPixie> {
ShaderCallback callback = shader -> {
final ShaderCallback callback = shader -> {
// Frag Uniforms
int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration");
ARBShaderObjects.glUniform1fARB(disfigurationUniform, 0.025F);
@@ -27,7 +27,7 @@ import javax.annotation.Nonnull;
public class RenderTileBrewery extends TileEntitySpecialRenderer<TileBrewery> {
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY);
ModelBrewery model = new ModelBrewery();
final ModelBrewery model = new ModelBrewery();
public TileBrewery brewery;
@Override
@@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderEntityItem;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -39,7 +38,6 @@ import net.minecraftforge.common.property.Properties;
import org.apache.commons.lang3.tuple.Pair;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.model.ModelCrystalCube;
import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
import vazkii.botania.common.core.handler.MethodHandles;
@@ -24,7 +24,7 @@ import javax.annotation.Nonnull;
public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer<TileCorporeaIndex> {
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX);
ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false);
final ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false);
public static boolean move = true;
@Override
@@ -20,7 +20,6 @@ import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.model.FloatingFlowerModel;
import javax.annotation.Nonnull;
import java.util.Random;
@@ -26,8 +26,8 @@ import java.util.Random;
public class RenderTileHourglass extends TileEntitySpecialRenderer<TileHourglass> {
ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS);
ModelHourglass model = new ModelHourglass();
final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS);
final ModelHourglass model = new ModelHourglass();
@Override
public void renderTileEntityAt(@Nonnull TileHourglass hourglass, double d0, double d1, double d2, float ticks, int digProgress) {
@@ -19,7 +19,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.item.EnumDyeColor;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.mana.IPoolOverlayProvider;
import vazkii.botania.api.state.BotaniaStateProps;
@@ -25,7 +25,7 @@ import javax.annotation.Nonnull;
public class RenderTileRuneAltar extends TileEntitySpecialRenderer<TileRuneAltar> {
ModelSpinningCubes cubes = new ModelSpinningCubes();
final ModelSpinningCubes cubes = new ModelSpinningCubes();
@Override
public void renderTileEntityAt(@Nonnull TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress) {
@@ -32,7 +32,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer<TileStarfield
private static final ResourceLocation END_SKY_TEXTURE = new ResourceLocation("textures/environment/end_sky.png");
private static final ResourceLocation END_PORTAL_TEXTURE = new ResourceLocation("textures/entity/end_portal.png");
private static final Random field_147527_e = new Random(31100L);
FloatBuffer field_147528_b = GLAllocation.createDirectFloatBuffer(16);
final FloatBuffer field_147528_b = GLAllocation.createDirectFloatBuffer(16);
public void renderTileEntityAt(@Nonnull TileStarfield starfield, double x, double y, double z, float partialTicks, int destroyStage)
{
@@ -111,7 +111,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer<TileStarfield
if (i == 0)
{
f11 = f12 = f13 = 1.0F * f6;
f11 = f12 = 1.0F * f6;
}
// Botania: change color based on time
@@ -28,7 +28,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer<TileTeruTe
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU);
private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU_HALLOWEEN);
ModelTeruTeruBozu model = new ModelTeruTeruBozu();
final ModelTeruTeruBozu model = new ModelTeruTeruBozu();
@Override
public void renderTileEntityAt(@Nonnull TileTeruTeruBozu tileentity, double d0, double d1, double d2, float f, int digProgress) {
@@ -11,12 +11,9 @@
package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDirectional;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumBlockRenderType;
@@ -26,9 +23,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.common.block.tile.TileCamo;
import java.util.ArrayList;
import java.util.List;
public abstract class BlockCamo extends BlockMod {
protected BlockCamo(Material par2Material, String name) {
@@ -63,7 +63,7 @@ public class BlockForestEye extends BlockMod implements ILexiconable {
@Override
public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) {
TileForestEye eye = (TileForestEye) par1World.getTileEntity(pos);
return Math.min(15, Math.max(0, eye.entities - 1));
return eye == null ? 0 : Math.min(15, Math.max(0, eye.entities - 1));
}
@Override
@@ -50,7 +50,7 @@ import java.util.Random;
public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, IWandHUD {
Random random;
final Random random;
public BlockOpenCrate() {
super(Material.WOOD, LibBlockNames.OPEN_CRATE);
@@ -179,19 +179,19 @@ public final class ModFluffBlocks {
public static Block stone;
public static Block pavement;
public static Block[] biomeStoneStairs = new Block[24];
public static Block[] biomeStoneSlabs = new Block[24];
public static Block[] biomeStoneFullSlabs = new Block[24];
public static final Block[] biomeStoneStairs = new Block[24];
public static final Block[] biomeStoneSlabs = new Block[24];
public static final Block[] biomeStoneFullSlabs = new Block[24];
public static Block biomeStoneWall;
public static Block[] stoneStairs = new Block[8];
public static Block[] stoneSlabs = new Block[8];
public static Block[] stoneFullSlabs = new Block[8];
public static final Block[] stoneStairs = new Block[8];
public static final Block[] stoneSlabs = new Block[8];
public static final Block[] stoneFullSlabs = new Block[8];
public static Block stoneWall;
public static Block[] pavementStairs = new Block[BlockPavement.TYPES];
public static Block[] pavementSlabs = new Block[BlockPavement.TYPES];
public static Block[] pavementFullSlabs = new Block[BlockPavement.TYPES];
public static final Block[] pavementStairs = new Block[BlockPavement.TYPES];
public static final Block[] pavementSlabs = new Block[BlockPavement.TYPES];
public static final Block[] pavementFullSlabs = new Block[BlockPavement.TYPES];
public static Block endStoneSlab;
public static Block endStoneSlabFull;
@@ -66,7 +66,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable {
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta) {
EnumFacing.Axis axis = null;
EnumFacing.Axis axis;
switch (meta) {
case 8: axis = EnumFacing.Axis.Z; break;
case 4: axis = EnumFacing.Axis.X; break;
@@ -73,7 +73,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable {
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta) {
EnumFacing side = null;
EnumFacing side;
switch (meta) {
case 3: side = EnumFacing.WEST; break;
case 0: side = EnumFacing.NORTH; break;
@@ -30,7 +30,7 @@ import java.util.Random;
public class BlockSpecialQuartzSlab extends BlockModSlab {
Block source;
final Block source;
public BlockSpecialQuartzSlab(Block source, boolean par2) {
super(par2, Material.ROCK, "quartzSlab" + ((BlockSpecialQuartz) source).type + (par2 ? "Full" : "Half"));
@@ -23,7 +23,7 @@ import vazkii.botania.common.lexicon.LexiconData;
public class Block18StoneSlab extends BlockLivingSlab {
int index;
final int index;
public Block18StoneSlab(boolean full, FutureStoneVariant variant, int index) {
super(full, ModFluffBlocks.stone.getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, variant));
@@ -22,7 +22,7 @@ import vazkii.botania.common.lexicon.LexiconData;
public class BlockBiomeStoneSlab extends BlockLivingSlab {
int index;
final int index;
public BlockBiomeStoneSlab(boolean full, IBlockState state, int index) {
super(full, state);
@@ -4,7 +4,7 @@ import net.minecraft.block.state.IBlockState;
public abstract class BlockLivingSlab extends BlockModSlab {
IBlockState sourceState;
final IBlockState sourceState;
public BlockLivingSlab(boolean full, IBlockState state) {
super(full, state.getMaterial(), state.getBlock().getUnlocalizedName().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Slab" + (full ? "Full" : ""));
@@ -28,7 +28,7 @@ import java.util.Random;
public abstract class BlockModSlab extends BlockSlab implements ILexiconable {
String name;
final String name;
protected final boolean doubleSlab;
public static final PropertyEnum<DummyEnum> DUMMY = PropertyEnum.create("dummy", DummyEnum.class);
@@ -84,11 +84,6 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable {
return Item.getItemFromBlock(getSingleBlock());
}
@Override
public int quantityDropped(IBlockState state, int fortune, @Nonnull Random random) {
return super.quantityDropped(state, fortune, random);
}
@Override
public ItemStack createStackedBlock(@Nonnull IBlockState par1) {
return new ItemStack(getSingleBlock());
@@ -23,7 +23,7 @@ import vazkii.botania.common.lexicon.LexiconData;
public class BlockPavementSlab extends BlockLivingSlab {
int index;
final int index;
public BlockPavementSlab(boolean full, EnumDyeColor color, int index) {
super(full, ModFluffBlocks.pavement.getDefaultState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, color));
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
public class BehaviourSeeds extends BehaviorDefaultDispenseItem {
Block block;
private final Block block;
public BehaviourSeeds(Block block) {
this.block = block;
@@ -41,7 +41,7 @@ public class SubTilePureDaisy extends SubTileEntity {
};
int positionAt = 0;
int[] ticksRemaining = { -1, -1, -1, -1, -1, -1, -1, -1};
final int[] ticksRemaining = { -1, -1, -1, -1, -1, -1, -1, -1};
@Override
public void onUpdate() {
@@ -40,10 +40,7 @@ import vazkii.botania.common.core.helper.InventoryHelper;
import vazkii.botania.common.lexicon.LexiconData;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.WeakHashMap;
public class SubTileHopperhock extends SubTileFunctional {
@@ -110,7 +107,6 @@ public class SubTileHopperhock extends SubTileFunctional {
invToPutItemIn = inv.handler;
priorityInv = priority;
sideToPutItemIn = dir.getOpposite();
amountToPutIn = availablePut;
}
}
@@ -26,7 +26,7 @@ import vazkii.botania.common.lexicon.LexiconData;
public class SubTileJadedAmaranthus extends SubTileFunctional {
private static final int COST = 100;
int RANGE = 4;
final int RANGE = 4;
@Override
public void onUpdate() {
@@ -164,7 +164,7 @@ public class SubTileOrechid extends SubTileFunctional {
private static class StringRandomItem extends WeightedRandom.Item {
public String s;
public final String s;
public StringRandomItem(int par1, String s) {
super(par1);
@@ -26,8 +26,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -14,7 +14,6 @@ import net.minecraft.entity.Entity;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.lexicon.LexiconData;
import java.util.Collections;
@@ -17,7 +17,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
@@ -17,11 +17,6 @@ import vazkii.botania.common.lexicon.LexiconData;
@PassiveFlower
public class SubTileNightshade extends SubTileDaybloom {
@Override
public int getDelayBetweenPassiveGeneration() {
return super.getDelayBetweenPassiveGeneration();
}
@Override
public boolean canGeneratePassively() {
return !super.canGeneratePassively() && !supertile.getWorld().isDaytime();
@@ -10,7 +10,6 @@
*/
package vazkii.botania.common.block.tile;
import com.google.common.base.Function;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.item.EntityItem;
@@ -43,6 +42,7 @@ import vazkii.botania.common.lexicon.LexiconData;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
public class TileAlfPortal extends TileMod {
@@ -76,10 +76,10 @@ public class TileAlfPortal extends TileMod {
private static final String TAG_STACK = "portalStack";
private static final String TAG_PORTAL_FLAG = "_elvenPortal";
List<ItemStack> stacksIn = new ArrayList<>();
private final List<ItemStack> stacksIn = new ArrayList<>();
public int ticksOpen = 0;
int ticksSinceLastItem = 0;
private int ticksSinceLastItem = 0;
private boolean closeNow = false;
private boolean hasUnloadedParts = false;
@@ -137,7 +137,7 @@ public class TileAlfPortal extends TileMod {
continue;
ItemStack stack = item.getEntityItem();
if(stack != null && (!(stack.getItem() instanceof IElvenItem) || !((IElvenItem) stack.getItem()).isElvenItem(stack)) && !item.getEntityData().hasKey(TAG_PORTAL_FLAG)) {
if((!(stack.getItem() instanceof IElvenItem) || !((IElvenItem) stack.getItem()).isElvenItem(stack)) && !item.getEntityData().hasKey(TAG_PORTAL_FLAG)) {
item.setDead();
addItem(stack);
ticksSinceLastItem = 0;
@@ -191,7 +191,7 @@ public class TileAlfPortal extends TileMod {
return false;
}
AxisAlignedBB getPortalAABB() {
private AxisAlignedBB getPortalAABB() {
AxisAlignedBB aabb = new AxisAlignedBB(pos.add(-1, 1, 0), pos.add(2, 4, 1));
if(worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.ON_X)
aabb = new AxisAlignedBB(pos.add(0, 1, -1), pos.add(1, 4, 2));
@@ -199,14 +199,14 @@ public class TileAlfPortal extends TileMod {
return aabb;
}
void addItem(ItemStack stack) {
private void addItem(ItemStack stack) {
int size = stack.stackSize;
stack.stackSize = 1;
for(int i = 0; i < size; i++)
stacksIn.add(stack.copy());
}
void resolveRecipes() {
private void resolveRecipes() {
int i = 0;
for(ItemStack stack : stacksIn) {
if(stack != null && stack.getItem() instanceof ILexicon) {
@@ -228,7 +228,7 @@ public class TileAlfPortal extends TileMod {
}
}
void spawnItem(ItemStack stack) {
private void spawnItem(ItemStack stack) {
EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, stack);
item.getEntityData().setBoolean(TAG_PORTAL_FLAG, true);
worldObj.spawnEntityInWorld(item);
@@ -338,7 +338,8 @@ public class TileAlfPortal extends TileMod {
}
}
private boolean check2DArray(BlockPos[] positions, IBlockState state, boolean onlyCheckBlock, Function<BlockPos, BlockPos>... converters) {
@SafeVarargs
private final boolean check2DArray(BlockPos[] positions, IBlockState state, boolean onlyCheckBlock, Function<BlockPos, BlockPos>... converters) {
for(BlockPos pos : positions) {
for(Function<BlockPos, BlockPos> f : converters)
if(f != null)
@@ -43,9 +43,9 @@ public class TileCocoon extends TileMod {
hatch();
}
public void hatch() {
private void hatch() {
if(!worldObj.isRemote) {
worldObj.playEvent(2001, pos, Block.getIdFromBlock(getBlockType()));
worldObj.playEvent(2001, pos, Block.getStateId(getBlockType().getStateFromMeta(getBlockMetadata())));
worldObj.setBlockToAir(pos);
EntityAgeable entity = null;
@@ -72,7 +72,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable {
int mana = 0;
public ItemStack itemToEnchant = null;
List<EnchantmentData> enchants = new ArrayList<>();
final List<EnchantmentData> enchants = new ArrayList<>();
private static final BlockPos[] OBSIDIAN_LOCATIONS = {
new BlockPos(0, -1, 0),
@@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile;
import net.minecraft.block.state.IBlockState;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ITickable;
@@ -14,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import vazkii.botania.api.mana.IManaCollisionGhost;
public class TilePlatform extends TileCamo {
@@ -10,7 +10,6 @@
*/
package vazkii.botania.common.block.tile;
import vazkii.botania.api.mana.IManaCollisionGhost;
import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet;
public class TileTinyPlanet extends TileMod {
@@ -17,7 +17,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.client.model.animation.Animation;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.model.animation.CapabilityAnimation;
import net.minecraftforge.common.model.animation.IAnimationStateMachine;
@@ -79,20 +79,20 @@ public class TileBellows extends TileMod {
switch (enumfacing)
{
case WEST:
worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]);
worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]);
worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D);
worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D);
break;
case EAST:
worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]);
worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]);
worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D);
worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D);
break;
case NORTH:
worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D, new int[0]);
worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D, new int[0]);
worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D);
worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D);
break;
case SOUTH:
worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D, new int[0]);
worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D, new int[0]);
worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D);
worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D);
}
}
}
@@ -22,7 +22,7 @@ import java.util.List;
public class TileDistributor extends TileMod implements IManaReceiver {
List<IManaReceiver> validPools = new ArrayList<>();
final List<IManaReceiver> validPools = new ArrayList<>();
@Override
public void updateEntity() {
@@ -14,7 +14,6 @@ import com.google.common.base.Predicates;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.AxisAlignedBB;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.mana.IManaCollisionGhost;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.tile.TileMod;
Loaded 100 of 158 files, more files were not shown because too many files have changed in this diff. Show more