diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index ba0af77c..35bf63cc 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -53,7 +53,8 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored return BlockRenderLayer.CUTOUT_MIPPED; } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side)); Block block = iblockstate.getBlock(); diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 828b3d43..f40b9db4 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -26,7 +26,6 @@ import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.block.ItemMetadata; import binnie.core.block.TileEntityMetadata; -import binnie.core.item.IItemMiscProvider; import binnie.core.item.ItemMisc; import binnie.extratrees.carpentry.ItemDesign; import net.minecraft.init.Blocks; diff --git a/src/main/java/binnie/core/block/TileEntityMetadata.java b/src/main/java/binnie/core/block/TileEntityMetadata.java index 22027076..99c7361c 100644 --- a/src/main/java/binnie/core/block/TileEntityMetadata.java +++ b/src/main/java/binnie/core/block/TileEntityMetadata.java @@ -1,6 +1,5 @@ package binnie.core.block; -import binnie.core.network.packet.MessageMetadata; import binnie.core.network.packet.PacketMetadata; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/binnie/core/models/DefaultStateMapper.java b/src/main/java/binnie/core/models/DefaultStateMapper.java index 17bd1878..93584c30 100644 --- a/src/main/java/binnie/core/models/DefaultStateMapper.java +++ b/src/main/java/binnie/core/models/DefaultStateMapper.java @@ -1,6 +1,5 @@ package binnie.core.models; -import binnie.Constants; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; diff --git a/src/main/java/binnie/extrabees/core/ModuleCore.java b/src/main/java/binnie/extrabees/core/ModuleCore.java index 57205c50..810a3705 100644 --- a/src/main/java/binnie/extrabees/core/ModuleCore.java +++ b/src/main/java/binnie/extrabees/core/ModuleCore.java @@ -1,7 +1,6 @@ package binnie.extrabees.core; import binnie.core.IInitializable; -import binnie.core.item.IItemMiscProvider; import binnie.core.item.ItemMisc; import binnie.extrabees.ExtraBees; import forestry.api.core.Tabs; diff --git a/src/main/java/binnie/extratrees/api/IPattern.java b/src/main/java/binnie/extratrees/api/IPattern.java index faae57e3..c1596cba 100644 --- a/src/main/java/binnie/extratrees/api/IPattern.java +++ b/src/main/java/binnie/extratrees/api/IPattern.java @@ -1,7 +1,6 @@ package binnie.extratrees.api; import forestry.api.core.ISpriteRegister; -import forestry.api.core.ITextureManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index a39330ba..2bc7fe1d 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -48,27 +48,27 @@ import net.minecraftforge.oredict.RecipeSorter; public class ModuleBlocks implements IInitializable { // public static int hedgeRenderID; - public static List logs; - public static List logsFireproof; - public static List planks; - public static List planksFireproof; - public static List slabs; - public static List slabsDouble; - public static List slabsFireproof; - public static List slabsDoubleFireproof; - public static List stairs; - public static List stairsFireproof; - public static List fences; - public static List fencesFireproof; - public static List fenceGates; - public static List fenceGatesFireproof; - public static List leavesDecorative; - public static Map speciesToLeavesDecorative; - public static Block blockDoor; - public static BlockMultiFence blockMultiFence; - public static BlockHedge blockHedge; + public List logs; + public List logsFireproof; + public List planks; + public List planksFireproof; + public List slabs; + public List slabsDouble; + public List slabsFireproof; + public List slabsDoubleFireproof; + public List stairs; + public List stairsFireproof; + public List fences; + public List fencesFireproof; + public List fenceGates; + public List fenceGatesFireproof; + public List leavesDecorative; + public Map speciesToLeavesDecorative; + public Block blockDoor; + public BlockMultiFence blockMultiFence; + public BlockHedge blockHedge; //???? - public static Block blockBranch; + public Block blockBranch; @Override public void preInit() { @@ -314,8 +314,7 @@ public class ModuleBlocks implements IInitializable { } public static ItemStack getDecorativeLeaves(String speciesUid) { - ExtraTrees.blocks(); - ItemStack itemStack = ModuleBlocks.speciesToLeavesDecorative.get(speciesUid); + ItemStack itemStack = ExtraTrees.blocks().speciesToLeavesDecorative.get(speciesUid); if (itemStack == null) { return null; } diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 1cacf079..1366464f 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -71,8 +71,7 @@ public class WoodManager { if (stack == null) { return null; } - ExtraTrees.blocks(); - if (stack.getItem() == Item.getItemFromBlock(ModuleBlocks.blockMultiFence)) { + if (stack.getItem() == Item.getItemFromBlock(ExtraTrees.blocks().blockMultiFence)) { final int damage = TileEntityMetadata.getItemDamage(stack); return getFenceDescription(damage); } @@ -117,15 +116,13 @@ public class WoodManager { } final int ord = type.ordinal(); final int i = getPlankTypeIndex(plank) + 256 * ord; - ExtraTrees.blocks(); - final ItemStack stack = TileEntityMetadata.getItemStack(ModuleBlocks.blockMultiFence, i + 65536 * getPlankTypeIndex(plank2)); + final ItemStack stack = TileEntityMetadata.getItemStack(ExtraTrees.blocks().blockMultiFence, i + 65536 * getPlankTypeIndex(plank2)); stack.stackSize = amount; return stack; } public static ItemStack getDoor(final IPlankType plank, final DoorType type) { - ExtraTrees.blocks(); - return TileEntityMetadata.getItemStack(ModuleBlocks.blockDoor, type.ordinal() * 256 + getPlankTypeIndex(plank)); + return TileEntityMetadata.getItemStack(ExtraTrees.blocks().blockDoor, type.ordinal() * 256 + getPlankTypeIndex(plank)); } public static List getAllPlankTypes() { diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index 0d485dcd..82c4fc6d 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -1,9 +1,5 @@ package binnie.extratrees.carpentry; -import binnie.Constants; -import binnie.botany.ceramic.brick.BlockCeramicBrick; -import binnie.botany.ceramic.brick.CeramicBrickPair; -import binnie.botany.ceramic.brick.TileCeramicBrick; import binnie.core.block.BlockMetadata; import binnie.core.block.IMultipassBlock; import binnie.core.block.TileEntityMetadata; @@ -23,7 +19,6 @@ import forestry.api.core.ITextureManager; import forestry.core.blocks.IColoredBlock; import forestry.core.blocks.propertys.UnlistedBlockAccess; import forestry.core.blocks.propertys.UnlistedBlockPos; -import forestry.core.items.IColoredItem; import forestry.core.models.BlockModelEntry; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -168,6 +163,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo return block.getItemMetadata(this.getDesignSystem()); } + @Override @SideOnly(Side.CLIENT) public EnumBlockRenderType getRenderType(IBlockState state){ return EnumBlockRenderType.MODEL; diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index 6661ca37..360419b0 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -1,15 +1,12 @@ package binnie.extratrees.carpentry; import binnie.Binnie; -import binnie.botany.Botany; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IDesign; import forestry.api.core.Tabs; import net.minecraft.block.Block; -import net.minecraft.block.BlockGlass; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -47,7 +44,8 @@ public class BlockStainedDesign extends BlockDesign { return 1; } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side)); Block block = iblockstate.getBlock(); diff --git a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java index 324a2fc5..1bdc0ff2 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java @@ -9,9 +9,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Rotations; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extratrees/carpentry/ItemDesign.java b/src/main/java/binnie/extratrees/carpentry/ItemDesign.java index ad6d256b..71b473db 100644 --- a/src/main/java/binnie/extratrees/carpentry/ItemDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/ItemDesign.java @@ -3,7 +3,6 @@ package binnie.extratrees.carpentry; import binnie.core.block.ItemMetadata; import binnie.core.block.TileEntityMetadata; import forestry.core.items.IColoredItem; -import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java index ce721c5e..82a88fb9 100644 --- a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java @@ -1,7 +1,6 @@ package binnie.extratrees.carpentry; import binnie.core.IInitializable; -import binnie.core.block.ItemMetadata; import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; @@ -11,13 +10,12 @@ import binnie.extratrees.api.IDesignSystem; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.registry.GameRegistry; public class ModuleCarpentry implements IInitializable { - public static BlockCarpentry blockCarpentry; - public static BlockCarpentry blockPanel; - public static BlockStainedDesign blockStained; + public BlockCarpentry blockCarpentry; + public BlockCarpentry blockPanel; + public BlockStainedDesign blockStained; @Override public void preInit() { diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index a9ef973c..1abe8814 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -51,7 +51,6 @@ public enum ExtraTreeItems implements IItemMiscProvider { @Override public ItemStack get(final int i) { - ExtraTrees.items(); - return new ItemStack(ModuleItems.itemMisc, i, this.ordinal()); + return new ItemStack(ExtraTrees.items().itemMisc, i, this.ordinal()); } } diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index 9413c328..dcff79ab 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -110,8 +110,7 @@ public enum Food implements IItemMiscProvider { @Override public ItemStack get(final int i) { - ExtraTrees.items(); - return new ItemStack(ModuleItems.itemFood, i, this.ordinal()); + return new ItemStack(ExtraTrees.items().itemFood, i, this.ordinal()); } @Override diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index b4d53aac..ca279239 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -4,7 +4,6 @@ import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; -import binnie.core.item.IItemMiscProvider; import binnie.core.item.ItemMisc; import binnie.core.liquid.ItemFluidContainer; import binnie.extratrees.ExtraTrees; @@ -26,12 +25,12 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModuleItems implements IInitializable { - public static Item itemDictionary; - public static Item itemDictionaryLepi; - public static ItemMisc itemMisc; - public static Item itemFood; - public static Item itemHammer; - public static Item itemDurableHammer; + public Item itemDictionary; + public Item itemDictionaryLepi; + public ItemMisc itemMisc; + public Item itemFood; + public Item itemHammer; + public Item itemDurableHammer; @Override public void preInit() { @@ -127,8 +126,8 @@ public class ModuleItems implements IInitializable { public void postInit() { ModuleItems items = ExtraTrees.items(); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ModuleItems.itemDurableHammer, 1, 0), "wiw", " s ", " s ", 'w', Blocks.OBSIDIAN, 'i', Items.GOLD_INGOT, 's', Items.STICK)); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ModuleItems.itemHammer, 1, 0), "wiw", " s ", " s ", 'w', "plankWood", 'i', Items.IRON_INGOT, 's', Items.STICK)); + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(items.itemDurableHammer, 1, 0), "wiw", " s ", " s ", 'w', Blocks.OBSIDIAN, 'i', Items.GOLD_INGOT, 's', Items.STICK)); + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(items.itemHammer, 1, 0), "wiw", " s ", " s ", 'w', "plankWood", 'i', Items.IRON_INGOT, 's', Items.STICK)); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeItems.Yeast.get(8), " m ", "mbm", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM)); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeItems.LagerYeast.get(8), "mbm", " m ", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM)); GameRegistry.addRecipe(ExtraTreeItems.GrainWheat.get(5), " s ", "sss", " s ", 's', Items.WHEAT_SEEDS); @@ -147,12 +146,12 @@ public class ModuleItems implements IInitializable { CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(Food.PAPAYIMAR.get(1), minium, "cropPapaya")); } catch (Exception ex) { } - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(ModuleItems.itemDictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotCopper", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(ModuleItems.itemDictionaryLepi), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotBronze", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(items.itemDictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotCopper", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(items.itemDictionaryLepi), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotBronze", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); RecipeManagers.stillManager.addRecipe(25, ExtraTreeLiquid.Resin.get(5), ExtraTreeLiquid.Turpentine.get(3)); - RecipeManagers.carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), null, ModuleItems.itemMisc.getStack(ExtraTreeItems.WoodWax, 4), "x", 'x', Mods.Forestry.stack("beeswax")); + RecipeManagers.carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), null, items.itemMisc.getStack(ExtraTreeItems.WoodWax, 4), "x", 'x', Mods.Forestry.stack("beeswax")); if (Binnie.LIQUID.getFluidStack("Creosote Oil", 100) != null) { - RecipeManagers.carpenterManager.addRecipe(25, Binnie.LIQUID.getFluidStack("Creosote Oil", 50), null, ModuleItems.itemMisc.getStack(ExtraTreeItems.WoodWax, 1), "x", 'x', Mods.Forestry.stack("beeswax")); + RecipeManagers.carpenterManager.addRecipe(25, Binnie.LIQUID.getFluidStack("Creosote Oil", 50), null, items.itemMisc.getStack(ExtraTreeItems.WoodWax, 1), "x", 'x', Mods.Forestry.stack("beeswax")); } for (final FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { if (data.fluid.isFluidEqual(Binnie.LIQUID.getFluidStack("water", 0)) && data.fluid.amount == 1000) { diff --git a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java b/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java index db8c2882..45c799b2 100644 --- a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java +++ b/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java @@ -8,7 +8,7 @@ import net.minecraft.block.Block; public class ModuleKitchen implements IInitializable { - public static Block blockKitchen; + public Block blockKitchen; @Override public void preInit() { diff --git a/src/main/java/binnie/extratrees/machines/DesignerType.java b/src/main/java/binnie/extratrees/machines/DesignerType.java index 3b65d65b..02a377b8 100644 --- a/src/main/java/binnie/extratrees/machines/DesignerType.java +++ b/src/main/java/binnie/extratrees/machines/DesignerType.java @@ -55,19 +55,16 @@ public enum DesignerType { private BlockDesign getBlock() { switch (this) { case GlassWorker: { - ExtraTrees.carpentry(); - return ModuleCarpentry.blockStained; + return ExtraTrees.carpentry().blockStained; } case Panelworker: { - ExtraTrees.carpentry(); - return ModuleCarpentry.blockPanel; + return ExtraTrees.carpentry().blockPanel; } case Tileworker: { return Botany.ceramicTile; } default: { - ExtraTrees.carpentry(); - return ModuleCarpentry.blockCarpentry; + return ExtraTrees.carpentry().blockCarpentry; } } } diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index 4af75cb6..3e97d04f 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -53,8 +53,7 @@ public enum ExtraTreeMachine implements IMachineType { } public ItemStack get(final int i) { - ExtraTrees.machine(); - return new ItemStack(ModuleMachine.blockMachine, i, this.ordinal()); + return new ItemStack(ExtraTrees.machine().blockMachine, i, this.ordinal()); } public static class ComponentExtraTreeGUI extends MachineComponent implements IInteraction.RightClick { diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index f497af7a..8e33b8c1 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -16,7 +16,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { - public static Block blockMachine; + public Block blockMachine; @Override public void preInit() { diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/src/main/java/binnie/extratrees/proxy/ProxyClient.java index 88a5008a..b3df424f 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -6,7 +6,6 @@ import binnie.Constants; import binnie.core.models.ModelManager; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.BlockETDecorativeLeaves; -import binnie.extratrees.block.ModuleBlocks; import binnie.extratrees.block.wood.BlockETSlab; import binnie.extratrees.models.ModelETDecorativeLeaves; import forestry.arboriculture.PluginArboriculture; @@ -65,8 +64,7 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { @Override public void registerModels() { - ExtraTrees.blocks(); - for (BlockETDecorativeLeaves leaves : ModuleBlocks.leavesDecorative) { + for (BlockETDecorativeLeaves leaves : ExtraTrees.blocks().leavesDecorative) { String resourceName = leaves.getRegistryName().toString(); ModelResourceLocation blockModelLocation = new ModelResourceLocation(resourceName); ModelResourceLocation itemModeLocation = new ModelResourceLocation(resourceName, "inventory"); @@ -74,12 +72,10 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { registerBlockModel(blockModelIndex); } - ExtraTrees.blocks(); - for(BlockETSlab slab : ModuleBlocks.slabsDouble){ + for(BlockETSlab slab : ExtraTrees.blocks().slabsDouble){ PluginArboriculture.proxy.registerWoodModel(slab, true); } - ExtraTrees.blocks(); - for(BlockETSlab slab : ModuleBlocks.slabsDoubleFireproof){ + for(BlockETSlab slab : ExtraTrees.blocks().slabsDoubleFireproof){ PluginArboriculture.proxy.registerWoodModel(slab, true); } getModelManager().registerModels(); diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index 26dcb48c..357ca558 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -5,13 +5,11 @@ import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; -import binnie.core.item.IItemMiscProvider; import binnie.core.item.ItemMisc; import binnie.core.liquid.ItemFluidContainer; import binnie.core.resource.BinnieIcon; import binnie.extrabees.ExtraBees; import binnie.extratrees.ExtraTrees; -import binnie.extratrees.item.ModuleItems; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import forestry.api.recipes.RecipeManagers; @@ -137,9 +135,7 @@ public class ModuleItem implements IInitializable { 'a', Mods.Forestry.item("portableAlyzer"), 'd', new ItemStack(Items.DIAMOND)); - ExtraTrees.items(); - ExtraTrees.items(); - final Item[] dbs = {ExtraBees.dictionary, ModuleItems.itemDictionary, ModuleItems.itemDictionaryLepi, Botany.database}; + final Item[] dbs = {ExtraBees.dictionary, ExtraTrees.items().itemDictionary, ExtraTrees.items().itemDictionaryLepi, Botany.database}; if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) { for (final Item a2 : dbs) { for (final Item b2 : dbs) {