mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-17 10:55:06 +00:00
This commit is contained in:
1 parent
d392666dc4
commit
d4c2d7220d
12 files changed
+119
-30
No files matched your search
@@ -10,8 +10,18 @@
|
||||
******************************************************************************/
|
||||
package forestry.farming;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.block.BlockBeetroot;
|
||||
import net.minecraft.block.BlockCrops;
|
||||
import net.minecraft.block.BlockNetherWart;
|
||||
@@ -23,12 +33,14 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.config.Property;
|
||||
import net.minecraftforge.fml.common.SidedProxy;
|
||||
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 forestry.Forestry;
|
||||
import forestry.api.circuits.ChipsetManager;
|
||||
import forestry.api.circuits.CircuitSocketType;
|
||||
import forestry.api.circuits.ICircuitLayout;
|
||||
@@ -37,10 +49,15 @@ import forestry.api.farming.Farmables;
|
||||
import forestry.core.PluginCore;
|
||||
import forestry.core.circuits.Circuit;
|
||||
import forestry.core.circuits.CircuitLayout;
|
||||
import forestry.core.config.Config;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.config.LocalizedConfiguration;
|
||||
import forestry.core.items.EnumElectronTube;
|
||||
import forestry.core.recipes.RecipeUtil;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
import forestry.core.utils.Log;
|
||||
import forestry.core.utils.OreDictUtil;
|
||||
import forestry.core.utils.Translator;
|
||||
import forestry.farming.blocks.BlockMushroom;
|
||||
import forestry.farming.blocks.BlockRegistryFarming;
|
||||
import forestry.farming.blocks.EnumFarmBlockType;
|
||||
@@ -91,7 +108,7 @@ public class PluginFarming extends BlankForestryPlugin {
|
||||
@Override
|
||||
public void preInit() {
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
|
||||
|
||||
Farmables.farmables.put("farmArboreal", new FarmableVanillaSapling());
|
||||
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) {
|
||||
Farmables.farmables.put("farmArboreal", new FarmableGE());
|
||||
@@ -125,6 +142,9 @@ public class PluginFarming extends BlankForestryPlugin {
|
||||
Farmables.farmables.put("farmVegetables", new FarmableAgingCrop(new ItemStack(Items.CARROT), Blocks.CARROTS, BlockCrops.AGE, 7));
|
||||
Farmables.farmables.put("farmVegetables", new FarmableAgingCrop(new ItemStack(Items.BEETROOT_SEEDS), Blocks.BEETROOTS, BlockBeetroot.BEETROOT_AGE, 3));
|
||||
|
||||
//Foretsry fertilizer
|
||||
Farmables.fertilizers.put(new ItemStack(PluginCore.items.fertilizerCompound, 1, OreDictionary.WILDCARD_VALUE), 500);
|
||||
|
||||
proxy.initializeModels();
|
||||
|
||||
// Layouts
|
||||
@@ -133,7 +153,39 @@ public class PluginFarming extends BlankForestryPlugin {
|
||||
ICircuitLayout layoutManual = new CircuitLayout("farms.manual", CircuitSocketType.FARM);
|
||||
ChipsetManager.circuitRegistry.registerLayout(layoutManual);
|
||||
}
|
||||
|
||||
private void loadConfig(LocalizedConfiguration config){
|
||||
List<String> defaultFertilizers = new ArrayList<>(getItemStrings(Farmables.fertilizers));
|
||||
Collections.sort(defaultFertilizers);
|
||||
String[] defaultSortedFertilizers = defaultFertilizers.toArray(new String[defaultFertilizers.size()]);
|
||||
Property fertilizerConf = config.get("fertilizers", "items", defaultSortedFertilizers, Translator.translateToLocal("for.config.farm.fertilizers.items"));
|
||||
|
||||
Farmables.fertilizers.clear();
|
||||
String[] fertilizerList = fertilizerConf.getStringList();
|
||||
for(int i = 0;i < fertilizerList.length;i++){
|
||||
try{
|
||||
String fertilizer = fertilizerList[i];
|
||||
String[] fertilizers = fertilizer.split(";");
|
||||
ItemStack fertilizerItem = ItemStackUtil.parseItemStackString(fertilizers[0], OreDictionary.WILDCARD_VALUE);
|
||||
int fertilizerValue = Integer.parseInt(fertilizers[1]);
|
||||
Farmables.fertilizers.put(fertilizerItem, fertilizerValue);
|
||||
}catch(Exception e){
|
||||
Log.error("Forestry failed to parse a fertilizer entry at the farm config, at the position " + i + ".", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
private static Set<String> getItemStrings(LinkedHashMap<ItemStack, Integer> itemStacks) {
|
||||
Set<String> itemStrings = new HashSet<>(itemStacks.size());
|
||||
for (Entry<ItemStack, Integer> itemStack : itemStacks.entrySet()) {
|
||||
String itemString = ItemStackUtil.getStringForItemStack(itemStack.getKey());
|
||||
itemString += ";" + itemStack.getValue();
|
||||
itemStrings.add(itemString);
|
||||
}
|
||||
return itemStrings;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerTriggers() {
|
||||
FarmingTriggers.initialize();
|
||||
@@ -142,6 +194,12 @@ public class PluginFarming extends BlankForestryPlugin {
|
||||
@Override
|
||||
public void doInit() {
|
||||
super.doInit();
|
||||
|
||||
//Load config
|
||||
File configFile = new File(Forestry.instance.getConfigFolder(), Config.CATEGORY_FARM + ".cfg");
|
||||
LocalizedConfiguration config = new LocalizedConfiguration(configFile, "1.0.0");
|
||||
loadConfig(config);
|
||||
config.save();
|
||||
|
||||
GameRegistry.registerTileEntity(TileFarmPlain.class, "forestry.Farm");
|
||||
GameRegistry.registerTileEntity(TileFarmGearbox.class, "forestry.FarmGearbox");
|
||||
|
||||
Reference in new issue
Block a user