diff --git a/src/main/java/forestry/apiculture/worldgen/Hive.java b/src/main/java/forestry/apiculture/worldgen/Hive.java index 8ce4857a0..0cc5094b9 100644 --- a/src/main/java/forestry/apiculture/worldgen/Hive.java +++ b/src/main/java/forestry/apiculture/worldgen/Hive.java @@ -13,8 +13,6 @@ package forestry.apiculture.worldgen; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import java.util.Locale; - import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java index a18f085fa..f8d83c581 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java @@ -18,13 +18,10 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.common.IPlantable; - import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.hives.HiveManager; import forestry.api.apiculture.hives.IHiveDescription; diff --git a/src/main/java/forestry/apiculture/worldgen/HiveGenTree.java b/src/main/java/forestry/apiculture/worldgen/HiveGenTree.java index 3371d6ee1..f70e3f28b 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveGenTree.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveGenTree.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.apiculture.worldgen; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index e1e1355e6..ca80bb2e4 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -91,7 +91,8 @@ public class BlockForestryLeaves extends BlockLeaves implements ITileEntityProvi return new ExtendedBlockState(this, new IProperty[]{DECAYABLE, CHECK_DECAY}, new IUnlistedProperty[]{UnlistedBlockPos.POS, UnlistedBlockAccess.BLOCKACCESS}); } - public int getMetaFromState(IBlockState state){ + @Override + public int getMetaFromState(IBlockState state){ return 0; } diff --git a/src/main/java/forestry/arboriculture/models/ModelProviderGermlingVanilla.java b/src/main/java/forestry/arboriculture/models/ModelProviderGermlingVanilla.java index df5fa7437..3a56193ce 100644 --- a/src/main/java/forestry/arboriculture/models/ModelProviderGermlingVanilla.java +++ b/src/main/java/forestry/arboriculture/models/ModelProviderGermlingVanilla.java @@ -46,10 +46,10 @@ public class ModelProviderGermlingVanilla implements IGermlingModelProvider { model = manager.getModelLocation("minecraft", "jungle_sapling"); break; case 4: - model = manager.getModelLocation("minecraft", "dark_oak_sapling"); + model = manager.getModelLocation("minecraft", "acacia_sapling"); break; case 5: - model = manager.getModelLocation("minecraft", "acacia_sapling"); + model = manager.getModelLocation("minecraft", "dark_oak_sapling"); break; } pollenModel = manager.getModelLocation("pollen"); diff --git a/src/main/java/forestry/core/utils/BlockUtil.java b/src/main/java/forestry/core/utils/BlockUtil.java index 5c5964f5e..8594d92b5 100644 --- a/src/main/java/forestry/core/utils/BlockUtil.java +++ b/src/main/java/forestry/core/utils/BlockUtil.java @@ -17,7 +17,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.BlockPlanks; -import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.Item; diff --git a/src/main/java/forestry/factory/PluginFactory.java b/src/main/java/forestry/factory/PluginFactory.java index 4ccc74c30..e0690576d 100644 --- a/src/main/java/forestry/factory/PluginFactory.java +++ b/src/main/java/forestry/factory/PluginFactory.java @@ -20,6 +20,7 @@ import net.minecraftforge.fluids.FluidStack; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; +import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitLayout; import forestry.api.core.ForestryAPI; import forestry.api.fuels.EngineBronzeFuel; @@ -360,13 +361,13 @@ public class PluginFactory extends BlankForestryPlugin { // / CHIPSETS ItemCircuitBoard circuitBoard = PluginCore.items.circuitboards; - RecipeManagers.carpenterManager.addRecipe(20, Fluids.WATER.getFluid(1000), null, circuitBoard.get(EnumCircuitBoardType.BASIC), + RecipeManagers.carpenterManager.addRecipe(20, Fluids.WATER.getFluid(1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.BASIC, null, new ICircuit[]{}), "R R", "R#R", "R R", '#', "ingotTin", 'R', "dustRedstone"); - RecipeManagers.carpenterManager.addRecipe(40, Fluids.WATER.getFluid(1000), null, circuitBoard.get(EnumCircuitBoardType.ENHANCED), + RecipeManagers.carpenterManager.addRecipe(40, Fluids.WATER.getFluid(1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.ENHANCED, null, new ICircuit[]{}), "R#R", "R#R", "R#R", '#', "ingotBronze", 'R', "dustRedstone"); - RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.getFluid(1000), null, circuitBoard.get(EnumCircuitBoardType.REFINED), + RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.getFluid(1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.REFINED, null, new ICircuit[]{}), "R#R", "R#R", "R#R", '#', "ingotIron", 'R', "dustRedstone"); - RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.getFluid(1000), null, circuitBoard.get(EnumCircuitBoardType.INTRICATE), + RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.getFluid(1000), null, ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.INTRICATE, null, new ICircuit[]{}), "R#R", "R#R", "R#R", '#', "ingotGold", 'R', "dustRedstone"); RecipeManagers.carpenterManager.addRecipe(40, Fluids.WATER.getFluid(1000), null, PluginCore.items.solderingIron.getItemStack(), " # ", "# #", " B", '#', "ingotIron", 'B', "ingotBronze"); diff --git a/src/main/java/forestry/factory/tiles/TileRaintank.java b/src/main/java/forestry/factory/tiles/TileRaintank.java index 4f3edc22e..110ae0245 100644 --- a/src/main/java/forestry/factory/tiles/TileRaintank.java +++ b/src/main/java/forestry/factory/tiles/TileRaintank.java @@ -116,7 +116,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa boolean hasSky = worldObj.canBlockSeeSky(getPos().add(0, 1, 0)); errorLogic.setCondition(!hasSky, EnumErrorCode.NO_SKY_RAIN_TANK); - errorLogic.setCondition(!worldObj.isRainingAt(getPos()), EnumErrorCode.NOT_RAINING); + errorLogic.setCondition(!worldObj.isRainingAt(getPos().add(0, 1, 0)), EnumErrorCode.NOT_RAINING); if (!errorLogic.hasErrors()) { resourceTank.fill(STACK_WATER, true); diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java index fbf31749b..f14fbfdfb 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java @@ -24,8 +24,6 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.color.BlockColors; -import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/forestry/mail/PluginMail.java b/src/main/java/forestry/mail/PluginMail.java index ae656ac4a..bebe1f87f 100644 --- a/src/main/java/forestry/mail/PluginMail.java +++ b/src/main/java/forestry/mail/PluginMail.java @@ -14,7 +14,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; - +import forestry.api.circuits.ICircuit; import forestry.api.mail.EnumAddressee; import forestry.api.mail.PostManager; import forestry.api.recipes.RecipeManagers; @@ -23,6 +23,7 @@ import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.ISaveEventHandler; import forestry.core.PluginCore; import forestry.core.circuits.EnumCircuitBoardType; +import forestry.core.circuits.ItemCircuitBoard; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; @@ -151,7 +152,7 @@ public class PluginMail extends BlankForestryPlugin { 'X', "chestWood", 'Y', PluginCore.items.sturdyCasing, 'Z', PluginCore.items.tubes.get(EnumElectronTube.IRON, 1), - 'W', PluginCore.items.circuitboards.get(EnumCircuitBoardType.REFINED)); + 'W', ItemCircuitBoard.createCircuitboard(EnumCircuitBoardType.REFINED, null, new ICircuit[]{})); } @Override