First 1.8.9 Version

This commit is contained in:
Nedelosk committed 2016-01-22 19:33:35 +01:00
1 parent d35cc1df09
commit 5a3850c264
1657 files changed
+26844 -13269

No files matched your search

@@ -22,12 +22,14 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
import cpw.mods.fml.common.registry.GameData;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.circuits.ChipsetManager;
import forestry.api.circuits.CircuitSocketType;
import forestry.api.circuits.ICircuitLayout;
@@ -38,9 +40,10 @@ import forestry.core.circuits.CircuitLayout;
import forestry.core.config.Constants;
import forestry.core.items.EnumElectronTube;
import forestry.core.recipes.RecipeUtil;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.Log;
import forestry.farming.blocks.BlockFarmType;
import forestry.farming.blocks.BlockRegistryFarming;
import forestry.farming.blocks.EnumBlockFarmType;
import forestry.farming.circuits.CircuitFarmLogic;
import forestry.farming.logic.FarmLogicArboreal;
import forestry.farming.logic.FarmLogicCereal;
@@ -87,6 +90,8 @@ public class PluginFarming extends ForestryPlugin {
@Override
public void preInit() {
super.preInit();
MinecraftForge.EVENT_BUS.register(this);
Farmables.farmables.put("farmArboreal", new ArrayList<IFarmable>());
Farmables.farmables.get("farmArboreal").add(new FarmableVanillaSapling());
@@ -124,7 +129,7 @@ public class PluginFarming extends ForestryPlugin {
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));
proxy.initializeRendering();
proxy.initializeModels();
// Layouts
ICircuitLayout layoutManaged = new CircuitLayout("farms.managed", CircuitSocketType.FARM);
@@ -200,7 +205,7 @@ public class PluginFarming extends ForestryPlugin {
String windfallMetaString = matchResult.group(4);
try {
Block sapling = GameData.getBlockRegistry().getRaw(saplingString);
Block sapling = ItemStackUtil.getBlockFromRegistry(saplingString);
if (sapling == null || sapling == Blocks.air) {
throw new RuntimeException("can't find block for " + saplingString);
}
@@ -209,7 +214,7 @@ public class PluginFarming extends ForestryPlugin {
if (windfallString == null) {
farmables.add(new FarmableGenericSapling(sapling, saplingMeta));
} else {
Item windfall = GameData.getItemRegistry().getRaw(windfallString);
Item windfall = ItemStackUtil.getItemFromRegistry(windfallString);
if (windfall == null) {
throw new RuntimeException("can't find item for " + windfallString);
}
@@ -244,11 +249,11 @@ public class PluginFarming extends ForestryPlugin {
}
try {
Item seed = GameData.getItemRegistry().getRaw(items[0]);
Item seed = ItemStackUtil.getItemFromRegistry(items[0]);
if (seed == null) {
throw new RuntimeException("can't find item for " + items[0]);
}
Block crop = GameData.getBlockRegistry().getRaw(items[2]);
Block crop = ItemStackUtil.getBlockFromRegistry(items[2]);
if (crop == null || crop == Blocks.air) {
throw new RuntimeException("can't find block for " + items[2]);
}
@@ -270,11 +275,11 @@ public class PluginFarming extends ForestryPlugin {
@Override
protected void registerRecipes() {
ItemStack basic = blocks.farm.get(BlockFarmType.BASIC, 1);
ItemStack gearbox = blocks.farm.get(BlockFarmType.GEARBOX, 1);
ItemStack hatch = blocks.farm.get(BlockFarmType.HATCH, 1);
ItemStack valve = blocks.farm.get(BlockFarmType.VALVE, 1);
ItemStack control = blocks.farm.get(BlockFarmType.CONTROL, 1);
ItemStack basic = blocks.farm.get(EnumBlockFarmType.BASIC, 1);
ItemStack gearbox = blocks.farm.get(EnumBlockFarmType.GEARBOX, 1);
ItemStack hatch = blocks.farm.get(EnumBlockFarmType.HATCH, 1);
ItemStack valve = blocks.farm.get(EnumBlockFarmType.VALVE, 1);
ItemStack control = blocks.farm.get(EnumBlockFarmType.CONTROL, 1);
for (EnumFarmBlockTexture block : EnumFarmBlockTexture.values()) {
NBTTagCompound compound = new NBTTagCompound();
@@ -343,4 +348,10 @@ public class PluginFarming extends ForestryPlugin {
ChipsetManager.solderManager.addRecipe(layoutManual, PluginCore.items.tubes.get(EnumElectronTube.APATITE, 1), Circuit.farmShroomManual);
ChipsetManager.solderManager.addRecipe(layoutManual, PluginCore.items.tubes.get(EnumElectronTube.LAPIS, 1), Circuit.farmCocoaManual);
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleTextureRemap(TextureStitchEvent.Pre event) {
EnumFarmBlockTexture.registerSprites();
}
}