mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-22 04:52:26 +00:00
Move arboriculture items into PluginApiculture.items
This commit is contained in:
1 parent
fe69452464
commit
fc289c16d4
13 files changed
+98
-84
No files matched your search
@@ -17,7 +17,6 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
@@ -33,7 +32,6 @@ import forestry.api.core.Tabs;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.apiculture.genetics.BeeGenome;
|
||||
import forestry.core.config.Config;
|
||||
import forestry.core.genetics.ItemGE;
|
||||
@@ -44,9 +42,8 @@ public class ItemBeeGE extends ItemGE {
|
||||
private final EnumBeeType type;
|
||||
|
||||
public ItemBeeGE(EnumBeeType type) {
|
||||
super();
|
||||
super(Tabs.tabApiculture);
|
||||
this.type = type;
|
||||
setCreativeTab(Tabs.tabApiculture);
|
||||
if (type != EnumBeeType.DRONE) {
|
||||
setMaxStackSize(1);
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ import forestry.api.arboriculture.ITree;
|
||||
import forestry.api.arboriculture.ITreeGenome;
|
||||
import forestry.api.arboriculture.TreeManager;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.core.config.ForestryItem;
|
||||
import forestry.plugins.PluginArboriculture;
|
||||
|
||||
public class VillageHandlerArboriculture implements IVillageTradeHandler {
|
||||
|
||||
@@ -39,7 +39,7 @@ public class VillageHandlerArboriculture implements IVillageTradeHandler {
|
||||
ItemStack randomTreeStack = TreeManager.treeRoot.getMemberStack(randomTree, EnumGermlingType.SAPLING.ordinal());
|
||||
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 8), randomTreeStack));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 2), ForestryItem.grafterProven.getItemStack()));
|
||||
recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 2), PluginArboriculture.items.grafterProven.getItemStack()));
|
||||
|
||||
EnumWoodType randomWoodType = EnumWoodType.getRandom(random);
|
||||
ItemStack planks = TreeManager.woodItemAccess.getPlanks(randomWoodType, false);
|
||||
|
||||
@@ -53,7 +53,6 @@ import forestry.arboriculture.tiles.TileFruitPod;
|
||||
import forestry.arboriculture.tiles.TileSapling;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.config.ForestryBlock;
|
||||
import forestry.core.config.ForestryItem;
|
||||
import forestry.core.genetics.SpeciesRoot;
|
||||
import forestry.core.utils.BlockUtil;
|
||||
import forestry.plugins.PluginArboriculture;
|
||||
@@ -119,9 +118,11 @@ public class TreeHelper extends SpeciesRoot implements ITreeRoot {
|
||||
return EnumGermlingType.NONE;
|
||||
}
|
||||
|
||||
if (ForestryItem.sapling.isItemEqual(stack)) {
|
||||
Item item = stack.getItem();
|
||||
|
||||
if (PluginArboriculture.items.sapling == item) {
|
||||
return EnumGermlingType.SAPLING;
|
||||
} else if (ForestryItem.pollenFertile.isItemEqual(stack)) {
|
||||
} else if (PluginArboriculture.items.pollenFertile == item) {
|
||||
return EnumGermlingType.POLLEN;
|
||||
}
|
||||
|
||||
@@ -169,10 +170,10 @@ public class TreeHelper extends SpeciesRoot implements ITreeRoot {
|
||||
Item germlingItem;
|
||||
switch (EnumGermlingType.VALUES[type]) {
|
||||
case SAPLING:
|
||||
germlingItem = ForestryItem.sapling.item();
|
||||
germlingItem = PluginArboriculture.items.sapling;
|
||||
break;
|
||||
case POLLEN:
|
||||
germlingItem = ForestryItem.pollenFertile.item();
|
||||
germlingItem = PluginArboriculture.items.pollenFertile;
|
||||
break;
|
||||
default:
|
||||
throw new RuntimeException("Cannot instantiate a tree of type " + type);
|
||||
|
||||
@@ -34,13 +34,12 @@ import forestry.api.genetics.IFruitFamily;
|
||||
import forestry.arboriculture.genetics.TreeGenome;
|
||||
import forestry.arboriculture.genetics.alleles.AlleleFruit;
|
||||
import forestry.arboriculture.inventory.ItemInventoryTreealyzer;
|
||||
import forestry.arboriculture.items.ItemGermlingGE;
|
||||
import forestry.core.config.ForestryItem;
|
||||
import forestry.core.genetics.alleles.AlleleBoolean;
|
||||
import forestry.core.genetics.alleles.AllelePlantType;
|
||||
import forestry.core.gui.ContainerAlyzer;
|
||||
import forestry.core.gui.GuiAlyzer;
|
||||
import forestry.core.utils.StringUtil;
|
||||
import forestry.plugins.PluginArboriculture;
|
||||
|
||||
public class GuiTreealyzer extends GuiAlyzer {
|
||||
|
||||
@@ -48,7 +47,7 @@ public class GuiTreealyzer extends GuiAlyzer {
|
||||
super(TreeManager.treeRoot, player, new ContainerAlyzer(inventory, player), inventory, "gui.treealyzer");
|
||||
|
||||
ArrayList<ItemStack> treeList = new ArrayList<>();
|
||||
((ItemGermlingGE) ForestryItem.sapling.item()).addCreativeItems(treeList, false);
|
||||
PluginArboriculture.items.sapling.addCreativeItems(treeList, false);
|
||||
for (ItemStack treeStack : treeList) {
|
||||
IAlleleTreeSpecies species = TreeGenome.getSpecies(treeStack);
|
||||
if (species != null) {
|
||||
|
||||
@@ -49,9 +49,8 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable {
|
||||
private final EnumGermlingType type;
|
||||
|
||||
public ItemGermlingGE(EnumGermlingType type) {
|
||||
super();
|
||||
super(Tabs.tabArboriculture);
|
||||
this.type = type;
|
||||
setCreativeTab(Tabs.tabArboriculture);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
/*******************************************************************************
|
||||
* 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.arboriculture.items;
|
||||
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import forestry.api.arboriculture.EnumGermlingType;
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.core.items.ItemRegistry;
|
||||
import forestry.core.items.ItemWithGui;
|
||||
import forestry.core.network.GuiId;
|
||||
|
||||
public class ItemRegistryArboriculture extends ItemRegistry {
|
||||
public final ItemGermlingGE sapling;
|
||||
public final ItemGermlingGE pollenFertile;
|
||||
public final ItemWithGui treealyzer;
|
||||
public final ItemGrafter grafter;
|
||||
public final ItemGrafter grafterProven;
|
||||
|
||||
public ItemRegistryArboriculture() {
|
||||
sapling = registerItem(new ItemGermlingGE(EnumGermlingType.SAPLING), "sapling");
|
||||
OreDictionary.registerOre("treeSapling", sapling.getWildcard());
|
||||
|
||||
pollenFertile = registerItem(new ItemGermlingGE(EnumGermlingType.POLLEN), "pollenFertile");
|
||||
treealyzer = registerItem(new ItemWithGui(GuiId.TreealyzerGUI, Tabs.tabArboriculture), "treealyzer");
|
||||
grafter = registerItem(new ItemGrafter(4), "grafter");
|
||||
grafterProven = registerItem(new ItemGrafter(149), "grafterProven");
|
||||
}
|
||||
}
|
||||
@@ -49,12 +49,6 @@ public enum ForestryItem {
|
||||
honeyedSlice,
|
||||
ambrosia,
|
||||
honeyPot,
|
||||
// Trees
|
||||
sapling,
|
||||
pollenFertile,
|
||||
treealyzer,
|
||||
grafter,
|
||||
grafterProven,
|
||||
// Butterflies
|
||||
butterflyGE,
|
||||
flutterlyzer,
|
||||
|
||||
@@ -13,8 +13,8 @@ package forestry.core.genetics;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
|
||||
@@ -23,14 +23,13 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.core.items.ItemForestry;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.utils.StringUtil;
|
||||
|
||||
public abstract class ItemGE extends Item {
|
||||
|
||||
protected ItemGE() {
|
||||
super();
|
||||
// maxStackSize = 1;
|
||||
public abstract class ItemGE extends ItemForestry {
|
||||
protected ItemGE(CreativeTabs creativeTab) {
|
||||
super(creativeTab);
|
||||
hasSubtypes = true;
|
||||
}
|
||||
|
||||
@@ -92,7 +91,6 @@ public abstract class ItemGE extends Item {
|
||||
|
||||
@Override
|
||||
public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
|
||||
|
||||
if (renderPass == 0) {
|
||||
return getDefaultPrimaryColour();
|
||||
} else if (renderPass == 1) {
|
||||
@@ -100,11 +98,9 @@ public abstract class ItemGE extends Item {
|
||||
} else {
|
||||
return 0xffffff;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public int getColourFromSpecies(IAlleleSpecies species, int renderPass) {
|
||||
return 0xffffff;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -10,6 +10,8 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.tiles;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
@@ -53,7 +55,7 @@ public class MachineDefinition {
|
||||
private float minX, minY, minZ, maxX, maxY, maxZ;
|
||||
|
||||
/* CRAFTING */
|
||||
public IRecipe[] recipes;
|
||||
public final List<IRecipe> recipes = new ArrayList<>();
|
||||
|
||||
public MachineDefinition(int meta, String teIdent, Class<? extends TileForestry> teClass, IRecipe... recipes) {
|
||||
this(meta, teIdent, teClass, null, recipes);
|
||||
@@ -65,7 +67,7 @@ public class MachineDefinition {
|
||||
this.teClass = teClass;
|
||||
this.renderer = renderer;
|
||||
|
||||
this.recipes = recipes;
|
||||
this.recipes.addAll(Arrays.asList(recipes));
|
||||
|
||||
this.faceMap = new int[8];
|
||||
for (int i = 0; i < 8; i++) {
|
||||
|
||||
@@ -51,8 +51,7 @@ public class ItemButterflyGE extends ItemGE {
|
||||
private final EnumFlutterType type;
|
||||
|
||||
public ItemButterflyGE(EnumFlutterType type) {
|
||||
super();
|
||||
setCreativeTab(Tabs.tabLepidopterology);
|
||||
super(Tabs.tabLepidopterology);
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ import net.minecraft.block.material.Material;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.WeightedRandomChestContent;
|
||||
@@ -128,7 +127,6 @@ import forestry.core.proxy.Proxies;
|
||||
import forestry.core.recipes.RecipeUtil;
|
||||
import forestry.core.recipes.ShapedRecipeCustom;
|
||||
import forestry.core.tiles.MachineDefinition;
|
||||
import forestry.core.tiles.TileAnalyzer;
|
||||
import forestry.core.utils.EntityUtil;
|
||||
import forestry.core.utils.Log;
|
||||
import forestry.core.utils.Stack;
|
||||
@@ -144,7 +142,7 @@ public class PluginApiculture extends ForestryPlugin {
|
||||
private static float secondPrincessChance = 0;
|
||||
public static final int ticksPerBeeWorkCycle = 550;
|
||||
public static boolean fancyRenderedBees = false;
|
||||
|
||||
|
||||
public static ItemRegistryApiculture items;
|
||||
|
||||
public static HiveRegistry hiveRegistry;
|
||||
@@ -153,7 +151,6 @@ public class PluginApiculture extends ForestryPlugin {
|
||||
private static MachineDefinition definitionChestLegacy;
|
||||
private static MachineDefinition definitionChest;
|
||||
private static MachineDefinition definitionBeehouse;
|
||||
private static MachineDefinition definitionAnalyzer;
|
||||
|
||||
private final Map<String, String[]> defaultAcceptedFlowers = new HashMap<>();
|
||||
private final Map<String, String[]> defaultPlantableFlowers = new HashMap<>();
|
||||
@@ -248,9 +245,6 @@ public class PluginApiculture extends ForestryPlugin {
|
||||
'C', "beeComb"))
|
||||
.setFaces(0, 1, 2, 2, 4, 4, 0, 7));
|
||||
|
||||
definitionAnalyzer = ((BlockBase) ForestryBlock.core.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_ANALYZER_META, "forestry.Analyzer", TileAnalyzer.class,
|
||||
PluginApiculture.proxy.getRendererAnalyzer(Constants.TEXTURE_PATH_BLOCKS + "/analyzer_")));
|
||||
|
||||
// Add triggers
|
||||
if (PluginManager.Module.BUILDCRAFT_STATEMENTS.isEnabled()) {
|
||||
ApicultureTriggers.initialize();
|
||||
@@ -775,32 +769,18 @@ public class PluginApiculture extends ForestryPlugin {
|
||||
}
|
||||
|
||||
// ANALYZER
|
||||
definitionAnalyzer.recipes = createAlyzerRecipes(ForestryBlock.core.block(), Constants.DEFINITION_ANALYZER_META);
|
||||
|
||||
definitionAnalyzer.register();
|
||||
definitionApiary.register();
|
||||
definitionBeehouse.register();
|
||||
definitionChestLegacy.register();
|
||||
definitionChest.register();
|
||||
}
|
||||
|
||||
private static IRecipe[] createAlyzerRecipes(Block block, int meta) {
|
||||
ArrayList<IRecipe> recipes = new ArrayList<>();
|
||||
recipes.add(ShapedRecipeCustom.createShapedRecipe(new ItemStack(block, 1, meta),
|
||||
PluginCore.definitionAnalyzer.recipes.add(ShapedRecipeCustom.createShapedRecipe(new ItemStack(ForestryBlock.core.block(), 1, Constants.DEFINITION_ANALYZER_META),
|
||||
"XTX",
|
||||
" Y ",
|
||||
"X X",
|
||||
'Y', PluginCore.items.sturdyCasing,
|
||||
'T', items.beealyzer,
|
||||
'X', "ingotBronze"));
|
||||
recipes.add(ShapedRecipeCustom.createShapedRecipe(new ItemStack(block, 1, meta),
|
||||
"XTX",
|
||||
" Y ",
|
||||
"X X",
|
||||
'Y', PluginCore.items.sturdyCasing,
|
||||
'T', ForestryItem.treealyzer,
|
||||
'X', "ingotBronze"));
|
||||
return recipes.toArray(new IRecipe[recipes.size()]);
|
||||
|
||||
definitionApiary.register();
|
||||
definitionBeehouse.register();
|
||||
definitionChestLegacy.register();
|
||||
definitionChest.register();
|
||||
}
|
||||
|
||||
private static void registerBeehiveDrops() {
|
||||
|
||||
@@ -63,8 +63,7 @@ import forestry.arboriculture.genetics.alleles.AlleleGrowth;
|
||||
import forestry.arboriculture.genetics.alleles.AlleleLeafEffect;
|
||||
import forestry.arboriculture.items.ItemBlockLeaves;
|
||||
import forestry.arboriculture.items.ItemBlockWood;
|
||||
import forestry.arboriculture.items.ItemGermlingGE;
|
||||
import forestry.arboriculture.items.ItemGrafter;
|
||||
import forestry.arboriculture.items.ItemRegistryArboriculture;
|
||||
import forestry.arboriculture.network.PacketRegistryArboriculture;
|
||||
import forestry.arboriculture.proxy.ProxyArboriculture;
|
||||
import forestry.arboriculture.tiles.TileArboristChest;
|
||||
@@ -77,13 +76,10 @@ import forestry.core.blocks.BlockBase;
|
||||
import forestry.core.config.Config;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.config.ForestryBlock;
|
||||
import forestry.core.config.ForestryItem;
|
||||
import forestry.core.fluids.Fluids;
|
||||
import forestry.core.genetics.alleles.AllelePlantType;
|
||||
import forestry.core.items.ItemBlockForestry;
|
||||
import forestry.core.items.ItemFruit.EnumFruit;
|
||||
import forestry.core.items.ItemWithGui;
|
||||
import forestry.core.network.GuiId;
|
||||
import forestry.core.network.IPacketRegistry;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.recipes.RecipeUtil;
|
||||
@@ -106,6 +102,8 @@ public class PluginArboriculture extends ForestryPlugin {
|
||||
private static MachineDefinition definitionChest;
|
||||
public static final List<Block> validFences = new ArrayList<>();
|
||||
|
||||
public static ItemRegistryArboriculture items;
|
||||
|
||||
@Override
|
||||
protected void setupAPI() {
|
||||
super.setupAPI();
|
||||
@@ -129,18 +127,7 @@ public class PluginArboriculture extends ForestryPlugin {
|
||||
|
||||
@Override
|
||||
protected void registerItemsAndBlocks() {
|
||||
|
||||
ForestryItem.sapling.registerItem(new ItemGermlingGE(EnumGermlingType.SAPLING), "sapling");
|
||||
OreDictionary.registerOre("treeSapling", ForestryItem.sapling.getWildcard());
|
||||
|
||||
if (PluginManager.Module.APICULTURE.isEnabled()) {
|
||||
ForestryItem.pollenFertile.registerItem(new ItemGermlingGE(EnumGermlingType.POLLEN), "pollenFertile");
|
||||
Item treealyzer = new ItemWithGui(GuiId.TreealyzerGUI).setCreativeTab(Tabs.tabArboriculture);
|
||||
ForestryItem.treealyzer.registerItem(treealyzer, "treealyzer");
|
||||
}
|
||||
|
||||
ForestryItem.grafter.registerItem(new ItemGrafter(4), "grafter");
|
||||
ForestryItem.grafterProven.registerItem(new ItemGrafter(149), "grafterProven");
|
||||
items = new ItemRegistryArboriculture();
|
||||
|
||||
// Wood blocks
|
||||
ForestryBlock.logs.registerBlock(new BlockLog(false), ItemBlockWood.class, "logs");
|
||||
@@ -365,7 +352,7 @@ public class PluginArboriculture extends ForestryPlugin {
|
||||
|
||||
if (PluginManager.Module.FACTORY.isEnabled()) {
|
||||
// Treealyzer
|
||||
RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, ForestryItem.treealyzer.getItemStack(), "X#X", "X#X", "RDR",
|
||||
RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, items.treealyzer.getItemStack(), "X#X", "X#X", "RDR",
|
||||
'#', "paneGlass",
|
||||
'X', "ingotCopper",
|
||||
'R', "dustRedstone",
|
||||
@@ -384,16 +371,25 @@ public class PluginArboriculture extends ForestryPlugin {
|
||||
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{EnumFruit.PAPAYA.getStack()}, Fluids.JUICE.getFluid(juiceMultiplier * 3), mulch, (int) Math.floor(mulchMultiplier * 0.5f));
|
||||
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{EnumFruit.DATES.getStack()}, Fluids.JUICE.getFluid((int) Math.floor(juiceMultiplier * 0.25)), mulch, mulchMultiplier);
|
||||
|
||||
RecipeUtil.addFermenterRecipes(ForestryItem.sapling.getItemStack(), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS);
|
||||
RecipeUtil.addFermenterRecipes(items.sapling.getItemStack(), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS);
|
||||
}
|
||||
|
||||
// Grafter
|
||||
RecipeUtil.addRecipe(ForestryItem.grafter.getItemStack(),
|
||||
RecipeUtil.addRecipe(items.grafter.getItemStack(),
|
||||
" B",
|
||||
" # ",
|
||||
"# ",
|
||||
'B', "ingotBronze",
|
||||
'#', "stickWood");
|
||||
|
||||
// ANALYZER
|
||||
PluginCore.definitionAnalyzer.recipes.add(ShapedRecipeCustom.createShapedRecipe(new ItemStack(ForestryBlock.core.block(), 1, Constants.DEFINITION_ANALYZER_META),
|
||||
"XTX",
|
||||
" Y ",
|
||||
"X X",
|
||||
'Y', PluginCore.items.sturdyCasing,
|
||||
'T', items.treealyzer,
|
||||
'X', "ingotBronze"));
|
||||
}
|
||||
|
||||
private static void createAlleles() {
|
||||
@@ -453,7 +449,7 @@ public class PluginArboriculture extends ForestryPlugin {
|
||||
}
|
||||
|
||||
private static void registerDungeonLoot() {
|
||||
ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(ForestryItem.grafter.getItemStack(), 1, 1, 8));
|
||||
ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(items.grafter.getItemStack(), 1, 1, 8));
|
||||
|
||||
ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Oak.getMemberStack(EnumGermlingType.SAPLING), 2, 3, 6));
|
||||
ChestGenHooks.addItem(Constants.CHEST_GEN_HOOK_NATURALIST_CHEST, new WeightedRandomChestContent(TreeDefinition.Spruce.getMemberStack(EnumGermlingType.SAPLING), 2, 3, 6));
|
||||
@@ -473,7 +469,9 @@ public class PluginArboriculture extends ForestryPlugin {
|
||||
private static class FuelHandler implements IFuelHandler {
|
||||
@Override
|
||||
public int getBurnTime(ItemStack fuel) {
|
||||
if (ForestryItem.sapling.isItemEqual(fuel)) {
|
||||
Item item = fuel.getItem();
|
||||
|
||||
if (items.sapling == item) {
|
||||
return 100;
|
||||
}
|
||||
|
||||
|
||||
@@ -61,6 +61,7 @@ import forestry.core.recipes.RecipeUtil;
|
||||
import forestry.core.recipes.ShapedRecipeCustom;
|
||||
import forestry.core.recipes.ShapelessRecipeCustom;
|
||||
import forestry.core.tiles.MachineDefinition;
|
||||
import forestry.core.tiles.TileAnalyzer;
|
||||
import forestry.core.tiles.TileEscritoire;
|
||||
import forestry.core.utils.ClimateUtil;
|
||||
import forestry.core.utils.ForestryModEnvWarningCallable;
|
||||
@@ -72,6 +73,7 @@ public class PluginCore extends ForestryPlugin {
|
||||
|
||||
public static final RootCommand rootCommand = new RootCommand();
|
||||
public static ItemRegistryCore items;
|
||||
static MachineDefinition definitionAnalyzer;
|
||||
|
||||
@Override
|
||||
protected void setupAPI() {
|
||||
@@ -128,6 +130,9 @@ public class PluginCore extends ForestryPlugin {
|
||||
|
||||
definitionEscritoire = ((BlockBase) ForestryBlock.core.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_ESCRITOIRE_META, "forestry.Escritoire", TileEscritoire.class,
|
||||
Proxies.render.getRenderEscritoire()));
|
||||
|
||||
definitionAnalyzer = ((BlockBase) ForestryBlock.core.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_ANALYZER_META, "forestry.Analyzer", TileAnalyzer.class,
|
||||
PluginApiculture.proxy.getRendererAnalyzer(Constants.TEXTURE_PATH_BLOCKS + "/analyzer_")));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -145,6 +150,13 @@ public class PluginCore extends ForestryPlugin {
|
||||
RecipeSorter.register("forestry:shapelessrecipecustom", ShapelessRecipeCustom.class, RecipeSorter.Category.SHAPELESS, "before:minecraft:shapeless");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void postInit() {
|
||||
super.postInit();
|
||||
|
||||
definitionAnalyzer.register();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return true;
|
||||
|
||||
Reference in new issue
Block a user