mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 03:39:09 +00:00
Move butterfly blocks to PluginLepidopterology.blocks
remove custom shaped and shapeless recipes
This commit is contained in:
1 parent
ce2a2ec8ed
commit
167e493160
23 files changed
+146
-563
No files matched your search
@@ -71,8 +71,6 @@ import forestry.core.items.ItemFruit.EnumFruit;
|
||||
import forestry.core.network.IPacketRegistry;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.recipes.RecipeUtil;
|
||||
import forestry.core.recipes.ShapedRecipeCustom;
|
||||
import forestry.core.recipes.ShapelessRecipeCustom;
|
||||
import forestry.core.tiles.MachineDefinition;
|
||||
import forestry.factory.recipes.FabricatorRecipe;
|
||||
|
||||
@@ -217,41 +215,41 @@ public class PluginArboriculture extends ForestryPlugin {
|
||||
|
||||
planks.stackSize = 4;
|
||||
logs.stackSize = 1;
|
||||
ShapelessRecipeCustom.buildRecipe(planks.copy(), logs.copy());
|
||||
RecipeUtil.addShapelessRecipe(planks.copy(), logs.copy());
|
||||
|
||||
fireproofPlanks.stackSize = 4;
|
||||
fireproofLogs.stackSize = 1;
|
||||
ShapelessRecipeCustom.buildRecipe(fireproofPlanks.copy(), fireproofLogs.copy());
|
||||
RecipeUtil.addShapelessRecipe(fireproofPlanks.copy(), fireproofLogs.copy());
|
||||
|
||||
slabs.stackSize = 6;
|
||||
planks.stackSize = 1;
|
||||
ShapedRecipeCustom.buildPriorityRecipe(slabs.copy(),
|
||||
RecipeUtil.addPriorityRecipe(slabs.copy(),
|
||||
"###",
|
||||
'#', planks.copy());
|
||||
|
||||
fireproofSlabs.stackSize = 6;
|
||||
fireproofPlanks.stackSize = 1;
|
||||
ShapedRecipeCustom.buildPriorityRecipe(fireproofSlabs.copy(),
|
||||
RecipeUtil.addPriorityRecipe(fireproofSlabs.copy(),
|
||||
"###",
|
||||
'#', fireproofPlanks.copy());
|
||||
|
||||
fences.stackSize = 3;
|
||||
planks.stackSize = 1;
|
||||
ShapedRecipeCustom.buildRecipe(fences.copy(),
|
||||
RecipeUtil.addRecipe(fences.copy(),
|
||||
"#X#",
|
||||
"#X#",
|
||||
'#', planks.copy(), 'X', "stickWood");
|
||||
|
||||
fireproofFences.stackSize = 3;
|
||||
fireproofPlanks.stackSize = 1;
|
||||
ShapedRecipeCustom.buildRecipe(fireproofFences.copy(),
|
||||
RecipeUtil.addRecipe(fireproofFences.copy(),
|
||||
"#X#",
|
||||
"#X#",
|
||||
'#', fireproofPlanks.copy(), 'X', "stickWood");
|
||||
|
||||
stairs.stackSize = 4;
|
||||
planks.stackSize = 1;
|
||||
ShapedRecipeCustom.buildPriorityRecipe(stairs.copy(),
|
||||
RecipeUtil.addPriorityRecipe(stairs.copy(),
|
||||
"# ",
|
||||
"## ",
|
||||
"###",
|
||||
@@ -259,7 +257,7 @@ public class PluginArboriculture extends ForestryPlugin {
|
||||
|
||||
fireproofStairs.stackSize = 4;
|
||||
fireproofPlanks.stackSize = 1;
|
||||
ShapedRecipeCustom.buildPriorityRecipe(fireproofStairs.copy(),
|
||||
RecipeUtil.addPriorityRecipe(fireproofStairs.copy(),
|
||||
"# ",
|
||||
"## ",
|
||||
"###",
|
||||
|
||||
@@ -57,7 +57,6 @@ import forestry.core.network.PacketRegistryCore;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.recipes.RecipeUtil;
|
||||
import forestry.core.recipes.ShapedRecipeCustom;
|
||||
import forestry.core.recipes.ShapelessRecipeCustom;
|
||||
import forestry.core.tiles.MachineDefinition;
|
||||
import forestry.core.utils.ClimateUtil;
|
||||
import forestry.core.utils.ForestryModEnvWarningCallable;
|
||||
@@ -117,9 +116,6 @@ public class PluginCore extends ForestryPlugin {
|
||||
ForestryModEnvWarningCallable.register();
|
||||
|
||||
AlleleHelper.instance.init();
|
||||
|
||||
RecipeSorter.register("forestry:shapedrecipecustom", ShapedRecipeCustom.class, RecipeSorter.Category.SHAPED, "before:minecraft:shaped");
|
||||
RecipeSorter.register("forestry:shapelessrecipecustom", ShapelessRecipeCustom.class, RecipeSorter.Category.SHAPELESS, "before:minecraft:shapeless");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -289,7 +289,7 @@ public class PluginFarming extends ForestryPlugin {
|
||||
block.saveToCompound(compound);
|
||||
|
||||
basic.setTagCompound((NBTTagCompound) compound.copy());
|
||||
ShapedRecipeCustom.buildRecipe(basic.copy(),
|
||||
RecipeUtil.addRecipe(basic.copy(),
|
||||
"I#I",
|
||||
"WCW",
|
||||
'#', block.getBase(),
|
||||
|
||||
@@ -23,23 +23,20 @@ import cpw.mods.fml.common.SidedProxy;
|
||||
|
||||
import forestry.Forestry;
|
||||
import forestry.api.arboriculture.TreeManager;
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.lepidopterology.ButterflyManager;
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
import forestry.core.GuiHandlerBase;
|
||||
import forestry.core.blocks.BlockBase;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.config.ForestryBlock;
|
||||
import forestry.core.config.LocalizedConfiguration;
|
||||
import forestry.core.fluids.Fluids;
|
||||
import forestry.core.items.ItemBlockForestry;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.recipes.RecipeUtil;
|
||||
import forestry.core.tiles.MachineDefinition;
|
||||
import forestry.core.utils.EntityUtil;
|
||||
import forestry.lepidopterology.ButterflySpawner;
|
||||
import forestry.lepidopterology.GuiHandlerLepidopterology;
|
||||
import forestry.lepidopterology.blocks.BlockLepidopterologyType;
|
||||
import forestry.lepidopterology.blocks.BlockRegistryLepidopterology;
|
||||
import forestry.lepidopterology.commands.CommandButterfly;
|
||||
import forestry.lepidopterology.entities.EntityButterfly;
|
||||
import forestry.lepidopterology.genetics.AlleleButterflyEffect;
|
||||
@@ -51,7 +48,6 @@ import forestry.lepidopterology.genetics.MothDefinition;
|
||||
import forestry.lepidopterology.items.ItemRegistryLepidopterology;
|
||||
import forestry.lepidopterology.proxy.ProxyLepidopterology;
|
||||
import forestry.lepidopterology.recipes.MatingRecipe;
|
||||
import forestry.lepidopterology.tiles.TileLepidopteristChest;
|
||||
|
||||
@Plugin(pluginID = "Lepidopterology", name = "Lepidopterology", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.lepidopterology.description")
|
||||
public class PluginLepidopterology extends ForestryPlugin {
|
||||
@@ -64,6 +60,7 @@ public class PluginLepidopterology extends ForestryPlugin {
|
||||
private static boolean allowPollination = true;
|
||||
|
||||
public static ItemRegistryLepidopterology items;
|
||||
public static BlockRegistryLepidopterology blocks;
|
||||
|
||||
@Override
|
||||
protected void setupAPI() {
|
||||
@@ -78,9 +75,7 @@ public class PluginLepidopterology extends ForestryPlugin {
|
||||
@Override
|
||||
protected void registerItemsAndBlocks() {
|
||||
items = new ItemRegistryLepidopterology();
|
||||
|
||||
ForestryBlock.lepidopterology.registerBlock(new BlockBase(true), ItemBlockForestry.class, "lepidopterology");
|
||||
ForestryBlock.lepidopterology.block().setCreativeTab(Tabs.tabLepidopterology);
|
||||
blocks = new BlockRegistryLepidopterology();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -88,10 +83,9 @@ public class PluginLepidopterology extends ForestryPlugin {
|
||||
ButterflyBranchDefinition.createAlleles();
|
||||
AlleleButterflyEffect.createAlleles();
|
||||
|
||||
BlockBase lepidopterology = ((BlockBase) ForestryBlock.lepidopterology.block());
|
||||
MachineDefinition definitionChest = new MachineDefinition(Constants.DEFINITION_LEPICHEST_META, "forestry.LepiChest", TileLepidopteristChest.class, Proxies.render.getRenderChest("lepichest"))
|
||||
MachineDefinition definitionChest = new MachineDefinition(BlockLepidopterologyType.LEPICHEST)
|
||||
.setBoundingBox(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F);
|
||||
lepidopterology.addDefinition(definitionChest);
|
||||
blocks.lepidopterology.addDefinition(definitionChest);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -114,7 +108,7 @@ public class PluginLepidopterology extends ForestryPlugin {
|
||||
MothDefinition.initMoths();
|
||||
ButterflyDefinition.initButterflies();
|
||||
|
||||
((BlockBase) ForestryBlock.lepidopterology.block()).init();
|
||||
blocks.lepidopterology.init();
|
||||
|
||||
TreeManager.treeRoot.registerLeafTickHandler(new ButterflySpawner());
|
||||
|
||||
@@ -140,7 +134,7 @@ public class PluginLepidopterology extends ForestryPlugin {
|
||||
"X#X", "X#X", "RDR", '#', "paneGlass", 'X', "ingotBronze", 'R',
|
||||
"dustRedstone", 'D', "gemDiamond");
|
||||
|
||||
RecipeUtil.addRecipe(ForestryBlock.lepidopterology.getItemStack(1, Constants.DEFINITION_LEPICHEST_META),
|
||||
RecipeUtil.addRecipe(blocks.lepidopterology.get(BlockLepidopterologyType.LEPICHEST),
|
||||
" # ",
|
||||
"XYX",
|
||||
"XXX",
|
||||
|
||||
@@ -60,7 +60,6 @@ import forestry.core.GuiHandlerBase;
|
||||
import forestry.core.IPickupHandler;
|
||||
import forestry.core.IResupplyHandler;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.config.ForestryBlock;
|
||||
import forestry.core.config.LocalizedConfiguration;
|
||||
import forestry.core.fluids.Fluids;
|
||||
import forestry.core.items.ItemCrated;
|
||||
@@ -68,6 +67,8 @@ import forestry.core.recipes.RecipeUtil;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
import forestry.core.utils.Log;
|
||||
import forestry.core.utils.StringUtil;
|
||||
import forestry.lepidopterology.blocks.BlockLepidopterologyType;
|
||||
import forestry.lepidopterology.blocks.BlockRegistryLepidopterology;
|
||||
import forestry.storage.BackpackDefinition;
|
||||
import forestry.storage.BackpackDefinition.BackpackDefinitionApiarist;
|
||||
import forestry.storage.BackpackDefinition.BackpackDefinitionLepidopterist;
|
||||
@@ -502,8 +503,9 @@ public class PluginStorage extends ForestryPlugin {
|
||||
addBackpackRecipe(items.apiaristBackpack, "stickWood", beeBlocks.apicultureChest);
|
||||
}
|
||||
|
||||
if (items.lepidopteristBackpack != null) {
|
||||
ItemStack chest = ForestryBlock.lepidopterology.getItemStack(1, Constants.DEFINITION_LEPICHEST_META);
|
||||
BlockRegistryLepidopterology butterflyBlocks = PluginLepidopterology.blocks;
|
||||
if (items.lepidopteristBackpack != null && butterflyBlocks != null) {
|
||||
ItemStack chest = butterflyBlocks.lepidopterology.get(BlockLepidopterologyType.LEPICHEST);
|
||||
addBackpackRecipe(items.lepidopteristBackpack, "stickWood", chest);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user