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
@@ -45,7 +45,7 @@ public interface IFarmLogic {
|
||||
Collection<ICrop> harvest(World world, BlockPos pos, FarmDirection direction, int extent);
|
||||
|
||||
/**
|
||||
* @deprecated Since Forestry 5.8 logic instances are created at the constructor of the {@link IFarmInstance} and
|
||||
* @deprecated Since Forestry 5.8 logic instances are created at the constructor of the {@link IFarmProperties} and
|
||||
* have a immutable manual state. TODO Remove this method in 1.13
|
||||
*/
|
||||
@Deprecated
|
||||
@@ -56,16 +56,16 @@ public interface IFarmLogic {
|
||||
/**
|
||||
* @since Forestry 5.8
|
||||
*
|
||||
* @return Returns the {@link IFarmInstance} that created this logic. Returns a fake instance from
|
||||
* @return Returns the {@link IFarmProperties} that created this logic. Returns a fake instance from
|
||||
* {@link IFarmRegistry#createFakeInstance(IFarmLogic)} if the logic is older that Forestry 5.8.
|
||||
*/
|
||||
default IFarmInstance getInstance(){
|
||||
default IFarmProperties getInstance(){
|
||||
return ForestryAPI.farmRegistry.createFakeInstance(this);
|
||||
}
|
||||
|
||||
/**
|
||||
* Use {@link IFarmRegistry#getFarm(String)} to get the soil container for the farm logic and register the soil
|
||||
* with {@link IFarmInstance#registerSoil(ItemStack, IBlockState, boolean)}.
|
||||
* with {@link IFarmProperties#registerSoil(ItemStack, IBlockState, boolean)}.
|
||||
*/
|
||||
@Deprecated
|
||||
default void addSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData){
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack;
|
||||
/**
|
||||
* @since Forestry 5.8
|
||||
*/
|
||||
public interface IFarmInstance {
|
||||
public interface IFarmProperties {
|
||||
|
||||
default void registerSoil(ItemStack resource, IBlockState soilState){
|
||||
registerSoil(resource, soilState, false);
|
||||
@@ -19,7 +19,7 @@ public interface IFarmRegistry {
|
||||
* @param logic corresponding instance of logic
|
||||
*
|
||||
* @deprecated Since Forestry 5.8. Use {@link #registerLogic(String, BiFunction, String...)} or
|
||||
* {@link #registerLogic(IFarmInstance)}.
|
||||
* {@link #registerLogic(IFarmProperties)}.
|
||||
*/
|
||||
@Deprecated
|
||||
void registerLogic(String identifier, IFarmLogic logic);
|
||||
@@ -28,7 +28,7 @@ public interface IFarmRegistry {
|
||||
* Registers farming logic in registry
|
||||
* @since Forestry 5.8
|
||||
*/
|
||||
IFarmInstance registerLogic(IFarmInstance farmInstance);
|
||||
IFarmProperties registerLogic(IFarmProperties farmInstance);
|
||||
|
||||
/**
|
||||
* Registers farming logic in registry under given identifier
|
||||
@@ -38,7 +38,7 @@ public interface IFarmRegistry {
|
||||
* @param farmablesIdentifiers Identifiers: farmArboreal farmCrops farmGourd farmInfernal farmPoales farmSucculentes farmShroom
|
||||
* @since Forestry 5.8
|
||||
*/
|
||||
IFarmInstance registerLogic(String identifier, BiFunction<IFarmInstance, Boolean, IFarmLogic> logicFactory, String... farmablesIdentifiers);
|
||||
IFarmProperties registerLogic(String identifier, BiFunction<IFarmProperties, Boolean, IFarmLogic> logicFactory, String... farmablesIdentifiers);
|
||||
|
||||
/**
|
||||
* Can be used to add IFarmables to some of the vanilla farm logics.
|
||||
@@ -54,7 +54,7 @@ public interface IFarmRegistry {
|
||||
*
|
||||
* @return Null if the farming plugin is not active.
|
||||
*
|
||||
* @deprecated Since Forestry 5.8. Use {@link #createCropLogic(IFarmInstance, boolean, ISimpleFarmLogic)} instead.
|
||||
* @deprecated Since Forestry 5.8. Use {@link #createCropLogic(IFarmProperties, boolean, ISimpleFarmLogic)} instead.
|
||||
*/
|
||||
@Nullable
|
||||
@Deprecated
|
||||
@@ -74,13 +74,13 @@ public interface IFarmRegistry {
|
||||
int getFertilizeValue(ItemStack itemStack);
|
||||
|
||||
/**
|
||||
* Returns a fake {@link IFarmInstance} that returns the given logic at {@link IFarmInstance#getLogic(boolean)}.
|
||||
* Returns a fake {@link IFarmProperties} that returns the given logic at {@link IFarmProperties#getLogic(boolean)}.
|
||||
*
|
||||
* @since Forestry 5.8
|
||||
* @deprecated Only for backwards comparability.
|
||||
*/
|
||||
@Deprecated
|
||||
IFarmInstance createFakeInstance(IFarmLogic logic);
|
||||
IFarmProperties createFakeInstance(IFarmLogic logic);
|
||||
|
||||
/**
|
||||
* Can be used to create a simple version of a farm logic, like the vanilla vegetable or wheat farm logic.
|
||||
@@ -88,7 +88,7 @@ public interface IFarmRegistry {
|
||||
* @return Null if the farming plugin is not active.
|
||||
*/
|
||||
@Nullable
|
||||
IFarmLogic createCropLogic(IFarmInstance instance, boolean isManual, ISimpleFarmLogic simpleFarmLogic);
|
||||
IFarmLogic createCropLogic(IFarmProperties instance, boolean isManual, ISimpleFarmLogic simpleFarmLogic);
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -98,6 +98,6 @@ public interface IFarmRegistry {
|
||||
* @since Forestry 5.8
|
||||
*/
|
||||
@Nullable
|
||||
IFarmInstance getFarm(String identifier);
|
||||
IFarmProperties getFarm(String identifier);
|
||||
|
||||
}
|
||||
@@ -40,7 +40,7 @@ public class GhostItemStackWidget extends ItemStackWidget {
|
||||
fontRenderer.drawStringWithShadow(getDirectionString(), xPos + startX + 5, yPos + startY + 4, ColourProperties.INSTANCE.get("gui.screen"));
|
||||
}
|
||||
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.85F);
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F);
|
||||
|
||||
TextureManager textureManager = Minecraft.getMinecraft().getTextureManager();
|
||||
textureManager.bindTexture(manager.gui.textureFile);
|
||||
|
||||
@@ -7,12 +7,12 @@ import java.util.function.BiFunction;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmLogic;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmRegistry;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.api.farming.ISimpleFarmLogic;
|
||||
import forestry.farming.logic.FakeFarmInstance;
|
||||
import forestry.farming.logic.FakeFarmProperties;
|
||||
|
||||
public class DummyFarmRegistry implements IFarmRegistry {
|
||||
|
||||
@@ -33,27 +33,27 @@ public class DummyFarmRegistry implements IFarmRegistry {
|
||||
}
|
||||
|
||||
@Override
|
||||
public IFarmInstance registerLogic(IFarmInstance farmInstance) {
|
||||
public IFarmProperties registerLogic(IFarmProperties farmInstance) {
|
||||
//Dummy-Implementation
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IFarmInstance registerLogic(String identifier, BiFunction<IFarmInstance, Boolean, IFarmLogic> logicFactory, String... farmablesIdentifiers) {
|
||||
public IFarmProperties registerLogic(String identifier, BiFunction<IFarmProperties, Boolean, IFarmLogic> logicFactory, String... farmablesIdentifiers) {
|
||||
//Dummy-Implementation
|
||||
return null;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public IFarmLogic createCropLogic(IFarmInstance instance, boolean isManual, ISimpleFarmLogic simpleFarmLogic) {
|
||||
public IFarmLogic createCropLogic(IFarmProperties instance, boolean isManual, ISimpleFarmLogic simpleFarmLogic) {
|
||||
//Dummy-Implementation
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IFarmInstance createFakeInstance(IFarmLogic logic) {
|
||||
return new FakeFarmInstance(logic);
|
||||
public IFarmProperties createFakeInstance(IFarmLogic logic) {
|
||||
return new FakeFarmProperties(logic);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -69,7 +69,7 @@ public class DummyFarmRegistry implements IFarmRegistry {
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public IFarmInstance getFarm(String identifier) {
|
||||
public IFarmProperties getFarm(String identifier) {
|
||||
//Dummy-Implementation
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package forestry.farming;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
@@ -22,8 +23,8 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.config.Property;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmLogic;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmRegistry;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.api.farming.ISimpleFarmLogic;
|
||||
@@ -31,16 +32,18 @@ import forestry.core.config.LocalizedConfiguration;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
import forestry.core.utils.Log;
|
||||
import forestry.core.utils.Translator;
|
||||
import forestry.farming.logic.FakeFarmInstance;
|
||||
import forestry.farming.logic.FarmInstance;
|
||||
import forestry.farming.logic.FakeFarmProperties;
|
||||
import forestry.farming.logic.FarmLogicSimple;
|
||||
import forestry.farming.logic.FarmProperties;
|
||||
|
||||
public final class FarmRegistry implements IFarmRegistry {
|
||||
|
||||
private static final FarmRegistry INSTANCE = new FarmRegistry();
|
||||
|
||||
private final Multimap<String, IFarmable> farmables = HashMultimap.create();
|
||||
private final Map<ItemStack, Integer> fertilizers = new LinkedHashMap<>();
|
||||
private final Map<String, IFarmInstance> farmInstances = new HashMap<>();
|
||||
private final Map<String, IFarmProperties> farmInstances = new HashMap<>();
|
||||
private FertilizerConfig fertilizer = FertilizerConfig.DUMMY;
|
||||
|
||||
public static FarmRegistry getInstance() {
|
||||
return INSTANCE;
|
||||
@@ -62,13 +65,13 @@ public final class FarmRegistry implements IFarmRegistry {
|
||||
}
|
||||
|
||||
@Override
|
||||
public IFarmLogic createCropLogic(IFarmInstance instance, boolean isManual, ISimpleFarmLogic simpleFarmLogic) {
|
||||
public IFarmLogic createCropLogic(IFarmProperties instance, boolean isManual, ISimpleFarmLogic simpleFarmLogic) {
|
||||
return new FarmLogicSimple(instance, isManual, simpleFarmLogic);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IFarmInstance createFakeInstance(IFarmLogic logic) {
|
||||
return new FakeFarmInstance(logic);
|
||||
public IFarmProperties createFakeInstance(IFarmLogic logic) {
|
||||
return new FakeFarmProperties(logic);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -81,72 +84,113 @@ public final class FarmRegistry implements IFarmRegistry {
|
||||
|
||||
@Override
|
||||
public int getFertilizeValue(ItemStack itemStack) {
|
||||
for (Entry<ItemStack, Integer> fertilizer : fertilizers.entrySet()) {
|
||||
ItemStack fertilizerStack = fertilizer.getKey();
|
||||
if (ItemStackUtil.isIdenticalItem(fertilizerStack, itemStack)) {
|
||||
return fertilizer.getValue();
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
return fertilizer.getFertilizeValue(itemStack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IFarmInstance registerLogic(IFarmInstance farmInstance) {
|
||||
public IFarmProperties registerLogic(IFarmProperties farmInstance) {
|
||||
farmInstances.put(farmInstance.getIdentifier(), farmInstance);
|
||||
return farmInstance;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IFarmInstance registerLogic(String identifier, BiFunction<IFarmInstance, Boolean, IFarmLogic> logicFactory, String... farmablesIdentifiers) {
|
||||
public IFarmProperties registerLogic(String identifier, BiFunction<IFarmProperties, Boolean, IFarmLogic> logicFactory, String... farmablesIdentifiers) {
|
||||
Set<String> fIdentifiers = new HashSet<>(Arrays.asList(farmablesIdentifiers));
|
||||
fIdentifiers.add(identifier);
|
||||
IFarmInstance instance = new FarmInstance(identifier, logicFactory, fIdentifiers);
|
||||
IFarmProperties instance = new FarmProperties(identifier, logicFactory, fIdentifiers);
|
||||
farmInstances.put(identifier, instance);
|
||||
return instance;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public IFarmInstance getFarm(String identifier) {
|
||||
public IFarmProperties getFarm(String identifier) {
|
||||
return farmInstances.get(identifier);
|
||||
}
|
||||
|
||||
void loadConfig(LocalizedConfiguration config) {
|
||||
List<String> defaultFertilizers = new ArrayList<>(getItemStrings());
|
||||
Map<String, String> defaultEntries = getItemStrings();
|
||||
List<String> defaultFertilizers = new ArrayList<>(defaultEntries.values());
|
||||
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"));
|
||||
Property property = config.get("fertilizers", "items", defaultSortedFertilizers, Translator.translateToLocal("for.config.farm.fertilizers.items"));
|
||||
|
||||
fertilizers.clear();
|
||||
String[] fertilizerList = fertilizerConf.getStringList();
|
||||
for (int i = 0; i < fertilizerList.length; i++) {
|
||||
try {
|
||||
String fertilizer = fertilizerList[i];
|
||||
String[] fertilizers = fertilizer.split(";");
|
||||
String itemName = fertilizers[0];
|
||||
if(itemName.equals("forestry:fertilizerCompound")){
|
||||
itemName = "forestry:fertilizer_compound";
|
||||
}
|
||||
ItemStack fertilizerItem = ItemStackUtil.parseItemStackString(itemName, OreDictionary.WILDCARD_VALUE);
|
||||
if(fertilizerItem == null){
|
||||
continue;
|
||||
}
|
||||
int fertilizerValue = Integer.parseInt(fertilizers[1]);
|
||||
registerFertilizer(fertilizerItem, fertilizerValue);
|
||||
} catch (Exception e) {
|
||||
Log.error("Forestry failed to parse a fertilizer entry at the farm config, at the position " + i + ".", e);
|
||||
ImmutableMap<ItemStack, Integer> fertilizerMap = checkConfig(property, defaultEntries);
|
||||
fertilizer = new FertilizerConfig(fertilizerMap);
|
||||
}
|
||||
|
||||
private ImmutableMap<ItemStack, Integer> checkConfig(Property property, Map<String, String> defaultEntries){
|
||||
String[] fertilizerList = property.getStringList();
|
||||
ImmutableMap.Builder<ItemStack, Integer> fertilizerMap = new ImmutableMap.Builder<>();
|
||||
Map<String, String> configEntries = parseConfig(fertilizerList, fertilizerMap);
|
||||
|
||||
List<String> newEntries = new ArrayList<>(Arrays.asList(fertilizerList));
|
||||
for(Entry<String, String> defaultEntry : defaultEntries.entrySet()){
|
||||
if(!configEntries.containsKey(defaultEntry.getKey())){
|
||||
newEntries.add(defaultEntry.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
if(newEntries.size() > fertilizerList.length){
|
||||
Collections.sort(newEntries);
|
||||
property.set(newEntries.toArray(new String[newEntries.size()]));
|
||||
return checkConfig(property, defaultEntries);
|
||||
}
|
||||
|
||||
return fertilizerMap.build();
|
||||
}
|
||||
|
||||
private Map<String, String> parseConfig(String[] fertilizerList, ImmutableMap.Builder<ItemStack, Integer> fertilizerMap){
|
||||
Map<String, String> configEntries = new HashMap<>();
|
||||
for(String entry : fertilizerList){
|
||||
String[] spited = entry.split(";");
|
||||
if(spited.length < 2){
|
||||
Log.error("Foretsry failed to parse a entry of the fertilizer config.");
|
||||
continue;
|
||||
}
|
||||
String itemName = spited[0];
|
||||
ItemStack fertilizerItem = ItemStackUtil.parseItemStackString(itemName, OreDictionary.WILDCARD_VALUE);
|
||||
if(fertilizerItem == null || fertilizerItem.isEmpty()){
|
||||
Log.error("Foretsry failed to parse a entry of the fertilizer config, because the item doesn't exists.");
|
||||
continue;
|
||||
}
|
||||
String value = spited[1];
|
||||
int fertilizerValue = Integer.parseInt(value);
|
||||
if(fertilizerValue > 0) {
|
||||
fertilizerMap.put(fertilizerItem, fertilizerValue);
|
||||
}
|
||||
configEntries.put(itemName, value);
|
||||
}
|
||||
return configEntries;
|
||||
}
|
||||
|
||||
private Set<String> getItemStrings() {
|
||||
Set<String> itemStrings = new HashSet<>(fertilizers.size());
|
||||
private Map<String, String> getItemStrings() {
|
||||
Map<String, String> itemStrings = new HashMap<>(fertilizers.size());
|
||||
for (Entry<ItemStack, Integer> itemStack : fertilizers.entrySet()) {
|
||||
String itemString = ItemStackUtil.getStringForItemStack(itemStack.getKey());
|
||||
itemString += ";" + itemStack.getValue();
|
||||
itemStrings.add(itemString);
|
||||
itemStrings.put(itemString, itemString + ";" + itemStack.getValue());
|
||||
}
|
||||
return itemStrings;
|
||||
}
|
||||
|
||||
private static class FertilizerConfig{
|
||||
private static final FertilizerConfig DUMMY = new FertilizerConfig(Collections.emptyMap());
|
||||
|
||||
private final Map<ItemStack, Integer> fertilizers;
|
||||
|
||||
private FertilizerConfig(Map<ItemStack, Integer> fertilizers) {
|
||||
this.fertilizers = fertilizers;
|
||||
}
|
||||
|
||||
private int getFertilizeValue(ItemStack itemStack) {
|
||||
for (Entry<ItemStack, Integer> fertilizer : fertilizers.entrySet()) {
|
||||
ItemStack fertilizerStack = fertilizer.getKey();
|
||||
if (ItemStackUtil.isIdenticalItem(fertilizerStack, itemStack)) {
|
||||
return fertilizer.getValue();
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -43,7 +43,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.farming.IFarmRegistry;
|
||||
import forestry.api.modules.ForestryModule;
|
||||
import forestry.core.ModuleCore;
|
||||
@@ -192,17 +192,17 @@ public class ModuleFarming extends BlankForestryModule {
|
||||
IFarmRegistry registry = FarmRegistry.getInstance();
|
||||
BlockRegistryCore coreBlocks = ModuleCore.getBlocks();
|
||||
|
||||
IFarmInstance arborealFarm = registry.registerLogic("farmArboreal", FarmLogicArboreal::new);
|
||||
IFarmInstance cropsFarm = registry.registerLogic("farmCrops", FarmLogicCrops::new);
|
||||
IFarmInstance mushroomFarm = registry.registerLogic("farmShroom", FarmLogicMushroom::new);
|
||||
IFarmInstance succulentFarm = registry.registerLogic("farmSucculent", FarmLogicSucculent::new);
|
||||
IFarmInstance peatFarm = registry.registerLogic("farmPeat", FarmLogicPeat::new);
|
||||
IFarmInstance infernalFarm = registry.registerLogic("farmInfernal", FarmLogicInfernal::new);
|
||||
IFarmInstance poalesFarm = registry.registerLogic("farmPoales", FarmLogicReeds::new);
|
||||
IFarmInstance orchardFarm = registry.registerLogic("farmOrchard", FarmLogicOrchard::new);
|
||||
IFarmInstance gourdFarm = registry.registerLogic("farmGourd", FarmLogicGourd::new);
|
||||
IFarmInstance cocoaFarm = registry.registerLogic("farmCocoa", FarmLogicCocoa::new);
|
||||
IFarmInstance enderFarm = registry.registerLogic("farmEnder", FarmLogicEnder::new);
|
||||
IFarmProperties arborealFarm = registry.registerLogic("farmArboreal", FarmLogicArboreal::new);
|
||||
IFarmProperties cropsFarm = registry.registerLogic("farmCrops", FarmLogicCrops::new);
|
||||
IFarmProperties mushroomFarm = registry.registerLogic("farmShroom", FarmLogicMushroom::new);
|
||||
IFarmProperties succulentFarm = registry.registerLogic("farmSucculent", FarmLogicSucculent::new);
|
||||
IFarmProperties peatFarm = registry.registerLogic("farmPeat", FarmLogicPeat::new);
|
||||
IFarmProperties infernalFarm = registry.registerLogic("farmInfernal", FarmLogicInfernal::new);
|
||||
IFarmProperties poalesFarm = registry.registerLogic("farmPoales", FarmLogicReeds::new);
|
||||
IFarmProperties orchardFarm = registry.registerLogic("farmOrchard", FarmLogicOrchard::new);
|
||||
IFarmProperties gourdFarm = registry.registerLogic("farmGourd", FarmLogicGourd::new);
|
||||
IFarmProperties cocoaFarm = registry.registerLogic("farmCocoa", FarmLogicCocoa::new);
|
||||
IFarmProperties enderFarm = registry.registerLogic("farmEnder", FarmLogicEnder::new);
|
||||
|
||||
Circuits.farmArborealManaged = new CircuitFarmLogic("managedArboreal", arborealFarm, false);
|
||||
Circuits.farmArborealManual = new CircuitFarmLogic("manualArboreal", arborealFarm, true);
|
||||
|
||||
@@ -14,8 +14,8 @@ import javax.annotation.Nullable;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmLogic;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.core.circuits.Circuit;
|
||||
|
||||
public class CircuitFarmLogic extends Circuit {
|
||||
@@ -23,7 +23,7 @@ public class CircuitFarmLogic extends Circuit {
|
||||
private final IFarmLogic logic;
|
||||
private boolean isManual = false;
|
||||
|
||||
public CircuitFarmLogic(String uid, IFarmInstance instance, boolean manual) {
|
||||
public CircuitFarmLogic(String uid, IFarmProperties instance, boolean manual) {
|
||||
super(uid);
|
||||
this.logic = instance.getLogic(manual);
|
||||
}
|
||||
|
||||
+3
-3
@@ -6,15 +6,15 @@ import java.util.Collections;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmLogic;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.api.farming.ISoil;
|
||||
|
||||
public class FakeFarmInstance implements IFarmInstance {
|
||||
public class FakeFarmProperties implements IFarmProperties {
|
||||
private final IFarmLogic logic;
|
||||
|
||||
public FakeFarmInstance(IFarmLogic logic) {
|
||||
public FakeFarmProperties(IFarmLogic logic) {
|
||||
this.logic = logic;
|
||||
}
|
||||
|
||||
@@ -31,28 +31,28 @@ import net.minecraft.world.World;
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmLogic;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.api.farming.ISoil;
|
||||
import forestry.core.utils.VectUtil;
|
||||
|
||||
public abstract class FarmLogic implements IFarmLogic {
|
||||
private final EntitySelectorFarm entitySelectorFarm = new EntitySelectorFarm(this);
|
||||
protected final IFarmInstance instance;
|
||||
protected final IFarmProperties properties;
|
||||
protected final boolean isManual;
|
||||
|
||||
public FarmLogic(IFarmInstance instance, boolean isManual) {
|
||||
this.instance = instance;
|
||||
public FarmLogic(IFarmProperties properties, boolean isManual) {
|
||||
this.properties = properties;
|
||||
this.isManual = isManual;
|
||||
}
|
||||
|
||||
protected Collection<IFarmable> getFarmables() {
|
||||
return instance.getFarmables();
|
||||
return properties.getFarmables();
|
||||
}
|
||||
|
||||
protected Collection<ISoil> getSoils() {
|
||||
return instance.getSoils();
|
||||
return properties.getSoils();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -66,7 +66,7 @@ public abstract class FarmLogic implements IFarmLogic {
|
||||
for (int i = 0; i < extent; i++) {
|
||||
BlockPos position = translateWithOffset(pos.up(), direction, i);
|
||||
ICrop crop = getCrop(world, position);
|
||||
if(crop != null){
|
||||
if (crop != null) {
|
||||
crops.push(crop);
|
||||
}
|
||||
}
|
||||
@@ -74,7 +74,7 @@ public abstract class FarmLogic implements IFarmLogic {
|
||||
}
|
||||
|
||||
@Nullable
|
||||
protected ICrop getCrop(World world, BlockPos position){
|
||||
protected ICrop getCrop(World world, BlockPos position) {
|
||||
if (world.isAirBlock(position)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ import net.minecraft.world.World;
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmable;
|
||||
|
||||
public class FarmLogicArboreal extends FarmLogicHomogeneous {
|
||||
@@ -39,14 +39,14 @@ public class FarmLogicArboreal extends FarmLogicHomogeneous {
|
||||
@Nullable
|
||||
private List<IFarmable> farmables;
|
||||
|
||||
public FarmLogicArboreal(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicArboreal(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<IFarmable> getFarmables() {
|
||||
if(farmables == null){
|
||||
this.farmables = new ArrayList<>(instance.getFarmables());
|
||||
if (farmables == null) {
|
||||
this.farmables = new ArrayList<>(properties.getFarmables());
|
||||
}
|
||||
return farmables;
|
||||
}
|
||||
|
||||
@@ -34,15 +34,15 @@ import net.minecraft.world.World;
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.farming.logic.farmables.FarmableCocoa;
|
||||
|
||||
public class FarmLogicCocoa extends FarmLogic {
|
||||
private final IFarmable cocoa = new FarmableCocoa();
|
||||
|
||||
public FarmLogicCocoa(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicCocoa(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -19,14 +19,14 @@ import net.minecraft.world.World;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.core.utils.BlockUtil;
|
||||
|
||||
public class FarmLogicCrops extends FarmLogicWatered {
|
||||
|
||||
public FarmLogicCrops(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicCrops(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -21,7 +21,7 @@ import net.minecraft.world.World;
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.core.utils.BlockUtil;
|
||||
import forestry.farming.logic.crops.CropDestroy;
|
||||
@@ -31,8 +31,8 @@ public class FarmLogicEnder extends FarmLogicHomogeneous {
|
||||
private static final Set<EnumFacing> VALID_DIRECTIONS = ImmutableSet.of(EnumFacing.UP, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.WEST, EnumFacing.EAST);
|
||||
private final IFarmable chorusFarmable;
|
||||
|
||||
public FarmLogicEnder(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicEnder(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
chorusFarmable = FarmableChorus.INSTANCE;
|
||||
}
|
||||
|
||||
@@ -85,12 +85,12 @@ public class FarmLogicEnder extends FarmLogicHomogeneous {
|
||||
}
|
||||
|
||||
private Collection<ICrop> harvestBlocks(World world, BlockPos position) {
|
||||
if(world.isAirBlock(position)){
|
||||
if (world.isAirBlock(position)) {
|
||||
return Collections.emptySet();
|
||||
}
|
||||
|
||||
ICrop crop = getCrop(world, position);
|
||||
if(crop != null){
|
||||
if (crop != null) {
|
||||
return Collections.singleton(crop);
|
||||
}
|
||||
|
||||
@@ -98,30 +98,30 @@ public class FarmLogicEnder extends FarmLogicHomogeneous {
|
||||
Stack<ICrop> plants = new Stack<>();
|
||||
harvestBlock(world, position, EnumFacing.DOWN, plants, crops);
|
||||
//Remove all flowers before remove all plants
|
||||
if(!crops.isEmpty()) {
|
||||
if (!crops.isEmpty()) {
|
||||
return crops;
|
||||
}
|
||||
return plants;
|
||||
}
|
||||
|
||||
private boolean harvestBlock(World world, BlockPos pos, EnumFacing from, Stack<ICrop> plants, Stack<ICrop> flowers){
|
||||
private boolean harvestBlock(World world, BlockPos pos, EnumFacing from, Stack<ICrop> plants, Stack<ICrop> flowers) {
|
||||
IBlockState blockState = world.getBlockState(pos);
|
||||
if(blockState.getBlock() == Blocks.CHORUS_FLOWER){
|
||||
if (blockState.getBlock() == Blocks.CHORUS_FLOWER) {
|
||||
ICrop crop = chorusFarmable.getCropAt(world, pos, blockState);
|
||||
if(crop != null){
|
||||
if (crop != null) {
|
||||
flowers.push(crop);
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}else if(blockState.getBlock() == Blocks.CHORUS_PLANT){
|
||||
} else if (blockState.getBlock() == Blocks.CHORUS_PLANT) {
|
||||
boolean canHarvest = true;
|
||||
for(EnumFacing facing : VALID_DIRECTIONS) {
|
||||
if(facing == from){
|
||||
for (EnumFacing facing : VALID_DIRECTIONS) {
|
||||
if (facing == from) {
|
||||
continue;
|
||||
}
|
||||
canHarvest &= harvestBlock(world, pos.offset(facing), facing.getOpposite(), plants, flowers);
|
||||
}
|
||||
if(canHarvest){
|
||||
if (canHarvest) {
|
||||
plants.push(new CropDestroy(world, Blocks.CHORUS_PLANT.getDefaultState(), pos, null));
|
||||
}
|
||||
return canHarvest;
|
||||
@@ -144,7 +144,7 @@ public class FarmLogicEnder extends FarmLogicHomogeneous {
|
||||
continue;
|
||||
}
|
||||
|
||||
if(trySetCrop(world, farmHousing, position, direction)){
|
||||
if (trySetCrop(world, farmHousing, position, direction)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,12 +18,12 @@ import net.minecraft.world.World;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
|
||||
public class FarmLogicGourd extends FarmLogic {
|
||||
|
||||
public FarmLogicGourd(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicGourd(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -18,7 +18,7 @@ import net.minecraft.world.World;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.api.farming.ISoil;
|
||||
import forestry.core.utils.BlockUtil;
|
||||
@@ -26,8 +26,8 @@ import forestry.core.utils.BlockUtil;
|
||||
public abstract class FarmLogicHomogeneous extends FarmLogicSoil {
|
||||
protected NonNullList<ItemStack> produce = NonNullList.create();
|
||||
|
||||
public FarmLogicHomogeneous(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicHomogeneous(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -62,14 +62,11 @@ public abstract class FarmLogicHomogeneous extends FarmLogicSoil {
|
||||
|
||||
@Override
|
||||
public boolean cultivate(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent) {
|
||||
if(isManual){
|
||||
|
||||
}
|
||||
return maintainSoil(world, farmHousing, pos, direction, extent) || maintainGermlings(world, farmHousing, pos.up(), direction, extent);
|
||||
}
|
||||
|
||||
private boolean maintainSoil(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent) {
|
||||
if(!farmHousing.canPlantSoil(isManual)){
|
||||
if (!farmHousing.canPlantSoil(isManual)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -23,14 +23,14 @@ import net.minecraft.world.World;
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.core.utils.BlockUtil;
|
||||
|
||||
public class FarmLogicInfernal extends FarmLogicHomogeneous {
|
||||
|
||||
public FarmLogicInfernal(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicInfernal(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,12 +16,12 @@ import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
|
||||
public class FarmLogicMushroom extends FarmLogicArboreal {
|
||||
|
||||
public FarmLogicMushroom(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicMushroom(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -31,7 +31,7 @@ import net.minecraft.world.World;
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.api.genetics.IFruitBearer;
|
||||
import forestry.core.ModuleCore;
|
||||
@@ -43,8 +43,8 @@ public class FarmLogicOrchard extends FarmLogic {
|
||||
private final HashMap<BlockPos, Integer> lastExtents = new HashMap<>();
|
||||
private final ImmutableList<Block> traversalBlocks;
|
||||
|
||||
public FarmLogicOrchard(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicOrchard(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
|
||||
ImmutableList.Builder<Block> traversalBlocksBuilder = ImmutableList.builder();
|
||||
// if (ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.AGRICRAFT) || ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.INDUSTRIALCRAFT)) {
|
||||
|
||||
@@ -21,14 +21,14 @@ import net.minecraft.world.World;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.core.ModuleCore;
|
||||
import forestry.core.blocks.BlockBogEarth;
|
||||
import forestry.farming.logic.crops.CropPeat;
|
||||
|
||||
public class FarmLogicPeat extends FarmLogicWatered {
|
||||
public FarmLogicPeat(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicPeat(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+10
-13
@@ -11,7 +11,6 @@
|
||||
package forestry.farming.logic;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
@@ -19,28 +18,27 @@ import net.minecraft.world.World;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.core.utils.BlockUtil;
|
||||
import forestry.plugins.PluginExtraUtilities;
|
||||
|
||||
public class FarmLogicExU extends FarmLogicHomogeneous {
|
||||
public class FarmLogicRedOrchid extends FarmLogicHomogeneous {
|
||||
|
||||
private final String name;
|
||||
private final Item iconItem;
|
||||
|
||||
public FarmLogicExU(IFarmInstance instance, boolean isManual, String name, Item iconItem) {
|
||||
super(instance, isManual);
|
||||
this.name = name;
|
||||
this.iconItem = iconItem;
|
||||
public FarmLogicRedOrchid(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name;
|
||||
if (isManual) {
|
||||
return "Manual Orchid Farm";
|
||||
}
|
||||
return "Managed Orchid Farm";
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getIconItemStack() {
|
||||
return new ItemStack(iconItem);
|
||||
return PluginExtraUtilities.orchidStack;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -78,5 +76,4 @@ public class FarmLogicExU extends FarmLogicHomogeneous {
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -18,11 +18,11 @@ import net.minecraft.world.World;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
|
||||
public class FarmLogicReeds extends FarmLogicSoil {
|
||||
public FarmLogicReeds(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicReeds(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -25,7 +25,7 @@ import net.minecraft.world.World;
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.ICrop;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
import forestry.core.utils.Log;
|
||||
import forestry.farming.logic.crops.CropRubber;
|
||||
@@ -35,8 +35,8 @@ public class FarmLogicRubber extends FarmLogic {
|
||||
|
||||
private boolean active = true;
|
||||
|
||||
public FarmLogicRubber(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicRubber(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
if (PluginIC2.rubberWood == null || PluginIC2.resin == null) {
|
||||
Log.warning("Failed to init a farm logic {} since IC2 rubber wood or resin were not found", getClass().getName());
|
||||
active = false;
|
||||
|
||||
@@ -2,14 +2,14 @@ package forestry.farming.logic;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.ISimpleFarmLogic;
|
||||
|
||||
public class FarmLogicSimple extends FarmLogicCrops {
|
||||
|
||||
private final ISimpleFarmLogic simpleLogic;
|
||||
|
||||
public FarmLogicSimple(IFarmInstance instance, boolean isManual, ISimpleFarmLogic simpleLogic) {
|
||||
public FarmLogicSimple(IFarmProperties instance, boolean isManual, ISimpleFarmLogic simpleLogic) {
|
||||
super(instance, isManual);
|
||||
this.simpleLogic = simpleLogic;
|
||||
}
|
||||
|
||||
@@ -3,21 +3,21 @@ package forestry.farming.logic;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
|
||||
public abstract class FarmLogicSoil extends FarmLogic {
|
||||
|
||||
public FarmLogicSoil(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicSoil(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
protected boolean isAcceptedSoil(IBlockState blockState) {
|
||||
return instance.isAcceptedSoil(blockState);
|
||||
return properties.isAcceptedSoil(blockState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAcceptedResource(ItemStack itemStack) {
|
||||
return instance.isAcceptedResource(itemStack);
|
||||
return properties.isAcceptedResource(itemStack);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -19,12 +19,12 @@ import net.minecraft.world.World;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
|
||||
public class FarmLogicSucculent extends FarmLogicSoil {
|
||||
public FarmLogicSucculent(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicSucculent(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -23,7 +23,7 @@ import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import forestry.api.farming.FarmDirection;
|
||||
import forestry.api.farming.IFarmHousing;
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.ISoil;
|
||||
import forestry.core.utils.BlockUtil;
|
||||
|
||||
@@ -32,8 +32,8 @@ public abstract class FarmLogicWatered extends FarmLogicSoil {
|
||||
|
||||
protected NonNullList<ItemStack> produce = NonNullList.create();
|
||||
|
||||
public FarmLogicWatered(IFarmInstance instance, boolean isManual) {
|
||||
super(instance, isManual);
|
||||
public FarmLogicWatered(IFarmProperties properties, boolean isManual) {
|
||||
super(properties, isManual);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -68,7 +68,7 @@ public abstract class FarmLogicWatered extends FarmLogicSoil {
|
||||
}
|
||||
|
||||
private boolean maintainSoil(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent) {
|
||||
if(!farmHousing.canPlantSoil(isManual)){
|
||||
if (!farmHousing.canPlantSoil(isManual)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+4
-4
@@ -11,13 +11,13 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import forestry.api.farming.IFarmInstance;
|
||||
import forestry.api.farming.IFarmLogic;
|
||||
import forestry.api.farming.IFarmProperties;
|
||||
import forestry.api.farming.IFarmable;
|
||||
import forestry.api.farming.ISoil;
|
||||
import forestry.farming.FarmRegistry;
|
||||
|
||||
public final class FarmInstance implements IFarmInstance {
|
||||
public final class FarmProperties implements IFarmProperties {
|
||||
private final Set<ISoil> soils = new HashSet<>();
|
||||
private final Set<String> farmablesIdentifiers;
|
||||
private final IFarmLogic manualLogic;
|
||||
@@ -27,7 +27,7 @@ public final class FarmInstance implements IFarmInstance {
|
||||
@Nullable
|
||||
private Collection<IFarmable> farmables;
|
||||
|
||||
public FarmInstance(String identifier, BiFunction<IFarmInstance, Boolean, IFarmLogic> logicFactory, Set<String> farmablesIdentifiers) {
|
||||
public FarmProperties(String identifier, BiFunction<IFarmProperties, Boolean, IFarmLogic> logicFactory, Set<String> farmablesIdentifiers) {
|
||||
this.identifier = identifier;
|
||||
this.farmablesIdentifiers = farmablesIdentifiers;
|
||||
this.manualLogic = logicFactory.apply(this, true);
|
||||
@@ -41,7 +41,7 @@ public final class FarmInstance implements IFarmInstance {
|
||||
|
||||
@Override
|
||||
public Collection<IFarmable> getFarmables() {
|
||||
if(farmables == null){
|
||||
if (farmables == null) {
|
||||
farmables = farmablesIdentifiers.stream().map(FarmRegistry.getInstance()::getFarmables).flatMap(Collection::stream).collect(Collectors.toSet());
|
||||
}
|
||||
return farmables;
|
||||
@@ -14,7 +14,7 @@ import forestry.core.utils.NetworkUtil;
|
||||
|
||||
public class CropChorusFlower extends Crop {
|
||||
private static final IBlockState BLOCK_STATE = Blocks.CHORUS_FLOWER.getDefaultState();
|
||||
|
||||
|
||||
public CropChorusFlower(World world, BlockPos position) {
|
||||
super(world, position);
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ public class CropDestroy extends Crop {
|
||||
}
|
||||
removedSeed = true;
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
dropIterator.remove();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ public class FarmableChorus implements IFarmable {
|
||||
|
||||
@Override
|
||||
public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) {
|
||||
if(!canPlace(world, pos)){
|
||||
if (!canPlace(world, pos)) {
|
||||
return false;
|
||||
}
|
||||
return BlockUtil.setBlockWithPlaceSound(world, pos, Blocks.CHORUS_FLOWER.getDefaultState());
|
||||
|
||||
@@ -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