mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-21 04:22:32 +00:00
Improve fertilizer config and Clean Up
This commit is contained in:
1 parent
ce3dea42e3
commit
c00fa15f0e
34 files changed
+263
-236
No files matched your search
@@ -10,24 +10,21 @@
|
||||
******************************************************************************/
|
||||
package forestry.plugins;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.properties.IProperty;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraftforge.fml.common.registry.ForgeRegistries;
|
||||
|
||||
import forestry.api.circuits.ChipsetManager;
|
||||
import forestry.api.circuits.ICircuit;
|
||||
import forestry.api.circuits.ICircuitLayout;
|
||||
import forestry.api.core.ForestryAPI;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmRegistry;
|
||||
import forestry.api.modules.ForestryModule;
|
||||
import forestry.core.ModuleCore;
|
||||
@@ -37,79 +34,71 @@ import forestry.core.config.Constants;
|
||||
import forestry.core.items.EnumElectronTube;
|
||||
import forestry.core.utils.BlockUtil;
|
||||
import forestry.core.utils.Log;
|
||||
import forestry.core.utils.ModUtil;
|
||||
import forestry.farming.FarmRegistry;
|
||||
import forestry.farming.circuits.CircuitFarmLogic;
|
||||
import forestry.farming.logic.FarmLogicExU;
|
||||
import forestry.farming.logic.FarmLogicRedOrchid;
|
||||
import forestry.farming.logic.farmables.FarmableAgingCrop;
|
||||
import forestry.modules.BlankForestryModule;
|
||||
import forestry.modules.ForestryModuleUids;
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.EXTRA_UTILITIES, name = "ExtraUtilities", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.module.extrautilities.description")
|
||||
public class PluginExtraUtilities extends BlankForestryModule {
|
||||
@ForestryModule(containerID = ForestryCompatPlugins.ID, moduleID = ForestryModuleUids.EXTRA_UTILITIES, name = "Extra Utilities", author = "Nirek", url = Constants.URL, unlocalizedDescription = "for.module.extrautilities.description")
|
||||
public class PluginExtraUtilities extends CompatPlugin {
|
||||
|
||||
private static final String ExU = "extrautils2";
|
||||
public static ItemStack orchidStack = ItemStack.EMPTY;
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return ModUtil.isModLoaded(ExU);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFailMessage() {
|
||||
return "ExtraUtilities not found";
|
||||
public PluginExtraUtilities() {
|
||||
super("Extra Utilities", "extrautils2");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doInit() {
|
||||
if (Config.isExUtilRedOrchidEnabled()) {
|
||||
registerExPlant("Orchid", "redorchid", "Red Orchid", circuit -> Circuits.farmOrchidManaged = circuit, Blocks.REDSTONE_ORE, Blocks.LIT_REDSTONE_ORE);
|
||||
Block redOrchid = getBlock("redorchid");
|
||||
Block enderLilly = getBlock("enderlilly");
|
||||
|
||||
if (Config.isExUtilRedOrchidEnabled() && redOrchid != null) {
|
||||
Item item = Item.getItemFromBlock(redOrchid);
|
||||
|
||||
registerFarmable(redOrchid, item, "farmOrchid");
|
||||
|
||||
IFarmProperties orchidFarm = FarmRegistry.getInstance().registerLogic("farmOrchid", FarmLogicRedOrchid::new);
|
||||
orchidFarm.registerSoil(new ItemStack(Blocks.REDSTONE_ORE), Blocks.REDSTONE_ORE.getDefaultState());
|
||||
orchidFarm.registerSoil(new ItemStack(Blocks.LIT_REDSTONE_ORE), Blocks.LIT_REDSTONE_ORE.getDefaultState());
|
||||
|
||||
Circuits.farmOrchidManaged = new CircuitFarmLogic("managedOrchid", orchidFarm, false);
|
||||
|
||||
orchidStack = new ItemStack(item);
|
||||
}
|
||||
|
||||
if (Config.isExUtilEnderLilyEnabled()) {
|
||||
registerExPlant("Ender", "enderlilly", "Ender Lily", circuit -> Circuits.farmEnderManaged = circuit);
|
||||
if (Config.isExUtilEnderLilyEnabled() && enderLilly != null) {
|
||||
Item item = Item.getItemFromBlock(enderLilly);
|
||||
registerFarmable(enderLilly, item, "farmEnder");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<ResourceLocation> getDependencyUids() {
|
||||
return ImmutableSet.of(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerRecipes() {
|
||||
if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.FARMING))) {
|
||||
return;
|
||||
}
|
||||
if(Circuits.farmOrchidManaged != null) {
|
||||
ICircuitLayout layoutManaged = ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed");
|
||||
ChipsetManager.solderManager.addRecipe(layoutManaged, ModuleCore.items.tubes.get(EnumElectronTube.ORCHID, 1), Circuits.farmOrchidManaged);
|
||||
if(layoutManaged == null){
|
||||
return;
|
||||
}
|
||||
ChipsetManager.solderManager.addRecipe(layoutManaged, ModuleCore.getItems().tubes.get(EnumElectronTube.ORCHID, 1), Circuits.farmOrchidManaged);
|
||||
}
|
||||
}
|
||||
|
||||
private void registerExPlant(String id, String itemResourceName, String itemName, Consumer<ICircuit> assignTo, Block... soils) {
|
||||
Block plantBlock = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(ExU, itemResourceName));
|
||||
Item plantItem = Item.getItemFromBlock(plantBlock);
|
||||
if(plantBlock == Blocks.AIR) {
|
||||
Log.error("Could not find {} block.", itemName);
|
||||
} else if (plantItem == Items.AIR) {
|
||||
Log.error("Could not find {} item.", itemName);
|
||||
private void registerFarmable(Block plantBlock, Item plantItem, String identifier){
|
||||
IProperty<Integer> growthProperty = BlockUtil.getProperty(plantBlock, "growth", Integer.class);
|
||||
if (growthProperty == null) {
|
||||
Log.error("Could not find the growth property of {}.", plantBlock.getLocalizedName());
|
||||
} else {
|
||||
IProperty<Integer> growthProperty = BlockUtil.getProperty(plantBlock, "growth", Integer.class);
|
||||
if (growthProperty == null) {
|
||||
Log.error("Could not find the growth property of {}.", itemName);
|
||||
} else {
|
||||
String identifier = "farm" + id;
|
||||
IFarmRegistry registry = FarmRegistry.getInstance();
|
||||
int harvestAge = Collections.max(growthProperty.getAllowedValues());
|
||||
int replantAge = plantBlock.getDefaultState().getValue(growthProperty);
|
||||
registry.registerFarmables(identifier, new FarmableAgingCrop(new ItemStack(plantItem), plantBlock, growthProperty, harvestAge, replantAge));
|
||||
|
||||
IFarmInstance instance = registry.getFarm(identifier);
|
||||
if(instance == null) {
|
||||
instance = registry.registerLogic(identifier, (i, m) -> new FarmLogicExU(i, m, (m ? "Manual " : "Managed ") + itemName + " Farm", plantItem), itemName);
|
||||
for (Block soil : soils) {
|
||||
instance.registerSoil(new ItemStack(soil), soil.getDefaultState());
|
||||
}
|
||||
assignTo.accept(new CircuitFarmLogic("managed" + id, instance, false));
|
||||
}
|
||||
}
|
||||
IFarmRegistry registry = FarmRegistry.getInstance();
|
||||
int harvestAge = Collections.max(growthProperty.getAllowedValues());
|
||||
int replantAge = plantBlock.getDefaultState().getValue(growthProperty);
|
||||
registry.registerFarmables(identifier, new FarmableAgingCrop(new ItemStack(plantItem), plantBlock, growthProperty, harvestAge, replantAge));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -31,7 +31,7 @@ import forestry.api.circuits.ChipsetManager;
|
||||
import forestry.api.circuits.CircuitSocketType;
|
||||
import forestry.api.circuits.ICircuitLayout;
|
||||
import forestry.api.core.ForestryAPI;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.fuels.EngineBronzeFuel;
|
||||
import forestry.api.fuels.FuelManager;
|
||||
import forestry.api.modules.ForestryModule;
|
||||
@@ -117,7 +117,7 @@ public class PluginIC2 extends BlankForestryModule {
|
||||
rubber = IC2Items.getItem("crafting", "rubber");
|
||||
fertilizer = IC2Items.getItem("crop_res","fertilizer");
|
||||
|
||||
IFarmInstance rubberFarm = FarmRegistry.getInstance().registerLogic("farmRubber", FarmLogicRubber::new);
|
||||
IFarmProperties rubberFarm = FarmRegistry.getInstance().registerLogic("farmRubber", FarmLogicRubber::new);
|
||||
|
||||
Circuits.farmRubberManual = new CircuitFarmLogic("manualRubber", rubberFarm, true);
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.registry.ForgeRegistries;
|
||||
|
||||
import forestry.api.core.ForestryAPI;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.fuels.FuelManager;
|
||||
import forestry.api.fuels.MoistenerFuel;
|
||||
import forestry.api.modules.ForestryModule;
|
||||
@@ -266,7 +266,7 @@ public class PluginNatura extends BlankForestryModule {
|
||||
*/
|
||||
@Override
|
||||
public void postInit() {
|
||||
IFarmInstance farmArboreal = FarmRegistry.getInstance().getFarm("managedArboreal");
|
||||
IFarmProperties farmArboreal = FarmRegistry.getInstance().getFarm("managedArboreal");
|
||||
if(farmArboreal != null) {
|
||||
farmArboreal.registerSoil(new ItemStack(Blocks.NETHERRACK), Blocks.NETHERRACK.getDefaultState(), false);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user