chunkList = chunkRegenList.get(dimensionID);
- if (chunkList.size() > 0) {
+ if (!chunkList.isEmpty()) {
ChunkCoords coords = chunkList.get(0);
chunkList.remove(0);
diff --git a/src/main/java/forestry/core/blocks/BlockBase.java b/src/main/java/forestry/core/blocks/BlockBase.java
index 57399e850..2a7d94525 100644
--- a/src/main/java/forestry/core/blocks/BlockBase.java
+++ b/src/main/java/forestry/core/blocks/BlockBase.java
@@ -20,7 +20,6 @@ import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.particle.EffectRenderer;
-import net.minecraft.client.particle.EntityDiggingFX;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
@@ -55,7 +54,6 @@ import forestry.core.proxy.Proxies;
import forestry.core.render.MachineParticleCallback;
import forestry.core.render.MachineStateMapper;
import forestry.core.render.ParticleHelper;
-import forestry.core.render.TextureManager;
import forestry.core.tiles.TileBase;
import forestry.core.tiles.TileForestry;
import forestry.core.tiles.TileUtil;
@@ -97,7 +95,7 @@ public class BlockBase & IBlockType & IStringSerializable> ext
IBlockState state = this.blockState.getBaseState().withProperty(FACE, EnumFacing.NORTH);
this.setDefaultState(state);
- particleCallback = new MachineParticleCallback(this, TYPE);
+ particleCallback = new MachineParticleCallback<>(this, TYPE);
}
public PropertyEnum
getTypeProperty() {
diff --git a/src/main/java/forestry/core/blocks/BlockCore.java b/src/main/java/forestry/core/blocks/BlockCore.java
index 27b5b202d..570487db3 100644
--- a/src/main/java/forestry/core/blocks/BlockCore.java
+++ b/src/main/java/forestry/core/blocks/BlockCore.java
@@ -10,11 +10,6 @@
******************************************************************************/
package forestry.core.blocks;
-import net.minecraft.client.particle.EffectRenderer;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-
public class BlockCore extends BlockBase {
public BlockCore() {
super(BlockTypeCoreTesr.class);
diff --git a/src/main/java/forestry/core/blocks/BlockStructure.java b/src/main/java/forestry/core/blocks/BlockStructure.java
index 754aacefe..80fea37bf 100644
--- a/src/main/java/forestry/core/blocks/BlockStructure.java
+++ b/src/main/java/forestry/core/blocks/BlockStructure.java
@@ -10,7 +10,6 @@
******************************************************************************/
package forestry.core.blocks;
-import forestry.core.utils.Translator;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
@@ -31,6 +30,7 @@ import forestry.core.circuits.ISocketable;
import forestry.core.multiblock.MultiblockTileEntityForestry;
import forestry.core.multiblock.MultiblockUtil;
import forestry.core.utils.InventoryUtil;
+import forestry.core.utils.Translator;
public abstract class BlockStructure extends BlockForestry {
@@ -120,7 +120,7 @@ public abstract class BlockStructure extends BlockForestry {
IMultiblockComponent part = (IMultiblockComponent) tile;
// drop inventory if we're the last part remaining
- if (MultiblockUtil.getNeighboringParts(world, part).size() == 0) {
+ if (MultiblockUtil.getNeighboringParts(world, part).isEmpty()) {
if (tile instanceof IInventory) {
InventoryUtil.dropInventory((IInventory) tile, world, pos);
}
diff --git a/src/main/java/forestry/core/blocks/MachinePropertiesTesr.java b/src/main/java/forestry/core/blocks/MachinePropertiesTesr.java
index 7e6cfc376..ad1c907fa 100644
--- a/src/main/java/forestry/core/blocks/MachinePropertiesTesr.java
+++ b/src/main/java/forestry/core/blocks/MachinePropertiesTesr.java
@@ -20,13 +20,13 @@ public class MachinePropertiesTesr extends MachineProper
@Nonnull
private final String particleTextureLocation;
- public MachinePropertiesTesr(int meta, @Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer super T> renderer, String particleTextureLocation) {
+ public MachinePropertiesTesr(int meta, @Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer super T> renderer, @Nonnull String particleTextureLocation) {
super(meta, teClass, name);
this.renderer = renderer;
this.particleTextureLocation = particleTextureLocation;
}
- public MachinePropertiesTesr(int meta, @Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer super T> renderer, @Nonnull AxisAlignedBB boundingBox, String particleTextureLocation) {
+ public MachinePropertiesTesr(int meta, @Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer super T> renderer, @Nonnull AxisAlignedBB boundingBox, @Nonnull String particleTextureLocation) {
super(meta, teClass, name, boundingBox);
this.renderer = renderer;
this.particleTextureLocation = particleTextureLocation;
diff --git a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java
index 7b4823520..b29a1fd18 100755
--- a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java
+++ b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java
@@ -33,7 +33,6 @@ import forestry.core.items.ItemForestry;
public class ItemCircuitBoard extends ItemForestry {
public ItemCircuitBoard() {
- super();
setHasSubtypes(true);
}
diff --git a/src/main/java/forestry/core/commands/CommandHelpers.java b/src/main/java/forestry/core/commands/CommandHelpers.java
index dbdc0ea10..84d37640a 100644
--- a/src/main/java/forestry/core/commands/CommandHelpers.java
+++ b/src/main/java/forestry/core/commands/CommandHelpers.java
@@ -109,7 +109,7 @@ public class CommandHelpers {
body.setColor(EnumChatFormatting.GRAY);
List commandAliases = command.getCommandAliases();
- if (commandAliases.size() > 0) {
+ if (!commandAliases.isEmpty()) {
sendLocalizedChatMessage(sender, body, "for.chat.command.aliases", commandAliases.toString().replace("[", "").replace("]", ""));
}
diff --git a/src/main/java/forestry/core/fluids/FluidHelper.java b/src/main/java/forestry/core/fluids/FluidHelper.java
index f6d70ba06..4948584c9 100644
--- a/src/main/java/forestry/core/fluids/FluidHelper.java
+++ b/src/main/java/forestry/core/fluids/FluidHelper.java
@@ -25,6 +25,7 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;
import net.minecraftforge.fluids.IFluidHandler;
+
import forestry.core.PluginFluids;
import forestry.core.config.Constants;
import forestry.core.utils.InventoryUtil;
diff --git a/src/main/java/forestry/core/genetics/BreedingTracker.java b/src/main/java/forestry/core/genetics/BreedingTracker.java
index 78679c067..dd94c2bf4 100755
--- a/src/main/java/forestry/core/genetics/BreedingTracker.java
+++ b/src/main/java/forestry/core/genetics/BreedingTracker.java
@@ -173,7 +173,7 @@ public abstract class BreedingTracker extends WorldSavedData implements IBreedin
final int count = nbttagcompound.getInteger(countKey);
for (int i = 0; i < count; i++) {
String value = nbttagcompound.getString(key + i);
- if (value != null && value.length() > 0) {
+ if (value != null && !value.isEmpty()) {
values.add(value);
}
}
@@ -186,7 +186,7 @@ public abstract class BreedingTracker extends WorldSavedData implements IBreedin
Iterator iterator = values.iterator();
for (int i = 0; i < count; i++) {
String value = iterator.next();
- if (value != null && value.length() > 0) {
+ if (value != null && !value.isEmpty()) {
nbttagcompound.setString(key + i, value);
}
}
diff --git a/src/main/java/forestry/core/genetics/ItemResearchNote.java b/src/main/java/forestry/core/genetics/ItemResearchNote.java
index 2510c05c3..7b511a42c 100755
--- a/src/main/java/forestry/core/genetics/ItemResearchNote.java
+++ b/src/main/java/forestry/core/genetics/ItemResearchNote.java
@@ -256,7 +256,6 @@ public class ItemResearchNote extends ItemForestry {
}
public ItemResearchNote() {
- super();
setCreativeTab(null);
}
diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java
index bce63b92e..dee5795f2 100644
--- a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java
+++ b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java
@@ -107,7 +107,7 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesBuil
ItemStack research = null;
if (world.rand.nextFloat() < (float) 10 / bountyLevel) {
Collection extends IMutation> combinations = getRoot().getCombinations(this);
- if (combinations.size() > 0) {
+ if (!combinations.isEmpty()) {
IMutation[] candidates = combinations.toArray(new IMutation[combinations.size()]);
research = AlleleManager.alleleRegistry.getMutationNoteStack(researcher, candidates[world.rand.nextInt(candidates.length)]);
}
diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java
index f0e4cf8a0..2ad9368d1 100644
--- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java
+++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java
@@ -35,7 +35,7 @@ public class MutationConditionRequiresResourceOreDict implements IMutationCondit
this.oreDictId = OreDictionary.getOreID(oreDictName);
List ores = OreDictionary.getOres(oreDictName);
- if (ores != null && 0 < ores.size()) {
+ if (ores != null && !ores.isEmpty()) {
this.displayName = ores.get(0).getDisplayName();
} else {
this.displayName = oreDictName;
diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java
index b44d4d0e2..9e3270257 100755
--- a/src/main/java/forestry/core/gui/GuiForestry.java
+++ b/src/main/java/forestry/core/gui/GuiForestry.java
@@ -112,7 +112,7 @@ public abstract class GuiForestry ext
if (Config.enableHints && inventory instanceof IHintSource) {
IHintSource hintSource = (IHintSource) inventory;
List hints = hintSource.getHints();
- if (hints != null && hints.size() > 0) {
+ if (hints != null && !hints.isEmpty()) {
ledgerManager.add(new HintLedger(ledgerManager, hintSource));
}
}
diff --git a/src/main/java/forestry/core/gui/GuiIdRegistry.java b/src/main/java/forestry/core/gui/GuiIdRegistry.java
index fcfb259f2..7334de37a 100644
--- a/src/main/java/forestry/core/gui/GuiIdRegistry.java
+++ b/src/main/java/forestry/core/gui/GuiIdRegistry.java
@@ -62,7 +62,7 @@ public class GuiIdRegistry {
private static int nextId = 0;
static {
- registerGuiHandlers(GuiType.Tile, Arrays.>asList(
+ registerGuiHandlers(GuiType.Tile, Arrays.asList(
TileAlveary.class,
TileAlvearyHygroregulator.class,
TileAlvearySieve.class,
@@ -98,7 +98,7 @@ public class GuiIdRegistry {
TileTrader.class
));
- registerGuiHandlers(GuiType.Item, Arrays.>asList(
+ registerGuiHandlers(GuiType.Item, Arrays.asList(
ItemBackpack.class,
ItemBackpackNaturalist.class,
ItemBeealyzer.class,
@@ -112,7 +112,7 @@ public class GuiIdRegistry {
ItemTreealyzer.class
));
- registerGuiHandlers(GuiType.Entity, Arrays.>asList(
+ registerGuiHandlers(GuiType.Entity, Arrays.asList(
EntityMinecartApiary.class,
EntityMinecartBeehouse.class
));
diff --git a/src/main/java/forestry/core/inventory/InventoryObject.java b/src/main/java/forestry/core/inventory/InventoryObject.java
index 153ccf7ec..6e7dc65a0 100644
--- a/src/main/java/forestry/core/inventory/InventoryObject.java
+++ b/src/main/java/forestry/core/inventory/InventoryObject.java
@@ -11,6 +11,7 @@
package forestry.core.inventory;
import net.minecraft.inventory.IInventory;
+
import net.minecraftforge.items.IItemHandler;
/**
@@ -19,17 +20,17 @@ import net.minecraftforge.items.IItemHandler;
* @author CovertJaguar
*/
public class InventoryObject {
- private Object inventory;
+ private final Object inventory;
- public InventoryObject(IInventory inventory) {
- this.inventory = inventory;
- }
+ public InventoryObject(IInventory inventory) {
+ this.inventory = inventory;
+ }
- public InventoryObject(IItemHandler inventory) {
- this.inventory = inventory;
- }
+ public InventoryObject(IItemHandler inventory) {
+ this.inventory = inventory;
+ }
- public Object getObject() {
- return inventory;
- }
+ public Object getObject() {
+ return inventory;
+ }
}
diff --git a/src/main/java/forestry/core/inventory/ItemHandlerItemInventory.java b/src/main/java/forestry/core/inventory/ItemHandlerItemInventory.java
deleted file mode 100644
index d1f563ade..000000000
--- a/src/main/java/forestry/core/inventory/ItemHandlerItemInventory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package forestry.core.inventory;
-
-import net.minecraftforge.items.wrapper.InvWrapper;
-
-public class ItemHandlerItemInventory extends InvWrapper {
-
- private I itemInventory;
-
- public ItemHandlerItemInventory(I inv) {
- super(inv);
-
- itemInventory = inv;
- }
-
- public I getItemInventory() {
- return itemInventory;
- }
-
-}
diff --git a/src/main/java/forestry/core/inventory/ItemInventory.java b/src/main/java/forestry/core/inventory/ItemInventory.java
index 54e69ea7a..29ab455b2 100755
--- a/src/main/java/forestry/core/inventory/ItemInventory.java
+++ b/src/main/java/forestry/core/inventory/ItemInventory.java
@@ -24,6 +24,7 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.wrapper.InvWrapper;
import forestry.core.tiles.IFilterSlotDelegate;
@@ -32,7 +33,7 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate,
private static final String KEY_UID = "UID";
private static final Random rand = new Random();
- private final IItemHandler capabilityHandler = new ItemHandlerItemInventory<>(this);
+ private final IItemHandler capabilityHandler = new InvWrapper(this);
private final EntityPlayer player;
private final ItemStack parent;
private final ItemStack[] inventoryStacks;
diff --git a/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java b/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java
index 257567f76..8fa8b184e 100755
--- a/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java
+++ b/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java
@@ -19,30 +19,30 @@ import forestry.core.utils.InventoryUtil;
*/
public class ArrayStackFilter extends StackFilter {
- private final ItemStack[] stacks;
+ private final ItemStack[] stacks;
- public ArrayStackFilter(ItemStack... stacks) {
- this.stacks = stacks;
- }
+ public ArrayStackFilter(ItemStack... stacks) {
+ this.stacks = stacks;
+ }
- @Override
- public boolean apply(final ItemStack stack) {
- if (stacks.length == 0 || !hasFilter()) {
- return true;
- }
- return InventoryUtil.isItemEqual(stack, stacks);
- }
+ @Override
+ public boolean apply(final ItemStack stack) {
+ if (stacks.length == 0 || !hasFilter()) {
+ return true;
+ }
+ return InventoryUtil.isItemEqual(stack, stacks);
+ }
- public ItemStack[] getStacks() {
- return stacks;
- }
+ public ItemStack[] getStacks() {
+ return stacks;
+ }
- public boolean hasFilter() {
- for (ItemStack filter : stacks) {
- if (filter != null) {
- return true;
- }
- }
- return false;
- }
+ public boolean hasFilter() {
+ for (ItemStack filter : stacks) {
+ if (filter != null) {
+ return true;
+ }
+ }
+ return false;
+ }
}
diff --git a/src/main/java/forestry/core/inventory/filters/ExclusionStackFilter.java b/src/main/java/forestry/core/inventory/filters/ExclusionStackFilter.java
deleted file mode 100644
index f2640ebf5..000000000
--- a/src/main/java/forestry/core/inventory/filters/ExclusionStackFilter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package forestry.core.inventory.filters;
-
-import forestry.core.utils.InventoryUtil;
-import net.minecraft.item.ItemStack;
-
-/**
- * @author CovertJaguar
- */
-public class ExclusionStackFilter extends StackFilter {
-
- private final ItemStack[] exclude;
-
- public ExclusionStackFilter(ItemStack... exclude) {
- this.exclude = exclude;
- }
-
- @Override
- public boolean apply(final ItemStack stack) {
- if (stack == null) {
- return false;
- }
- return !InventoryUtil.isItemEqual(stack, exclude);
- }
-
-}
diff --git a/src/main/java/forestry/core/inventory/filters/IStackFilter.java b/src/main/java/forestry/core/inventory/filters/IStackFilter.java
index 94e2d127b..3f0047c28 100755
--- a/src/main/java/forestry/core/inventory/filters/IStackFilter.java
+++ b/src/main/java/forestry/core/inventory/filters/IStackFilter.java
@@ -11,10 +11,11 @@
package forestry.core.inventory.filters;
import com.google.common.base.Predicate;
-import net.minecraft.item.ItemStack;
import javax.annotation.Nonnull;
+import net.minecraft.item.ItemStack;
+
/**
* This interface is used to provide a convenient means of dealing with entire classes of items without having to specify each item individually.
*
@@ -22,9 +23,9 @@ import javax.annotation.Nonnull;
*/
public interface IStackFilter extends Predicate {
- StackFilter and(@Nonnull Predicate super ItemStack>... other);
+ StackFilter and(@Nonnull Predicate super ItemStack>... other);
- StackFilter or(@Nonnull Predicate super ItemStack>... other);
+ StackFilter or(@Nonnull Predicate super ItemStack>... other);
- StackFilter negate();
+ StackFilter negate();
}
diff --git a/src/main/java/forestry/core/inventory/filters/InventoryStackFilter.java b/src/main/java/forestry/core/inventory/filters/InventoryStackFilter.java
deleted file mode 100644
index 49fe5564f..000000000
--- a/src/main/java/forestry/core/inventory/filters/InventoryStackFilter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
- ******************************************************************************/
-package forestry.core.inventory.filters;
-
-import forestry.core.utils.InventoryUtil;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-/**
- * @author CovertJaguar
- */
-public class InventoryStackFilter extends StackFilter {
-
- private final IInventory inv;
-
- public InventoryStackFilter(IInventory inv) {
- this.inv = inv;
- }
-
- @Override
- public boolean apply(final ItemStack stack) {
- return InventoryUtil.containsItem(inv, stack);
- }
-}
diff --git a/src/main/java/forestry/core/inventory/filters/StackFilter.java b/src/main/java/forestry/core/inventory/filters/StackFilter.java
index e3831bada..a19f7b703 100755
--- a/src/main/java/forestry/core/inventory/filters/StackFilter.java
+++ b/src/main/java/forestry/core/inventory/filters/StackFilter.java
@@ -11,7 +11,6 @@
package forestry.core.inventory.filters;
import com.google.common.base.Predicate;
-import net.minecraft.item.ItemStack;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -19,6 +18,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
+import net.minecraft.item.ItemStack;
+
/**
* This class is used to provide a convenient means of dealing with entire classes of items without having to specify each item individually.
*
@@ -26,97 +27,97 @@ import java.util.Objects;
*/
@SuppressWarnings("unused")
public class StackFilter implements IStackFilter {
- /**
- * Railcraft adds the following IItemTypes during preInit: ALL, FUEL, TRACK, MINECART, BALLAST, FEED
- *
- * Feel free to grab them from here or define your own.
- */
- public static final Map standardFilters = new HashMap();
+ /**
+ * Railcraft adds the following IItemTypes during preInit: ALL, FUEL, TRACK, MINECART, BALLAST, FEED
+ *
+ * Feel free to grab them from here or define your own.
+ */
+ public static final Map standardFilters = new HashMap<>();
- @Override
- public boolean apply(@Nullable final ItemStack input) {
- return true;
- }
+ @Override
+ public boolean apply(@Nullable final ItemStack input) {
+ return true;
+ }
- @Override
- public final StackFilter and(@Nonnull final Predicate super ItemStack>... other) {
- Objects.requireNonNull(other);
- return new StackFilter() {
- @Override
- public boolean apply(ItemStack stack) {
- for (Predicate super ItemStack> filter : other) {
- if (!filter.apply(stack)) {
+ @Override
+ public final StackFilter and(@Nonnull final Predicate super ItemStack>... other) {
+ Objects.requireNonNull(other);
+ return new StackFilter() {
+ @Override
+ public boolean apply(ItemStack stack) {
+ for (Predicate super ItemStack> filter : other) {
+ if (!filter.apply(stack)) {
return false;
}
- }
- return StackFilter.this.apply(stack);
- }
- };
- }
+ }
+ return StackFilter.this.apply(stack);
+ }
+ };
+ }
- @Override
- public final StackFilter or(@Nonnull final Predicate super ItemStack>... other) {
- Objects.requireNonNull(other);
- return new StackFilter() {
- @Override
- public boolean apply(ItemStack stack) {
- for (Predicate super ItemStack> filter : other) {
- if (filter.apply(stack)) {
+ @Override
+ public final StackFilter or(@Nonnull final Predicate super ItemStack>... other) {
+ Objects.requireNonNull(other);
+ return new StackFilter() {
+ @Override
+ public boolean apply(ItemStack stack) {
+ for (Predicate super ItemStack> filter : other) {
+ if (filter.apply(stack)) {
return true;
}
- }
- return StackFilter.this.apply(stack);
- }
- };
- }
+ }
+ return StackFilter.this.apply(stack);
+ }
+ };
+ }
- @Override
- public final StackFilter negate() {
- return new StackFilter() {
- @Override
- public boolean apply(ItemStack stack) {
- return !StackFilter.this.apply(stack);
- }
- };
- }
+ @Override
+ public final StackFilter negate() {
+ return new StackFilter() {
+ @Override
+ public boolean apply(ItemStack stack) {
+ return !StackFilter.this.apply(stack);
+ }
+ };
+ }
- public static StackFilter buildAnd(@Nonnull final Predicate super ItemStack>... filters) {
- return new StackFilter() {
- @Override
- public boolean apply(ItemStack stack) {
- Objects.requireNonNull(stack);
- for (Predicate super ItemStack> filter : filters) {
- if (!filter.apply(stack)) {
+ public static StackFilter buildAnd(@Nonnull final Predicate super ItemStack>... filters) {
+ return new StackFilter() {
+ @Override
+ public boolean apply(ItemStack stack) {
+ Objects.requireNonNull(stack);
+ for (Predicate super ItemStack> filter : filters) {
+ if (!filter.apply(stack)) {
return false;
}
- }
- return true;
- }
- };
- }
+ }
+ return true;
+ }
+ };
+ }
- public static StackFilter buildOr(@Nonnull final Predicate super ItemStack>... filters) {
- return new StackFilter() {
- @Override
- public boolean apply(ItemStack stack) {
- Objects.requireNonNull(stack);
- for (Predicate super ItemStack> filter : filters) {
- if (filter.apply(stack)) {
+ public static StackFilter buildOr(@Nonnull final Predicate super ItemStack>... filters) {
+ return new StackFilter() {
+ @Override
+ public boolean apply(ItemStack stack) {
+ Objects.requireNonNull(stack);
+ for (Predicate super ItemStack> filter : filters) {
+ if (filter.apply(stack)) {
return true;
}
- }
- return false;
- }
- };
- }
+ }
+ return false;
+ }
+ };
+ }
- public static StackFilter invert(@Nonnull final Predicate super ItemStack> filter) {
- return new StackFilter() {
- @Override
- public boolean apply(ItemStack stack) {
- return !filter.apply(stack);
- }
- };
- }
+ public static StackFilter invert(@Nonnull final Predicate super ItemStack> filter) {
+ return new StackFilter() {
+ @Override
+ public boolean apply(ItemStack stack) {
+ return !filter.apply(stack);
+ }
+ };
+ }
}
diff --git a/src/main/java/forestry/core/inventory/filters/StandardStackFilters.java b/src/main/java/forestry/core/inventory/filters/StandardStackFilters.java
index 8044d53e8..a046eaacf 100644
--- a/src/main/java/forestry/core/inventory/filters/StandardStackFilters.java
+++ b/src/main/java/forestry/core/inventory/filters/StandardStackFilters.java
@@ -11,13 +11,16 @@
package forestry.core.inventory.filters;
import com.google.common.base.Predicate;
-import net.minecraft.init.Items;
-import net.minecraft.item.*;
-import net.minecraft.tileentity.TileEntityFurnace;
import javax.annotation.Nonnull;
import java.util.Objects;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemSeeds;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntityFurnace;
+
/**
* This interface is used with several of the functions in IItemTransfer to
* provide a convenient means of dealing with entire classes of items without
@@ -46,55 +49,55 @@ public enum StandardStackFilters implements IStackFilter {
}
};
- public static void initialize() {
- for (StandardStackFilters type : StandardStackFilters.values()) {
- StackFilter.standardFilters.put(type.name(), type);
- }
- }
+ public static void initialize() {
+ for (StandardStackFilters type : StandardStackFilters.values()) {
+ StackFilter.standardFilters.put(type.name(), type);
+ }
+ }
- @Override
- public abstract boolean apply(ItemStack stack);
+ @Override
+ public abstract boolean apply(ItemStack stack);
- @Override
- public final StackFilter and(@Nonnull final Predicate super ItemStack>... other) {
- Objects.requireNonNull(other);
- return new StackFilter() {
- @Override
- public boolean apply(ItemStack stack) {
- for (Predicate super ItemStack> filter : other) {
- if (!filter.apply(stack)) {
+ @Override
+ public final StackFilter and(@Nonnull final Predicate super ItemStack>... other) {
+ Objects.requireNonNull(other);
+ return new StackFilter() {
+ @Override
+ public boolean apply(ItemStack stack) {
+ for (Predicate super ItemStack> filter : other) {
+ if (!filter.apply(stack)) {
return false;
}
- }
- return StandardStackFilters.this.apply(stack);
- }
- };
- }
+ }
+ return StandardStackFilters.this.apply(stack);
+ }
+ };
+ }
- @Override
- public final StackFilter or(@Nonnull final Predicate super ItemStack>... other) {
- Objects.requireNonNull(other);
- return new StackFilter() {
- @Override
- public boolean apply(ItemStack stack) {
- for (Predicate super ItemStack> filter : other) {
- if (filter.apply(stack)) {
+ @Override
+ public final StackFilter or(@Nonnull final Predicate super ItemStack>... other) {
+ Objects.requireNonNull(other);
+ return new StackFilter() {
+ @Override
+ public boolean apply(ItemStack stack) {
+ for (Predicate super ItemStack> filter : other) {
+ if (filter.apply(stack)) {
return true;
}
- }
- return StandardStackFilters.this.apply(stack);
- }
- };
- }
+ }
+ return StandardStackFilters.this.apply(stack);
+ }
+ };
+ }
- @Override
- public final StackFilter negate() {
- return new StackFilter() {
- @Override
- public boolean apply(ItemStack stack) {
- return !StandardStackFilters.this.apply(stack);
- }
- };
- }
+ @Override
+ public final StackFilter negate() {
+ return new StackFilter() {
+ @Override
+ public boolean apply(ItemStack stack) {
+ return !StandardStackFilters.this.apply(stack);
+ }
+ };
+ }
}
diff --git a/src/main/java/forestry/core/inventory/iterators/IExtInvSlot.java b/src/main/java/forestry/core/inventory/iterators/IExtInvSlot.java
index 7890fc96c..48eebcce3 100644
--- a/src/main/java/forestry/core/inventory/iterators/IExtInvSlot.java
+++ b/src/main/java/forestry/core/inventory/iterators/IExtInvSlot.java
@@ -23,8 +23,8 @@ import net.minecraft.item.ItemStack;
* @author CovertJaguar
*/
public interface IExtInvSlot extends IInvSlot {
- /**
- * Sets the current ItemStack in the slot.
- */
- void setStackInSlot(ItemStack stack);
+ /**
+ * Sets the current ItemStack in the slot.
+ */
+ void setStackInSlot(ItemStack stack);
}
diff --git a/src/main/java/forestry/core/inventory/iterators/IInvSlot.java b/src/main/java/forestry/core/inventory/iterators/IInvSlot.java
index c5453e3b6..4a5bd0568 100644
--- a/src/main/java/forestry/core/inventory/iterators/IInvSlot.java
+++ b/src/main/java/forestry/core/inventory/iterators/IInvSlot.java
@@ -19,19 +19,19 @@ import net.minecraft.item.ItemStack;
*/
public interface IInvSlot {
- boolean canPutStackInSlot(ItemStack stack);
+ boolean canPutStackInSlot(ItemStack stack);
- boolean canTakeStackFromSlot(ItemStack stack);
+ boolean canTakeStackFromSlot(ItemStack stack);
- ItemStack decreaseStackInSlot();
+ ItemStack decreaseStackInSlot();
- /**
- * It is not legal to edit the stack returned from this function.
- */
- ItemStack getStackInSlot();
+ /**
+ * It is not legal to edit the stack returned from this function.
+ */
+ ItemStack getStackInSlot();
// void setStackInSlot(ItemStack stack);
- int getIndex();
+ int getIndex();
}
diff --git a/src/main/java/forestry/core/inventory/iterators/InventoryIterator.java b/src/main/java/forestry/core/inventory/iterators/InventoryIterator.java
index 16afbd2eb..72317c200 100644
--- a/src/main/java/forestry/core/inventory/iterators/InventoryIterator.java
+++ b/src/main/java/forestry/core/inventory/iterators/InventoryIterator.java
@@ -12,49 +12,22 @@ package forestry.core.inventory.iterators;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
+
import net.minecraftforge.items.IItemHandler;
-import java.util.ArrayList;
-import java.util.List;
-
-import forestry.core.inventory.InventoryObject;
-
/**
* @author CovertJaguar
*/
public abstract class InventoryIterator implements Iterable {
- public static InventoryIterator getIterable(IInventory inv) {
- if (inv instanceof ISidedInventory) {
+ public static InventoryIterator getIterable(IInventory inv) {
+ if (inv instanceof ISidedInventory) {
return new SidedInventoryIterator((ISidedInventory) inv);
}
- return new StandardInventoryIterator(inv);
- }
+ return new StandardInventoryIterator(inv);
+ }
- public static InventoryIterator getIterable(IItemHandler inv) {
- return new ItemHandlerInventoryIterator(inv);
- }
-
- public static InventoryIterator extends IInvSlot> getIterable(InventoryObject inv) {
- if (inv.getObject() instanceof ISidedInventory) {
- return new SidedInventoryIterator((ISidedInventory) inv.getObject());
- }
- if (inv.getObject() instanceof IInventory) {
- return new StandardInventoryIterator((IInventory) inv.getObject());
- }
- if (inv.getObject() instanceof IItemHandler) {
- return new ItemHandlerInventoryIterator((IItemHandler) inv.getObject());
- }
- throw new RuntimeException("Invalid Inventory Object");
- }
-
- public Iterable notNull() {
- List filledSlots = new ArrayList(32);
- for (T slot : this) {
- if (slot.getStackInSlot() != null) {
- filledSlots.add(slot);
- }
- }
- return filledSlots;
- }
+ public static InventoryIterator getIterable(IItemHandler inv) {
+ return new ItemHandlerInventoryIterator(inv);
+ }
}
diff --git a/src/main/java/forestry/core/inventory/iterators/ItemHandlerInventoryIterator.java b/src/main/java/forestry/core/inventory/iterators/ItemHandlerInventoryIterator.java
index 9a8f9bd95..bd7d5d5c9 100644
--- a/src/main/java/forestry/core/inventory/iterators/ItemHandlerInventoryIterator.java
+++ b/src/main/java/forestry/core/inventory/iterators/ItemHandlerInventoryIterator.java
@@ -10,11 +10,12 @@
******************************************************************************/
package forestry.core.inventory.iterators;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.IItemHandler;
-
import java.util.Iterator;
+import net.minecraft.item.ItemStack;
+
+import net.minecraftforge.items.IItemHandler;
+
import forestry.core.utils.InventoryUtil;
/**
@@ -22,67 +23,67 @@ import forestry.core.utils.InventoryUtil;
*/
public class ItemHandlerInventoryIterator extends InventoryIterator {
- private final IItemHandler inv;
+ private final IItemHandler inv;
- protected ItemHandlerInventoryIterator(IItemHandler inv) {
- this.inv = inv;
- }
+ protected ItemHandlerInventoryIterator(IItemHandler inv) {
+ this.inv = inv;
+ }
- @Override
- public Iterator iterator() {
- return new Iterator() {
- int slot = 0;
+ @Override
+ public Iterator iterator() {
+ return new Iterator() {
+ int slot = 0;
- @Override
- public boolean hasNext() {
- return slot < inv.getSlots();
- }
+ @Override
+ public boolean hasNext() {
+ return slot < inv.getSlots();
+ }
- @Override
- public IInvSlot next() {
- return new InvSlot(slot++);
- }
+ @Override
+ public IInvSlot next() {
+ return new InvSlot(slot++);
+ }
- @Override
- public void remove() {
- throw new UnsupportedOperationException("Remove not supported.");
- }
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException("Remove not supported.");
+ }
- };
- }
+ };
+ }
- private class InvSlot implements IInvSlot {
+ private class InvSlot implements IInvSlot {
- protected final int slot;
+ protected final int slot;
- public InvSlot(int slot) {
- this.slot = slot;
- }
+ public InvSlot(int slot) {
+ this.slot = slot;
+ }
- @Override
- public int getIndex() {
- return slot;
- }
+ @Override
+ public int getIndex() {
+ return slot;
+ }
- @Override
- public boolean canPutStackInSlot(ItemStack stack) {
- return inv.insertItem(slot, stack, true) == null;
- }
+ @Override
+ public boolean canPutStackInSlot(ItemStack stack) {
+ return inv.insertItem(slot, stack, true) == null;
+ }
- @Override
- public boolean canTakeStackFromSlot(ItemStack stack) {
- return inv.extractItem(slot, 1, true) != null;
- }
+ @Override
+ public boolean canTakeStackFromSlot(ItemStack stack) {
+ return inv.extractItem(slot, 1, true) != null;
+ }
- @Override
- public ItemStack decreaseStackInSlot() {
- return inv.extractItem(slot, 1, false);
- }
+ @Override
+ public ItemStack decreaseStackInSlot() {
+ return inv.extractItem(slot, 1, false);
+ }
- @Override
- public ItemStack getStackInSlot() {
- return InventoryUtil.makeSafe(inv.getStackInSlot(slot));
- }
+ @Override
+ public ItemStack getStackInSlot() {
+ return InventoryUtil.makeSafe(inv.getStackInSlot(slot));
+ }
- }
+ }
}
diff --git a/src/main/java/forestry/core/inventory/iterators/SidedInventoryIterator.java b/src/main/java/forestry/core/inventory/iterators/SidedInventoryIterator.java
index 8b2d0f6d6..b2fcb0a5b 100644
--- a/src/main/java/forestry/core/inventory/iterators/SidedInventoryIterator.java
+++ b/src/main/java/forestry/core/inventory/iterators/SidedInventoryIterator.java
@@ -10,63 +10,63 @@
******************************************************************************/
package forestry.core.inventory.iterators;
+import java.util.Iterator;
+
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
-import java.util.Iterator;
-
/**
* @author CovertJaguar
*/
public class SidedInventoryIterator extends StandardInventoryIterator {
- private final ISidedInventory inv;
+ private final ISidedInventory inv;
- protected SidedInventoryIterator(ISidedInventory inv) {
- super(inv);
- this.inv = inv;
- }
+ protected SidedInventoryIterator(ISidedInventory inv) {
+ super(inv);
+ this.inv = inv;
+ }
- @Override
- public Iterator iterator() {
- return new Iterator() {
- int[] slots = inv.getSlotsForFace(EnumFacing.DOWN);
- int index = 0;
+ @Override
+ public Iterator iterator() {
+ return new Iterator() {
+ int[] slots = inv.getSlotsForFace(EnumFacing.DOWN);
+ int index = 0;
- @Override
- public boolean hasNext() {
- return slots != null && index < slots.length;
- }
+ @Override
+ public boolean hasNext() {
+ return slots != null && index < slots.length;
+ }
- @Override
- public IExtInvSlot next() {
- return new InvSlot(slots[index++]);
- }
+ @Override
+ public IExtInvSlot next() {
+ return new InvSlot(slots[index++]);
+ }
- @Override
- public void remove() {
- throw new UnsupportedOperationException("Remove not supported.");
- }
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException("Remove not supported.");
+ }
- };
- }
+ };
+ }
- private class InvSlot extends StandardInventoryIterator.InvSlot implements IExtInvSlot {
+ private class InvSlot extends StandardInventoryIterator.InvSlot implements IExtInvSlot {
- public InvSlot(int slot) {
- super(slot);
- }
+ public InvSlot(int slot) {
+ super(slot);
+ }
- @Override
- public boolean canPutStackInSlot(ItemStack stack) {
- return inv.canInsertItem(slot, stack, EnumFacing.DOWN);
- }
+ @Override
+ public boolean canPutStackInSlot(ItemStack stack) {
+ return inv.canInsertItem(slot, stack, EnumFacing.DOWN);
+ }
- @Override
- public boolean canTakeStackFromSlot(ItemStack stack) {
- return inv.canExtractItem(slot, stack, EnumFacing.DOWN);
- }
+ @Override
+ public boolean canTakeStackFromSlot(ItemStack stack) {
+ return inv.canExtractItem(slot, stack, EnumFacing.DOWN);
+ }
- }
+ }
}
diff --git a/src/main/java/forestry/core/inventory/iterators/StandardInventoryIterator.java b/src/main/java/forestry/core/inventory/iterators/StandardInventoryIterator.java
index 50727aee3..14256b9c3 100644
--- a/src/main/java/forestry/core/inventory/iterators/StandardInventoryIterator.java
+++ b/src/main/java/forestry/core/inventory/iterators/StandardInventoryIterator.java
@@ -11,90 +11,90 @@
package forestry.core.inventory.iterators;
+import java.util.Iterator;
+
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
-import java.util.Iterator;
-
/**
* @author CovertJaguar
*/
public class StandardInventoryIterator extends InventoryIterator {
- private final IInventory inv;
- private final int invSize;
+ private final IInventory inv;
+ private final int invSize;
- protected StandardInventoryIterator(IInventory inv) {
- this.inv = inv;
- this.invSize = inv.getSizeInventory();
- }
+ protected StandardInventoryIterator(IInventory inv) {
+ this.inv = inv;
+ this.invSize = inv.getSizeInventory();
+ }
- @Override
- public Iterator iterator() {
- return new Iterator() {
- int slot = 0;
+ @Override
+ public Iterator iterator() {
+ return new Iterator() {
+ int slot = 0;
- @Override
- public boolean hasNext() {
- return slot < invSize;
- }
+ @Override
+ public boolean hasNext() {
+ return slot < invSize;
+ }
- @Override
- public IExtInvSlot next() {
- return new InvSlot(slot++);
- }
+ @Override
+ public IExtInvSlot next() {
+ return new InvSlot(slot++);
+ }
- @Override
- public void remove() {
- throw new UnsupportedOperationException("Remove not supported.");
- }
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException("Remove not supported.");
+ }
- };
- }
+ };
+ }
- class InvSlot implements IExtInvSlot {
+ class InvSlot implements IExtInvSlot {
- protected final int slot;
+ protected final int slot;
- public InvSlot(int slot) {
- this.slot = slot;
- }
+ public InvSlot(int slot) {
+ this.slot = slot;
+ }
- @Override
- public ItemStack getStackInSlot() {
- return inv.getStackInSlot(slot);
- }
+ @Override
+ public ItemStack getStackInSlot() {
+ return inv.getStackInSlot(slot);
+ }
- @Override
- public void setStackInSlot(ItemStack stack) {
- inv.setInventorySlotContents(slot, stack);
- }
+ @Override
+ public void setStackInSlot(ItemStack stack) {
+ inv.setInventorySlotContents(slot, stack);
+ }
- @Override
- public boolean canPutStackInSlot(ItemStack stack) {
- return inv.isItemValidForSlot(slot, stack);
- }
+ @Override
+ public boolean canPutStackInSlot(ItemStack stack) {
+ return inv.isItemValidForSlot(slot, stack);
+ }
- @Override
- public boolean canTakeStackFromSlot(ItemStack stack) {
- return true;
- }
+ @Override
+ public boolean canTakeStackFromSlot(ItemStack stack) {
+ return true;
+ }
- @Override
- public ItemStack decreaseStackInSlot() {
- return inv.decrStackSize(slot, 1);
- }
+ @Override
+ public ItemStack decreaseStackInSlot() {
+ return inv.decrStackSize(slot, 1);
+ }
- @Override
- public int getIndex() {
- return slot;
- }
+ @Override
+ public int getIndex() {
+ return slot;
+ }
- @Override
- public String toString() {
- ItemStack stack = getStackInSlot();
- return "SlotNum = " + slot + " Stack = " + (stack == null ? "null" : getStackInSlot().toString());
- }
+ @Override
+ public String toString() {
+ ItemStack stack = getStackInSlot();
+ return "SlotNum = " + slot + " Stack = " + (stack == null ? "null" : getStackInSlot().toString());
+ }
- }
+ }
}
diff --git a/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java b/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java
index e3c55ef28..3745ff7a4 100755
--- a/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java
+++ b/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java
@@ -12,9 +12,8 @@ package forestry.core.inventory.manipulators;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.IItemHandler;
-import java.util.List;
+import net.minecraftforge.items.IItemHandler;
import forestry.core.inventory.InventoryObject;
import forestry.core.inventory.filters.IStackFilter;
@@ -26,116 +25,53 @@ import forestry.core.inventory.iterators.IInvSlot;
*/
public abstract class InventoryManipulator implements Iterable {
- public static InventoryManipulator get(IInventory inv) {
- return new StandardInventoryManipulator(inv);
- }
+ public static InventoryManipulator get(IInventory inv) {
+ return new StandardInventoryManipulator(inv);
+ }
- public static InventoryManipulator get(IItemHandler inv) {
- return new ItemHandlerInventoryManipulator(inv);
- }
+ public static InventoryManipulator get(IItemHandler inv) {
+ return new ItemHandlerInventoryManipulator(inv);
+ }
- public static InventoryManipulator extends IInvSlot> get(InventoryObject inv) {
- if (inv.getObject() instanceof IInventory) {
+ public static InventoryManipulator extends IInvSlot> get(InventoryObject inv) {
+ if (inv.getObject() instanceof IInventory) {
return new StandardInventoryManipulator((IInventory) inv.getObject());
}
- if (inv.getObject() instanceof IItemHandler) {
+ if (inv.getObject() instanceof IItemHandler) {
return new ItemHandlerInventoryManipulator((IItemHandler) inv.getObject());
}
- throw new RuntimeException("Invalid Inventory Object");
- }
+ throw new RuntimeException("Invalid Inventory Object");
+ }
- protected InventoryManipulator() {
- }
+ protected InventoryManipulator() {
+ }
- public boolean canAddStack(ItemStack stack) {
- return tryAddStack(stack) == null;
- }
+ public ItemStack tryAddStack(ItemStack stack) {
+ return addStack(stack, false);
+ }
- public ItemStack tryAddStack(ItemStack stack) {
- return addStack(stack, false);
- }
+ /**
+ * Attempt to add the stack to the inventory.
+ *
+ * @return The remainder
+ */
+ public ItemStack addStack(ItemStack stack) {
+ return addStack(stack, true);
+ }
- /**
- * Attempt to add the stack to the inventory.
- *
- * @return The remainder
- */
- public ItemStack addStack(ItemStack stack) {
- return addStack(stack, true);
- }
+ protected abstract ItemStack addStack(ItemStack stack, boolean doAdd);
- protected abstract ItemStack addStack(ItemStack stack, boolean doAdd);
-
- /**
- * Returns true if an item matching the filter can be removed from the
- * inventory.
- */
- public boolean canRemoveItem(IStackFilter filter) {
- return tryRemoveItem(filter) == null;
- }
-
- /**
- * Returns the item that would be returned if an item matching the filter
- * was removed. Does not modify the inventory.
- */
- public ItemStack tryRemoveItem(IStackFilter filter) {
- for (IInvSlot slot : this) {
- ItemStack stack = slot.getStackInSlot();
- if (stack != null && stack.stackSize > 0 && slot.canTakeStackFromSlot(stack) && filter.apply(stack)) {
- ItemStack output = stack.copy();
- output.stackSize = 1;
- return output;
- }
- }
- return null;
- }
-
- /**
- * Removed an item matching the filter.
- */
- public ItemStack removeItem(IStackFilter filter) {
- for (IInvSlot slot : this) {
- ItemStack stack = slot.getStackInSlot();
- if (stack != null && stack.stackSize > 0 && slot.canTakeStackFromSlot(stack) && filter.apply(stack)) {
+ /**
+ * Removed an item matching the filter.
+ */
+ public ItemStack removeItem(IStackFilter filter) {
+ for (IInvSlot slot : this) {
+ ItemStack stack = slot.getStackInSlot();
+ if (stack != null && stack.stackSize > 0 && slot.canTakeStackFromSlot(stack) && filter.apply(stack)) {
return slot.decreaseStackInSlot();
}
- }
- return null;
- }
-
- public boolean canRemoveItems(IStackFilter filter, int maxAmount) {
- List outputList = removeItem(filter, maxAmount, false);
- int found = 0;
- for (ItemStack stack : outputList) {
- found += stack.stackSize;
- }
- return found == maxAmount;
- }
-
- public List removeItems(IStackFilter filter, int maxAmount) {
- return removeItem(filter, maxAmount, true);
- }
-
- protected abstract List removeItem(IStackFilter filter, int maxAmount, boolean doRemove);
-
- public ItemStack moveItem(IInventory dest, IStackFilter filter) {
- return moveItem(new InventoryObject(dest), filter);
- }
-
- public ItemStack moveItem(InventoryObject dest, IStackFilter filter) {
- InventoryManipulator imDest = InventoryManipulator.get(dest);
- for (IInvSlot slot : this) {
- ItemStack stack = slot.getStackInSlot();
- if (stack != null && stack.stackSize > 0 && slot.canTakeStackFromSlot(stack) && filter.apply(stack)) {
- stack = stack.copy();
- stack.stackSize = 1;
- stack = imDest.addStack(stack);
- if (stack == null) {
- return slot.decreaseStackInSlot();
- }
- }
- }
- return null;
- }
+ }
+ return null;
+ }
}
diff --git a/src/main/java/forestry/core/inventory/manipulators/ItemHandlerInventoryManipulator.java b/src/main/java/forestry/core/inventory/manipulators/ItemHandlerInventoryManipulator.java
index 09813c8c9..8e00e58dc 100644
--- a/src/main/java/forestry/core/inventory/manipulators/ItemHandlerInventoryManipulator.java
+++ b/src/main/java/forestry/core/inventory/manipulators/ItemHandlerInventoryManipulator.java
@@ -10,13 +10,14 @@
******************************************************************************/
package forestry.core.inventory.manipulators;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.IItemHandler;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import net.minecraft.item.ItemStack;
+
+import net.minecraftforge.items.IItemHandler;
+
import forestry.core.inventory.filters.IStackFilter;
import forestry.core.inventory.iterators.IInvSlot;
import forestry.core.inventory.iterators.InventoryIterator;
@@ -26,81 +27,61 @@ import forestry.core.inventory.iterators.InventoryIterator;
*/
public class ItemHandlerInventoryManipulator extends InventoryManipulator {
- private final IItemHandler inv;
+ private final IItemHandler inv;
- protected ItemHandlerInventoryManipulator(IItemHandler inv) {
- this.inv = inv;
- }
+ protected ItemHandlerInventoryManipulator(IItemHandler inv) {
+ this.inv = inv;
+ }
- @Override
- public Iterator iterator() {
- return InventoryIterator.getIterable(inv).iterator();
- }
+ @Override
+ public Iterator iterator() {
+ return InventoryIterator.getIterable(inv).iterator();
+ }
- @Override
+ @Override
protected ItemStack addStack(ItemStack stack, boolean doAdd) {
- if (stack == null || stack.stackSize <= 0) {
+ if (stack == null || stack.stackSize <= 0) {
return null;
}
- stack = stack.copy();
- List filledSlots = new ArrayList(inv.getSlots());
- List emptySlots = new ArrayList(inv.getSlots());
- for (IInvSlot slot : InventoryIterator.getIterable(inv)) {
- if (slot.canPutStackInSlot(stack)) {
- if (slot.getStackInSlot() == null) {
+ stack = stack.copy();
+ List filledSlots = new ArrayList<>(inv.getSlots());
+ List emptySlots = new ArrayList<>(inv.getSlots());
+ for (IInvSlot slot : InventoryIterator.getIterable(inv)) {
+ if (slot.canPutStackInSlot(stack)) {
+ if (slot.getStackInSlot() == null) {
emptySlots.add(slot);
} else {
filledSlots.add(slot);
}
- }
- }
+ }
+ }
- int injected = 0;
- injected = tryPut(filledSlots, stack, injected, doAdd);
- injected = tryPut(emptySlots, stack, injected, doAdd);
- stack.stackSize -= injected;
- if (stack.stackSize <= 0) {
+ int injected = 0;
+ injected = tryPut(filledSlots, stack, injected, doAdd);
+ injected = tryPut(emptySlots, stack, injected, doAdd);
+ stack.stackSize -= injected;
+ if (stack.stackSize <= 0) {
return null;
}
- return stack;
- }
+ return stack;
+ }
- private int tryPut(List slots, ItemStack stack, int injected, boolean doAdd) {
- if (injected >= stack.stackSize) {
+ private int tryPut(List slots, ItemStack stack, int injected, boolean doAdd) {
+ if (injected >= stack.stackSize) {
return injected;
}
- for (IInvSlot slot : slots) {
- ItemStack stackToInsert = stack.copy();
- stackToInsert.stackSize = stack.stackSize - injected;
- ItemStack remainder = inv.insertItem(slot.getIndex(), stackToInsert, !doAdd);
- if (remainder == null) {
+ for (IInvSlot slot : slots) {
+ ItemStack stackToInsert = stack.copy();
+ stackToInsert.stackSize = stack.stackSize - injected;
+ ItemStack remainder = inv.insertItem(slot.getIndex(), stackToInsert, !doAdd);
+ if (remainder == null) {
return injected;
}
- injected += remainder.stackSize;
- if (injected >= stack.stackSize) {
+ injected += remainder.stackSize;
+ if (injected >= stack.stackSize) {
return injected;
}
- }
- return injected;
- }
-
- @Override
- protected List removeItem(IStackFilter filter, int maxAmount, boolean doRemove) {
- int amountNeeded = maxAmount;
- List outputList = new ArrayList();
- for (IInvSlot slot : this) {
- if (amountNeeded <= 0) {
- break;
- }
- ItemStack stack = slot.getStackInSlot();
- if (stack != null && stack.stackSize > 0 && slot.canTakeStackFromSlot(stack) && filter.apply(stack)) {
- ItemStack removed = inv.extractItem(slot.getIndex(), amountNeeded, !doRemove);
- if (removed != null) {
- amountNeeded -= removed.stackSize;
- outputList.add(removed);
- }
- }
- }
- return outputList;
- }
+ }
+ return injected;
+ }
}
diff --git a/src/main/java/forestry/core/inventory/manipulators/StandardInventoryManipulator.java b/src/main/java/forestry/core/inventory/manipulators/StandardInventoryManipulator.java
index 4666ad623..d59bcfb44 100644
--- a/src/main/java/forestry/core/inventory/manipulators/StandardInventoryManipulator.java
+++ b/src/main/java/forestry/core/inventory/manipulators/StandardInventoryManipulator.java
@@ -10,13 +10,13 @@
******************************************************************************/
package forestry.core.inventory.manipulators;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
import forestry.core.inventory.filters.IStackFilter;
import forestry.core.inventory.iterators.IExtInvSlot;
import forestry.core.inventory.iterators.InventoryIterator;
@@ -27,134 +27,99 @@ import forestry.core.utils.InventoryUtil;
*/
public class StandardInventoryManipulator extends InventoryManipulator {
- private final IInventory inv;
+ private final IInventory inv;
- protected StandardInventoryManipulator(IInventory inv) {
- this.inv = inv;
- }
+ protected StandardInventoryManipulator(IInventory inv) {
+ this.inv = inv;
+ }
- @Override
- public Iterator iterator() {
- return InventoryIterator.getIterable(inv).iterator();
- }
+ @Override
+ public Iterator iterator() {
+ return InventoryIterator.getIterable(inv).iterator();
+ }
- @Override
+ @Override
protected ItemStack addStack(ItemStack stack, boolean doAdd) {
- if (stack == null || stack.stackSize <= 0) {
+ if (stack == null || stack.stackSize <= 0) {
return null;
}
- stack = stack.copy();
- List filledSlots = new ArrayList(inv.getSizeInventory());
- List emptySlots = new ArrayList(inv.getSizeInventory());
- for (IExtInvSlot slot : this) {
- if (slot.canPutStackInSlot(stack)) {
+ stack = stack.copy();
+ List filledSlots = new ArrayList<>(inv.getSizeInventory());
+ List emptySlots = new ArrayList<>(inv.getSizeInventory());
+ for (IExtInvSlot slot : this) {
+ if (slot.canPutStackInSlot(stack)) {
if (slot.getStackInSlot() == null) {
emptySlots.add(slot);
} else {
filledSlots.add(slot);
}
}
- }
+ }
- int injected = 0;
- injected = tryPut(filledSlots, stack, injected, doAdd);
- injected = tryPut(emptySlots, stack, injected, doAdd);
- stack.stackSize -= injected;
- if (stack.stackSize <= 0) {
+ int injected = 0;
+ injected = tryPut(filledSlots, stack, injected, doAdd);
+ injected = tryPut(emptySlots, stack, injected, doAdd);
+ stack.stackSize -= injected;
+ if (stack.stackSize <= 0) {
return null;
}
- return stack;
- }
+ return stack;
+ }
- private int tryPut(List slots, ItemStack stack, int injected, boolean doAdd) {
- if (injected >= stack.stackSize) {
+ private int tryPut(List slots, ItemStack stack, int injected, boolean doAdd) {
+ if (injected >= stack.stackSize) {
return injected;
}
- for (IExtInvSlot slot : slots) {
- ItemStack stackInSlot = slot.getStackInSlot();
- if (stackInSlot == null || InventoryUtil.isItemEqual(stackInSlot, stack)) {
- int used = addToSlot(slot, stack, stack.stackSize - injected, doAdd);
- if (used > 0) {
- injected += used;
- if (injected >= stack.stackSize) {
+ for (IExtInvSlot slot : slots) {
+ ItemStack stackInSlot = slot.getStackInSlot();
+ if (stackInSlot == null || InventoryUtil.isItemEqual(stackInSlot, stack)) {
+ int used = addToSlot(slot, stack, stack.stackSize - injected, doAdd);
+ if (used > 0) {
+ injected += used;
+ if (injected >= stack.stackSize) {
return injected;
}
- }
- }
- }
- return injected;
- }
+ }
+ }
+ }
+ return injected;
+ }
- /**
- * @param available Amount we can move
- * @return Return the number of items moved.
- */
- private int addToSlot(IExtInvSlot slot, ItemStack stack, int available, boolean doAdd) {
- int max = Math.min(stack.getMaxStackSize(), inv.getInventoryStackLimit());
+ /**
+ * @param available Amount we can move
+ * @return Return the number of items moved.
+ */
+ private int addToSlot(IExtInvSlot slot, ItemStack stack, int available, boolean doAdd) {
+ int max = Math.min(stack.getMaxStackSize(), inv.getInventoryStackLimit());
- ItemStack stackInSlot = slot.getStackInSlot();
- if (stackInSlot == null) {
- int wanted = Math.min(available, max);
- if (doAdd) {
- stackInSlot = stack.copy();
- stackInSlot.stackSize = wanted;
- slot.setStackInSlot(stackInSlot);
- }
- return wanted;
- }
+ ItemStack stackInSlot = slot.getStackInSlot();
+ if (stackInSlot == null) {
+ int wanted = Math.min(available, max);
+ if (doAdd) {
+ stackInSlot = stack.copy();
+ stackInSlot.stackSize = wanted;
+ slot.setStackInSlot(stackInSlot);
+ }
+ return wanted;
+ }
- if (!InventoryUtil.isItemEqual(stack, stackInSlot)) {
+ if (!InventoryUtil.isItemEqual(stack, stackInSlot)) {
return 0;
}
- int wanted = max - stackInSlot.stackSize;
- if (wanted <= 0) {
+ int wanted = max - stackInSlot.stackSize;
+ if (wanted <= 0) {
return 0;
}
- if (wanted > available) {
+ if (wanted > available) {
wanted = available;
}
- if (doAdd) {
- stackInSlot.stackSize += wanted;
- slot.setStackInSlot(stackInSlot);
- }
- return wanted;
- }
-
- @Override
- protected List removeItem(IStackFilter filter, int maxAmount, boolean doRemove) {
- int amountNeeded = maxAmount;
- List outputList = new ArrayList();
- for (IExtInvSlot slot : this) {
- if (amountNeeded <= 0) {
- break;
- }
- ItemStack stack = slot.getStackInSlot();
- if (stack != null && stack.stackSize > 0 && slot.canTakeStackFromSlot(stack) && filter.apply(stack)) {
- ItemStack output = stack.copy();
- if (output.stackSize >= amountNeeded) {
- output.stackSize = amountNeeded;
- if (doRemove) {
- stack.stackSize -= amountNeeded;
- if (stack.stackSize <= 0) {
- stack = null;
- }
- slot.setStackInSlot(stack);
- }
- amountNeeded = 0;
- outputList.add(output);
- } else {
- amountNeeded -= output.stackSize;
- outputList.add(output);
- if (doRemove) {
- slot.setStackInSlot(null);
- }
- }
- }
- }
- return outputList;
- }
-
+ if (doAdd) {
+ stackInSlot.stackSize += wanted;
+ slot.setStackInSlot(stackInSlot);
+ }
+ return wanted;
+ }
}
diff --git a/src/main/java/forestry/core/inventory/wrappers/InventoryCopy.java b/src/main/java/forestry/core/inventory/wrappers/InventoryCopy.java
index 5f51ca9f7..dd42865b3 100755
--- a/src/main/java/forestry/core/inventory/wrappers/InventoryCopy.java
+++ b/src/main/java/forestry/core/inventory/wrappers/InventoryCopy.java
@@ -10,11 +10,12 @@
******************************************************************************/
package forestry.core.inventory.wrappers;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
import forestry.core.inventory.InventoryPlain;
import forestry.core.inventory.iterators.IExtInvSlot;
import forestry.core.inventory.iterators.InventoryIterator;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
/**
* Creates a deep copy of an existing IInventory.
@@ -26,40 +27,40 @@ import net.minecraft.item.ItemStack;
*/
public class InventoryCopy extends InvWrapperBase {
- private InventoryPlain copy;
+ private final InventoryPlain copy;
- public InventoryCopy(IInventory original) {
- super(original);
- this.copy = new InventoryPlain(original.getSizeInventory());
- for (IExtInvSlot slot : InventoryIterator.getIterable(original)) {
- ItemStack stack = slot.getStackInSlot();
- if (stack != null) {
- copy.setInventorySlotContents(slot.getIndex(), stack.copy());
- }
- }
- }
+ public InventoryCopy(IInventory original) {
+ super(original);
+ this.copy = new InventoryPlain(original.getSizeInventory());
+ for (IExtInvSlot slot : InventoryIterator.getIterable(original)) {
+ ItemStack stack = slot.getStackInSlot();
+ if (stack != null) {
+ copy.setInventorySlotContents(slot.getIndex(), stack.copy());
+ }
+ }
+ }
- @Override
- public void setInventorySlotContents(int slot, ItemStack itemstack) {
- copy.setInventorySlotContents(slot, itemstack);
- }
+ @Override
+ public void setInventorySlotContents(int slot, ItemStack itemstack) {
+ copy.setInventorySlotContents(slot, itemstack);
+ }
- @Override
- public ItemStack getStackInSlot(int slot) {
- return copy.getStackInSlot(slot);
- }
+ @Override
+ public ItemStack getStackInSlot(int slot) {
+ return copy.getStackInSlot(slot);
+ }
- @Override
- public ItemStack decrStackSize(int slot, int amount) {
- return copy.decrStackSize(slot, amount);
- }
+ @Override
+ public ItemStack decrStackSize(int slot, int amount) {
+ return copy.decrStackSize(slot, amount);
+ }
- @Override
- public ItemStack removeStackFromSlot(int slot) {
- return copy.removeStackFromSlot(slot);
- }
+ @Override
+ public ItemStack removeStackFromSlot(int slot) {
+ return copy.removeStackFromSlot(slot);
+ }
- @Override
+ @Override
public void markDirty() {
- }
+ }
}
diff --git a/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java b/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java
index a70f164e6..a975315d0 100755
--- a/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java
+++ b/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java
@@ -22,70 +22,70 @@ import net.minecraft.item.ItemStack;
*/
public class InventoryMapper extends InvWrapperBase implements IInventory {
- private final IInventory inv;
- private final int start;
- private final int size;
- private int stackSizeLimit = -1;
+ private final IInventory inv;
+ private final int start;
+ private final int size;
+ private int stackSizeLimit = -1;
- public InventoryMapper(IInventory inv) {
- this(inv, 0, inv.getSizeInventory(), true);
- }
+ public InventoryMapper(IInventory inv) {
+ this(inv, 0, inv.getSizeInventory(), true);
+ }
- public InventoryMapper(IInventory inv, boolean checkItems) {
- this(inv, 0, inv.getSizeInventory(), checkItems);
- }
+ public InventoryMapper(IInventory inv, boolean checkItems) {
+ this(inv, 0, inv.getSizeInventory(), checkItems);
+ }
- /**
- * Creates a new InventoryMapper
- *
- * @param inv The backing inventory
- * @param start The starting index
- * @param size The size of the new inventory, take care not to exceed the
- * end of the backing inventory
- */
- public InventoryMapper(IInventory inv, int start, int size) {
- this(inv, start, size, true);
- }
+ /**
+ * Creates a new InventoryMapper
+ *
+ * @param inv The backing inventory
+ * @param start The starting index
+ * @param size The size of the new inventory, take care not to exceed the
+ * end of the backing inventory
+ */
+ public InventoryMapper(IInventory inv, int start, int size) {
+ this(inv, start, size, true);
+ }
- public InventoryMapper(IInventory inv, int start, int size, boolean checkItems) {
- super(inv, checkItems);
- this.inv = inv;
- this.start = start;
- this.size = size;
- }
+ public InventoryMapper(IInventory inv, int start, int size, boolean checkItems) {
+ super(inv, checkItems);
+ this.inv = inv;
+ this.start = start;
+ this.size = size;
+ }
- @Override
- public int getSizeInventory() {
- return size;
- }
+ @Override
+ public int getSizeInventory() {
+ return size;
+ }
- @Override
- public ItemStack getStackInSlot(int slot) {
- return inv.getStackInSlot(start + slot);
- }
+ @Override
+ public ItemStack getStackInSlot(int slot) {
+ return inv.getStackInSlot(start + slot);
+ }
- @Override
- public ItemStack decrStackSize(int slot, int amount) {
- return inv.decrStackSize(start + slot, amount);
- }
+ @Override
+ public ItemStack decrStackSize(int slot, int amount) {
+ return inv.decrStackSize(start + slot, amount);
+ }
- @Override
- public void setInventorySlotContents(int slot, ItemStack itemstack) {
- inv.setInventorySlotContents(start + slot, itemstack);
- }
+ @Override
+ public void setInventorySlotContents(int slot, ItemStack itemstack) {
+ inv.setInventorySlotContents(start + slot, itemstack);
+ }
- public void setStackSizeLimit(int limit) {
- stackSizeLimit = limit;
- }
+ public void setStackSizeLimit(int limit) {
+ stackSizeLimit = limit;
+ }
- @Override
- public int getInventoryStackLimit() {
- return stackSizeLimit > 0 ? stackSizeLimit : inv.getInventoryStackLimit();
- }
+ @Override
+ public int getInventoryStackLimit() {
+ return stackSizeLimit > 0 ? stackSizeLimit : inv.getInventoryStackLimit();
+ }
- @Override
- public boolean isItemValidForSlot(int slot, ItemStack stack) {
- return !checkItems() || inv.isItemValidForSlot(start + slot, stack);
- }
+ @Override
+ public boolean isItemValidForSlot(int slot, ItemStack stack) {
+ return !checkItems() || inv.isItemValidForSlot(start + slot, stack);
+ }
}
diff --git a/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java b/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java
index 5a4b8f770..4acab568c 100755
--- a/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java
+++ b/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java
@@ -22,32 +22,32 @@ import net.minecraft.util.EnumFacing;
*/
public class SidedInventoryMapper extends InvWrapperBase implements ISidedInventory {
- private final ISidedInventory inv;
- private final EnumFacing side;
+ private final ISidedInventory inv;
+ private final EnumFacing side;
- public SidedInventoryMapper(ISidedInventory inv, EnumFacing side) {
- this(inv, side, true);
- }
+ public SidedInventoryMapper(ISidedInventory inv, EnumFacing side) {
+ this(inv, side, true);
+ }
- public SidedInventoryMapper(ISidedInventory inv, EnumFacing side, boolean checkItems) {
- super(inv, checkItems);
- this.inv = inv;
- this.side = side;
- }
+ public SidedInventoryMapper(ISidedInventory inv, EnumFacing side, boolean checkItems) {
+ super(inv, checkItems);
+ this.inv = inv;
+ this.side = side;
+ }
- @Override
- public int[] getSlotsForFace(EnumFacing side) {
- return inv.getSlotsForFace(side);
- }
+ @Override
+ public int[] getSlotsForFace(EnumFacing side) {
+ return inv.getSlotsForFace(side);
+ }
- @Override
- public boolean canInsertItem(int slot, ItemStack stack, EnumFacing s) {
- return !checkItems() || inv.canInsertItem(slot, stack, side);
- }
+ @Override
+ public boolean canInsertItem(int slot, ItemStack stack, EnumFacing s) {
+ return !checkItems() || inv.canInsertItem(slot, stack, side);
+ }
- @Override
- public boolean canExtractItem(int slot, ItemStack stack, EnumFacing s) {
- return !checkItems() || inv.canExtractItem(slot, stack, side);
- }
+ @Override
+ public boolean canExtractItem(int slot, ItemStack stack, EnumFacing s) {
+ return !checkItems() || inv.canExtractItem(slot, stack, side);
+ }
}
diff --git a/src/main/java/forestry/core/items/ItemCraftingMaterial.java b/src/main/java/forestry/core/items/ItemCraftingMaterial.java
index 6e3defb93..10ced3761 100644
--- a/src/main/java/forestry/core/items/ItemCraftingMaterial.java
+++ b/src/main/java/forestry/core/items/ItemCraftingMaterial.java
@@ -26,7 +26,6 @@ public class ItemCraftingMaterial extends ItemForestry {
private final String[] definition = new String[]{"pulsatingDust", "pulsatingMesh", "silkWisp", "wovenSilk", "dissipationCharge", "iceShard", "scentedPaneling", "camouflagedPaneling" };
public ItemCraftingMaterial() {
- super();
setMaxDamage(0);
setHasSubtypes(true);
}
diff --git a/src/main/java/forestry/core/items/ItemPipette.java b/src/main/java/forestry/core/items/ItemPipette.java
index 664be7e25..4a668bbf8 100755
--- a/src/main/java/forestry/core/items/ItemPipette.java
+++ b/src/main/java/forestry/core/items/ItemPipette.java
@@ -32,7 +32,6 @@ import forestry.core.fluids.PipetteContents;
public class ItemPipette extends ItemForestry implements IToolPipette {
public ItemPipette() {
- super();
setMaxStackSize(1);
setFull3D();
}
diff --git a/src/main/java/forestry/core/items/ItemWrench.java b/src/main/java/forestry/core/items/ItemWrench.java
index 1a6141cf6..692241225 100755
--- a/src/main/java/forestry/core/items/ItemWrench.java
+++ b/src/main/java/forestry/core/items/ItemWrench.java
@@ -26,7 +26,6 @@ import buildcraft.api.tools.IToolWrench;
public class ItemWrench extends ItemForestry implements IToolWrench {
public ItemWrench() {
- super();
setHarvestLevel("wrench", 0);
}
diff --git a/src/main/java/forestry/core/models/ModelCrate.java b/src/main/java/forestry/core/models/ModelCrate.java
index fafecce68..7b3d1b38b 100644
--- a/src/main/java/forestry/core/models/ModelCrate.java
+++ b/src/main/java/forestry/core/models/ModelCrate.java
@@ -11,7 +11,6 @@
package forestry.core.models;
import com.google.common.base.Charsets;
-import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
@@ -28,7 +27,6 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
import net.minecraft.client.renderer.block.model.ModelBlock;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.resources.IResource;
import net.minecraft.client.resources.model.IBakedModel;
@@ -79,8 +77,7 @@ public class ModelCrate extends BlankItemModel {
MODEL_COMPASS = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 15);
MODEL_CLOCK = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 16);
} catch (IOException e) {
- Log.error("Failed to init the crate model.");
- e.printStackTrace();
+ Log.error("Failed to init the crate model.", e);
}
}
@@ -176,6 +173,7 @@ public class ModelCrate extends BlankItemModel {
try {
model.parent = loadModel(model.getParentLocation());
} catch (IOException e) {
+ Log.error("Failed to load model.", e);
}
}
}
@@ -202,16 +200,6 @@ public class ModelCrate extends BlankItemModel {
}
}
- private Function textureGetter = new DefaultTextureGetter();
-
- /**
- * Bake the crate model;
- */
- /*private IFlexibleBakedModel getModelCrate() {
- IFlexibleBakedModel flexModel = getModel(new ItemStack(PluginStorage.items.crate, 1, 1));
- return crateModel.bake(crateModel.getDefaultState(), flexModel.getFormat(), textureGetter);
- }*/
-
/**
* Bake the crated model
*/
diff --git a/src/main/java/forestry/core/models/ModelManager.java b/src/main/java/forestry/core/models/ModelManager.java
index e75ff6381..827ae0ce9 100644
--- a/src/main/java/forestry/core/models/ModelManager.java
+++ b/src/main/java/forestry/core/models/ModelManager.java
@@ -40,8 +40,8 @@ public class ModelManager implements IModelManager {
private static final ModelManager instance = new ModelManager();
- private static final ArrayList customBlockModels = new ArrayList();
- private static final ArrayList customModels = new ArrayList();
+ private static final ArrayList customBlockModels = new ArrayList<>();
+ private static final ArrayList customModels = new ArrayList<>();
static {
ForestryAPI.modelManager = instance;
diff --git a/src/main/java/forestry/core/models/TRSRBakedModel.java b/src/main/java/forestry/core/models/TRSRBakedModel.java
index 1d1add8ec..6b2352054 100644
--- a/src/main/java/forestry/core/models/TRSRBakedModel.java
+++ b/src/main/java/forestry/core/models/TRSRBakedModel.java
@@ -76,7 +76,7 @@ public class TRSRBakedModel implements IFlexibleBakedModel {
}
}
//faces.put(face, builder.build());
- faces.put(face, ImmutableList.of());
+ faces.put(face, ImmutableList.of());
}
// general quads
diff --git a/src/main/java/forestry/core/models/baker/ModelBakerModel.java b/src/main/java/forestry/core/models/baker/ModelBakerModel.java
index a04fefcb9..52ae33a1a 100644
--- a/src/main/java/forestry/core/models/baker/ModelBakerModel.java
+++ b/src/main/java/forestry/core/models/baker/ModelBakerModel.java
@@ -42,9 +42,9 @@ public class ModelBakerModel implements IModelBakerModel {
private float[] scale = getDefaultScale();
public ModelBakerModel() {
- general = new ArrayList();
+ general = new ArrayList<>();
for (EnumFacing f : EnumFacing.VALUES) {
- faces[f.ordinal()] = new ArrayList();
+ faces[f.ordinal()] = new ArrayList<>();
}
formate = DefaultVertexFormats.BLOCK;
isGui3d = true;
diff --git a/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java b/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java
index 5664e41f5..3f594fed4 100644
--- a/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java
+++ b/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java
@@ -13,6 +13,8 @@ package forestry.core.multiblock;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
+import javax.annotation.Nonnull;
+
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
@@ -98,6 +100,7 @@ public abstract class MultiblockControllerForestry extends MultiblockControllerB
}
/* INVENTORY */
+ @Nonnull
public IInventoryAdapter getInternalInventory() {
return FakeInventoryAdapter.instance();
}
diff --git a/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java b/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java
index cdf3b8394..246bac833 100644
--- a/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java
+++ b/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java
@@ -70,7 +70,7 @@ public class MultiblockWorldRegistry {
* Called before Tile Entities are ticked in the world. Run game logic.
*/
public void tickStart() {
- if (controllers.size() > 0) {
+ if (!controllers.isEmpty()) {
for (IMultiblockControllerInternal controller : controllers) {
if (controller.getWorld() == worldObj && controller.getWorld().isRemote == worldObj.isRemote) {
if (controller.isEmpty()) {
@@ -95,7 +95,7 @@ public class MultiblockWorldRegistry {
// Merge pools - sets of adjacent machines which should be merged later on in processing
List> mergePools = null;
- if (orphanedParts.size() > 0) {
+ if (!orphanedParts.isEmpty()) {
Set orphansToProcess = null;
// Keep the synchronized block small. We can't iterate over orphanedParts directly
@@ -103,13 +103,13 @@ public class MultiblockWorldRegistry {
// is not chunk-safe on the client, because Minecraft is stupid.
// It's possible to polyfill this, but the polyfill is too slow for comfort.
synchronized (orphanedPartsMutex) {
- if (orphanedParts.size() > 0) {
+ if (!orphanedParts.isEmpty()) {
orphansToProcess = orphanedParts;
orphanedParts = new HashSet<>();
}
}
- if (orphansToProcess != null && orphansToProcess.size() > 0) {
+ if (orphansToProcess != null && !orphansToProcess.isEmpty()) {
Set compatibleControllers;
// Process orphaned blocks
@@ -133,7 +133,7 @@ public class MultiblockWorldRegistry {
// THIS IS THE ONLY PLACE WHERE PARTS ATTACH TO MACHINES
// Try to attach to a neighbor's master controller
compatibleControllers = attachToNeighbors(orphan);
- if (compatibleControllers.size() == 0) {
+ if (compatibleControllers.isEmpty()) {
// FOREVER ALONE! Create and register a new controller.
// THIS IS THE ONLY PLACE WHERE NEW CONTROLLERS ARE CREATED.
MultiblockLogic logic = (MultiblockLogic) orphan.getMultiblockLogic();
@@ -178,7 +178,7 @@ public class MultiblockWorldRegistry {
}
}
- if (mergePools != null && mergePools.size() > 0) {
+ if (mergePools != null && !mergePools.isEmpty()) {
// Process merges - any machines that have been marked for merge should be merged
// into the "master" machine.
// To do this, we combine lists of machines that are touching one another and therefore
@@ -211,7 +211,7 @@ public class MultiblockWorldRegistry {
// Process splits and assembly
// Any controllers which have had parts removed must be checked to see if some parts are no longer
// physically connected to their master.
- if (dirtyControllers.size() > 0) {
+ if (!dirtyControllers.isEmpty()) {
for (IMultiblockControllerInternal controller : dirtyControllers) {
if (controller == null) {
continue;
@@ -229,7 +229,7 @@ public class MultiblockWorldRegistry {
addDeadController(controller);
}
- if (newlyDetachedParts.size() > 0) {
+ if (!newlyDetachedParts.isEmpty()) {
// Controller has shed some parts - add them to the detached list for delayed processing
detachedParts.addAll(newlyDetachedParts);
}
@@ -239,7 +239,7 @@ public class MultiblockWorldRegistry {
}
// Unregister dead controllers
- if (deadControllers.size() > 0) {
+ if (!deadControllers.isEmpty()) {
for (IMultiblockControllerInternal controller : deadControllers) {
// Go through any controllers which have marked themselves as potentially dead.
// Validate that they are empty/dead, then unregister them.
diff --git a/src/main/java/forestry/core/render/EmptyStateMapper.java b/src/main/java/forestry/core/render/EmptyStateMapper.java
index 99916e98f..809c27a01 100644
--- a/src/main/java/forestry/core/render/EmptyStateMapper.java
+++ b/src/main/java/forestry/core/render/EmptyStateMapper.java
@@ -4,7 +4,10 @@ import java.util.Collections;
import java.util.Map;
import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.statemap.IStateMapper;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -17,7 +20,7 @@ public class EmptyStateMapper implements IStateMapper {
}
@Override
- public Map putStateModelLocations(Block block) {
+ public Map putStateModelLocations(Block block) {
return Collections.emptyMap();
}
diff --git a/src/main/java/forestry/core/render/MachineParticleCallback.java b/src/main/java/forestry/core/render/MachineParticleCallback.java
index 3dd46e55b..6c497a095 100644
--- a/src/main/java/forestry/core/render/MachineParticleCallback.java
+++ b/src/main/java/forestry/core/render/MachineParticleCallback.java
@@ -10,17 +10,17 @@
******************************************************************************/
package forestry.core.render;
-import forestry.core.blocks.BlockBase;
-import forestry.core.blocks.IBlockType;
-import forestry.core.blocks.IMachinePropertiesTesr;
-import forestry.core.proxy.Proxies;
-import net.minecraft.block.Block;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.particle.EntityDiggingFX;
import net.minecraft.util.BlockPos;
import net.minecraft.util.IStringSerializable;
+import forestry.core.blocks.BlockBase;
+import forestry.core.blocks.IBlockType;
+import forestry.core.blocks.IMachinePropertiesTesr;
+import forestry.core.proxy.Proxies;
+
public class MachineParticleCallback & IBlockType & IStringSerializable> extends ParticleHelper.DefaultCallback {
private final PropertyEnum TYPE;
diff --git a/src/main/java/forestry/core/render/ParticleHelper.java b/src/main/java/forestry/core/render/ParticleHelper.java
index a70237b35..544fafcbc 100644
--- a/src/main/java/forestry/core/render/ParticleHelper.java
+++ b/src/main/java/forestry/core/render/ParticleHelper.java
@@ -141,20 +141,4 @@ public class ParticleHelper {
fx.setParticleIcon(Proxies.common.getClientInstance().getBlockRendererDispatcher().getBlockModelShapes().getTexture(state));
}
}
-
- public static class TexturedCallback extends ParticleHelper.DefaultCallback{
-
- private final String textureLocation;
-
- public TexturedCallback(Block block, String textureLocation) {
- super(block);
- this.textureLocation = textureLocation;
- }
-
- @Override
- protected void setTexture(EntityDiggingFX fx, BlockPos pos, IBlockState state) {
- fx.setParticleIcon(Proxies.common.getClientInstance().getTextureMapBlocks().getAtlasSprite(textureLocation));
- }
-
- }
}
diff --git a/src/main/java/forestry/core/render/TextureManager.java b/src/main/java/forestry/core/render/TextureManager.java
index 0b8f07878..efa4a03aa 100755
--- a/src/main/java/forestry/core/render/TextureManager.java
+++ b/src/main/java/forestry/core/render/TextureManager.java
@@ -20,15 +20,14 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
+
import net.minecraftforge.fml.common.registry.GameData;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.ForestryAPI;
-import forestry.api.core.IItemModelRegister;
import forestry.api.core.ISpriteProvider;
import forestry.api.core.ISpriteRegister;
-import forestry.api.core.IStateMapperRegister;
import forestry.api.core.ITextureManager;
import forestry.core.proxy.Proxies;
diff --git a/src/main/java/forestry/core/tiles/ILiquidTankTile.java b/src/main/java/forestry/core/tiles/ILiquidTankTile.java
index abe9370a3..622a73191 100644
--- a/src/main/java/forestry/core/tiles/ILiquidTankTile.java
+++ b/src/main/java/forestry/core/tiles/ILiquidTankTile.java
@@ -10,10 +10,13 @@
******************************************************************************/
package forestry.core.tiles;
+import javax.annotation.Nonnull;
+
import forestry.core.fluids.ITankManager;
public interface ILiquidTankTile extends ILocatable {
+ @Nonnull
ITankManager getTankManager();
}
diff --git a/src/main/java/forestry/core/utils/GeneticsUtil.java b/src/main/java/forestry/core/utils/GeneticsUtil.java
index fa534c8e1..b806abf10 100644
--- a/src/main/java/forestry/core/utils/GeneticsUtil.java
+++ b/src/main/java/forestry/core/utils/GeneticsUtil.java
@@ -194,7 +194,7 @@ public class GeneticsUtil {
}
public static int getResearchComplexity(IAlleleSpecies species, IChromosomeType speciesChromosome) {
- return 1 + getGeneticAdvancement(species, new HashSet(), speciesChromosome);
+ return 1 + getGeneticAdvancement(species, new HashSet<>(), speciesChromosome);
}
private static int getGeneticAdvancement(IAlleleSpecies species, Set exclude, IChromosomeType speciesChromosome) {
diff --git a/src/main/java/forestry/core/utils/InventoryUtil.java b/src/main/java/forestry/core/utils/InventoryUtil.java
index 89168bdc4..3d9b74df4 100644
--- a/src/main/java/forestry/core/utils/InventoryUtil.java
+++ b/src/main/java/forestry/core/utils/InventoryUtil.java
@@ -39,7 +39,6 @@ import forestry.core.inventory.filters.ArrayStackFilter;
import forestry.core.inventory.filters.IStackFilter;
import forestry.core.inventory.filters.StandardStackFilters;
import forestry.core.inventory.iterators.IExtInvSlot;
-import forestry.core.inventory.iterators.IInvSlot;
import forestry.core.inventory.iterators.InventoryIterator;
import forestry.core.inventory.manipulators.InventoryManipulator;
import forestry.core.inventory.wrappers.InventoryCopy;
@@ -78,12 +77,12 @@ public abstract class InventoryUtil {
return damage == -1 || damage == OreDictionary.WILDCARD_VALUE;
}
- public static ItemStack makeSafe(ItemStack stack) {
- if (stack.stackSize <= 0) {
+ public static ItemStack makeSafe(ItemStack stack) {
+ if (stack.stackSize <= 0) {
return null;
}
- return stack;
- }
+ return stack;
+ }
/**
* A more robust item comparison function.
@@ -166,21 +165,21 @@ public abstract class InventoryUtil {
return false;
}
- /**
- * Returns true if the item is equal to any one of several possible matches.
- *
- * @param stack the ItemStack to test
- * @param matches the ItemStacks to test against
- * @return true if a match is found
- */
- public static boolean isItemEqual(ItemStack stack, Collection matches) {
- for (ItemStack match : matches) {
- if (isItemEqual(stack, match)) {
+ /**
+ * Returns true if the item is equal to any one of several possible matches.
+ *
+ * @param stack the ItemStack to test
+ * @param matches the ItemStacks to test against
+ * @return true if a match is found
+ */
+ public static boolean isItemEqual(ItemStack stack, Collection matches) {
+ for (ItemStack match : matches) {
+ if (isItemEqual(stack, match)) {
return true;
}
- }
- return false;
- }
+ }
+ return false;
+ }
/**
* Places an ItemStack in a destination IInventory. Will attempt to move as
@@ -215,23 +214,6 @@ public abstract class InventoryUtil {
}
return false;
}
-
- /**
- * Returns true if the inventory contains the specified item.
- *
- * @param inv the inventory The inventory to check
- * @param item The ItemStack to look for
- * @return true is exists
- */
- public static boolean containsItem(IInventory inv, ItemStack item) {
- for (IInvSlot slot : InventoryIterator.getIterable(inv)) {
- ItemStack stack = slot.getStackInSlot();
- if (stack != null && isItemEqual(stack, item)) {
- return true;
- }
- }
- return false;
- }
/**
* Attempts to move an ItemStack from one inventory to another.
diff --git a/src/main/java/forestry/core/utils/ItemStackUtil.java b/src/main/java/forestry/core/utils/ItemStackUtil.java
index 463373edf..317808a8c 100644
--- a/src/main/java/forestry/core/utils/ItemStackUtil.java
+++ b/src/main/java/forestry/core/utils/ItemStackUtil.java
@@ -484,8 +484,7 @@ public abstract class ItemStackUtil {
Item item = stack.getItem();
if (item != null) {
int meta = stack.getMeta();
- ItemStack itemStack = new ItemStack(item, 1, meta);
- return itemStack;
+ return new ItemStack(item, 1, meta);
}
return null;
}
diff --git a/src/main/java/forestry/factory/recipes/MemorizedRecipe.java b/src/main/java/forestry/factory/recipes/MemorizedRecipe.java
index 9750d56c4..09bf87699 100644
--- a/src/main/java/forestry/factory/recipes/MemorizedRecipe.java
+++ b/src/main/java/forestry/factory/recipes/MemorizedRecipe.java
@@ -86,7 +86,7 @@ public final class MemorizedRecipe implements INbtWritable, INbtReadable, IStrea
}
public ItemStack getRecipeOutput() {
- if (recipeOutputs.size() == 0) {
+ if (recipeOutputs.isEmpty()) {
return null;
} else {
return recipeOutputs.get(selectedRecipe);
diff --git a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java
index d8cc6770b..b7052539f 100644
--- a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java
+++ b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java
@@ -74,7 +74,7 @@ public class CentrifugeRecipeCategory extends ForestryRecipeCategory {
private void setResults(Map outputs, GuiItemStackGroup guiItemStacks) {
Set> entrySet = outputs.entrySet();
- if (entrySet.size() == 0) {
+ if (entrySet.isEmpty()) {
return;
}
PriorityQueue> sortByChance = new PriorityQueue<>(entrySet.size(), highestChanceComparator);
diff --git a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java
index c599ae559..7c53505ce 100644
--- a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java
+++ b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java
@@ -95,7 +95,7 @@ public class FabricatorRecipeCategory extends ForestryRecipeCategory {
for (IFabricatorSmeltingRecipe smelting : FabricatorSmeltingRecipeManager.recipes) {
Fluid fluid = smelting.getProduct().getFluid();
if (!smeltingInputs.containsKey(fluid)) {
- smeltingInputs.put(fluid, new ArrayList());
+ smeltingInputs.put(fluid, new ArrayList<>());
}
smeltingInputs.get(fluid).add(smelting);
}
diff --git a/src/main/java/forestry/factory/tiles/TileMoistener.java b/src/main/java/forestry/factory/tiles/TileMoistener.java
index c2c5941b0..b0ac638e0 100644
--- a/src/main/java/forestry/factory/tiles/TileMoistener.java
+++ b/src/main/java/forestry/factory/tiles/TileMoistener.java
@@ -381,7 +381,7 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT
}
// Grab new items from stash
- for (int i = 0; i < (slotsToShift.size() > 0 ? shiftedSlots : 2); i++) {
+ for (int i = 0; i < (!slotsToShift.isEmpty() ? shiftedSlots : 2); i++) {
int resourceSlot = getNextResourceSlot(0, InventoryMoistener.SLOT_RESERVOIR_1);
// Stop if no resources are available
if (resourceSlot < 0) {
diff --git a/src/main/java/forestry/farming/PluginFarming.java b/src/main/java/forestry/farming/PluginFarming.java
index 0dd8bc640..4811d719e 100644
--- a/src/main/java/forestry/farming/PluginFarming.java
+++ b/src/main/java/forestry/farming/PluginFarming.java
@@ -101,39 +101,39 @@ public class PluginFarming extends BlankForestryPlugin {
public void preInit() {
MinecraftForge.EVENT_BUS.register(this);
- Farmables.farmables.put("farmArboreal", new ArrayList());
+ Farmables.farmables.put("farmArboreal", new ArrayList<>());
Farmables.farmables.get("farmArboreal").add(new FarmableVanillaSapling());
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) {
Farmables.farmables.get("farmArboreal").add(new FarmableGE());
}
- Farmables.farmables.put("farmOrchard", new ArrayList());
+ Farmables.farmables.put("farmOrchard", new ArrayList<>());
Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(Blocks.wheat, 7));
Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(Blocks.potatoes, 7));
Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(Blocks.carrots, 7));
- Farmables.farmables.put("farmShroom", new ArrayList());
+ Farmables.farmables.put("farmShroom", new ArrayList<>());
Farmables.farmables.get("farmShroom").add(new FarmableVanillaMushroom(Blocks.brown_mushroom, 0));
Farmables.farmables.get("farmShroom").add(new FarmableVanillaMushroom(Blocks.red_mushroom, 0));
- Farmables.farmables.put("farmWheat", new ArrayList());
+ Farmables.farmables.put("farmWheat", new ArrayList<>());
Farmables.farmables.get("farmWheat").add(new FarmableGenericCrop(new ItemStack(Items.wheat_seeds), Blocks.wheat, 7));
- Farmables.farmables.put("farmGourd", new ArrayList());
+ Farmables.farmables.put("farmGourd", new ArrayList<>());
Farmables.farmables.get("farmGourd").add(
new FarmableGourd(new ItemStack(Items.pumpkin_seeds), new ItemStack(Blocks.pumpkin_stem), new ItemStack(Blocks.pumpkin)));
Farmables.farmables.get("farmGourd").add(new FarmableGourd(new ItemStack(Items.melon_seeds), new ItemStack(Blocks.melon_stem), new ItemStack(Blocks.melon_block)));
- Farmables.farmables.put("farmInfernal", new ArrayList());
+ Farmables.farmables.put("farmInfernal", new ArrayList<>());
Farmables.farmables.get("farmInfernal").add(new FarmableGenericCrop(new ItemStack(Items.nether_wart), Blocks.nether_wart, 3));
- Farmables.farmables.put("farmPoales", new ArrayList());
+ Farmables.farmables.put("farmPoales", new ArrayList<>());
Farmables.farmables.get("farmPoales").add(new FarmableStacked(Blocks.reeds, 3, 0));
- Farmables.farmables.put("farmSucculentes", new ArrayList());
+ Farmables.farmables.put("farmSucculentes", new ArrayList<>());
Farmables.farmables.get("farmSucculentes").add(new FarmableStacked(Blocks.cactus, 3, 0));
- Farmables.farmables.put("farmVegetables", new ArrayList());
+ Farmables.farmables.put("farmVegetables", new ArrayList<>());
Farmables.farmables.get("farmVegetables").add(new FarmableGenericCrop(new ItemStack(Items.potato), Blocks.potatoes, 7));
Farmables.farmables.get("farmVegetables").add(new FarmableGenericCrop(new ItemStack(Items.carrot), Blocks.carrots, 7));
diff --git a/src/main/java/forestry/farming/models/ModelFarmBlock.java b/src/main/java/forestry/farming/models/ModelFarmBlock.java
index 81eb5c5b3..bf61f7157 100644
--- a/src/main/java/forestry/farming/models/ModelFarmBlock.java
+++ b/src/main/java/forestry/farming/models/ModelFarmBlock.java
@@ -1,10 +1,14 @@
package forestry.farming.models;
+import javax.annotation.Nonnull;
+
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
+
import net.minecraftforge.common.property.IExtendedBlockState;
+
import forestry.api.core.IModelBaker;
import forestry.core.models.ModelBlockOverlay;
import forestry.farming.blocks.BlockFarm;
@@ -18,7 +22,7 @@ public class ModelFarmBlock extends ModelBlockOverlay {
}
@Override
- public void bakeInventoryBlock(BlockFarm blockFarm, ItemStack item, IModelBaker baker) {
+ public void bakeInventoryBlock(@Nonnull BlockFarm blockFarm, @Nonnull ItemStack item, @Nonnull IModelBaker baker) {
if (blockFarm == null) {
return;
}
@@ -32,7 +36,7 @@ public class ModelFarmBlock extends ModelBlockOverlay {
}
@Override
- public void bakeWorldBlock(BlockFarm blockFarm, IBlockAccess world, BlockPos pos, IExtendedBlockState stateExtended, IModelBaker baker) {
+ public void bakeWorldBlock(@Nonnull BlockFarm blockFarm, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, @Nonnull IExtendedBlockState stateExtended, @Nonnull IModelBaker baker) {
TileFarm farm = (TileFarm) world.getTileEntity(pos);
diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java
index 293ca5031..be1bb4240 100644
--- a/src/main/java/forestry/farming/multiblock/FarmController.java
+++ b/src/main/java/forestry/farming/multiblock/FarmController.java
@@ -500,8 +500,8 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
if (stage == Stage.HARVEST) {
Collection harvested = harvestTargets(farmTargets, logic, farmListeners);
- farmWorkStatus.didWork = harvested.size() > 0;
- if (harvested.size() > 0) {
+ farmWorkStatus.didWork = !harvested.isEmpty();
+ if (!harvested.isEmpty()) {
pendingCrops.addAll(harvested);
harvestProvider = logic;
}
@@ -684,7 +684,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
if (farmTargets != null) {
for (FarmTarget target : farmTargets) {
Collection harvested = harvestTarget(target, logic, farmListeners);
- if (harvested.size() > 0) {
+ if (!harvested.isEmpty()) {
return harvested;
}
}
@@ -696,7 +696,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
private static Collection harvestTarget(FarmTarget target, IFarmLogic logic, Iterable farmListeners) {
BlockPos pos = new BlockPos(target.getStart().getX(), target.getStart().getX() + target.getYOffset(), target.getStart().getZ());
Collection harvested = logic.harvest(pos, target.getDirection(), target.getExtent());
- if (harvested == null || harvested.size() == 0) {
+ if (harvested == null || harvested.isEmpty()) {
return Collections.emptyList();
}
diff --git a/src/main/java/forestry/farming/triggers/FarmingTriggers.java b/src/main/java/forestry/farming/triggers/FarmingTriggers.java
index fb15d5120..80df09a84 100644
--- a/src/main/java/forestry/farming/triggers/FarmingTriggers.java
+++ b/src/main/java/forestry/farming/triggers/FarmingTriggers.java
@@ -30,7 +30,7 @@ public class FarmingTriggers {
public static List allExternalTriggers;
public static void initialize() {
- allExternalTriggers = Arrays.asList(
+ allExternalTriggers = Arrays.asList(
lowResourceLiquid50 = new TriggerLowLiquid("lowLiquid.50", 0.5f),
lowResourceLiquid25 = new TriggerLowLiquid("lowLiquid.25", 0.25f),
lowSoil128 = new TriggerLowSoil(128),
diff --git a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java
index c269944d3..b21c2c649 100755
--- a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java
+++ b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java
@@ -43,11 +43,6 @@ public class TriggerLowSoil extends Trigger {
return 1;
}
- @Override
- public int minParameters() {
- return 0;
- }
-
/**
* Return true if the tile given in parameter activates the trigger, given
* the parameters.
diff --git a/src/main/java/forestry/greenhouse/EventHandlerGreenhouse.java b/src/main/java/forestry/greenhouse/EventHandlerGreenhouse.java
index f0ef18af2..77433a037 100644
--- a/src/main/java/forestry/greenhouse/EventHandlerGreenhouse.java
+++ b/src/main/java/forestry/greenhouse/EventHandlerGreenhouse.java
@@ -10,34 +10,31 @@
******************************************************************************/
package forestry.greenhouse;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
import forestry.api.core.ICamouflageHandler;
import forestry.api.greenhouse.EnumGreenhouseEventType;
import forestry.api.greenhouse.GreenhouseEvents.CamouflageChangeEvent;
import forestry.api.multiblock.IGreenhouseComponent;
import forestry.api.multiblock.IGreenhouseController;
-import forestry.greenhouse.blocks.BlockGreenhouseType;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
public class EventHandlerGreenhouse {
@SubscribeEvent
- public void onCamouflageChance(CamouflageChangeEvent event){
+ public void onCamouflageChance(CamouflageChangeEvent event) {
ICamouflageHandler handler = event.camouflageHandler;
IGreenhouseController controller = null;
- if(handler instanceof IGreenhouseController){
+ if (handler instanceof IGreenhouseController) {
controller = (IGreenhouseController) handler;
}
- if(handler instanceof IGreenhouseComponent){
+ if (handler instanceof IGreenhouseComponent) {
IGreenhouseComponent component = (IGreenhouseComponent) handler;
controller = component.getMultiblockLogic().getController();
}
- if(controller != null){
+ if (controller != null) {
controller.onChange(EnumGreenhouseEventType.CAMOUFLAGE, event);
}
}
diff --git a/src/main/java/forestry/greenhouse/FakeGreenhouseState.java b/src/main/java/forestry/greenhouse/FakeGreenhouseState.java
index 6f87154dd..69ff222e5 100644
--- a/src/main/java/forestry/greenhouse/FakeGreenhouseState.java
+++ b/src/main/java/forestry/greenhouse/FakeGreenhouseState.java
@@ -14,12 +14,13 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import net.minecraft.world.World;
+
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.greenhouse.IGreenhouseState;
import forestry.api.greenhouse.IInternalBlock;
import forestry.api.multiblock.IMultiblockComponent;
-import net.minecraft.world.World;
public class FakeGreenhouseState implements IGreenhouseState {
diff --git a/src/main/java/forestry/greenhouse/GreenhouseAccess.java b/src/main/java/forestry/greenhouse/GreenhouseAccess.java
index b7d13c944..81f272488 100644
--- a/src/main/java/forestry/greenhouse/GreenhouseAccess.java
+++ b/src/main/java/forestry/greenhouse/GreenhouseAccess.java
@@ -10,59 +10,59 @@
******************************************************************************/
package forestry.greenhouse;
+import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
import forestry.api.core.EnumCamouflageType;
import forestry.api.greenhouse.IGreenhouseAccess;
import forestry.core.utils.Log;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
public class GreenhouseAccess implements IGreenhouseAccess {
- private final Map greenhouseGlass = new HashMap();
- private final Map> camouflageBlockBlacklist = new EnumMap(EnumCamouflageType.class);
+ private final Map greenhouseGlasses = new HashMap<>();
+ private final Map> camouflageBlockBlacklist = new EnumMap<>(EnumCamouflageType.class);
public GreenhouseAccess() {
- for(EnumCamouflageType type : EnumCamouflageType.VALUES){
- camouflageBlockBlacklist.put(type, new ArrayList());
+ for (EnumCamouflageType type : EnumCamouflageType.VALUES) {
+ camouflageBlockBlacklist.put(type, new ArrayList<>());
}
}
@Override
public void registerGreenhouseGlass(@Nonnull ItemStack glass, float lightTransmittance) {
- if(glass == null || glass.getItem() == null){
+ if (glass == null || glass.getItem() == null) {
Log.error("Fail to register greenhouse glass, because it is null");
return;
}
Block block = Block.getBlockFromItem(glass.getItem());
- if(block == null || block.isOpaqueCube()){
+ if (block == null || block.isOpaqueCube()) {
Log.error("Fail to register greenhouse glass: " + block + ".");
return;
}
- for(ItemStack greenhouseGlass : greenhouseGlass.keySet()){
- if(greenhouseGlass.getItem() == glass.getItem() && greenhouseGlass.getItemDamage() == glass.getItemDamage() && ItemStack.areItemStackTagsEqual(glass, greenhouseGlass)){
+ for (ItemStack greenhouseGlass : greenhouseGlasses.keySet()) {
+ if (greenhouseGlass.getItem() == glass.getItem() && greenhouseGlass.getItemDamage() == glass.getItemDamage() && ItemStack.areItemStackTagsEqual(glass, greenhouseGlass)) {
Log.error("Fail to register greenhouse glass, because it is already registered: " + glass + ".");
return;
}
}
- greenhouseGlass.put(glass, lightTransmittance);
+ greenhouseGlasses.put(glass, lightTransmittance);
}
@Override
- public float getGreenhouseGlassLightTransmittance(ItemStack glass) {
- if(glass == null || glass.getItem() == null || Block.getBlockFromItem(glass.getItem()) == null) {
+ public float getGreenhouseGlassLightTransmittance(@Nonnull ItemStack glass) {
+ if (glass == null || glass.getItem() == null || Block.getBlockFromItem(glass.getItem()) == null) {
return 0.5F;
}
- for(Map.Entry greenhouseGlassEntry : greenhouseGlass.entrySet()){
+ for (Map.Entry greenhouseGlassEntry : greenhouseGlasses.entrySet()) {
ItemStack greenhouseGlass = greenhouseGlassEntry.getKey();
- if(greenhouseGlass.getItem() == glass.getItem() && greenhouseGlass.getItemDamage() == glass.getItemDamage() && ItemStack.areItemStackTagsEqual(glass, greenhouseGlass)){
+ if (greenhouseGlass.getItem() == glass.getItem() && greenhouseGlass.getItemDamage() == glass.getItemDamage() && ItemStack.areItemStackTagsEqual(glass, greenhouseGlass)) {
return greenhouseGlassEntry.getValue();
}
}
@@ -71,11 +71,11 @@ public class GreenhouseAccess implements IGreenhouseAccess {
@Override
public boolean isGreenhouseGlass(@Nonnull ItemStack glass) {
- if(glass == null || glass.getItem() == null || Block.getBlockFromItem(glass.getItem()) == null) {
+ if (glass == null || glass.getItem() == null || Block.getBlockFromItem(glass.getItem()) == null) {
return false;
}
- for(ItemStack greenhouseGlass : greenhouseGlass.keySet()){
- if(greenhouseGlass.getItem() == glass.getItem() && greenhouseGlass.getItemDamage() == glass.getItemDamage() && ItemStack.areItemStackTagsEqual(glass, greenhouseGlass)){
+ for (ItemStack greenhouseGlass : greenhouseGlasses.keySet()) {
+ if (greenhouseGlass.getItem() == glass.getItem() && greenhouseGlass.getItemDamage() == glass.getItemDamage() && ItemStack.areItemStackTagsEqual(glass, greenhouseGlass)) {
return true;
}
}
@@ -84,17 +84,17 @@ public class GreenhouseAccess implements IGreenhouseAccess {
@Override
public void addToCamouflageBlockBlackList(@Nonnull EnumCamouflageType type, @Nonnull ItemStack camouflageBlock) {
- if(camouflageBlock == null || camouflageBlock.getItem() == null){
+ if (camouflageBlock == null || camouflageBlock.getItem() == null) {
Log.error("Fail to add camouflage block item to the black list, because it is null");
return;
}
Block block = Block.getBlockFromItem(camouflageBlock.getItem());
- if(block == null){
+ if (block == null) {
Log.error("Fail to add camouflage block item to the black list: because it has no block.");
return;
}
- for(ItemStack camouflageBlacklisted : camouflageBlockBlacklist.get(type)){
- if(camouflageBlacklisted.getItem() == camouflageBlock.getItem() && camouflageBlacklisted.getItemDamage() == camouflageBlock.getItemDamage() && ItemStack.areItemStackTagsEqual(camouflageBlock, camouflageBlacklisted)){
+ for (ItemStack camouflageBlacklisted : camouflageBlockBlacklist.get(type)) {
+ if (camouflageBlacklisted.getItem() == camouflageBlock.getItem() && camouflageBlacklisted.getItemDamage() == camouflageBlock.getItemDamage() && ItemStack.areItemStackTagsEqual(camouflageBlock, camouflageBlacklisted)) {
Log.error("Fail to add camouflage block item to the black list, because it is already registered: " + camouflageBlock + ".");
return;
}
@@ -104,11 +104,11 @@ public class GreenhouseAccess implements IGreenhouseAccess {
@Override
public boolean isOnCamouflageBlockBlackList(@Nonnull EnumCamouflageType type, @Nonnull ItemStack camouflageBlock) {
- if(camouflageBlock == null || camouflageBlock.getItem() == null || Block.getBlockFromItem(camouflageBlock.getItem()) == null) {
+ if (camouflageBlock == null || camouflageBlock.getItem() == null || Block.getBlockFromItem(camouflageBlock.getItem()) == null) {
return false;
}
- for(ItemStack camouflageBlacklisted : camouflageBlockBlacklist.get(type)){
- if(camouflageBlacklisted.getItem() == camouflageBlock.getItem() && camouflageBlacklisted.getItemDamage() == camouflageBlock.getItemDamage() && ItemStack.areItemStackTagsEqual(camouflageBlock, camouflageBlacklisted)){
+ for (ItemStack camouflageBlacklisted : camouflageBlockBlacklist.get(type)) {
+ if (camouflageBlacklisted.getItem() == camouflageBlock.getItem() && camouflageBlacklisted.getItemDamage() == camouflageBlock.getItemDamage() && ItemStack.areItemStackTagsEqual(camouflageBlock, camouflageBlacklisted)) {
return true;
}
}
diff --git a/src/main/java/forestry/greenhouse/GreenhouseHelper.java b/src/main/java/forestry/greenhouse/GreenhouseHelper.java
index 83a9df888..f14bbc36d 100644
--- a/src/main/java/forestry/greenhouse/GreenhouseHelper.java
+++ b/src/main/java/forestry/greenhouse/GreenhouseHelper.java
@@ -10,24 +10,25 @@
******************************************************************************/
package forestry.greenhouse;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
import forestry.api.greenhouse.IGreenhouseHelper;
import forestry.api.greenhouse.IGreenhouseState;
import forestry.api.greenhouse.IInternalBlock;
import forestry.core.multiblock.IMultiblockControllerInternal;
import forestry.core.multiblock.MultiblockRegistry;
import forestry.greenhouse.multiblock.IGreenhouseControllerInternal;
-import net.minecraft.util.BlockPos;
-import net.minecraft.world.World;
public class GreenhouseHelper implements IGreenhouseHelper {
@Override
public IGreenhouseState getGreenhouseState(World world, BlockPos pos) {
- if(MultiblockRegistry.getControllersFromWorld(world) != null){
- for(IMultiblockControllerInternal controllerInternal : MultiblockRegistry.getControllersFromWorld(world)){
- if(controllerInternal instanceof IGreenhouseControllerInternal){
- if(controllerInternal.isAssembled()){
- if(isPosiotionInGreenhouse((IGreenhouseControllerInternal) controllerInternal, pos)){
+ if (MultiblockRegistry.getControllersFromWorld(world) != null) {
+ for (IMultiblockControllerInternal controllerInternal : MultiblockRegistry.getControllersFromWorld(world)) {
+ if (controllerInternal instanceof IGreenhouseControllerInternal) {
+ if (controllerInternal.isAssembled()) {
+ if (isPosiotionInGreenhouse((IGreenhouseControllerInternal) controllerInternal, pos)) {
return ((IGreenhouseControllerInternal) controllerInternal).createState();
}
}
@@ -37,9 +38,9 @@ public class GreenhouseHelper implements IGreenhouseHelper {
return null;
}
- private static boolean isPosiotionInGreenhouse(IGreenhouseControllerInternal controller, BlockPos pos){
- for(IInternalBlock internalBlock : controller.getInternalBlocks()){
- if(internalBlock.getPos().equals(pos)){
+ private static boolean isPosiotionInGreenhouse(IGreenhouseControllerInternal controller, BlockPos pos) {
+ for (IInternalBlock internalBlock : controller.getInternalBlocks()) {
+ if (internalBlock.getPos().equals(pos)) {
return true;
}
}
diff --git a/src/main/java/forestry/greenhouse/GreenhouseState.java b/src/main/java/forestry/greenhouse/GreenhouseState.java
index afc64fb2c..6bb3c61a5 100644
--- a/src/main/java/forestry/greenhouse/GreenhouseState.java
+++ b/src/main/java/forestry/greenhouse/GreenhouseState.java
@@ -13,13 +13,14 @@ package forestry.greenhouse;
import java.util.Collection;
import java.util.List;
+import net.minecraft.world.World;
+
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.greenhouse.IGreenhouseState;
import forestry.api.greenhouse.IInternalBlock;
import forestry.api.multiblock.IMultiblockComponent;
import forestry.greenhouse.multiblock.GreenhouseController;
-import net.minecraft.world.World;
public final class GreenhouseState implements IGreenhouseState {
diff --git a/src/main/java/forestry/greenhouse/PluginGreenhouse.java b/src/main/java/forestry/greenhouse/PluginGreenhouse.java
index e4bfd9d75..97d45c23c 100644
--- a/src/main/java/forestry/greenhouse/PluginGreenhouse.java
+++ b/src/main/java/forestry/greenhouse/PluginGreenhouse.java
@@ -10,6 +10,13 @@
******************************************************************************/
package forestry.greenhouse;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+
import forestry.api.core.ForestryAPI;
import forestry.api.greenhouse.GreenhouseManager;
import forestry.api.greenhouse.IGreenhouseAccess;
@@ -40,11 +47,6 @@ import forestry.greenhouse.tiles.TileGreenhouseValve;
import forestry.plugins.BlankForestryPlugin;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.SidedProxy;
-import net.minecraftforge.fml.common.registry.GameRegistry;
@ForestryPlugin(pluginID = ForestryPluginUids.GREENHOUSE, name = "Greenhouse", author = "Nedelosk", url = Constants.URL, unlocalizedDescription = "for.plugin.greenhouse.description")
public class PluginGreenhouse extends BlankForestryPlugin {
@@ -192,13 +194,13 @@ public class PluginGreenhouse extends BlankForestryPlugin {
GameRegistry.registerTileEntity(TileGreenhousePlain.class, "forestry.GreenhousePlain");
GameRegistry.registerTileEntity(TileGreenhouseDoor.class, "forestry.GreenhouseDoor");
GameRegistry.registerTileEntity(TileGreenhouseHatch.class, "forestry.GreenhouseHatch");
- if(ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)){
+ if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) {
GameRegistry.registerTileEntity(TileGreenhouseButterflyHatch.class, "forestry.GreenhouseButterflyHatch");
}
}
@Override
- public void preInit(){
+ public void preInit() {
MinecraftForge.EVENT_BUS.register(new EventHandlerGreenhouse());
IGreenhouseAccess greenhouseAccess = GreenhouseManager.greenhouseAccess;
diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java
index ae68a4f94..e8480a997 100644
--- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java
+++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java
@@ -70,7 +70,7 @@ public abstract class BlockGreenhouse extends BlockStructure implements ISpriteR
public static final PropertyEnum STATE = PropertyEnum.create("state", State.class);
- public static enum State implements IStringSerializable {
+ public enum State implements IStringSerializable {
ON, OFF;
@Override
@@ -82,16 +82,16 @@ public abstract class BlockGreenhouse extends BlockStructure implements ISpriteR
public static Map create() {
Map blockMap = new EnumMap<>(BlockGreenhouseType.class);
for (final BlockGreenhouseType type : BlockGreenhouseType.VALUES) {
- if(type == BlockGreenhouseType.BUTTERFLY_HATCH){
- if(!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) {
+ if (type == BlockGreenhouseType.BUTTERFLY_HATCH) {
+ if (!ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) {
continue;
}
}
BlockGreenhouse block;
- if(type == BlockGreenhouseType.DOOR){
+ if (type == BlockGreenhouseType.DOOR) {
block = new BlockGreenhouseDoor();
- }else{
+ } else {
block = new BlockGreenhouse() {
@Nonnull
@Override
@@ -109,45 +109,45 @@ public abstract class BlockGreenhouse extends BlockStructure implements ISpriteR
super(Material.rock);
BlockGreenhouseType greenhouseType = getGreenhouseType();
IBlockState defaultState = this.blockState.getBaseState();
- if(greenhouseType.activatable && greenhouseType != BlockGreenhouseType.SPRINKLER){
+ if (greenhouseType.activatable && greenhouseType != BlockGreenhouseType.SPRINKLER) {
defaultState = defaultState.withProperty(STATE, State.OFF);
}
setDefaultState(defaultState);
setHardness(1.0f);
setHarvestLevel("pickaxe", 0);
- if(ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)){
+ if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING)) {
setCreativeTab(Tabs.tabAgriculture);
- }else{
+ } else {
setCreativeTab(CreativeTabForestry.tabForestry);
}
}
- @Override
+ @Override
@SideOnly(Side.CLIENT)
- public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos){
- if(getGreenhouseType() == BlockGreenhouseType.SPRINKLER){
- this.setBlockBoundsBasedOnState(worldIn, pos);
- }
- return super.getSelectedBoundingBox(worldIn, pos);
- }
+ public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos) {
+ if (getGreenhouseType() == BlockGreenhouseType.SPRINKLER) {
+ this.setBlockBoundsBasedOnState(worldIn, pos);
+ }
+ return super.getSelectedBoundingBox(worldIn, pos);
+ }
- @Override
- public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state){
- if(getGreenhouseType() == BlockGreenhouseType.SPRINKLER){
- this.setBlockBoundsBasedOnState(worldIn, pos);
- }
- return super.getCollisionBoundingBox(worldIn, pos, state);
- }
+ @Override
+ public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state) {
+ if (getGreenhouseType() == BlockGreenhouseType.SPRINKLER) {
+ this.setBlockBoundsBasedOnState(worldIn, pos);
+ }
+ return super.getCollisionBoundingBox(worldIn, pos, state);
+ }
- @Override
- public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos){
- if(getGreenhouseType() == BlockGreenhouseType.SPRINKLER){
- setBlockBounds(0.3125F, 0.25F, 0.3125F, 0.6875F, 1F, 0.6875F);
- }else{
- super.setBlockBoundsBasedOnState(worldIn, pos);
- }
- }
+ @Override
+ public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos) {
+ if (getGreenhouseType() == BlockGreenhouseType.SPRINKLER) {
+ setBlockBounds(0.3125F, 0.25F, 0.3125F, 0.6875F, 1F, 0.6875F);
+ } else {
+ super.setBlockBoundsBasedOnState(worldIn, pos);
+ }
+ }
@Override
public int getMetaFromState(IBlockState state) {
@@ -156,29 +156,29 @@ public abstract class BlockGreenhouse extends BlockStructure implements ISpriteR
@Override
public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) {
- if(getGreenhouseType() != BlockGreenhouseType.SPRINKLER && getGreenhouseType() != BlockGreenhouseType.DOOR){
+ if (getGreenhouseType() != BlockGreenhouseType.SPRINKLER && getGreenhouseType() != BlockGreenhouseType.DOOR) {
return ((IExtendedBlockState) super.getExtendedState(state, world, pos)).withProperty(UnlistedBlockPos.POS, pos)
- . withProperty(UnlistedBlockAccess.BLOCKACCESS, world);
+ .withProperty(UnlistedBlockAccess.BLOCKACCESS, world);
}
return super.getExtendedState(state, world, pos);
}
@Override
protected BlockState createBlockState() {
- if(getGreenhouseType() == BlockGreenhouseType.SPRINKLER){
- return new ExtendedBlockState(this, new IProperty[]{ Properties.StaticProperty }, new IUnlistedProperty[]{ Properties.AnimationProperty });
- }else if(getGreenhouseType().activatable){
+ if (getGreenhouseType() == BlockGreenhouseType.SPRINKLER) {
+ return new ExtendedBlockState(this, new IProperty[]{Properties.StaticProperty}, new IUnlistedProperty[]{Properties.AnimationProperty});
+ } else if (getGreenhouseType().activatable) {
return new ExtendedBlockState(this, new IProperty[]{STATE}, new IUnlistedProperty[]{UnlistedBlockPos.POS, UnlistedBlockAccess.BLOCKACCESS});
- }else{
+ } else {
return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[]{UnlistedBlockPos.POS, UnlistedBlockAccess.BLOCKACCESS});
}
}
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) {
- if(getGreenhouseType() == BlockGreenhouseType.SPRINKLER){
+ if (getGreenhouseType() == BlockGreenhouseType.SPRINKLER) {
return state.withProperty(Properties.StaticProperty, true);
- }else{
+ } else {
return super.getActualState(state, worldIn, pos);
}
}
@@ -222,15 +222,15 @@ public abstract class BlockGreenhouse extends BlockStructure implements ISpriteR
@Override
public int colorMultiplier(IBlockAccess world, BlockPos pos, int renderPass) {
TileEntity tile = world.getTileEntity(pos);
- if(tile instanceof ICamouflagedBlock){
+ if (tile instanceof ICamouflagedBlock) {
ItemStack camouflageStack = CamouflageUtil.getCamouflageBlock(world, pos);
- if(renderPass < 100 && camouflageStack != null){
+ if (renderPass < 100 && camouflageStack != null) {
return Block.getBlockFromItem(camouflageStack.getItem()).colorMultiplier(world, pos, renderPass);
}
return super.colorMultiplier(world, pos, renderPass);
- }else{
+ } else {
return super.colorMultiplier(world, pos, renderPass);
}
}
@@ -239,7 +239,7 @@ public abstract class BlockGreenhouse extends BlockStructure implements ISpriteR
@Override
@SideOnly(Side.CLIENT)
public EnumWorldBlockLayer getBlockLayer() {
- if(getGreenhouseType() == BlockGreenhouseType.GLASS || getGreenhouseType() == BlockGreenhouseType.SPRINKLER){
+ if (getGreenhouseType() == BlockGreenhouseType.GLASS || getGreenhouseType() == BlockGreenhouseType.SPRINKLER) {
return EnumWorldBlockLayer.TRANSLUCENT;
}
return EnumWorldBlockLayer.CUTOUT;
@@ -257,48 +257,44 @@ public abstract class BlockGreenhouse extends BlockStructure implements ISpriteR
@Override
public boolean canPlaceBlockAt(World worldIn, BlockPos pos) {
- if(getGreenhouseType() == BlockGreenhouseType.SPRINKLER){
- if(worldIn.getBlockState(pos.up()).getBlock() == this){
+ if (getGreenhouseType() == BlockGreenhouseType.SPRINKLER) {
+ if (worldIn.getBlockState(pos.up()).getBlock() == this) {
return false;
}
- if(!(worldIn.getTileEntity(pos.up()) instanceof IGreenhouseComponent)){
+ if (!(worldIn.getTileEntity(pos.up()) instanceof IGreenhouseComponent)) {
return false;
}
}
return super.canPlaceBlockAt(worldIn, pos);
}
- @Override
+ @Override
@SideOnly(Side.CLIENT)
- public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side)
- {
- IBlockState iblockstate = worldIn.getBlockState(pos);
- Block block = iblockstate.getBlock();
+ public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side) {
+ IBlockState iblockstate = worldIn.getBlockState(pos);
+ Block block = iblockstate.getBlock();
- if (getGreenhouseType() == BlockGreenhouseType.GLASS)
- {
- if (worldIn.getBlockState(pos.offset(side.getOpposite())) != iblockstate)
- {
- return true;
- }
+ if (getGreenhouseType() == BlockGreenhouseType.GLASS) {
+ if (worldIn.getBlockState(pos.offset(side.getOpposite())) != iblockstate) {
+ return true;
+ }
- if (block == this)
- {
- return false;
- }
- }else if(getGreenhouseType() == BlockGreenhouseType.DOOR){
- return super.shouldSideBeRendered(worldIn, pos, side);
- }
+ if (block == this) {
+ return false;
+ }
+ } else if (getGreenhouseType() == BlockGreenhouseType.DOOR) {
+ return super.shouldSideBeRendered(worldIn, pos, side);
+ }
- return block == this ? false : super.shouldSideBeRendered(worldIn, pos, side);
- }
+ return block != this && super.shouldSideBeRendered(worldIn, pos, side);
+ }
@SideOnly(Side.CLIENT)
@Override
public void registerModel(Item item, IModelManager manager) {
- if(getGreenhouseType() == BlockGreenhouseType.SPRINKLER){
+ if (getGreenhouseType() == BlockGreenhouseType.SPRINKLER) {
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation("forestry:greenhouse.sprinkler", "inventory"));
- }else{
+ } else {
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation("forestry:greenhouse", "inventory"));
}
}
diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseDoor.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseDoor.java
index b499b6fb4..d80fa47ae 100644
--- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseDoor.java
+++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseDoor.java
@@ -44,295 +44,276 @@ import forestry.core.proxy.Proxies;
import forestry.core.utils.Translator;
import forestry.greenhouse.tiles.TileGreenhouseDoor;
-public class BlockGreenhouseDoor extends BlockGreenhouse implements IStateMapperRegister {
+public class BlockGreenhouseDoor extends BlockGreenhouse implements IStateMapperRegister {
- //The door properties
- private static final PropertyDirection FACING = BlockDoor.FACING;
- private static final PropertyBool OPEN = BlockDoor.OPEN;
- private static final PropertyEnum HINGE = BlockDoor.HINGE;
- private static final PropertyBool POWERED = BlockDoor.POWERED;
- private static final PropertyEnum HALF = BlockDoor.HALF;
-
- public BlockGreenhouseDoor() {
- setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(OPEN, false).withProperty(HINGE, BlockDoor.EnumHingePosition.LEFT).withProperty(POWERED, false).withProperty(HALF, BlockDoor.EnumDoorHalf.LOWER));
- }
+ //The door properties
+ private static final PropertyDirection FACING = BlockDoor.FACING;
+ private static final PropertyBool OPEN = BlockDoor.OPEN;
+ private static final PropertyEnum HINGE = BlockDoor.HINGE;
+ private static final PropertyBool POWERED = BlockDoor.POWERED;
+ private static final PropertyEnum HALF = BlockDoor.HALF;
- @Override
- public String getLocalizedName(){
- return Translator.translateToLocal((this.getUnlocalizedName() + ".name").replaceAll("tile", "item"));
- }
+ public BlockGreenhouseDoor() {
+ setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(OPEN, false).withProperty(HINGE, BlockDoor.EnumHingePosition.LEFT).withProperty(POWERED, false).withProperty(HALF, BlockDoor.EnumDoorHalf.LOWER));
+ }
- @Override
- public boolean isOpaqueCube(){
- return false;
- }
+ @Override
+ public String getLocalizedName() {
+ return Translator.translateToLocal((this.getUnlocalizedName() + ".name").replaceAll("tile", "item"));
+ }
- @Override
- public boolean isPassable(IBlockAccess worldIn, BlockPos pos){
- return isOpen(combineMetadata(worldIn, pos));
- }
+ @Override
+ public boolean isOpaqueCube() {
+ return false;
+ }
- @Override
- public boolean isFullCube(){
- return false;
- }
+ @Override
+ public boolean isPassable(IBlockAccess worldIn, BlockPos pos) {
+ return isOpen(combineMetadata(worldIn, pos));
+ }
- @Override
+ @Override
+ public boolean isFullCube() {
+ return false;
+ }
+
+ @Override
@SideOnly(Side.CLIENT)
- public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos){
- this.setBlockBoundsBasedOnState(worldIn, pos);
- return super.getSelectedBoundingBox(worldIn, pos);
- }
+ public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos) {
+ this.setBlockBoundsBasedOnState(worldIn, pos);
+ return super.getSelectedBoundingBox(worldIn, pos);
+ }
- @Override
- public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state){
- this.setBlockBoundsBasedOnState(worldIn, pos);
- return super.getCollisionBoundingBox(worldIn, pos, state);
- }
+ @Override
+ public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state) {
+ this.setBlockBoundsBasedOnState(worldIn, pos);
+ return super.getCollisionBoundingBox(worldIn, pos, state);
+ }
- @Override
- public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos){
- this.setBoundBasedOnMeta(combineMetadata(worldIn, pos));
- }
+ @Override
+ public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos) {
+ this.setBoundBasedOnMeta(combineMetadata(worldIn, pos));
+ }
- private void setBoundBasedOnMeta(int combinedMeta){
- float f = 0.1875F;
- this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 2.0F, 1.0F);
- EnumFacing enumfacing = getFacing(combinedMeta);
- boolean flag = isOpen(combinedMeta);
- boolean flag1 = isHingeLeft(combinedMeta);
+ private void setBoundBasedOnMeta(int combinedMeta) {
+ float f = 0.1875F;
+ this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 2.0F, 1.0F);
+ EnumFacing enumfacing = getFacing(combinedMeta);
+ boolean flag = isOpen(combinedMeta);
+ boolean flag1 = isHingeLeft(combinedMeta);
- if (flag){
- if (enumfacing == EnumFacing.EAST){
- if (!flag1){
- this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, f);
- }else{
- this.setBlockBounds(0.0F, 0.0F, 1.0F - f, 1.0F, 1.0F, 1.0F);
- }
- }else if (enumfacing == EnumFacing.SOUTH){
- if (!flag1){
- this.setBlockBounds(1.0F - f, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
- }else{
- this.setBlockBounds(0.0F, 0.0F, 0.0F, f, 1.0F, 1.0F);
- }
- }else if (enumfacing == EnumFacing.WEST){
- if (!flag1){
- this.setBlockBounds(0.0F, 0.0F, 1.0F - f, 1.0F, 1.0F, 1.0F);
- }else{
- this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, f);
- }
- }else if (enumfacing == EnumFacing.NORTH){
- if (!flag1){
- this.setBlockBounds(0.0F, 0.0F, 0.0F, f, 1.0F, 1.0F);
- }else{
- this.setBlockBounds(1.0F - f, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
- }
- }
- }else if (enumfacing == EnumFacing.EAST){
- this.setBlockBounds(0.0F, 0.0F, 0.0F, f, 1.0F, 1.0F);
- }else if (enumfacing == EnumFacing.SOUTH){
- this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, f);
- }else if (enumfacing == EnumFacing.WEST){
- this.setBlockBounds(1.0F - f, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
- }else if (enumfacing == EnumFacing.NORTH){
- this.setBlockBounds(0.0F, 0.0F, 1.0F - f, 1.0F, 1.0F, 1.0F);
- }
- }
+ if (flag) {
+ if (enumfacing == EnumFacing.EAST) {
+ if (!flag1) {
+ this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, f);
+ } else {
+ this.setBlockBounds(0.0F, 0.0F, 1.0F - f, 1.0F, 1.0F, 1.0F);
+ }
+ } else if (enumfacing == EnumFacing.SOUTH) {
+ if (!flag1) {
+ this.setBlockBounds(1.0F - f, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+ } else {
+ this.setBlockBounds(0.0F, 0.0F, 0.0F, f, 1.0F, 1.0F);
+ }
+ } else if (enumfacing == EnumFacing.WEST) {
+ if (!flag1) {
+ this.setBlockBounds(0.0F, 0.0F, 1.0F - f, 1.0F, 1.0F, 1.0F);
+ } else {
+ this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, f);
+ }
+ } else if (enumfacing == EnumFacing.NORTH) {
+ if (!flag1) {
+ this.setBlockBounds(0.0F, 0.0F, 0.0F, f, 1.0F, 1.0F);
+ } else {
+ this.setBlockBounds(1.0F - f, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+ }
+ }
+ } else if (enumfacing == EnumFacing.EAST) {
+ this.setBlockBounds(0.0F, 0.0F, 0.0F, f, 1.0F, 1.0F);
+ } else if (enumfacing == EnumFacing.SOUTH) {
+ this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, f);
+ } else if (enumfacing == EnumFacing.WEST) {
+ this.setBlockBounds(1.0F - f, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+ } else if (enumfacing == EnumFacing.NORTH) {
+ this.setBlockBounds(0.0F, 0.0F, 1.0F - f, 1.0F, 1.0F, 1.0F);
+ }
+ }
- @Override
- public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ){
- TileEntity tile = world.getTileEntity(pos);
- if(!(tile instanceof TileGreenhouseDoor)){
- return false;
- }
- TileGreenhouseDoor door = (TileGreenhouseDoor) tile;
- if(!door.getAccessHandler().allowsInteracting(player)){
- return false;
- }else{
- BlockPos blockpos = state.getValue(HALF) == BlockDoor.EnumDoorHalf.LOWER ? pos : pos.down();
- IBlockState iblockstate = pos.equals(blockpos) ? state : world.getBlockState(blockpos);
+ @Override
+ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) {
+ TileEntity tile = world.getTileEntity(pos);
+ if (!(tile instanceof TileGreenhouseDoor)) {
+ return false;
+ }
+ TileGreenhouseDoor door = (TileGreenhouseDoor) tile;
+ if (!door.getAccessHandler().allowsInteracting(player)) {
+ return false;
+ } else {
+ BlockPos blockpos = state.getValue(HALF) == BlockDoor.EnumDoorHalf.LOWER ? pos : pos.down();
+ IBlockState iblockstate = pos.equals(blockpos) ? state : world.getBlockState(blockpos);
- if (iblockstate.getBlock() != this)
- {
- return false;
- }else{
- state = iblockstate.cycleProperty(OPEN);
- world.setBlockState(blockpos, state, 2);
- world.markBlockRangeForRenderUpdate(blockpos, pos);
- world.playAuxSFXAtEntity(player, state.getValue(OPEN) ? 1003 : 1006, pos, 0);
- return true;
- }
- }
- }
+ if (iblockstate.getBlock() != this) {
+ return false;
+ } else {
+ state = iblockstate.cycleProperty(OPEN);
+ world.setBlockState(blockpos, state, 2);
+ world.markBlockRangeForRenderUpdate(blockpos, pos);
+ world.playAuxSFXAtEntity(player, state.getValue(OPEN) ? 1003 : 1006, pos, 0);
+ return true;
+ }
+ }
+ }
- public void toggleDoor(World worldIn, BlockPos pos, boolean open){
- IBlockState iblockstate = worldIn.getBlockState(pos);
+ @Override
+ public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock) {
+ if (state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER) {
+ BlockPos blockpos = pos.down();
+ IBlockState iblockstate = worldIn.getBlockState(blockpos);
- if (iblockstate.getBlock() == this){
- BlockPos blockpos = iblockstate.getValue(HALF) == BlockDoor.EnumDoorHalf.LOWER ? pos : pos.down();
- IBlockState iblockstate1 = pos == blockpos ? iblockstate : worldIn.getBlockState(blockpos);
+ if (iblockstate.getBlock() != this) {
+ worldIn.setBlockToAir(pos);
+ } else if (neighborBlock != this) {
+ this.onNeighborBlockChange(worldIn, blockpos, iblockstate, neighborBlock);
+ }
+ } else {
+ boolean flag1 = false;
+ BlockPos blockpos1 = pos.up();
+ IBlockState iblockstate1 = worldIn.getBlockState(blockpos1);
- if (iblockstate1.getBlock() == this && iblockstate1.getValue(OPEN) != open) {
- worldIn.setBlockState(blockpos, iblockstate1.withProperty(OPEN, open), 2);
- worldIn.markBlockRangeForRenderUpdate(blockpos, pos);
- worldIn.playAuxSFXAtEntity((EntityPlayer)null, open ? 1003 : 1006, pos, 0);
- }
- }
- }
-
- @Override
- public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock){
- if (state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER){
- BlockPos blockpos = pos.down();
- IBlockState iblockstate = worldIn.getBlockState(blockpos);
+ if (iblockstate1.getBlock() != this) {
+ worldIn.setBlockToAir(pos);
+ flag1 = true;
+ }
- if (iblockstate.getBlock() != this){
- worldIn.setBlockToAir(pos);
- }else if (neighborBlock != this){
- this.onNeighborBlockChange(worldIn, blockpos, iblockstate, neighborBlock);
- }
- }else{
- boolean flag1 = false;
- BlockPos blockpos1 = pos.up();
- IBlockState iblockstate1 = worldIn.getBlockState(blockpos1);
+ if (!World.doesBlockHaveSolidTopSurface(worldIn, pos.down())) {
+ worldIn.setBlockToAir(pos);
+ flag1 = true;
- if (iblockstate1.getBlock() != this){
- worldIn.setBlockToAir(pos);
- flag1 = true;
- }
+ if (iblockstate1.getBlock() == this) {
+ worldIn.setBlockToAir(blockpos1);
+ }
+ }
- if (!World.doesBlockHaveSolidTopSurface(worldIn, pos.down())){
- worldIn.setBlockToAir(pos);
- flag1 = true;
+ if (flag1) {
+ if (!worldIn.isRemote) {
+ this.dropBlockAsItem(worldIn, pos, state, 0);
+ }
+ } else {
+ boolean flag = worldIn.isBlockPowered(pos) || worldIn.isBlockPowered(blockpos1);
- if (iblockstate1.getBlock() == this){
- worldIn.setBlockToAir(blockpos1);
- }
- }
+ if ((flag || neighborBlock.canProvidePower()) && neighborBlock != this && flag != iblockstate1.getValue(POWERED)) {
+ worldIn.setBlockState(blockpos1, iblockstate1.withProperty(POWERED, flag), 2);
- if (flag1){
- if (!worldIn.isRemote){
- this.dropBlockAsItem(worldIn, pos, state, 0);
- }
- }else{
- boolean flag = worldIn.isBlockPowered(pos) || worldIn.isBlockPowered(blockpos1);
+ if (flag != state.getValue(OPEN)) {
+ worldIn.setBlockState(pos, state.withProperty(OPEN, flag), 2);
+ worldIn.markBlockRangeForRenderUpdate(pos, pos);
+ worldIn.playAuxSFXAtEntity((EntityPlayer) null, flag ? 1003 : 1006, pos, 0);
+ }
+ }
+ }
+ }
+ }
- if ((flag || neighborBlock.canProvidePower()) && neighborBlock != this && flag != iblockstate1.getValue(POWERED)) {
- worldIn.setBlockState(blockpos1, iblockstate1.withProperty(POWERED, flag), 2);
+ @Override
+ public Item getItemDropped(IBlockState state, Random rand, int fortune) {
+ return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? null : Item.getItemFromBlock(state.getBlock());
+ }
- if (flag != state.getValue(OPEN)) {
- worldIn.setBlockState(pos, state.withProperty(OPEN, flag), 2);
- worldIn.markBlockRangeForRenderUpdate(pos, pos);
- worldIn.playAuxSFXAtEntity((EntityPlayer)null, flag ? 1003 : 1006, pos, 0);
- }
- }
- }
- }
- }
+ @Override
+ public MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end) {
+ this.setBlockBoundsBasedOnState(worldIn, pos);
+ return super.collisionRayTrace(worldIn, pos, start, end);
+ }
- @Override
- public Item getItemDropped(IBlockState state, Random rand, int fortune){
- return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? null : Item.getItemFromBlock(state.getBlock());
- }
+ @Override
+ public boolean canPlaceBlockAt(World worldIn, BlockPos pos) {
+ return pos.getY() < worldIn.getHeight() - 1 && (World.doesBlockHaveSolidTopSurface(worldIn, pos.down()) && super.canPlaceBlockAt(worldIn, pos) && super.canPlaceBlockAt(worldIn, pos.up()));
+ }
- @Override
- public MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end){
- this.setBlockBoundsBasedOnState(worldIn, pos);
- return super.collisionRayTrace(worldIn, pos, start, end);
- }
+ @Override
+ public int getMobilityFlag() {
+ return 1;
+ }
- @Override
- public boolean canPlaceBlockAt(World worldIn, BlockPos pos){
- return pos.getY() < worldIn.getHeight() - 1 && (World.doesBlockHaveSolidTopSurface(worldIn, pos.down()) && super.canPlaceBlockAt(worldIn, pos) && super.canPlaceBlockAt(worldIn, pos.up()));
- }
+ private static int combineMetadata(IBlockAccess worldIn, BlockPos pos) {
+ IBlockState iblockstate = worldIn.getBlockState(pos);
+ int i = iblockstate.getBlock().getMetaFromState(iblockstate);
+ boolean flag = isTop(i);
+ IBlockState iblockstate1 = worldIn.getBlockState(pos.down());
+ int j = iblockstate1.getBlock().getMetaFromState(iblockstate1);
+ int k = flag ? j : i;
+ IBlockState iblockstate2 = worldIn.getBlockState(pos.up());
+ int l = iblockstate2.getBlock().getMetaFromState(iblockstate2);
+ int i1 = flag ? i : l;
+ boolean flag1 = (i1 & 1) != 0;
+ boolean flag2 = (i1 & 2) != 0;
+ return removeHalfBit(k) | (flag ? 8 : 0) | (flag1 ? 16 : 0) | (flag2 ? 32 : 0);
+ }
- @Override
- public int getMobilityFlag(){
- return 1;
- }
+ @Override
+ public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) {
+ BlockPos blockpos = pos.down();
- private static int combineMetadata(IBlockAccess worldIn, BlockPos pos){
- IBlockState iblockstate = worldIn.getBlockState(pos);
- int i = iblockstate.getBlock().getMetaFromState(iblockstate);
- boolean flag = isTop(i);
- IBlockState iblockstate1 = worldIn.getBlockState(pos.down());
- int j = iblockstate1.getBlock().getMetaFromState(iblockstate1);
- int k = flag ? j : i;
- IBlockState iblockstate2 = worldIn.getBlockState(pos.up());
- int l = iblockstate2.getBlock().getMetaFromState(iblockstate2);
- int i1 = flag ? i : l;
- boolean flag1 = (i1 & 1) != 0;
- boolean flag2 = (i1 & 2) != 0;
- return removeHalfBit(k) | (flag ? 8 : 0) | (flag1 ? 16 : 0) | (flag2 ? 32 : 0);
- }
+ if (player.capabilities.isCreativeMode && state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER && worldIn.getBlockState(blockpos).getBlock() == this) {
+ worldIn.setBlockToAir(blockpos);
+ }
+ }
- @Override
- public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player){
- BlockPos blockpos = pos.down();
+ @Override
+ public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) {
+ if (state.getValue(HALF) == BlockDoor.EnumDoorHalf.LOWER) {
+ IBlockState iblockstate = worldIn.getBlockState(pos.up());
- if (player.capabilities.isCreativeMode && state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER && worldIn.getBlockState(blockpos).getBlock() == this)
- {
- worldIn.setBlockToAir(blockpos);
- }
- }
+ if (iblockstate.getBlock() == this) {
+ state = state.withProperty(HINGE, iblockstate.getValue(HINGE)).withProperty(POWERED, iblockstate.getValue(POWERED));
+ }
+ } else {
+ IBlockState iblockstate1 = worldIn.getBlockState(pos.down());
- @Override
- public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos){
- if (state.getValue(HALF) == BlockDoor.EnumDoorHalf.LOWER){
- IBlockState iblockstate = worldIn.getBlockState(pos.up());
+ if (iblockstate1.getBlock() == this) {
+ state = state.withProperty(FACING, iblockstate1.getValue(FACING)).withProperty(OPEN, iblockstate1.getValue(OPEN));
+ }
+ }
- if (iblockstate.getBlock() == this){
- state = state.withProperty(HINGE, iblockstate.getValue(HINGE)).withProperty(POWERED, iblockstate.getValue(POWERED));
- }
- }else{
- IBlockState iblockstate1 = worldIn.getBlockState(pos.down());
+ return state;
+ }
- if (iblockstate1.getBlock() == this){
- state = state.withProperty(FACING, iblockstate1.getValue(FACING)).withProperty(OPEN, iblockstate1.getValue(OPEN));
- }
- }
+ @Override
+ public IBlockState getStateFromMeta(int meta) {
+ return (meta & 8) > 0 ? this.getDefaultState().withProperty(HALF, BlockDoor.EnumDoorHalf.UPPER).withProperty(HINGE, (meta & 1) > 0 ? BlockDoor.EnumHingePosition.RIGHT : BlockDoor.EnumHingePosition.LEFT).withProperty(POWERED, (meta & 2) > 0) : this.getDefaultState().withProperty(HALF, BlockDoor.EnumDoorHalf.LOWER).withProperty(FACING, EnumFacing.getHorizontal(meta & 3).rotateYCCW()).withProperty(OPEN, (meta & 4) > 0);
+ }
- return state;
- }
-
- @Override
- public IBlockState getStateFromMeta(int meta){
- return (meta & 8) > 0 ? this.getDefaultState().withProperty(HALF, BlockDoor.EnumDoorHalf.UPPER).withProperty(HINGE, (meta & 1) > 0 ? BlockDoor.EnumHingePosition.RIGHT : BlockDoor.EnumHingePosition.LEFT).withProperty(POWERED, Boolean.valueOf((meta & 2) > 0)) : this.getDefaultState().withProperty(HALF, BlockDoor.EnumDoorHalf.LOWER).withProperty(FACING, EnumFacing.getHorizontal(meta & 3).rotateYCCW()).withProperty(OPEN, Boolean.valueOf((meta & 4) > 0));
- }
-
- @Override
+ @Override
@SideOnly(Side.CLIENT)
- public EnumWorldBlockLayer getBlockLayer(){
- return EnumWorldBlockLayer.TRANSLUCENT;
- }
+ public EnumWorldBlockLayer getBlockLayer() {
+ return EnumWorldBlockLayer.TRANSLUCENT;
+ }
- @Override
- public int getMetaFromState(IBlockState state){
- int i = 0;
+ @Override
+ public int getMetaFromState(IBlockState state) {
+ int i = 0;
- if (state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER){
- i = i | 8;
+ if (state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER) {
+ i = i | 8;
- if (state.getValue(HINGE) == BlockDoor.EnumHingePosition.RIGHT)
- {
- i |= 1;
- }
+ if (state.getValue(HINGE) == BlockDoor.EnumHingePosition.RIGHT) {
+ i |= 1;
+ }
- if (state.getValue(POWERED))
- {
- i |= 2;
- }
- }else{
- i = i | state.getValue(FACING).rotateY().getHorizontalIndex();
+ if (state.getValue(POWERED)) {
+ i |= 2;
+ }
+ } else {
+ i = i | state.getValue(FACING).rotateY().getHorizontalIndex();
- if (state.getValue(OPEN)) {
- i |= 4;
- }
- }
+ if (state.getValue(OPEN)) {
+ i |= 4;
+ }
+ }
+
+ return i;
+ }
- return i;
- }
-
@SideOnly(Side.CLIENT)
@Override
public void registerModel(Item item, IModelManager manager) {
@@ -342,59 +323,51 @@ public class BlockGreenhouseDoor extends BlockGreenhouse implements IStateMappe
@SideOnly(Side.CLIENT)
@Override
public void registerStateMapper() {
- Proxies.render.registerStateMapper(this, new StateMap.Builder().ignore(BlockDoor.POWERED).build());
- }
+ Proxies.render.registerStateMapper(this, new StateMap.Builder().ignore(BlockDoor.POWERED).build());
+ }
- protected static int removeHalfBit(int meta)
- {
- return meta & 7;
- }
+ protected static int removeHalfBit(int meta) {
+ return meta & 7;
+ }
- public static boolean isOpen(IBlockAccess worldIn, BlockPos pos)
- {
- return isOpen(combineMetadata(worldIn, pos));
- }
+ public static boolean isOpen(IBlockAccess worldIn, BlockPos pos) {
+ return isOpen(combineMetadata(worldIn, pos));
+ }
- public static EnumFacing getFacing(IBlockAccess worldIn, BlockPos pos)
- {
- return getFacing(combineMetadata(worldIn, pos));
- }
+ public static EnumFacing getFacing(IBlockAccess worldIn, BlockPos pos) {
+ return getFacing(combineMetadata(worldIn, pos));
+ }
- public static EnumFacing getFacing(int combinedMeta)
- {
- return EnumFacing.getHorizontal(combinedMeta & 3).rotateYCCW();
- }
+ public static EnumFacing getFacing(int combinedMeta) {
+ return EnumFacing.getHorizontal(combinedMeta & 3).rotateYCCW();
+ }
- protected static boolean isOpen(int combinedMeta)
- {
- return (combinedMeta & 4) != 0;
- }
+ protected static boolean isOpen(int combinedMeta) {
+ return (combinedMeta & 4) != 0;
+ }
- protected static boolean isTop(int meta)
- {
- return (meta & 8) != 0;
- }
+ protected static boolean isTop(int meta) {
+ return (meta & 8) != 0;
+ }
- protected static boolean isHingeLeft(int combinedMeta)
- {
- return (combinedMeta & 16) != 0;
- }
+ protected static boolean isHingeLeft(int combinedMeta) {
+ return (combinedMeta & 16) != 0;
+ }
- @Override
- protected BlockState createBlockState()
- {
- return new BlockState(this, HALF, FACING, OPEN, HINGE, POWERED);
- }
-
- @Override
- public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) {
- return state;
- }
+ @Override
+ protected BlockState createBlockState() {
+ return new BlockState(this, HALF, FACING, OPEN, HINGE, POWERED);
+ }
- @Nonnull
- @Override
- public BlockGreenhouseType getGreenhouseType() {
- return BlockGreenhouseType.DOOR;
+ @Override
+ public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) {
+ return state;
+ }
+
+ @Nonnull
+ @Override
+ public BlockGreenhouseType getGreenhouseType() {
+ return BlockGreenhouseType.DOOR;
}
}
diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java
index 31a94a75b..10bc9185a 100644
--- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java
+++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java
@@ -1,10 +1,9 @@
package forestry.greenhouse.blocks;
+import javax.annotation.Nullable;
import java.util.EnumMap;
import java.util.Locale;
-import javax.annotation.Nullable;
-
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -12,9 +11,10 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
+
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
-import forestry.api.core.ITextureManager;
+
import forestry.core.render.TextureManager;
import forestry.greenhouse.blocks.BlockGreenhouse.State;
import forestry.greenhouse.tiles.TileGreenhouseHatch;
@@ -57,18 +57,18 @@ public enum BlockGreenhouseType {
@SideOnly(Side.CLIENT)
private static EnumMap sprites;
- private static enum BlockGreenhouseSprites{
+ private enum BlockGreenhouseSprites {
PLAIN, GLASS, GEARS("gears"), VALVE("valve"), FAN_OFF("fan.off"), FAN_ON("fan.on"), HEATER_OFF("heater.off"), HEATER_ON("heater.on"), DRYER("dryer"), CONTROL("control"), HATCH_DEFAULT("hatch"), HATCH_INPUT("hatch_input"), HATCH_OUTPUT("hatch_output"), BUTTERFLY_HATCH("butterfly_hatch");
public static final BlockGreenhouseSprites[] VALUES = values();
- private String spriteName;
+ private final String spriteName;
- private BlockGreenhouseSprites(String spriteName) {
+ BlockGreenhouseSprites(String spriteName) {
this.spriteName = spriteName;
}
- private BlockGreenhouseSprites() {
+ BlockGreenhouseSprites() {
this.spriteName = null;
}
}
@@ -76,12 +76,12 @@ public enum BlockGreenhouseType {
@SideOnly(Side.CLIENT)
public static void registerSprites() {
sprites = new EnumMap<>(BlockGreenhouseSprites.class);
- for(BlockGreenhouseSprites sprite : BlockGreenhouseSprites.VALUES){
- if(sprite == BlockGreenhouseSprites.PLAIN){
+ for (BlockGreenhouseSprites sprite : BlockGreenhouseSprites.VALUES) {
+ if (sprite == BlockGreenhouseSprites.PLAIN) {
sprites.put(sprite, TextureManager.getSprite("minecraft", "blocks/brick"));
- }else if(sprite == BlockGreenhouseSprites.GLASS){
+ } else if (sprite == BlockGreenhouseSprites.GLASS) {
sprites.put(sprite, TextureManager.getSprite("minecraft", "blocks/glass_green"));
- }else{
+ } else {
sprites.put(sprite, TextureManager.registerSprite("blocks/greenhouse/" + sprite.spriteName));
}
}
@@ -93,26 +93,26 @@ public enum BlockGreenhouseType {
@SideOnly(Side.CLIENT)
public static TextureAtlasSprite getSprite(BlockGreenhouseType type, EnumFacing facing, @Nullable IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos) {
TileEntity tile = null;
- if(world != null && pos != null){
+ if (world != null && pos != null) {
tile = world.getTileEntity(pos);
}
switch (type) {
- case PLAIN:
- return sprites.get(BlockGreenhouseSprites.PLAIN);
- case GLASS:
- return sprites.get(BlockGreenhouseSprites.GLASS);
+ case PLAIN:
+ return sprites.get(BlockGreenhouseSprites.PLAIN);
+ case GLASS:
+ return sprites.get(BlockGreenhouseSprites.GLASS);
case GEARBOX:
return sprites.get(BlockGreenhouseSprites.GEARS);
case VALVE:
return sprites.get(BlockGreenhouseSprites.VALVE);
case FAN:
- if(state == null || state.getValue(BlockGreenhouse.STATE) == State.OFF) {
+ if (state == null || state.getValue(BlockGreenhouse.STATE) == State.OFF) {
return sprites.get(BlockGreenhouseSprites.FAN_OFF);
} else {
return sprites.get(BlockGreenhouseSprites.FAN_ON);
}
case HEATER:
- if(state == null || state.getValue(BlockGreenhouse.STATE) == State.OFF) {
+ if (state == null || state.getValue(BlockGreenhouse.STATE) == State.OFF) {
return sprites.get(BlockGreenhouseSprites.HEATER_OFF);
} else {
return sprites.get(BlockGreenhouseSprites.HEATER_ON);
@@ -123,26 +123,26 @@ public enum BlockGreenhouseType {
return sprites.get(BlockGreenhouseSprites.CONTROL);
case HATCH_OUTPUT:
case HATCH_INPUT:
- if(tile == null || facing == null || !(tile instanceof TileGreenhouseHatch)){
+ if (tile == null || facing == null || !(tile instanceof TileGreenhouseHatch)) {
return sprites.get(BlockGreenhouseSprites.HATCH_DEFAULT);
}
TileGreenhouseHatch hatch = (TileGreenhouseHatch) tile;
- if(hatch.getOutwardsDir() == null){
+ if (hatch.getOutwardsDir() == null) {
return sprites.get(BlockGreenhouseSprites.HATCH_DEFAULT);
}
- if(hatch.getOutwardsDir() == facing){
+ if (hatch.getOutwardsDir() == facing) {
return sprites.get(BlockGreenhouseSprites.HATCH_OUTPUT);
- }else if(hatch.getOutwardsDir().getOpposite() == facing){
+ } else if (hatch.getOutwardsDir().getOpposite() == facing) {
return sprites.get(BlockGreenhouseSprites.HATCH_INPUT);
}
return null;
case BUTTERFLY_HATCH:
- if(facing == EnumFacing.DOWN || facing == EnumFacing.UP){
+ if (facing == EnumFacing.DOWN || facing == EnumFacing.UP) {
return null;
}
return sprites.get(BlockGreenhouseSprites.BUTTERFLY_HATCH);
default:
- return Minecraft.getMinecraft().getTextureMapBlocks().getMissingSprite();
+ return Minecraft.getMinecraft().getTextureMapBlocks().getMissingSprite();
}
}
diff --git a/src/main/java/forestry/greenhouse/blocks/BlockRegistryGreenhouse.java b/src/main/java/forestry/greenhouse/blocks/BlockRegistryGreenhouse.java
index ecfdaf632..54f5ee8ec 100644
--- a/src/main/java/forestry/greenhouse/blocks/BlockRegistryGreenhouse.java
+++ b/src/main/java/forestry/greenhouse/blocks/BlockRegistryGreenhouse.java
@@ -2,13 +2,14 @@ package forestry.greenhouse.blocks;
import java.util.Map;
-import forestry.core.blocks.BlockRegistry;
-import forestry.core.items.ItemBlockForestry;
-import forestry.greenhouse.items.ItemBlockGreenhouseDoor;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
-public class BlockRegistryGreenhouse extends BlockRegistry{
+import forestry.core.blocks.BlockRegistry;
+import forestry.core.items.ItemBlockForestry;
+import forestry.greenhouse.items.ItemBlockGreenhouseDoor;
+
+public class BlockRegistryGreenhouse extends BlockRegistry {
private final Map greenhouseBlockMap;
@@ -16,7 +17,7 @@ public class BlockRegistryGreenhouse extends BlockRegistry{
greenhouseBlockMap = BlockGreenhouse.create();
for (BlockGreenhouse block : greenhouseBlockMap.values()) {
ItemBlock itemBlock = new ItemBlockForestry(block);
- if(block instanceof BlockGreenhouseDoor){
+ if (block instanceof BlockGreenhouseDoor) {
itemBlock = new ItemBlockGreenhouseDoor(block);
}
registerBlock(block, itemBlock, "greenhouse." + block.getGreenhouseType());
diff --git a/src/main/java/forestry/greenhouse/gui/ContainerGreenhouse.java b/src/main/java/forestry/greenhouse/gui/ContainerGreenhouse.java
index 7e1bb1624..e61fa3ff9 100644
--- a/src/main/java/forestry/greenhouse/gui/ContainerGreenhouse.java
+++ b/src/main/java/forestry/greenhouse/gui/ContainerGreenhouse.java
@@ -11,7 +11,9 @@
package forestry.greenhouse.gui;
import net.minecraft.entity.player.InventoryPlayer;
+
import net.minecraftforge.fluids.IFluidTank;
+
import forestry.core.gui.ContainerTile;
import forestry.core.gui.slots.SlotFiltered;
import forestry.core.network.packets.PacketGuiUpdate;
diff --git a/src/main/java/forestry/greenhouse/gui/ContainerGreenhouseButterflyHatch.java b/src/main/java/forestry/greenhouse/gui/ContainerGreenhouseButterflyHatch.java
index 84c900ee3..ce4071609 100644
--- a/src/main/java/forestry/greenhouse/gui/ContainerGreenhouseButterflyHatch.java
+++ b/src/main/java/forestry/greenhouse/gui/ContainerGreenhouseButterflyHatch.java
@@ -11,7 +11,9 @@
package forestry.greenhouse.gui;
import net.minecraft.entity.player.InventoryPlayer;
+
import net.minecraftforge.fluids.IFluidTank;
+
import forestry.core.gui.ContainerTile;
import forestry.core.gui.slots.SlotOutput;
import forestry.core.network.packets.PacketGuiUpdate;
diff --git a/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java b/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java
index a89e5065b..cd7acc07c 100644
--- a/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java
+++ b/src/main/java/forestry/greenhouse/gui/GuiGreenhouse.java
@@ -11,6 +11,7 @@
package forestry.greenhouse.gui;
import net.minecraft.entity.player.EntityPlayer;
+
import forestry.api.core.EnumCamouflageType;
import forestry.core.config.Constants;
import forestry.core.gui.GuiForestryTitled;
diff --git a/src/main/java/forestry/greenhouse/gui/GuiGreenhouseButterflyHatch.java b/src/main/java/forestry/greenhouse/gui/GuiGreenhouseButterflyHatch.java
index 14591be6c..133dd9c9f 100644
--- a/src/main/java/forestry/greenhouse/gui/GuiGreenhouseButterflyHatch.java
+++ b/src/main/java/forestry/greenhouse/gui/GuiGreenhouseButterflyHatch.java
@@ -11,6 +11,7 @@
package forestry.greenhouse.gui;
import net.minecraft.entity.player.EntityPlayer;
+
import forestry.core.config.Constants;
import forestry.core.gui.GuiForestryTitled;
import forestry.core.gui.ledgers.ClimateLedger;
diff --git a/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageSlot.java b/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageSlot.java
index 5b72be164..d895398af 100644
--- a/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageSlot.java
+++ b/src/main/java/forestry/greenhouse/gui/widgets/WidgetCamouflageSlot.java
@@ -33,8 +33,8 @@ import forestry.core.utils.Translator;
public class WidgetCamouflageSlot extends Widget {
- private ICamouflageHandler camouflageHandler;
- private EnumCamouflageType type;
+ private final ICamouflageHandler camouflageHandler;
+ private final EnumCamouflageType type;
public WidgetCamouflageSlot(WidgetManager manager, int xPos, int yPos, ICamouflageHandler camouflageHandler, EnumCamouflageType type) {
super(manager, xPos, yPos);
@@ -55,18 +55,18 @@ public class WidgetCamouflageSlot extends Widget {
@Override
public void handleMouseClick(int mouseX, int mouseY, int mouseButton) {
super.handleMouseClick(mouseX, mouseY, mouseButton);
- if(camouflageHandler == null){
+ if (camouflageHandler == null) {
return;
}
- if(GuiScreen.isShiftKeyDown()){
+ if (GuiScreen.isShiftKeyDown()) {
camouflageHandler.setCamouflageBlock(type, camouflageHandler.getDefaultCamouflageBlock(type));
- }else{
+ } else {
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
ItemStack stack = player.inventory.getItemStack();
- if(stack != null && Block.getBlockFromItem(stack.getItem()) != null){
+ if (stack != null && Block.getBlockFromItem(stack.getItem()) != null) {
Block block = Block.getBlockFromItem(stack.getItem());
- if(!GreenhouseManager.greenhouseAccess.isOnCamouflageBlockBlackList(type, stack) && (type == EnumCamouflageType.DEFAULT && block.isOpaqueCube() && !block.hasTileEntity(block.getStateFromMeta(stack.getItemDamage())) && block.isNormalCube(player.worldObj, camouflageHandler.getCoordinates()) || type == EnumCamouflageType.GLASS && GreenhouseManager.greenhouseAccess.isGreenhouseGlass(stack))){
+ if (!GreenhouseManager.greenhouseAccess.isOnCamouflageBlockBlackList(type, stack) && (type == EnumCamouflageType.DEFAULT && block.isOpaqueCube() && !block.hasTileEntity(block.getStateFromMeta(stack.getItemDamage())) && block.isNormalCube(player.worldObj, camouflageHandler.getCoordinates()) || type == EnumCamouflageType.GLASS && GreenhouseManager.greenhouseAccess.isGreenhouseGlass(stack))) {
camouflageHandler.setCamouflageBlock(type, stack);
}
}
@@ -87,16 +87,16 @@ public class WidgetCamouflageSlot extends Widget {
public void refresh() {
toolTip.clear();
String typeName = type.name().toLowerCase(Locale.ENGLISH);
- if(camouflageHandler instanceof IMultiblockController){
+ if (camouflageHandler instanceof IMultiblockController) {
toolTip.add(Translator.translateToLocal("for.gui.empty.slot.camouflage.multiblock." + typeName) + ": ");
- }else{
+ } else {
toolTip.add(Translator.translateToLocal("for.gui.empty.slot.camouflage") + ": ");
}
ItemStack camouflageBlock = camouflageHandler.getCamouflageBlock(type);
-
+
if (camouflageHandler == null || camouflageBlock == null) {
toolTip.add(EnumChatFormatting.ITALIC.toString() + Translator.translateToLocal("for.gui.empty"));
- }else{
+ } else {
toolTip.add(EnumChatFormatting.ITALIC.toString() + camouflageBlock.getTooltip(Proxies.common.getClientInstance().thePlayer, false));
}
}
diff --git a/src/main/java/forestry/greenhouse/inventory/InventoryGreenhouse.java b/src/main/java/forestry/greenhouse/inventory/InventoryGreenhouse.java
index 0a188c682..b63728386 100644
--- a/src/main/java/forestry/greenhouse/inventory/InventoryGreenhouse.java
+++ b/src/main/java/forestry/greenhouse/inventory/InventoryGreenhouse.java
@@ -10,12 +10,14 @@
******************************************************************************/
package forestry.greenhouse.inventory;
+import net.minecraft.item.ItemStack;
+
+import net.minecraftforge.fluids.Fluid;
+
import forestry.core.fluids.FluidHelper;
import forestry.core.fluids.TankManager;
import forestry.core.inventory.InventoryAdapterRestricted;
import forestry.greenhouse.multiblock.GreenhouseController;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
public class InventoryGreenhouse extends InventoryAdapterRestricted {
diff --git a/src/main/java/forestry/greenhouse/items/ItemBlockGreenhouseDoor.java b/src/main/java/forestry/greenhouse/items/ItemBlockGreenhouseDoor.java
index 98f271eea..6e94e840b 100644
--- a/src/main/java/forestry/greenhouse/items/ItemBlockGreenhouseDoor.java
+++ b/src/main/java/forestry/greenhouse/items/ItemBlockGreenhouseDoor.java
@@ -10,8 +10,6 @@
******************************************************************************/
package forestry.greenhouse.items;
-import forestry.core.items.ItemBlockForestry;
-import forestry.greenhouse.blocks.BlockGreenhouseDoor;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDoor;
import net.minecraft.block.state.IBlockState;
@@ -21,55 +19,58 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
+import forestry.core.items.ItemBlockForestry;
+import forestry.greenhouse.blocks.BlockGreenhouseDoor;
+
public class ItemBlockGreenhouseDoor extends ItemBlockForestry {
public ItemBlockGreenhouseDoor(Block block) {
super(block);
}
- @Override
- public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ){
- if (side != EnumFacing.UP){
- return false;
- }else{
- IBlockState iblockstate = worldIn.getBlockState(pos);
- Block block = iblockstate.getBlock();
+ @Override
+ public boolean onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
+ if (side != EnumFacing.UP) {
+ return false;
+ } else {
+ IBlockState iblockstate = worldIn.getBlockState(pos);
+ Block block = iblockstate.getBlock();
- if (!block.isReplaceable(worldIn, pos)){
- pos = pos.offset(side);
- }
+ if (!block.isReplaceable(worldIn, pos)) {
+ pos = pos.offset(side);
+ }
- if (!playerIn.canPlayerEdit(pos, side, stack)){
- return false;
- } else if (!this.block.canPlaceBlockAt(worldIn, pos)){
- return false;
- }else{
- placeDoor(worldIn, pos, EnumFacing.fromAngle(playerIn.rotationYaw), this.block);
- --stack.stackSize;
- return true;
- }
- }
- }
+ if (!playerIn.canPlayerEdit(pos, side, stack)) {
+ return false;
+ } else if (!this.block.canPlaceBlockAt(worldIn, pos)) {
+ return false;
+ } else {
+ placeDoor(worldIn, pos, EnumFacing.fromAngle(playerIn.rotationYaw), this.block);
+ --stack.stackSize;
+ return true;
+ }
+ }
+ }
- private void placeDoor(World worldIn, BlockPos pos, EnumFacing facing, Block door){
- BlockPos blockpos = pos.offset(facing.rotateY());
- BlockPos blockpos1 = pos.offset(facing.rotateYCCW());
- int i = (worldIn.getBlockState(blockpos1).getBlock().isNormalCube() ? 1 : 0) + (worldIn.getBlockState(blockpos1.up()).getBlock().isNormalCube() ? 1 : 0);
- int j = (worldIn.getBlockState(blockpos).getBlock().isNormalCube() ? 1 : 0) + (worldIn.getBlockState(blockpos.up()).getBlock().isNormalCube() ? 1 : 0);
- boolean flag = worldIn.getBlockState(blockpos1).getBlock() == door || worldIn.getBlockState(blockpos1.up()).getBlock() == door;
- boolean flag1 = worldIn.getBlockState(blockpos).getBlock() == door || worldIn.getBlockState(blockpos.up()).getBlock() == door;
- boolean flag2 = false;
+ private void placeDoor(World worldIn, BlockPos pos, EnumFacing facing, Block door) {
+ BlockPos blockpos = pos.offset(facing.rotateY());
+ BlockPos blockpos1 = pos.offset(facing.rotateYCCW());
+ int i = (worldIn.getBlockState(blockpos1).getBlock().isNormalCube() ? 1 : 0) + (worldIn.getBlockState(blockpos1.up()).getBlock().isNormalCube() ? 1 : 0);
+ int j = (worldIn.getBlockState(blockpos).getBlock().isNormalCube() ? 1 : 0) + (worldIn.getBlockState(blockpos.up()).getBlock().isNormalCube() ? 1 : 0);
+ boolean flag = worldIn.getBlockState(blockpos1).getBlock() == door || worldIn.getBlockState(blockpos1.up()).getBlock() == door;
+ boolean flag1 = worldIn.getBlockState(blockpos).getBlock() == door || worldIn.getBlockState(blockpos.up()).getBlock() == door;
+ boolean flag2 = false;
- if (flag && !flag1 || j > i){
- flag2 = true;
- }
+ if (flag && !flag1 || j > i) {
+ flag2 = true;
+ }
- BlockPos blockpos2 = pos.up();
- IBlockState iblockstate = door.getDefaultState().withProperty(BlockDoor.FACING, facing).withProperty(BlockDoor.HINGE, flag2 ? BlockDoor.EnumHingePosition.RIGHT : BlockDoor.EnumHingePosition.LEFT);
- worldIn.setBlockState(pos, iblockstate.withProperty(BlockDoor.HALF, BlockDoor.EnumDoorHalf.LOWER), 2);
- worldIn.setBlockState(blockpos2, iblockstate.withProperty(BlockDoor.HALF, BlockDoor.EnumDoorHalf.UPPER), 2);
- worldIn.notifyNeighborsOfStateChange(pos, door);
- worldIn.notifyNeighborsOfStateChange(blockpos2, door);
- }
+ BlockPos blockpos2 = pos.up();
+ IBlockState iblockstate = door.getDefaultState().withProperty(BlockDoor.FACING, facing).withProperty(BlockDoor.HINGE, flag2 ? BlockDoor.EnumHingePosition.RIGHT : BlockDoor.EnumHingePosition.LEFT);
+ worldIn.setBlockState(pos, iblockstate.withProperty(BlockDoor.HALF, BlockDoor.EnumDoorHalf.LOWER), 2);
+ worldIn.setBlockState(blockpos2, iblockstate.withProperty(BlockDoor.HALF, BlockDoor.EnumDoorHalf.UPPER), 2);
+ worldIn.notifyNeighborsOfStateChange(pos, door);
+ worldIn.notifyNeighborsOfStateChange(blockpos2, door);
+ }
}
diff --git a/src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseDoor.java b/src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseDoor.java
index acf23b2ff..e20fc2b49 100644
--- a/src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseDoor.java
+++ b/src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseDoor.java
@@ -10,16 +10,17 @@
******************************************************************************/
package forestry.greenhouse.logics;
+import net.minecraft.block.BlockDoor;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.nbt.NBTTagCompound;
+
import forestry.api.greenhouse.DefaultGreenhouseLogic;
import forestry.api.greenhouse.IGreenhouseClimaLogic;
import forestry.api.multiblock.IGreenhouseController;
import forestry.api.multiblock.IMultiblockComponent;
import forestry.greenhouse.tiles.TileGreenhouseDoor;
-import net.minecraft.block.BlockDoor;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.nbt.NBTTagCompound;
-public class GreenhouseLogicGreenhouseDoor extends DefaultGreenhouseLogic implements IGreenhouseClimaLogic{
+public class GreenhouseLogicGreenhouseDoor extends DefaultGreenhouseLogic implements IGreenhouseClimaLogic {
private int workTimer;
@@ -29,15 +30,15 @@ public class GreenhouseLogicGreenhouseDoor extends DefaultGreenhouseLogic implem
@Override
public void work() {
- if(controller == null || !controller.isAssembled()){
+ if (controller == null || !controller.isAssembled()) {
return;
}
- if(workTimer++>20){
+ if (workTimer++ > 20) {
int openDoors = 0;
- for(IMultiblockComponent component : controller.getComponents()){
- if(component instanceof TileGreenhouseDoor){
+ for (IMultiblockComponent component : controller.getComponents()) {
+ if (component instanceof TileGreenhouseDoor) {
IBlockState state = ((TileGreenhouseDoor) component).getWorld().getBlockState(component.getCoordinates());
- if(state.getValue(BlockDoor.OPEN)){
+ if (state.getValue(BlockDoor.OPEN)) {
openDoors++;
}
}
diff --git a/src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseEffect.java b/src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseEffect.java
index 07afb31fc..299dd927e 100644
--- a/src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseEffect.java
+++ b/src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseEffect.java
@@ -10,6 +10,10 @@
******************************************************************************/
package forestry.greenhouse.logics;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
import forestry.api.core.EnumCamouflageType;
import forestry.api.core.ICamouflagedBlock;
import forestry.api.greenhouse.DefaultGreenhouseLogic;
@@ -19,9 +23,6 @@ import forestry.api.greenhouse.IGreenhouseClimaLogic;
import forestry.api.multiblock.IGreenhouseController;
import forestry.api.multiblock.IMultiblockComponent;
import forestry.core.utils.CamouflageUtil;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
public class GreenhouseLogicGreenhouseEffect extends DefaultGreenhouseLogic implements IGreenhouseClimaLogic {
@@ -35,11 +36,11 @@ public class GreenhouseLogicGreenhouseEffect extends DefaultGreenhouseLogic impl
@Override
public void work() {
- if(controller == null || !controller.isAssembled()){
+ if (controller == null || !controller.isAssembled()) {
return;
}
- if(controller.getWorld().isDaytime()){
- if(workTimer++>20){
+ if (controller.getWorld().isDaytime()) {
+ if (workTimer++ > 20) {
controller.addTemperatureChange(lightTransmittance / 100, 0F, 2.5F);
workTimer = 0;
}
@@ -60,31 +61,31 @@ public class GreenhouseLogicGreenhouseEffect extends DefaultGreenhouseLogic impl
@Override
public void onEvent(EnumGreenhouseEventType type, Object event) {
- if(type == EnumGreenhouseEventType.CAMOUFLAGE){
- if(controller == null || !controller.isAssembled()) {
+ if (type == EnumGreenhouseEventType.CAMOUFLAGE) {
+ if (controller == null || !controller.isAssembled()) {
return;
}
float lightTransmittance = 0F;
int i = 0;
World world = controller.getWorld();
- for(IMultiblockComponent component : controller.getComponents()){
- if(component instanceof ICamouflagedBlock){
+ for (IMultiblockComponent component : controller.getComponents()) {
+ if (component instanceof ICamouflagedBlock) {
ICamouflagedBlock block = (ICamouflagedBlock) component;
- if(block.getCamouflageType() == EnumCamouflageType.GLASS){
- if(world.canBlockSeeSky(component.getCoordinates())){
+ if (block.getCamouflageType() == EnumCamouflageType.GLASS) {
+ if (world.canBlockSeeSky(component.getCoordinates())) {
ItemStack camouflageStack = CamouflageUtil.getCamouflageBlock(world, component.getCoordinates());
float camouflageLightTransmittance = GreenhouseManager.greenhouseAccess.getGreenhouseGlassLightTransmittance(camouflageStack);
- if(camouflageLightTransmittance < 1 && camouflageLightTransmittance > 0){
- lightTransmittance= lightTransmittance + camouflageLightTransmittance;
+ if (camouflageLightTransmittance < 1 && camouflageLightTransmittance > 0) {
+ lightTransmittance = lightTransmittance + camouflageLightTransmittance;
i++;
}
}
}
}
}
- if(i != 0){
+ if (i != 0) {
this.lightTransmittance = lightTransmittance / i;
}
}
diff --git a/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java b/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java
index b6ee2f124..c268965af 100644
--- a/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java
+++ b/src/main/java/forestry/greenhouse/models/ModelGreenhouse.java
@@ -10,8 +10,9 @@
******************************************************************************/
package forestry.greenhouse.models;
-import forestry.greenhouse.blocks.BlockGreenhouse;
-import forestry.greenhouse.blocks.BlockGreenhouseType;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BlockModelShapes;
@@ -20,14 +21,14 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.common.property.IExtendedBlockState;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import net.minecraftforge.common.property.IExtendedBlockState;
import forestry.api.core.IModelBaker;
import forestry.core.models.ModelBlockOverlay;
import forestry.core.utils.CamouflageUtil;
+import forestry.greenhouse.blocks.BlockGreenhouse;
+import forestry.greenhouse.blocks.BlockGreenhouseType;
public class ModelGreenhouse extends ModelBlockOverlay {
@@ -36,19 +37,19 @@ public class ModelGreenhouse extends ModelBlockOverlay {
}
@Override
- protected void bakeInventoryBlock(BlockGreenhouse block, ItemStack item, IModelBaker baker) {
+ protected void bakeInventoryBlock(@Nonnull BlockGreenhouse block, @Nonnull ItemStack item, @Nonnull IModelBaker baker) {
bakeBlockModel(block, null, null, null, baker, null);
}
@Override
- protected void bakeWorldBlock(BlockGreenhouse block, IBlockAccess world, BlockPos pos, IExtendedBlockState stateExtended, IModelBaker baker) {
+ protected void bakeWorldBlock(@Nonnull BlockGreenhouse block, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, @Nonnull IExtendedBlockState stateExtended, @Nonnull IModelBaker baker) {
ItemStack camouflageStack = CamouflageUtil.getCamouflageBlock(world, pos);
bakeBlockModel(block, world, pos, stateExtended, baker, camouflageStack);
}
- private void bakeBlockModel(@Nonnull BlockGreenhouse block, @Nullable IBlockAccess world, @Nullable BlockPos pos, @Nullable IExtendedBlockState stateExtended, @Nonnull IModelBaker baker, @Nullable ItemStack camouflageStack){
- if(camouflageStack != null){
+ private void bakeBlockModel(@Nonnull BlockGreenhouse block, @Nullable IBlockAccess world, @Nullable BlockPos pos, @Nullable IExtendedBlockState stateExtended, @Nonnull IModelBaker baker, @Nullable ItemStack camouflageStack) {
+ if (camouflageStack != null) {
BlockModelShapes modelShapes = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes();
baker.addBakedModel(modelShapes.getModelForState(Block.getBlockFromItem(camouflageStack.getItem()).getStateFromMeta(camouflageStack.getItemDamage())));
@@ -56,21 +57,21 @@ public class ModelGreenhouse extends ModelBlockOverlay {
}
//Bake the default blocks
- else if(block.getGreenhouseType() == BlockGreenhouseType.GLASS){
+ else if (block.getGreenhouseType() == BlockGreenhouseType.GLASS) {
TextureAtlasSprite glassSprite = BlockGreenhouseType.getSprite(BlockGreenhouseType.GLASS, null, null, world, pos);
baker.addBlockModel(block, pos, BlockGreenhouseType.getSprite(BlockGreenhouseType.GLASS, null, null, world, pos), 100);
baker.setParticleSprite(glassSprite);
- }else{
+ } else {
TextureAtlasSprite plainSprite = BlockGreenhouseType.getSprite(BlockGreenhouseType.PLAIN, null, null, world, pos);
baker.addBlockModel(block, pos, BlockGreenhouseType.getSprite(BlockGreenhouseType.PLAIN, null, null, world, pos), 100);
baker.setParticleSprite(plainSprite);
}
- if(block.getGreenhouseType().hasOverlaySprite){
+ if (block.getGreenhouseType().hasOverlaySprite) {
TextureAtlasSprite[] sprite = new TextureAtlasSprite[6];
- for(EnumFacing facing : EnumFacing.VALUES){
- sprite[facing.ordinal()] = BlockGreenhouseType.getSprite(block.getGreenhouseType(), facing, stateExtended, world, pos);
+ for (EnumFacing facing : EnumFacing.VALUES) {
+ sprite[facing.ordinal()] = BlockGreenhouseType.getSprite(block.getGreenhouseType(), facing, stateExtended, world, pos);
}
baker.addBlockModel(block, pos, sprite, 101);
}
diff --git a/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java
index a089b1a25..7f16c8b79 100644
--- a/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java
+++ b/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java
@@ -10,9 +10,13 @@
******************************************************************************/
package forestry.greenhouse.multiblock;
+import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
+
import forestry.api.core.EnumCamouflageType;
import forestry.api.greenhouse.EnumGreenhouseEventType;
import forestry.api.greenhouse.IGreenhouseLogic;
@@ -25,8 +29,6 @@ import forestry.core.inventory.IInventoryAdapter;
import forestry.core.multiblock.FakeMultiblockController;
import forestry.energy.EnergyManager;
import forestry.greenhouse.FakeGreenhouseState;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
public class FakeGreenhouseController extends FakeMultiblockController implements IGreenhouseControllerInternal {
public static final FakeGreenhouseController instance = new FakeGreenhouseController();
@@ -34,11 +36,13 @@ public class FakeGreenhouseController extends FakeMultiblockController implement
private FakeGreenhouseController() {
}
+ @Nonnull
@Override
public IInventoryAdapter getInternalInventory() {
return FakeInventoryAdapter.instance();
}
+ @Nonnull
@Override
public ITankManager getTankManager() {
return FakeTankManager.instance;
@@ -86,6 +90,7 @@ public class FakeGreenhouseController extends FakeMultiblockController implement
public void addHumidityChange(float change, float boundaryDown, float boundaryUp) {
}
+ @Nonnull
@Override
public IGreenhouseState createState() {
return FakeGreenhouseState.instance;
diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java
index 360954861..946623c03 100644
--- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java
+++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java
@@ -10,6 +10,7 @@
******************************************************************************/
package forestry.greenhouse.multiblock;
+import javax.annotation.Nonnull;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@@ -17,23 +18,36 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
+
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fluids.FluidRegistry;
+
+import forestry.api.core.EnumCamouflageType;
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import forestry.api.core.ICamouflagedBlock;
import forestry.api.greenhouse.EnumGreenhouseEventType;
+import forestry.api.greenhouse.GreenhouseEvents.CamouflageChangeEvent;
+import forestry.api.greenhouse.GreenhouseEvents.CheckInternalBlockFaceEvent;
+import forestry.api.greenhouse.GreenhouseEvents.CreateInternalBlockEvent;
import forestry.api.greenhouse.GreenhouseManager;
import forestry.api.greenhouse.IGreenhouseLogic;
import forestry.api.greenhouse.IGreenhouseState;
import forestry.api.greenhouse.IInternalBlock;
import forestry.api.greenhouse.IInternalBlockFace;
-import forestry.api.greenhouse.GreenhouseEvents.CamouflageChangeEvent;
-import forestry.api.greenhouse.GreenhouseEvents.CheckInternalBlockFaceEvent;
-import forestry.api.greenhouse.GreenhouseEvents.CreateInternalBlockEvent;
-import forestry.api.core.EnumCamouflageType;
-import forestry.api.core.EnumHumidity;
-import forestry.api.core.EnumTemperature;
-import forestry.api.core.ICamouflagedBlock;
import forestry.api.multiblock.IGreenhouseComponent;
+import forestry.api.multiblock.IGreenhouseComponent.ButterflyHatch;
import forestry.api.multiblock.IGreenhouseController;
import forestry.api.multiblock.IMultiblockComponent;
-import forestry.api.multiblock.IGreenhouseComponent.ButterflyHatch;
import forestry.core.access.EnumAccess;
import forestry.core.config.Constants;
import forestry.core.fluids.TankManager;
@@ -58,25 +72,14 @@ import forestry.greenhouse.blocks.BlockGreenhouseType;
import forestry.greenhouse.inventory.InventoryGreenhouse;
import forestry.greenhouse.network.packets.PacketCamouflageUpdate;
import forestry.greenhouse.tiles.TileGreenhouseSprinkler;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.FluidRegistry;
public class GreenhouseController extends RectangularMultiblockControllerBase implements IGreenhouseControllerInternal, ILiquidTankTile {
- private final List internalBlocks = new ArrayList();
- private final Set listenerComponents = new HashSet();
- private final Set climatiserComponents = new HashSet();
- private final Set activeComponents = new HashSet();
- private final List logics = new ArrayList();
+ private final List internalBlocks = new ArrayList<>();
+ private final Set listenerComponents = new HashSet<>();
+ private final Set climatiserComponents = new HashSet<>();
+ private final Set activeComponents = new HashSet<>();
+ private final List logics = new ArrayList<>();
private float tempChange;
private float humidChange;
@@ -201,7 +204,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
CamouflageUtil.writeCamouflageBlockToNBT(data, this, EnumCamouflageType.GLASS);
CamouflageUtil.writeCamouflageBlockToNBT(data, this, EnumCamouflageType.DOOR);
- for(IGreenhouseLogic logic : getLogics()){
+ for (IGreenhouseLogic logic : getLogics()) {
NBTTagCompound nbtTag = new NBTTagCompound();
logic.writeToNBT(nbtTag);
data.setTag("logic" + logic.getName(), nbtTag);
@@ -222,11 +225,11 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
CamouflageUtil.readCamouflageBlockFromNBT(data, this, EnumCamouflageType.GLASS);
CamouflageUtil.readCamouflageBlockFromNBT(data, this, EnumCamouflageType.DOOR);
- if(logics.isEmpty()){
+ if (logics.isEmpty()) {
createLogics();
}
- for(IGreenhouseLogic logic : getLogics()){
+ for (IGreenhouseLogic logic : getLogics()) {
logic.readFromNBT(data.getCompoundTag("logic" + logic.getName()));
}
}
@@ -289,25 +292,25 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
@Override
public void setCamouflageBlock(EnumCamouflageType type, ItemStack camouflageBlock) {
switch (type) {
- case DEFAULT:
- camouflagePlainBlock = camouflageBlock;
- break;
- case GLASS:
- camouflageGlassBlock = camouflageBlock;
- break;
- case DOOR:
- camouflageDoorBlock = camouflageBlock;
- break;
- default:
- return;
+ case DEFAULT:
+ camouflagePlainBlock = camouflageBlock;
+ break;
+ case GLASS:
+ camouflageGlassBlock = camouflageBlock;
+ break;
+ case DOOR:
+ camouflageDoorBlock = camouflageBlock;
+ break;
+ default:
+ return;
}
if (worldObj != null) {
- if(worldObj.isRemote){
- for(IMultiblockComponent comp : connectedParts){
- if(comp instanceof ICamouflagedBlock){
+ if (worldObj.isRemote) {
+ for (IMultiblockComponent comp : connectedParts) {
+ if (comp instanceof ICamouflagedBlock) {
ICamouflagedBlock camBlock = (ICamouflagedBlock) comp;
- if(camBlock.getCamouflageType() == type){
+ if (camBlock.getCamouflageType() == type) {
worldObj.markBlockForUpdate(camBlock.getCoordinates());
}
}
@@ -322,32 +325,33 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
@Override
public ItemStack getCamouflageBlock(EnumCamouflageType type) {
switch (type) {
- case DEFAULT:
- return camouflagePlainBlock;
- case GLASS:
- return camouflageGlassBlock;
- case DOOR:
- return camouflageDoorBlock;
- default:
- return null;
+ case DEFAULT:
+ return camouflagePlainBlock;
+ case GLASS:
+ return camouflageGlassBlock;
+ case DOOR:
+ return camouflageDoorBlock;
+ default:
+ return null;
}
}
@Override
public ItemStack getDefaultCamouflageBlock(EnumCamouflageType type) {
switch (type) {
- case DEFAULT:
- return new ItemStack(Blocks.brick_block);
- case GLASS:
- return new ItemStack(Blocks.stained_glass, 1, 13);
- case DOOR:
- return null;
- default:
- return null;
+ case DEFAULT:
+ return new ItemStack(Blocks.brick_block);
+ case GLASS:
+ return new ItemStack(Blocks.stained_glass, 1, 13);
+ case DOOR:
+ return null;
+ default:
+ return null;
}
}
/* GREENHOUSE */
+ @Nonnull
@Override
public IGreenhouseState createState() {
return new GreenhouseState(this);
@@ -355,7 +359,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
@Override
public void onChange(EnumGreenhouseEventType type, Object event) {
- for(IGreenhouseLogic logic : logics){
+ for (IGreenhouseLogic logic : logics) {
logic.onEvent(type, event);
}
}
@@ -363,9 +367,9 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
/* GREENHOUSE LOGICS */
private void createLogics() {
logics.clear();
- for(Class extends IGreenhouseLogic> logicClass : GreenhouseManager.greenhouseLogics){
+ for (Class extends IGreenhouseLogic> logicClass : GreenhouseManager.greenhouseLogics) {
IGreenhouseLogic logic = createLogic(logicClass);
- if(logic != null){
+ if (logic != null) {
logics.add(logic);
}
}
@@ -376,8 +380,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
return logicClass.getConstructor(IGreenhouseController.class).newInstance(this);
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
| NoSuchMethodException | SecurityException e) {
- e.printStackTrace();
- Log.error("Fail to create a greenhouse logic with the class: " + logicClass);
+ Log.error("Fail to create a greenhouse logic with the class: {}", logicClass, e);
return null;
}
}
@@ -388,6 +391,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
}
/* MANAGERS */
+ @Nonnull
@Override
public TankManager getTankManager() {
return tankManager;
@@ -398,6 +402,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
return energyManager;
}
+ @Nonnull
@Override
public IInventoryAdapter getInternalInventory() {
if (isAssembled()) {
@@ -425,22 +430,22 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
@Override
protected void onBlockAdded(IMultiblockComponent newPart) {
- if(newPart instanceof IGreenhouseComponent.Listener){
+ if (newPart instanceof IGreenhouseComponent.Listener) {
listenerComponents.add((IGreenhouseComponent.Listener) newPart);
- }else if(newPart instanceof IGreenhouseComponent.Climatiser){
+ } else if (newPart instanceof IGreenhouseComponent.Climatiser) {
climatiserComponents.add((IGreenhouseComponent.Climatiser) newPart);
- }else if(newPart instanceof IGreenhouseComponent.Active){
+ } else if (newPart instanceof IGreenhouseComponent.Active) {
activeComponents.add((IGreenhouseComponent.Active) newPart);
}
}
@Override
protected void onBlockRemoved(IMultiblockComponent oldPart) {
- if(oldPart instanceof IGreenhouseComponent.Listener){
+ if (oldPart instanceof IGreenhouseComponent.Listener) {
listenerComponents.remove(oldPart);
- }else if(oldPart instanceof IGreenhouseComponent.Climatiser){
+ } else if (oldPart instanceof IGreenhouseComponent.Climatiser) {
climatiserComponents.remove(oldPart);
- }else if(oldPart instanceof IGreenhouseComponent.Active){
+ } else if (oldPart instanceof IGreenhouseComponent.Active) {
activeComponents.remove(oldPart);
}
}
@@ -455,33 +460,33 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
@Override
protected boolean updateServer(int tickCount) {
- if(!isAssembled()){
+ if (!isAssembled()) {
boolean hasChangeClima = false;
if (updateOnInterval(45)) {
- if(humidChange > 0F){
- if(humidChange > 0.25F){
- humidChange=- 0.25F;
- }else{
+ if (humidChange > 0F) {
+ if (humidChange > 0.25F) {
+ humidChange = -0.25F;
+ } else {
humidChange = 0F;
}
hasChangeClima = true;
}
- if(tempChange > 0F){
- if(tempChange > 0.25F){
- tempChange=- 0.25F;
- }else{
+ if (tempChange > 0F) {
+ if (tempChange > 0.25F) {
+ tempChange = -0.25F;
+ } else {
tempChange = 0F;
}
hasChangeClima = true;
}
}
return hasChangeClima;
- }else{
+ } else {
if (updateOnInterval(20)) {
inventory.drainCan(tankManager);
}
- for(IGreenhouseLogic logic : logics){
+ for (IGreenhouseLogic logic : logics) {
logic.work();
}
@@ -494,16 +499,16 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
canWork = listenerComponent.getGreenhouseListener().canWork(this, canWork);
}
- if(canWork){
-
+ if (canWork) {
+
for (IGreenhouseComponent.Climatiser climatiser : climatiserComponents) {
climatiser.changeClimate(tickCount, this);
}
-
+
tempChange = equalizeChange(tempChange);
humidChange = equalizeChange(humidChange);
}
-
+
return canWork;
}
}
@@ -556,7 +561,8 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
boolean isNextRoof = false;
Class extends RectangularMultiblockControllerBase> myClass = this.getClass();
- height: for (int y = minimumCoord.getY(); y <= maximumCoord.getY(); y++) {
+ height:
+ for (int y = minimumCoord.getY(); y <= maximumCoord.getY(); y++) {
for (int x = minimumCoord.getX(); x <= maximumCoord.getX(); x++) {
for (int z = minimumCoord.getZ(); z <= maximumCoord.getZ(); z++) {
// Okay, figure out what sort of block this should be.
@@ -599,9 +605,9 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
// Side
BlockPos posUp = pos.add(0, 1, 0);
TileEntity tileUp = worldObj.getTileEntity(posUp);
- if(sides >= 1 && !(tileUp instanceof IGreenhouseComponent)){
+ if (sides >= 1 && !(tileUp instanceof IGreenhouseComponent)) {
int delta = y - minimumCoord.getY();
- if(y - minimumCoord.getY() >= minY){
+ if (y - minimumCoord.getY() >= minY) {
isNextRoof = true;
}
break height;
@@ -620,9 +626,9 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
} else {
if (part != null) {
IBlockState state = worldObj.getBlockState(part.getCoordinates());
- if(state.getBlock() instanceof BlockGreenhouse && ((BlockGreenhouse)state.getBlock()).getGreenhouseType() == BlockGreenhouseType.SPRINKLER || !myClass.equals(part.getMultiblockLogic().getController().getClass())){
+ if (state.getBlock() instanceof BlockGreenhouse && ((BlockGreenhouse) state.getBlock()).getGreenhouseType() == BlockGreenhouseType.SPRINKLER || !myClass.equals(part.getMultiblockLogic().getController().getClass())) {
isGoodForInterior(part);
- }else{
+ } else {
throw new MultiblockValidationException(Translator.translateToLocalFormatted("for.multiblock.error.invalid.part", Translator.translateToLocal(getUnlocalizedType())));
}
} else {
@@ -634,21 +640,21 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
}
internalBlocks.clear();
- if(isNextRoof){
+ if (isNextRoof) {
checkInternalBlock(createInternalBlock(new InternalBlock(worldObj, getMinimumCoord().add(1, 1, 1))));
}
- if(internalBlocks.isEmpty()){
+ if (internalBlocks.isEmpty()) {
throw new MultiblockValidationException(Translator.translateToLocalFormatted("for.multiblock.error.space.closed"));
}
this.internalBlocks.addAll(internalBlocks);
int hatches = 0;
- for(IMultiblockComponent comp : connectedParts){
- if(comp instanceof IGreenhouseComponent.ButterflyHatch){
+ for (IMultiblockComponent comp : connectedParts) {
+ if (comp instanceof IGreenhouseComponent.ButterflyHatch) {
hatches++;
}
}
- if(hatches > 1){
+ if (hatches > 1) {
throw new MultiblockValidationException(Translator.translateToLocalFormatted("for.multiblock.error.butterflyhatch.toomany"));
}
}
@@ -657,42 +663,41 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
protected void updateClient(int tickCount) {
}
- private void checkInternalBlock(IInternalBlock blockToCheck) throws MultiblockValidationException{
+ private void checkInternalBlock(IInternalBlock blockToCheck) throws MultiblockValidationException {
internalBlocks.add(blockToCheck);
BlockPos posRoot = blockToCheck.getPos();
isBlockGoodForInterior(worldObj, posRoot);
- for(IInternalBlockFace faceToCheck : blockToCheck.getFaces()){
+ for (IInternalBlockFace faceToCheck : blockToCheck.getFaces()) {
CheckInternalBlockFaceEvent checkEvent = new CheckInternalBlockFaceEvent(createState(), blockToCheck, faceToCheck);
MinecraftForge.EVENT_BUS.post(checkEvent);
- if(!faceToCheck.isTested()){
+ if (!faceToCheck.isTested()) {
EnumFacing face = faceToCheck.getFace();
BlockPos posFacing = posRoot.offset(face);
BlockPos minPos = getMinimumCoord();
BlockPos maxPos = getMaximumCoord();
- if(minPos.getX() > posFacing.getX() || minPos.getY() > posFacing.getY() || minPos.getZ() > posFacing.getZ() || maxPos.getX() < posFacing.getX() || maxPos.getY() < posFacing.getY() || maxPos.getZ() < posFacing.getZ()){
+ if (minPos.getX() > posFacing.getX() || minPos.getY() > posFacing.getY() || minPos.getZ() > posFacing.getZ() || maxPos.getX() < posFacing.getX() || maxPos.getY() < posFacing.getY() || maxPos.getZ() < posFacing.getZ()) {
throw new MultiblockValidationException(Translator.translateToLocalFormatted("for.multiblock.error.space.closed"));
}
TileEntity tileFace = worldObj.getTileEntity(posFacing);
- if(tileFace instanceof IGreenhouseComponent){
- if(((IGreenhouseComponent) tileFace).getMultiblockLogic().getController() != this){
+ if (tileFace instanceof IGreenhouseComponent) {
+ if (((IGreenhouseComponent) tileFace).getMultiblockLogic().getController() != this) {
throw new MultiblockValidationException(Translator.translateToLocalFormatted("for.multiblock.error.not.connected.part"));
- }
- else if(!(tileFace instanceof TileGreenhouseSprinkler)){
+ } else if (!(tileFace instanceof TileGreenhouseSprinkler)) {
faceToCheck.setTested(true);
}
- }else{
+ } else {
IInternalBlock internalBlock = createInternalBlock(new InternalBlock(worldObj, posFacing, face.getOpposite(), blockToCheck));
// Check is the internal block in the list
- if(internalBlocks.contains(internalBlock)){
+ if (internalBlocks.contains(internalBlock)) {
faceToCheck.setTested(true);
- }else{
+ } else {
checkInternalBlock(internalBlock);
}
}
@@ -700,7 +705,7 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
}
}
- private IInternalBlock createInternalBlock(IInternalBlock internalBlock){
+ private IInternalBlock createInternalBlock(IInternalBlock internalBlock) {
CreateInternalBlockEvent createEvent = new CreateInternalBlockEvent(createState(), internalBlock);
MinecraftForge.EVENT_BUS.post(createEvent);
@@ -714,19 +719,19 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im
return internalBlocks;
}
- public static ButterflyHatch getGreenhouseButterflyHatch(World world, BlockPos pos){
- if(GreenhouseManager.greenhouseHelper.getGreenhouseState(world, pos) == null){
- return null;
- }
- IGreenhouseState state = GreenhouseManager.greenhouseHelper.getGreenhouseState(world, pos);
- for(IMultiblockComponent greenhouse : state.getGreenhouseComponents()){
- if(greenhouse instanceof ButterflyHatch){
- return (ButterflyHatch) greenhouse;
- }
- }
- return null;
- }
-
+ public static ButterflyHatch getGreenhouseButterflyHatch(World world, BlockPos pos) {
+ if (GreenhouseManager.greenhouseHelper.getGreenhouseState(world, pos) == null) {
+ return null;
+ }
+ IGreenhouseState state = GreenhouseManager.greenhouseHelper.getGreenhouseState(world, pos);
+ for (IMultiblockComponent greenhouse : state.getGreenhouseComponents()) {
+ if (greenhouse instanceof ButterflyHatch) {
+ return (ButterflyHatch) greenhouse;
+ }
+ }
+ return null;
+ }
+
@Override
protected void isGoodForExteriorLevel(IMultiblockComponent part, int level) throws MultiblockValidationException {
diff --git a/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java b/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java
index 18225b310..4aba839e7 100644
--- a/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java
+++ b/src/main/java/forestry/greenhouse/multiblock/IGreenhouseControllerInternal.java
@@ -10,10 +10,9 @@
******************************************************************************/
package forestry.greenhouse.multiblock;
-import java.util.List;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import java.util.List;
import forestry.api.greenhouse.IGreenhouseState;
import forestry.api.greenhouse.IInternalBlock;
diff --git a/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java b/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java
index 2e7989e8c..bb8acd284 100644
--- a/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java
+++ b/src/main/java/forestry/greenhouse/multiblock/InternalBlock.java
@@ -10,57 +10,68 @@
******************************************************************************/
package forestry.greenhouse.multiblock;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import forestry.api.greenhouse.IInternalBlock;
-import forestry.api.greenhouse.IInternalBlockFace;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
+import forestry.api.greenhouse.IInternalBlock;
+import forestry.api.greenhouse.IInternalBlockFace;
+
public class InternalBlock implements IInternalBlock {
+ @Nonnull
private final BlockPos pos;
+ @Nonnull
private final World world;
- private final List faces = new ArrayList(6);
+ @Nonnull
+ private final List faces = new ArrayList<>(6);
+ @Nullable
private final IInternalBlock root;
- public InternalBlock(World world, BlockPos pos) {
+ public InternalBlock(@Nonnull World world, @Nonnull BlockPos pos) {
this.world = world;
this.pos = pos;
this.root = null;
- for(EnumFacing facing : EnumFacing.VALUES){
+ for (EnumFacing facing : EnumFacing.VALUES) {
this.faces.add(new InternalBlockFace(facing, getPos().offset(facing), false));
}
}
- public InternalBlock(World world, BlockPos pos, EnumFacing rootFace, IInternalBlock root) {
+ public InternalBlock(@Nonnull World world, @Nonnull BlockPos pos, EnumFacing rootFace, @Nonnull IInternalBlock root) {
this.world = world;
this.pos = pos;
this.root = root;
- for(EnumFacing face : EnumFacing.VALUES){
+ for (EnumFacing face : EnumFacing.VALUES) {
this.faces.add(new InternalBlockFace(face, getPos().offset(face), face == rootFace));
}
}
+ @Nonnull
@Override
public World getWorld() {
return world;
}
+ @Nonnull
@Override
public BlockPos getPos() {
return pos;
}
+ @Nonnull
@Override
public Collection getFaces() {
return faces;
}
+ @Nullable
@Override
public IInternalBlock getRoot() {
return root;
@@ -68,7 +79,7 @@ public class InternalBlock implements IInternalBlock {
@Override
public boolean equals(Object obj) {
- if(!(obj instanceof IInternalBlock)){
+ if (!(obj instanceof IInternalBlock)) {
return false;
}
IInternalBlock internalBlock = (IInternalBlock) obj;
diff --git a/src/main/java/forestry/greenhouse/multiblock/InternalBlockFace.java b/src/main/java/forestry/greenhouse/multiblock/InternalBlockFace.java
index 9dc8ccb3e..d831d2916 100644
--- a/src/main/java/forestry/greenhouse/multiblock/InternalBlockFace.java
+++ b/src/main/java/forestry/greenhouse/multiblock/InternalBlockFace.java
@@ -10,10 +10,13 @@
******************************************************************************/
package forestry.greenhouse.multiblock;
-import forestry.api.greenhouse.IInternalBlockFace;
+import javax.annotation.Nonnull;
+
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
+import forestry.api.greenhouse.IInternalBlockFace;
+
public class InternalBlockFace implements IInternalBlockFace {
private final EnumFacing face;
@@ -36,11 +39,13 @@ public class InternalBlockFace implements IInternalBlockFace {
this.isTested = tested;
}
+ @Nonnull
@Override
public EnumFacing getFace() {
return face;
}
+ @Nonnull
@Override
public BlockPos getPos() {
return pos;
diff --git a/src/main/java/forestry/greenhouse/multiblock/MultiblockLogicGreenhouse.java b/src/main/java/forestry/greenhouse/multiblock/MultiblockLogicGreenhouse.java
index 7a990dd3c..2630094e7 100644
--- a/src/main/java/forestry/greenhouse/multiblock/MultiblockLogicGreenhouse.java
+++ b/src/main/java/forestry/greenhouse/multiblock/MultiblockLogicGreenhouse.java
@@ -10,9 +10,10 @@
******************************************************************************/
package forestry.greenhouse.multiblock;
+import net.minecraft.world.World;
+
import forestry.api.multiblock.IMultiblockLogicGreenhouse;
import forestry.core.multiblock.MultiblockLogic;
-import net.minecraft.world.World;
public class MultiblockLogicGreenhouse extends MultiblockLogic implements IMultiblockLogicGreenhouse {
diff --git a/src/main/java/forestry/greenhouse/network/packets/PacketCamouflageUpdate.java b/src/main/java/forestry/greenhouse/network/packets/PacketCamouflageUpdate.java
index f11145683..a807d55bd 100644
--- a/src/main/java/forestry/greenhouse/network/packets/PacketCamouflageUpdate.java
+++ b/src/main/java/forestry/greenhouse/network/packets/PacketCamouflageUpdate.java
@@ -15,6 +15,7 @@ import java.io.IOException;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
+
import forestry.api.core.EnumCamouflageType;
import forestry.api.core.ICamouflageHandler;
import forestry.api.multiblock.IMultiblockComponent;
@@ -74,18 +75,18 @@ public class PacketCamouflageUpdate extends PacketCoordinates implements IForest
TileEntity tile = getTarget(player.worldObj);
ICamouflageHandler handler = null;
- if(isMultiblock && tile instanceof IMultiblockComponent){
+ if (isMultiblock && tile instanceof IMultiblockComponent) {
IMultiblockController controller = ((IMultiblockComponent) tile).getMultiblockLogic().getController();
- if(controller instanceof ICamouflageHandler){
+ if (controller instanceof ICamouflageHandler) {
handler = (ICamouflageHandler) controller;
}
- }else if (tile instanceof ICamouflageHandler) {
+ } else if (tile instanceof ICamouflageHandler) {
handler = (ICamouflageHandler) tile;
}
- if(handler != null){
+ if (handler != null) {
handler.setCamouflageBlock(type, camouflageStack);
}
}
diff --git a/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java b/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java
index 09f91f6ed..2e7083eaf 100644
--- a/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java
+++ b/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java
@@ -12,8 +12,10 @@ package forestry.greenhouse.proxy;
import net.minecraft.block.Block;
import net.minecraft.client.resources.model.ModelResourceLocation;
+
import net.minecraftforge.client.model.animation.AnimationTESR;
import net.minecraftforge.fml.client.registry.ClientRegistry;
+
import forestry.core.models.BlockModelIndex;
import forestry.core.proxy.Proxies;
import forestry.greenhouse.PluginGreenhouse;
@@ -25,17 +27,16 @@ public class ProxyGreenhouseClient extends ProxyGreenhouse {
@Override
public void initializeModels() {
- for(BlockGreenhouseType greenhouseType : BlockGreenhouseType.VALUES){
- if(greenhouseType == BlockGreenhouseType.DOOR) {
+ for (BlockGreenhouseType greenhouseType : BlockGreenhouseType.VALUES) {
+ if (greenhouseType == BlockGreenhouseType.DOOR) {
continue;
- }
- else if(greenhouseType == BlockGreenhouseType.SPRINKLER){
- ClientRegistry.bindTileEntitySpecialRenderer(TileGreenhouseSprinkler.class, new AnimationTESR());
+ } else if (greenhouseType == BlockGreenhouseType.SPRINKLER) {
+ ClientRegistry.bindTileEntitySpecialRenderer(TileGreenhouseSprinkler.class, new AnimationTESR<>());
continue;
}
Proxies.render.registerBlockModel(new BlockModelIndex(new ModelResourceLocation("forestry:greenhouse." + greenhouseType),
- new ModelResourceLocation("forestry:greenhouse", "inventory"), new ModelGreenhouse(),
- Block.getBlockFromItem(PluginGreenhouse.blocks.getGreenhouseBlock(greenhouseType).getItem())));
+ new ModelResourceLocation("forestry:greenhouse", "inventory"), new ModelGreenhouse(),
+ Block.getBlockFromItem(PluginGreenhouse.blocks.getGreenhouseBlock(greenhouseType).getItem())));
}
}
}
diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouse.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouse.java
index 41d09e78b..871052ef9 100644
--- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouse.java
+++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouse.java
@@ -17,7 +17,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.BlockPos;
+
import net.minecraftforge.common.MinecraftForge;
+
import forestry.api.core.EnumCamouflageType;
import forestry.api.core.ICamouflageHandler;
import forestry.api.core.ICamouflagedBlock;
@@ -66,17 +68,12 @@ public abstract class TileGreenhouse extends MultiblockTileEntityForestry loots = new ArrayList();
- for(ItemStack loot : cocoon.getCaterpillar().getCocoonDrop(cocoon)){
- if(!InventoryUtil.tryAddStack(this, loot, 0, InventoryGreenhouseButterflyHatch.SLOTS, true)){
+ List loots = new ArrayList<>();
+ for (ItemStack loot : cocoon.getCaterpillar().getCocoonDrop(cocoon)) {
+ if (!InventoryUtil.tryAddStack(this, loot, 0, InventoryGreenhouseButterflyHatch.SLOTS, true)) {
loots.add(loot);
}
}
- if(loots.size() > 0){
+ if (!loots.isEmpty()) {
return loots.toArray(new ItemStack[loots.size()]);
}
return null;
diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java
index 466fb085c..dc281a09d 100644
--- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java
+++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseClimatiser.java
@@ -10,6 +10,8 @@
******************************************************************************/
package forestry.greenhouse.tiles;
+import net.minecraft.nbt.NBTTagCompound;
+
import forestry.api.core.IClimateControlled;
import forestry.api.greenhouse.IGreenhouseHousing;
import forestry.api.multiblock.IGreenhouseComponent;
@@ -18,14 +20,13 @@ import forestry.apiculture.network.packets.PacketActiveUpdate;
import forestry.core.proxy.Proxies;
import forestry.core.tiles.IActivatable;
import forestry.greenhouse.multiblock.IGreenhouseControllerInternal;
-import net.minecraft.nbt.NBTTagCompound;
public class TileGreenhouseClimatiser extends TileGreenhouse implements IActivatable, IGreenhouseComponent.Climatiser {
protected static final int WORK_CYCLES = 1;
protected static final int ENERGY_PER_OPERATION = 50;
- protected enum ClimitiserType{
+ protected enum ClimitiserType {
TEMPERATURE, HUMIDITY
}
@@ -59,9 +60,9 @@ public class TileGreenhouseClimatiser extends TileGreenhouse implements IActivat
if (workingTime > 0) {
workingTime--;
- if(definition.getType() == ClimitiserType.TEMPERATURE){
+ if (definition.getType() == ClimitiserType.TEMPERATURE) {
greenhouse.addTemperatureChange(definition.getChangePerTransfer(), definition.getBoundaryDown(), definition.getBoundaryUp());
- }else if(definition.getType() == ClimitiserType.HUMIDITY){
+ } else if (definition.getType() == ClimitiserType.HUMIDITY) {
greenhouse.addHumidityChange(definition.getChangePerTransfer(), definition.getBoundaryDown(), definition.getBoundaryUp());
}
}
diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseControl.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseControl.java
index 1b0c69b71..1b87d2ddb 100644
--- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseControl.java
+++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseControl.java
@@ -46,11 +46,11 @@ public class TileGreenhouseControl extends TileGreenhouse implements IGreenhouse
}
private boolean hasRedstoneSignal() {
- for(EnumFacing direction : EnumFacing.VALUES){
+ for (EnumFacing direction : EnumFacing.VALUES) {
Vect side = new Vect(tile).add(direction);
EnumFacing dir = direction.getOpposite();
World world = tile.getWorld();
- if(world.getRedstonePower(side, dir) > 0 || world.getStrongPower(side, dir) > 0){
+ if (world.getRedstonePower(side, dir) > 0 || world.getStrongPower(side, dir) > 0) {
return true;
}
}
diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseDoor.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseDoor.java
index d38abca11..fef6517cd 100644
--- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseDoor.java
+++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseDoor.java
@@ -10,6 +10,9 @@
******************************************************************************/
package forestry.greenhouse.tiles;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.BlockPos;
+
import forestry.api.core.IErrorLogic;
import forestry.api.core.IErrorLogicSource;
import forestry.api.multiblock.IGreenhouseComponent;
@@ -19,8 +22,6 @@ import forestry.core.access.IAccessHandler;
import forestry.core.access.IRestrictedAccess;
import forestry.core.multiblock.MultiblockTileEntityForestry;
import forestry.greenhouse.multiblock.MultiblockLogicGreenhouse;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.BlockPos;
public class TileGreenhouseDoor extends MultiblockTileEntityForestry implements IGreenhouseComponent.Door, IErrorLogicSource, IRestrictedAccess {
@@ -39,11 +40,6 @@ public class TileGreenhouseDoor extends MultiblockTileEntityForestry implements IGreenhouseComponent, IHintSource, IErrorLogicSource, IRestrictedAccess, ICamouflageHandler, ICamouflagedBlock, IFluidHandler, IEnergyProvider, IEnergyReceiver {
@@ -93,7 +96,7 @@ public class TileGreenhouseHatch extends MultiblockTileEntityBase T getCapability(Capability capability, EnumFacing facing) {
- if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && getOutwardsTile() != null){
+ if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && getOutwardsTile() != null) {
return getOutwardsTile().getCapability(capability, facing);
}
return super.getCapability(capability, facing);
@@ -297,7 +306,7 @@ public class TileGreenhouseHatch extends MultiblockTileEntityBase capability, EnumFacing facing) {
- if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && getOutwardsTile() != null){
+ if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && getOutwardsTile() != null) {
return getOutwardsTile().hasCapability(capability, facing);
}
return super.hasCapability(capability, facing);
@@ -306,7 +315,7 @@ public class TileGreenhouseHatch extends MultiblockTileEntityBaseof(
- "cycle_length", cycleLength,
- "click_time", clickTime
- ));
+ asm = Proxies.render.loadAnimationState(new ResourceLocation(Constants.RESOURCE_ID, "asms/block/sprinkler.json"), ImmutableMap.of(
+ "cycle_length", cycleLength,
+ "click_time", clickTime
+ ));
}
- @Override
- public boolean hasFastRenderer(){
- return true;
- }
+ @Override
+ public boolean hasFastRenderer() {
+ return true;
+ }
@Override
public void changeClimate(int tick, G greenhouse) {
@@ -68,13 +69,13 @@ public class TileGreenhouseSprinkler extends TileGreenhouseClimatiser implements
public void setActive(boolean active) {
super.setActive(active);
if (worldObj != null && worldObj.isRemote) {
- if(asm.currentState().equals("moving") && !isActive()){
+ if (asm.currentState().equals("moving") && !isActive()) {
clickTime.setValue(Animation.getWorldTime(getWorld(), Animation.getPartialTickTime()));
asm.transition("stopping");
- }else if(asm.currentState().equals("default") && isActive()){
- float time = Animation.getWorldTime(getWorld(), Animation.getPartialTickTime());
- clickTime.setValue(time);
-
+ } else if (asm.currentState().equals("default") && isActive()) {
+ float time = Animation.getWorldTime(getWorld(), Animation.getPartialTickTime());
+ clickTime.setValue(time);
+
asm.transition("starting");
}
}
@@ -102,9 +103,9 @@ public class TileGreenhouseSprinkler extends TileGreenhouseClimatiser implements
}
@Override
- public IAnimationStateMachine asm(){
- return asm;
- }
+ public IAnimationStateMachine asm() {
+ return asm;
+ }
private static class SprinklerDefinition implements IClimitiserDefinition {
diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java
index f30cf73b4..483a123f5 100644
--- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java
+++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java
@@ -50,6 +50,7 @@ import forestry.core.fluids.Fluids;
import forestry.core.recipes.RecipeUtil;
import forestry.core.utils.EntityUtil;
import forestry.core.utils.ItemStackUtil;
+import forestry.core.utils.Log;
import forestry.core.utils.Translator;
import forestry.lepidopterology.blocks.BlockRegistryLepidopterology;
import forestry.lepidopterology.blocks.BlockTypeLepidopterologyTesr;
@@ -209,7 +210,7 @@ public class PluginLepidopterology extends BlankForestryPlugin {
try{
spawnRaritys.put(raritys[0], Float.parseFloat(raritys[1]));
}catch(Exception e){
-
+ Log.error("Failed to parse spawn rarity for butterfly. {}", rarity, e);
}
}
}
@@ -224,8 +225,8 @@ public class PluginLepidopterology extends BlankForestryPlugin {
}
private static void parseCooconLoot(LocalizedConfiguration config, IAlleleButterflyCocoon cocoon){
- Map cooconLoot = new HashMap();
- List lootList = new ArrayList();
+ Map cooconLoot = new HashMap<>();
+ List lootList = new ArrayList<>();
for(Entry entry : cocoon.getCocoonLoot().entrySet()){
String itemStackString = ItemStackUtil.getItemNameFromRegistryAsString(entry.getKey().getItem());
@@ -251,7 +252,7 @@ public class PluginLepidopterology extends BlankForestryPlugin {
cooconLoot.put(itemStack, Float.parseFloat(loots[1]));
}
}catch(Exception e){
-
+ Log.error("Failed to parse cocoon loot. {}", loot, e);
}
}
}
diff --git a/src/main/java/forestry/lepidopterology/blocks/CocoonStateMapper.java b/src/main/java/forestry/lepidopterology/blocks/CocoonStateMapper.java
index d10b31616..13bb6cc98 100644
--- a/src/main/java/forestry/lepidopterology/blocks/CocoonStateMapper.java
+++ b/src/main/java/forestry/lepidopterology/blocks/CocoonStateMapper.java
@@ -3,21 +3,17 @@ package forestry.lepidopterology.blocks;
import java.util.Map;
import net.minecraft.block.Block;
-import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
-import forestry.api.arboriculture.IAlleleFruit;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.lepidopterology.IAlleleButterflyCocoon;
-import forestry.arboriculture.blocks.BlockFruitPod;
import forestry.core.config.Constants;
import forestry.core.render.ForestryStateMapper;
-import forestry.lepidopterology.blocks.property.PropertyCocoon;
import forestry.lepidopterology.genetics.alleles.AlleleButterflyCocoon;
@SideOnly(Side.CLIENT)
diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java
index ec8b00a6d..87d5e4de0 100755
--- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java
+++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java
@@ -136,7 +136,7 @@ public class Butterfly extends IndividualLiving implements IButterfly {
}
BiomeGenBase biome = world.getBiomeGenForCoordsBody(new BlockPos(x, 0, z));
- if (getGenome().getPrimary().getSpawnBiomes().size() > 0) {
+ if (!getGenome().getPrimary().getSpawnBiomes().isEmpty()) {
boolean noneMatched = true;
if (getGenome().getPrimary().strictSpawnMatch()) {
diff --git a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java
index 4afdda0fe..c53779b6f 100644
--- a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java
+++ b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java
@@ -15,6 +15,7 @@ import java.util.Arrays;
import java.util.Locale;
import net.minecraft.item.ItemStack;
+
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IClassification;
import forestry.api.lepidopterology.ButterflyManager;
@@ -45,11 +46,6 @@ public enum MothDefinition implements IButterflyDefinition {
}
},
BombyxMori(ButterflyBranchDefinition.Bombyx, "bombyxMori", "bombyxMori", new Color(0xDADADA), false, 0){
-
- @Override
- protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
- }
-
@Override
protected void setAlleles(IAllele[] alleles) {
AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLEST);
diff --git a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java
index 9ae3647b7..071732be6 100644
--- a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java
+++ b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java
@@ -10,11 +10,16 @@
******************************************************************************/
package forestry.lepidopterology.genetics.alleles;
+import javax.annotation.Nonnull;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import net.minecraft.block.properties.PropertyInteger;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.item.ItemStack;
+
import forestry.api.genetics.AlleleManager;
import forestry.api.lepidopterology.EnumButterflyChromosome;
import forestry.api.lepidopterology.IAlleleButterflyCocoon;
@@ -22,9 +27,6 @@ import forestry.core.PluginCore;
import forestry.core.config.Constants;
import forestry.core.genetics.alleles.AlleleCategorized;
import forestry.lepidopterology.blocks.property.PropertyCocoon;
-import net.minecraft.block.properties.PropertyInteger;
-import net.minecraft.client.resources.model.ModelResourceLocation;
-import net.minecraft.item.ItemStack;
public class AlleleButterflyCocoon extends AlleleCategorized implements IAlleleButterflyCocoon {
@@ -51,8 +53,8 @@ public class AlleleButterflyCocoon extends AlleleCategorized implements IAlleleB
cocoonSilk.getCocoonLoot().put(PluginCore.items.craftingMaterial.getSilkWisp(), 0.25F);
}
- private Map loot = new HashMap();
- private String name;
+ private final Map loot = new HashMap<>();
+ private final String name;
public AlleleButterflyCocoon(String name, boolean isDominant) {
super(Constants.MOD_ID, "cocoon", name, isDominant);
@@ -85,7 +87,7 @@ public class AlleleButterflyCocoon extends AlleleCategorized implements IAlleleB
}
@Override
- public int compareTo(IAlleleButterflyCocoon o) {
+ public int compareTo(@Nonnull IAlleleButterflyCocoon o) {
return 0;
}
diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java
index 8a2f9c49b..0c14aa762 100644
--- a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java
+++ b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java
@@ -14,6 +14,7 @@ import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap;
import java.io.IOException;
+
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.resources.model.IBakedModel;
@@ -26,6 +27,7 @@ import net.minecraftforge.client.model.IRetexturableModel;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
+
import forestry.api.lepidopterology.ButterflyManager;
import forestry.api.lepidopterology.IButterfly;
import forestry.core.models.BlankItemModel;
@@ -35,6 +37,7 @@ import forestry.core.models.TRSRBakedModel;
@SideOnly(Side.CLIENT)
public class ModelButterflyItem extends BlankItemModel {
+ private final Function textureGetter = new DefaultTextureGetter();
@SideOnly(Side.CLIENT)
private IRetexturableModel modelButterfly;
@@ -56,8 +59,6 @@ public class ModelButterflyItem extends BlankItemModel {
}
return bakeModel(butterfly);
}
-
- private Function textureGetter = new DefaultTextureGetter();
private IBakedModel bakeModel(IButterfly butterfly) {
ImmutableMap.Builder textures = ImmutableMap.builder();
diff --git a/src/main/java/forestry/lepidopterology/render/TextureAtlasButterfly.java b/src/main/java/forestry/lepidopterology/render/TextureAtlasButterfly.java
index c36fba434..32c654859 100644
--- a/src/main/java/forestry/lepidopterology/render/TextureAtlasButterfly.java
+++ b/src/main/java/forestry/lepidopterology/render/TextureAtlasButterfly.java
@@ -49,7 +49,7 @@ public class TextureAtlasButterfly extends TextureAtlasSprite {
}
private void resetSprite() {
- this.setFramesTextureData(Lists.newArrayList());
+ this.setFramesTextureData(Lists.newArrayList());
this.frameCounter = 0;
this.tickCounter = 0;
}
diff --git a/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java b/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java
index e43fb45c9..5d25c873f 100644
--- a/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java
+++ b/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java
@@ -12,6 +12,16 @@ package forestry.lepidopterology.tiles;
import java.io.IOException;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.Packet;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.world.World;
+
import com.mojang.authlib.GameProfile;
import forestry.api.genetics.IAllele;
@@ -32,15 +42,6 @@ import forestry.core.utils.Log;
import forestry.core.utils.PlayerUtil;
import forestry.greenhouse.multiblock.GreenhouseController;
import forestry.lepidopterology.genetics.Butterfly;
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.Packet;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
-import net.minecraft.world.World;
public class TileCocoon extends TileEntity implements IStreamable, IOwnable, IButterflyCocoon {
@@ -49,7 +50,7 @@ public class TileCocoon extends TileEntity implements IStreamable, IOwnable, IBu
public TileCocoon(boolean isSolid) {
this.isSolid = isSolid;
- if(isSolid){
+ if (isSolid) {
this.age = 2;
}
}
@@ -72,7 +73,7 @@ public class TileCocoon extends TileEntity implements IStreamable, IOwnable, IBu
if (nbttagcompound.hasKey("owner")) {
owner = PlayerUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner"));
}
- if(nbttagcompound.hasKey("nursery")){
+ if (nbttagcompound.hasKey("nursery")) {
NBTTagCompound nbt = nbttagcompound.getCompoundTag("nursery");
int x = nbt.getInteger("x");
int y = nbt.getInteger("y");
@@ -98,7 +99,7 @@ public class TileCocoon extends TileEntity implements IStreamable, IOwnable, IBu
PlayerUtil.writeGameProfile(nbt, owner);
nbttagcompound.setTag("owner", nbt);
}
- if(nursery != null){
+ if (nursery != null) {
BlockPos pos = nursery;
NBTTagCompound nbt = new NBTTagCompound();
nbt.setInteger("x", pos.getX());
@@ -177,23 +178,22 @@ public class TileCocoon extends TileEntity implements IStreamable, IOwnable, IBu
int caterpillarMatureTime = Math.round((float) caterpillarGenome.getLifespan() / (caterpillarGenome.getFertility() * 2));
if (maturationTime >= caterpillarMatureTime) {
- if(age < 2){
+ if (age < 2) {
age++;
maturationTime = 0;
- }else if(caterpillar.canTakeFlight(worldObj, getPos().getX(), getPos().getY(), getPos().getZ())){
+ } else if (caterpillar.canTakeFlight(worldObj, getPos().getX(), getPos().getY(), getPos().getZ())) {
IGreenhouseComponent.ButterflyHatch hatch = GreenhouseController.getGreenhouseButterflyHatch(worldObj, pos);
ItemStack[] cocoonDrops;
- if(hatch != null){
+ if (hatch != null) {
cocoonDrops = hatch.addCocoonLoot(this);
- }else{
+ } else {
cocoonDrops = caterpillar.getCocoonDrop(this);
}
- for(ItemStack drop : cocoonDrops){
+ for (ItemStack drop : cocoonDrops) {
ItemStackUtil.dropItemStackAsEntity(drop, worldObj, pos);
}
worldObj.setBlockToAir(getPos());
attemptButterflySpawn(worldObj, caterpillar, getPos());
- return;
}
}
}
@@ -217,7 +217,7 @@ public class TileCocoon extends TileEntity implements IStreamable, IOwnable, IBu
@Override
public IButterflyNursery getNursery() {
TileEntity nursery = worldObj.getTileEntity(this.nursery);
- if(nursery instanceof IButterflyNursery){
+ if (nursery instanceof IButterflyNursery) {
return (IButterflyNursery) nursery;
}
return null;
diff --git a/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java b/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java
index beba5f5fe..98d62b093 100644
--- a/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java
+++ b/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java
@@ -22,6 +22,7 @@ import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.IChunkProvider;
+
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.BiomeDictionary.Type;
import net.minecraftforge.common.util.EnumHelper;
@@ -70,14 +71,14 @@ public abstract class CocoonDecorator {
Type[] types = BiomeDictionary.getTypesForBiome(biome);
EnumSet speciesTypes = butterfly.getGenome().getPrimary().getSpawnBiomes();
-
+
boolean biomeTypesGood = false;
- for(Type type : types){
- if(speciesTypes == null || speciesTypes.size() <= 0 || speciesTypes.equals(type)){
+ for (Type type : types) {
+ if (speciesTypes == null || speciesTypes.size() <= 0 || speciesTypes.contains(type)) {
biomeTypesGood = true;
}
}
- if(!biomeTypesGood) {
+ if (!biomeTypesGood) {
return false;
}
@@ -121,10 +122,10 @@ public abstract class CocoonDecorator {
}
TileEntity tile = world.getTileEntity(pos);
- if(tile instanceof TileCocoon){
+ if (tile instanceof TileCocoon) {
TileCocoon cocoon = (TileCocoon) tile;
cocoon.setCaterpillar(butterfly);
- }else{
+ } else {
return false;
}
@@ -134,7 +135,7 @@ public abstract class CocoonDecorator {
return true;
}
- private static int getYForCocoon(World world, int x, int z){
+ private static int getYForCocoon(World world, int x, int z) {
int y = world.getHeight(new BlockPos(x, 0, z)).getY() - 1;
if (!world.getBlockState(new BlockPos(x, y, z)).getBlock().isLeaves(world, new BlockPos(x, y, z))) {
return -1;