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

@@ -19,21 +19,18 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.WeightedRandomChestContent;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.ChestGenHooks;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.FuelBurnTimeEvent;
import net.minecraftforge.fml.common.IFuelHandler;
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 net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.IFuelHandler;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.registry.GameData;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.VillagerRegistry;
import forestry.api.arboriculture.EnumGermlingType;
import forestry.api.arboriculture.EnumWoodType;
import forestry.api.arboriculture.TreeManager;
@@ -43,9 +40,9 @@ import forestry.api.recipes.RecipeManagers;
import forestry.api.storage.ICrateRegistry;
import forestry.api.storage.StorageManager;
import forestry.arboriculture.IWoodTyped;
import forestry.arboriculture.VillageHandlerArboriculture;
import forestry.arboriculture.WoodItemAccess;
import forestry.arboriculture.blocks.BlockArboricultureType;
import forestry.arboriculture.blocks.BlockFruitPod;
import forestry.arboriculture.blocks.BlockRegistryArboriculture;
import forestry.arboriculture.commands.CommandTree;
import forestry.arboriculture.genetics.TreeBranchDefinition;
@@ -54,19 +51,18 @@ import forestry.arboriculture.genetics.TreeFactory;
import forestry.arboriculture.genetics.TreeHelper;
import forestry.arboriculture.genetics.TreeMutationFactory;
import forestry.arboriculture.genetics.TreekeepingMode;
import forestry.arboriculture.genetics.alleles.AlleleFruit;
import forestry.arboriculture.genetics.alleles.AlleleGrowth;
import forestry.arboriculture.genetics.alleles.AlleleLeafEffect;
import forestry.arboriculture.items.ItemRegistryArboriculture;
import forestry.arboriculture.network.PacketRegistryArboriculture;
import forestry.arboriculture.proxy.ProxyArboriculture;
import forestry.arboriculture.render.TextureLeaves;
import forestry.arboriculture.tiles.TileArboristChest;
import forestry.arboriculture.tiles.TileFruitPod;
import forestry.arboriculture.tiles.TileLeaves;
import forestry.arboriculture.tiles.TileSapling;
import forestry.arboriculture.tiles.TileWood;
import forestry.core.blocks.BlockCoreType;
import forestry.core.config.Config;
import forestry.core.config.Constants;
import forestry.core.fluids.Fluids;
import forestry.core.genetics.alleles.AllelePlantType;
@@ -75,6 +71,7 @@ import forestry.core.network.IPacketRegistry;
import forestry.core.proxy.Proxies;
import forestry.core.recipes.RecipeUtil;
import forestry.core.tiles.MachineDefinition;
import forestry.core.utils.ItemStackUtil;
import forestry.factory.recipes.FabricatorRecipe;
@Plugin(pluginID = "Arboriculture", name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.arboriculture.description")
@@ -84,10 +81,6 @@ public class PluginArboriculture extends ForestryPlugin {
public static ProxyArboriculture proxy;
public static String treekeepingMode = "NORMAL";
public static int modelIdSaplings;
public static int modelIdLeaves;
public static int modelIdPods;
public static final List<Block> validFences = new ArrayList<>();
public static ItemRegistryArboriculture items;
@@ -124,7 +117,6 @@ public class PluginArboriculture extends ForestryPlugin {
public void preInit() {
super.preInit();
// register for FuelBurnTimeEvent
MinecraftForge.EVENT_BUS.register(this);
for (EnumWoodType woodType : EnumWoodType.VALUES) {
@@ -147,13 +139,23 @@ public class PluginArboriculture extends ForestryPlugin {
blocks.arboriculture.addDefinition(definitionChest);
// Init rendering
proxy.initializeRendering();
proxy.initializeModels();
// Register vanilla and forestry fence ids
validFences.add(blocks.fences);
validFences.add(blocks.fencesFireproof);
validFences.add(Blocks.fence);
validFences.add(Blocks.fence_gate);
validFences.add(Blocks.oak_fence);
validFences.add(Blocks.spruce_fence);
validFences.add(Blocks.birch_fence);
validFences.add(Blocks.jungle_fence);
validFences.add(Blocks.dark_oak_fence);
validFences.add(Blocks.acacia_fence);
validFences.add(Blocks.oak_fence_gate);
validFences.add(Blocks.spruce_fence_gate);
validFences.add(Blocks.birch_fence_gate);
validFences.add(Blocks.jungle_fence_gate);
validFences.add(Blocks.dark_oak_fence_gate);
validFences.add(Blocks.acacia_fence_gate);
validFences.add(Blocks.nether_brick_fence);
// Commands
@@ -176,11 +178,11 @@ public class PluginArboriculture extends ForestryPlugin {
blocks.arboriculture.init();
if (Config.enableVillagers) {
/*if (Config.enableVillagers) {
VillagerRegistry.instance().registerVillagerId(Constants.ID_VILLAGER_LUMBERJACK);
Proxies.render.registerVillagerSkin(Constants.ID_VILLAGER_LUMBERJACK, Constants.TEXTURE_SKIN_LUMBERJACK);
VillagerRegistry.instance().registerVillageTradeHandler(Constants.ID_VILLAGER_LUMBERJACK, new VillageHandlerArboriculture());
}
}*/
}
@Override
@@ -345,7 +347,6 @@ public class PluginArboriculture extends ForestryPlugin {
TreeBranchDefinition.createAlleles();
AlleleFruit.createAlleles();
AlleleGrowth.createAlleles();
AlleleLeafEffect.createAlleles();
AllelePlantType.createAlleles();
@@ -380,7 +381,7 @@ public class PluginArboriculture extends ForestryPlugin {
@Override
public boolean processIMCMessage(IMCMessage message) {
if (message.key.equals("add-fence-block") && message.isStringMessage()) {
Block block = GameData.getBlockRegistry().getRaw(message.getStringValue());
Block block = ItemStackUtil.getBlockFromRegistry(message.getStringValue());
if (block != null && block != Blocks.air) {
validFences.add(block);
@@ -418,12 +419,30 @@ public class PluginArboriculture extends ForestryPlugin {
if (items.sapling == item) {
return 100;
}
Block block = Block.getBlockFromItem(item);
if (block instanceof IWoodTyped) {
IWoodTyped woodTypedBlock = (IWoodTyped) block;
if (woodTypedBlock.isFireproof()) {
return 0;
} else if (blocks.slabs == block) {
return 150;
}
}
return 0;
}
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void textureHook(TextureStitchEvent.Pre event) {
TextureLeaves.registerAllSprites();
BlockFruitPod.registerSprites();
}
/*@SubscribeEvent
public void fuelBurnTimeEvent(FuelBurnTimeEvent fuelBurnTimeEvent) {
Item item = fuelBurnTimeEvent.fuel.getItem();
Block block = Block.getBlockFromItem(item);
@@ -438,5 +457,5 @@ public class PluginArboriculture extends ForestryPlugin {
fuelBurnTimeEvent.setResult(Event.Result.DENY);
}
}
}
}*/
}