upstream/Binnie
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Binnie.git synced 2026-10-25 20:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Yeet custom config in favor of NHLib (#53)

Browse Source 
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com>
This commit is contained in:
ah-OOG-ahMartin RobertzMaya
 authored and GitHub committed 2024-12-29 12:37:43 -06:00
1 parent 32b7efcd15
commit 0265d70a53
63 files changed
+160 -992
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/binnie/Binnie.java
-2
View File
@@ -8,14 +8,12 @@ import binnie.core.genetics.ManagerGenetics;
import binnie.core.item.ManagerItem;
import binnie.core.liquid.ManagerLiquid;
import binnie.core.machines.ManagerMachine;
import binnie.core.mod.config.ManagerConfig;
import binnie.core.resource.ManagerResource;
public final class Binnie {
public static List<ManagerBase> Managers = new ArrayList<>();
public static ManagerGenetics Genetics = new ManagerGenetics();
public static ManagerConfig Configuration = new ManagerConfig();
public static ManagerLiquid Liquid = new ManagerLiquid();
public static ManagerMachine Machine = new ManagerMachine();
public static ManagerItem Item = new ManagerItem();
src/main/java/binnie/botany/Botany.java
-5
View File
@@ -303,11 +303,6 @@ public class Botany extends AbstractMod {
}
}
@Override
public boolean isActive() {
return BinnieCore.isBotanyActive();
}
@Mod.EventHandler
public void onIMC(FMLInterModComms.IMCEvent event) {
for (FMLInterModComms.IMCMessage message : event.getMessages()) {
src/main/java/binnie/core/AbstractMod.java
+3 -12
View File
@@ -8,7 +8,6 @@ import java.util.List;
import net.minecraftforge.common.MinecraftForge;
import binnie.Binnie;
import binnie.core.gui.IBinnieGUID;
import binnie.core.mod.parser.FieldParser;
import binnie.core.network.BinniePacketHandler;
@@ -33,7 +32,9 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
MinecraftForge.EVENT_BUS.register(this);
}
public abstract boolean isActive();
public boolean isActive() {
return true;
}
@Override
public abstract String getChannel();
@@ -47,10 +48,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
return new IBinnieGUID[0];
}
public Class<?>[] getConfigs() {
return new Class[0];
}
public abstract IProxyCore getProxy();
public abstract String getModID();
@@ -67,12 +64,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
return;
}
if (getConfigs() != null) {
for (Class<?> cls : getConfigs()) {
Binnie.Configuration.registerConfiguration(cls, this);
}
}
getProxy().preInit();
for (IInitializable module : modules) {
module.preInit();
src/main/java/binnie/core/BinnieCore.java
+7 -20
View File
@@ -22,8 +22,6 @@ import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.ItemFluidContainer;
import binnie.core.machines.MachineGroup;
import binnie.core.machines.storage.ModuleStorage;
import binnie.core.mod.config.ConfigurationMain;
import binnie.core.mod.config.ConfigurationMods;
import binnie.core.mod.parser.FieldParser;
import binnie.core.mod.parser.ItemParser;
import binnie.core.network.BinnieCorePacketID;
@@ -49,13 +47,16 @@ import forestry.api.core.ForestryEvent;
import forestry.plugins.PluginManager;
@Mod(
modid = "BinnieCore",
name = "Binnie Core",
modid = BinnieCore.CORE_MODID,
name = BinnieCore.CORE_MOD_NAME,
version = Tags.VERSION,
useMetadata = true,
dependencies = "after:Forestry@[4.2,),required-after:gtnhlib@[0.0.10,)")
public class BinnieCore extends AbstractMod {
public static final String CORE_MODID = "BinnieCore";
public static final String CORE_MOD_NAME = "Binnie Core";
@Mod.Instance("BinnieCore")
public static BinnieCore instance;
@@ -70,7 +71,6 @@ public class BinnieCore extends AbstractMod {
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this);
for (ManagerBase baseManager : Binnie.Managers) {
addModule(baseManager);
}
@@ -134,20 +134,12 @@ public class BinnieCore extends AbstractMod {
return PluginManager.Module.ARBORICULTURE.isEnabled();
}
public static boolean isBotanyActive() {
return ConfigurationMods.botany;
}
public static boolean isGeneticsActive() {
return ConfigurationMods.genetics;
}
public static boolean isExtraBeesActive() {
return ConfigurationMods.extraBees && isApicultureActive();
return isApicultureActive();
}
public static boolean isExtraTreesActive() {
return ConfigurationMods.extraTrees && isArboricultureActive();
return isArboricultureActive();
}
@Override
@@ -215,11 +207,6 @@ public class BinnieCore extends AbstractMod {
Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
}
@Override
public Class<?>[] getConfigs() {
return new Class[] { ConfigurationMain.class };
}
@Override
protected Class<? extends BinniePacketHandler> getPacketHandler() {
return PacketHandler.class;
src/main/java/binnie/core/Mods.java
+1
View File
@@ -14,6 +14,7 @@ public class Mods {
public static final Mod botania = new Mod("Botania");
public static final Mod extraBiomes = new Mod("ExtrabiomesXL");
public static final Mod dreamcraft = new Mod("dreamcraft");
public static final Mod buildcraftCore = new Mod("BuildCraft|Core");
private static Item findItem(String modId, String name) {
Item stack = GameRegistry.findItem(modId, name);
src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java
-15
View File
@@ -1,7 +1,5 @@
package binnie.core.craftgui.minecraft.control;
import net.minecraft.inventory.IInventory;
import org.lwjgl.opengl.GL11;
import binnie.core.craftgui.CraftGUI;
@@ -17,8 +15,6 @@ import binnie.core.craftgui.minecraft.MinecraftTooltip;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.machines.Machine;
import binnie.core.machines.TileEntityMachine;
import binnie.core.machines.power.IPoweredMachine;
import binnie.core.machines.power.IProcess;
import binnie.core.util.I18N;
@@ -34,17 +30,6 @@ public class ControlEnergyBar extends Control implements ITooltip {
addAttribute(WidgetAttribute.MOUSE_OVER);
}
// TODO unused method?
public IPoweredMachine getClientPower() {
IInventory inventory = Window.get(this).getInventory();
TileEntityMachine machine = (inventory instanceof TileEntityMachine) ? (TileEntityMachine) inventory : null;
if (machine == null) {
return null;
}
return machine.getMachine().getInterface(IPoweredMachine.class);
}
public float getPercentage() {
float percentage = 100.0f * getStoredEnergy() / getMaxEnergy();
if (percentage > 100.0f) {
src/main/java/binnie/core/genetics/ManagerGenetics.java
+2 -3
View File
@@ -58,9 +58,8 @@ public class ManagerGenetics extends ManagerBase {
if (BinnieCore.isLepidopteryActive()) {
mothBreedingSystem = new MothBreedingSystem();
}
if (BinnieCore.isBotanyActive()) {
flowerBreedingSystem = new FlowerBreedingSystem();
}
flowerBreedingSystem = new FlowerBreedingSystem();
}
@Override
src/main/java/binnie/core/item/ModuleItems.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class ModuleItems implements IInitializable {
@SubscribeEvent
public void onUseFieldKit(PlayerInteractEvent event) {
if (!BinnieCore.isBotanyActive() || event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
return;
}
src/main/java/binnie/core/machines/IMachineType.java
-2
View File
@@ -5,6 +5,4 @@ import binnie.core.network.IOrdinaled;
public interface IMachineType extends IOrdinaled {
Class<? extends MachinePackage> getPackageClass();
boolean isActive();
}
src/main/java/binnie/core/machines/MachineGroup.java
+3 -3
View File
@@ -31,14 +31,14 @@ public class MachineGroup {
this.blockName = blockName;
for (IMachineType type : types) {
if (type.getPackageClass() != null && type.isActive()) {
if (type.getPackageClass() != null) {
try {
MachinePackage pack = type.getPackageClass().newInstance();
pack.assignMetadata(type.ordinal());
pack.setActive(type.isActive());
pack.setActive(true);
addPackage(pack);
} catch (Exception e) {
throw new RuntimeException("Failed to create machine package " + type.toString(), e);
throw new RuntimeException("Failed to create machine package " + type, e);
}
}
}
src/main/java/binnie/core/machines/inventory/TransferHandler.java
-233
View File
@@ -1,233 +0,0 @@
package binnie.core.machines.inventory;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
import binnie.core.machines.Machine;
import binnie.core.machines.power.ITankMachine;
// TODO unused class?
public class TransferHandler {
public static ItemStack transfer(ItemStack item, IInventory origin, IInventory destination, boolean doAdd) {
ItemStack ret = transferItemToInventory(item, destination, doAdd);
if (destination instanceof ITankMachine) {
ret = transferContainerIntoTank(ret, origin, (ITankMachine) destination, doAdd);
ret = transferTankIntoContainer(ret, origin, (ITankMachine) destination, doAdd);
}
return ret;
}
public static ItemStack transferItemToInventory(ItemStack item, IInventory destination, boolean doAdd) {
if (item == null || destination == null) {
return item;
}
ItemStack addition = item.copy();
for (int i = 0; i < destination.getSizeInventory(); ++i) {
addition = transferToInventory(addition, destination, new int[] { i }, doAdd, false);
if (addition == null) {
return null;
}
}
return addition;
}
public static ItemStack transferToInventory(ItemStack item, IInventory destination, int[] targetSlots,
boolean doAdd, boolean ignoreValidation) {
for (int i : targetSlots) {
if (destination.isItemValidForSlot(i, item) || ignoreValidation) {
if (destination.getStackInSlot(i) == null) {
if (doAdd) {
destination.setInventorySlotContents(i, item.copy());
}
return null;
}
if (item.isStackable()) {
ItemStack merged = destination.getStackInSlot(i).copy();
ItemStack[] newStacks = mergeStacks(item.copy(), merged.copy());
item = newStacks[0];
if (doAdd) {
destination.setInventorySlotContents(i, newStacks[1]);
}
if (item == null) {
return null;
}
}
}
}
return item;
}
public static ItemStack[] mergeStacks(ItemStack itemstack, ItemStack merged) {
if (ItemStack.areItemStackTagsEqual(itemstack, merged) && itemstack.isItemEqual(merged)) {
int space = merged.getMaxStackSize() - merged.stackSize;
if (space > 0) {
if (itemstack.stackSize > space) {
itemstack.stackSize -= space;
merged.stackSize += space;
} else {
merged.stackSize += itemstack.stackSize;
itemstack = null;
}
}
}
return new ItemStack[] { itemstack, merged };
}
public static ItemStack transferContainerIntoTank(ItemStack item, IInventory origin, ITankMachine destination,
boolean doAdd) {
if (item == null) {
return null;
}
IFluidTank[] tanks = destination.getTanks();
ItemStack stack = item.copy();
for (int i = 0; i < tanks.length; ++i) {
stack = transferToTank(stack, origin, destination, i, doAdd);
}
return stack;
}
public static ItemStack transferTankIntoContainer(ItemStack item, IInventory origin, ITankMachine destination,
boolean doAdd) {
if (item == null) {
return null;
}
IFluidTank[] tanks = destination.getTanks();
ItemStack stack = item.copy();
for (int i = 0; i < tanks.length; ++i) {
stack = transferFromTank(stack, origin, destination, i, doAdd);
}
return stack;
}
public static ItemStack transferToTank(ItemStack item, IInventory origin, ITankMachine destination, int tankID,
boolean doAdd) {
if (item == null) {
return item;
}
FluidStack containerLiquid = null;
FluidContainerRegistry.FluidContainerData containerLiquidData = null;
for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry
.getRegisteredFluidContainerData()) {
if (data.filledContainer.isItemEqual(item)) {
containerLiquidData = data;
containerLiquid = data.fluid.copy();
break;
}
}
if (containerLiquid == null) {
return item;
}
IFluidTank tank = destination.getTanks()[tankID];
IValidatedTankContainer validated = Machine.getInterface(IValidatedTankContainer.class, destination);
if (validated != null && !validated.isLiquidValidForTank(containerLiquid, tankID)) {
return item;
}
FluidStack largeAmountOfLiquid = containerLiquid.copy();
largeAmountOfLiquid.amount = tank.getCapacity();
int amountAdded = tank.fill(largeAmountOfLiquid, false);
int numberOfContainersToAdd = amountAdded / containerLiquid.amount;
if (numberOfContainersToAdd > item.stackSize) {
numberOfContainersToAdd = item.stackSize;
}
ItemStack copy;
ItemStack leftOverContainers = copy = item.copy();
copy.stackSize -= numberOfContainersToAdd;
if (leftOverContainers.stackSize <= 0) {
leftOverContainers = null;
}
ItemStack emptyContainers = containerLiquidData.emptyContainer.copy();
emptyContainers.stackSize = 0;
ItemStack itemStack = emptyContainers;
itemStack.stackSize += numberOfContainersToAdd;
if (emptyContainers.stackSize <= 0) {
emptyContainers = null;
}
ItemStack containersThatCantBeDumped = transferItemToInventory(emptyContainers, origin, false);
if (containersThatCantBeDumped != null) {
return item;
}
if (doAdd) {
FluidStack copy2;
FluidStack liquidToFillTank = copy2 = containerLiquid.copy();
copy2.amount *= numberOfContainersToAdd;
tank.fill(liquidToFillTank, true);
transferItemToInventory(emptyContainers, origin, true);
}
return leftOverContainers;
}
public static ItemStack transferFromTank(ItemStack item, IInventory origin, ITankMachine destination, int tankID,
boolean doAdd) {
if (item == null) {
return item;
}
IFluidTank tank = destination.getTanks()[tankID];
FluidStack liquidInTank = tank.getFluid();
if (liquidInTank == null) {
return item;
}
FluidContainerRegistry.FluidContainerData containerLiquidData = null;
for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry
.getRegisteredFluidContainerData()) {
if (data.emptyContainer.isItemEqual(item) && liquidInTank.isFluidEqual(data.fluid)) {
containerLiquidData = data;
break;
}
}
if (containerLiquidData == null) {
return item;
}
int maximumExtractedLiquid = item.stackSize * containerLiquidData.fluid.amount;
FluidStack drainedLiquid = tank.drain(maximumExtractedLiquid, false);
int amountInTank = (drainedLiquid == null) ? 0 : drainedLiquid.amount;
int numberOfContainersToFill = amountInTank / containerLiquidData.fluid.amount;
if (numberOfContainersToFill > item.stackSize) {
numberOfContainersToFill = item.stackSize;
}
ItemStack copy;
ItemStack leftOverContainers = copy = item.copy();
copy.stackSize -= numberOfContainersToFill;
if (leftOverContainers.stackSize <= 0) {
leftOverContainers = null;
}
ItemStack filledContainers = containerLiquidData.filledContainer.copy();
filledContainers.stackSize = 0;
ItemStack itemStack = filledContainers;
itemStack.stackSize += numberOfContainersToFill;
if (filledContainers.stackSize <= 0) {
filledContainers = null;
}
ItemStack containersThatCantBeDumped = transferItemToInventory(filledContainers, origin, false);
if (containersThatCantBeDumped != null) {
return item;
}
if (doAdd) {
tank.drain(maximumExtractedLiquid, true);
transferItemToInventory(filledContainers, origin, true);
}
return leftOverContainers;
}
}
src/main/java/binnie/core/machines/storage/Compartment.java
-5
View File
@@ -32,11 +32,6 @@ enum Compartment implements IMachineType {
return clss;
}
@Override
public boolean isActive() {
return true;
}
public ItemStack get(int i) {
return new ItemStack(BinnieCore.packageCompartment.getBlock(), i, ordinal());
}
src/main/java/binnie/core/machines/transfer/TransferHandler.java
-5
View File
@@ -1,5 +0,0 @@
package binnie.core.machines.transfer;
// TODO unused class?
public class TransferHandler {
}
src/main/java/binnie/core/mod/config/BinnieConfiguration.java
-20
View File
@@ -1,20 +0,0 @@
package binnie.core.mod.config;
import java.io.File;
import net.minecraftforge.common.config.Configuration;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
public class BinnieConfiguration extends Configuration {
public AbstractMod mod;
private final String filename;
public BinnieConfiguration(String filename, AbstractMod mod) {
super(new File(BinnieCore.proxy.getDirectory(), filename));
this.mod = mod;
this.filename = filename;
}
}
src/main/java/binnie/core/mod/config/BinnieItemData.java
-15
View File
@@ -1,15 +0,0 @@
package binnie.core.mod.config;
// TODO Why do we need this class?
class BinnieItemData {
private final int item;
private final BinnieConfiguration configFile;
private final String configKey;
public BinnieItemData(int item, BinnieConfiguration configFile, String configKey) {
this.item = item;
this.configFile = configFile;
this.configKey = configKey;
}
}
src/main/java/binnie/core/mod/config/ConfigFile.java
-10
View File
@@ -1,10 +0,0 @@
package binnie.core.mod.config;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.RUNTIME)
public @interface ConfigFile {
String filename();
}
src/main/java/binnie/core/mod/config/ConfigProperty.java
-26
View File
@@ -1,26 +0,0 @@
package binnie.core.mod.config;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.FIELD })
public @interface ConfigProperty {
String key();
String category() default "";
String[] comment() default {};
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.ANNOTATION_TYPE })
@interface Type {
Class<? extends PropertyBase> propertyClass();
String category() default "general";
}
}
src/main/java/binnie/core/mod/config/ConfigurationMain.java
-5
View File
@@ -1,5 +0,0 @@
package binnie.core.mod.config;
@ConfigFile(filename = "/config/forestry/binniecore/main.conf")
public class ConfigurationMain {
}
src/main/java/binnie/core/mod/config/ConfigurationMods.java
-21
View File
@@ -1,21 +0,0 @@
package binnie.core.mod.config;
@ConfigFile(filename = "/config/forestry/binnie-mods.conf")
public class ConfigurationMods {
@ConfigProperty(key = "extraBees", comment = { "Enables the Extra Bees Mod." })
@PropBoolean
public static boolean extraBees = true;
@ConfigProperty(key = "extraTrees", comment = { "Enables the Extra Trees Mod." })
@PropBoolean
public static boolean extraTrees = true;
@ConfigProperty(key = "botany", comment = { "Enables the Botany Mod." })
@PropBoolean
public static boolean botany = true;
@ConfigProperty(key = "genetics", comment = { "Enables the Genetics Mod." })
@PropBoolean
public static boolean genetics = true;
}
src/main/java/binnie/core/mod/config/ManagerConfig.java
-71
View File
@@ -1,71 +0,0 @@
package binnie.core.mod.config;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import net.minecraftforge.common.config.Configuration;
import binnie.core.AbstractMod;
import binnie.core.ManagerBase;
public class ManagerConfig extends ManagerBase {
private final Map<Class<?>, Configuration> configurations;
private final Map<AbstractMod, List<BinnieItemData>> itemIDs;
public ManagerConfig() {
configurations = new LinkedHashMap<>();
itemIDs = new HashMap<>();
}
public void registerConfiguration(Class<?> cls, AbstractMod mod) {
if (cls.isAnnotationPresent(ConfigFile.class)) {
loadConfiguration(cls, mod);
}
}
public void loadConfiguration(Class<?> cls, AbstractMod mod) {
try {
String filename = cls.getAnnotation(ConfigFile.class).filename();
BinnieConfiguration config = new BinnieConfiguration(filename, mod);
config.load();
for (Field field : cls.getFields()) {
if (field.isAnnotationPresent(ConfigProperty.class)) {
ConfigProperty propertyAnnot = field.getAnnotation(ConfigProperty.class);
for (Annotation annotation : field.getAnnotations()) {
if (annotation.annotationType().isAnnotationPresent(ConfigProperty.Type.class)) {
Class<?> propertyClass = annotation.annotationType()
.getAnnotation(ConfigProperty.Type.class).propertyClass();
// TODO what for?
PropertyBase property = (PropertyBase) propertyClass.getConstructor(
Field.class,
BinnieConfiguration.class,
ConfigProperty.class,
annotation.annotationType()).newInstance(
field,
config,
propertyAnnot,
annotation.annotationType().cast(annotation));
}
}
}
}
config.save();
configurations.put(cls, config);
} catch (Exception e) {
e.printStackTrace();
}
}
public void addItemID(Integer configValue, String configKey, BinnieConfiguration configFile) {
if (!itemIDs.containsKey(configFile.mod)) {
itemIDs.put(configFile.mod, new ArrayList<>());
}
itemIDs.get(configFile.mod).add(new BinnieItemData(configValue + 256, configFile, configKey));
}
}
src/main/java/binnie/core/mod/config/PropBoolean.java
-35
View File
@@ -1,35 +0,0 @@
package binnie.core.mod.config;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Field;
import net.minecraftforge.common.config.Property;
@Retention(RetentionPolicy.RUNTIME)
@ConfigProperty.Type(propertyClass = PropBoolean.PropertyBoolean.class)
public @interface PropBoolean {
class PropertyBoolean extends PropertyBase<Boolean, PropBoolean> {
public PropertyBoolean(Field field, BinnieConfiguration file, ConfigProperty configProperty,
PropBoolean annotedProperty) throws IllegalArgumentException, IllegalAccessException {
super(field, file, configProperty, annotedProperty);
}
@Override
protected Property getProperty() {
return file.get(getCategory(), getKey(), defaultValue);
}
@Override
protected Boolean getConfigValue() {
return property.getBoolean(defaultValue);
}
@Override
protected void addComments() {
addComment("Default value is " + defaultValue + ".");
}
}
}
src/main/java/binnie/core/mod/config/PropDouble.java
-35
View File
@@ -1,35 +0,0 @@
package binnie.core.mod.config;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Field;
import net.minecraftforge.common.config.Property;
@Retention(RetentionPolicy.RUNTIME)
@ConfigProperty.Type(propertyClass = PropDouble.PropertyDouble.class)
public @interface PropDouble {
class PropertyDouble extends PropertyBase<Double, PropDouble> {
public PropertyDouble(Field field, BinnieConfiguration file, ConfigProperty configProperty,
PropDouble annotedProperty) throws IllegalArgumentException, IllegalAccessException {
super(field, file, configProperty, annotedProperty);
}
@Override
protected Property getProperty() {
return file.get(getCategory(), getKey(), defaultValue);
}
@Override
protected Double getConfigValue() {
return property.getDouble(defaultValue);
}
@Override
protected void addComments() {
addComment("Default value is " + defaultValue + ".");
}
}
}
src/main/java/binnie/core/mod/config/PropInteger.java
-35
View File
@@ -1,35 +0,0 @@
package binnie.core.mod.config;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Field;
import net.minecraftforge.common.config.Property;
@Retention(RetentionPolicy.RUNTIME)
@ConfigProperty.Type(propertyClass = PropInteger.PropertyInteger.class)
public @interface PropInteger {
class PropertyInteger extends PropertyBase<Integer, PropInteger> {
public PropertyInteger(Field field, BinnieConfiguration file, ConfigProperty configProperty,
PropInteger annotedProperty) throws IllegalArgumentException, IllegalAccessException {
super(field, file, configProperty, annotedProperty);
}
@Override
protected Property getProperty() {
return file.get(getCategory(), getKey(), defaultValue);
}
@Override
protected Integer getConfigValue() {
return property.getInt(defaultValue);
}
@Override
protected void addComments() {
addComment("Default value is " + defaultValue + ".");
}
}
}
src/main/java/binnie/core/mod/config/PropPercentage.java
-40
View File
@@ -1,40 +0,0 @@
package binnie.core.mod.config;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Field;
import net.minecraftforge.common.config.Property;
@Retention(RetentionPolicy.RUNTIME)
@ConfigProperty.Type(propertyClass = PropPercentage.PropertyPercentage.class)
public @interface PropPercentage {
int upper() default 100;
int lower() default 0;
class PropertyPercentage extends PropertyBase<Integer, PropPercentage> {
public PropertyPercentage(Field field, BinnieConfiguration file, ConfigProperty configProperty,
PropPercentage annotedProperty) throws IllegalArgumentException, IllegalAccessException {
super(field, file, configProperty, annotedProperty);
}
@Override
protected Integer getConfigValue() {
return property.getInt(defaultValue);
}
@Override
protected void addComments() {
addComment("Default value is " + defaultValue + "%.");
addComment("Range is " + annotatedProperty.lower() + "-" + annotatedProperty.upper() + "%.");
}
@Override
protected Property getProperty() {
return file.get(getCategory(), getKey(), defaultValue);
}
}
}
src/main/java/binnie/core/mod/config/PropertyBase.java
-71
View File
@@ -1,71 +0,0 @@
package binnie.core.mod.config;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
public abstract class PropertyBase<ValueType, AnnotationType extends Annotation> {
protected Configuration file;
protected Property property;
protected ValueType defaultValue;
protected AnnotationType annotatedProperty;
private final ConfigProperty configProperty;
private final List<String> comments;
private final Field field;
protected PropertyBase(Field field, BinnieConfiguration file, ConfigProperty configProperty,
AnnotationType annotedProperty) throws IllegalArgumentException, IllegalAccessException {
comments = new ArrayList<>();
this.field = field;
this.file = file;
this.configProperty = configProperty;
annotatedProperty = annotedProperty;
defaultValue = getDefaultValue(field);
property = getProperty();
for (String comment : configProperty.comment()) {
addComment(comment);
}
addComments();
property.comment = getComment();
field.set(null, getConfigValue());
}
protected abstract Property getProperty();
protected abstract ValueType getConfigValue();
protected abstract void addComments();
protected String getCategory() {
return configProperty.category().isEmpty()
? annotatedProperty.annotationType().getAnnotation(ConfigProperty.Type.class).category()
: configProperty.category();
}
protected String getKey() {
return configProperty.key();
}
protected ValueType getDefaultValue(Field field) throws IllegalArgumentException, IllegalAccessException {
return (ValueType) field.get(null);
}
protected void addComment(String comment) {
comments.add(comment);
}
protected String getComment() {
StringBuilder comment = new StringBuilder();
for (String com : comments) {
comment.append(com).append(" ");
}
return comment.toString();
}
}
src/main/java/binnie/core/network/packet/IPacket.java
-9
View File
@@ -1,9 +0,0 @@
package binnie.core.network.packet;
import net.minecraft.network.Packet;
// TODO unused interface?
public interface IPacket {
Packet getPacket();
}
src/main/java/binnie/core/network/packet/IndexInPayload.java
-15
View File
@@ -1,15 +0,0 @@
package binnie.core.network.packet;
// TODO unused class?
public class IndexInPayload {
public int intIndex;
public int floatIndex;
public int stringIndex;
public IndexInPayload(int intIndex, int floatIndex, int stringIndex) {
this.intIndex = intIndex;
this.floatIndex = floatIndex;
this.stringIndex = stringIndex;
}
}
src/main/java/binnie/core/network/packet/MessageContainerUpdate.java
-4
View File
@@ -8,8 +8,4 @@ public class MessageContainerUpdate extends MessageCraftGUI {
super(nbt);
}
// TODO unused constructor?
public MessageContainerUpdate(MessageBinnie message) {
super(message);
}
}
src/main/java/binnie/core/network/packet/MessageCoordinates.java
-11
View File
@@ -3,7 +3,6 @@ package binnie.core.network.packet;
import java.io.IOException;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.World;
import io.netty.buffer.ByteBuf;
@@ -18,11 +17,6 @@ public class MessageCoordinates extends MessageBase {
super(message);
}
// TODO unused constructor?
public MessageCoordinates(int id, ChunkCoordinates coordinates) {
this(id, coordinates.posX, coordinates.posY, coordinates.posZ);
}
public MessageCoordinates(int id, int posX, int posY, int posZ) {
super(id);
this.posX = posX;
@@ -44,11 +38,6 @@ public class MessageCoordinates extends MessageBase {
posZ = data.readInt();
}
// TODO unused method?
public ChunkCoordinates getCoordinates() {
return new ChunkCoordinates(posX, posY, posZ);
}
public TileEntity getTileEntity(World world) {
return world.getTileEntity(posX, posY, posZ);
}
src/main/java/binnie/core/network/packet/MessageUpdate.java
-5
View File
@@ -4,7 +4,6 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import binnie.core.network.INetworkedEntity;
import io.netty.buffer.ByteBuf;
@@ -75,8 +74,4 @@ public class MessageUpdate extends MessageCoordinates {
}
}
// TODO unused method?
public TileEntity getTarget(World world) {
return world.getTileEntity(posX, posY, posZ);
}
}
src/main/java/binnie/core/network/packet/PacketPayload.java
-18
View File
@@ -3,8 +3,6 @@ package binnie.core.network.packet;
import java.util.ArrayList;
import java.util.List;
import binnie.core.network.INetworkedEntity;
public class PacketPayload {
public List<Integer> intPayload;
@@ -17,12 +15,6 @@ public class PacketPayload {
stringPayload = new ArrayList<>();
}
// TODO unused constructor?
public PacketPayload(INetworkedEntity tile) {
this();
tile.writeToPacket(this);
}
public void addInteger(int a) {
intPayload.add(a);
}
@@ -47,16 +39,6 @@ public class PacketPayload {
return stringPayload.remove(0);
}
// TODO unused method
public void append(PacketPayload other) {
if (other == null) {
return;
}
intPayload.addAll(other.intPayload);
floatPayload.addAll(other.floatPayload);
stringPayload.addAll(other.stringPayload);
}
public boolean isEmpty() {
return intPayload.isEmpty() && floatPayload.isEmpty() && stringPayload.isEmpty();
}
src/main/java/binnie/core/proxy/BinnieProxy.java
-16
View File
@@ -20,7 +20,6 @@ import binnie.core.network.INetworkedEntity;
import binnie.core.network.packet.MessageUpdate;
import binnie.core.resource.BinnieResource;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.GameRegistry;
public class BinnieProxy extends BinnieModProxy implements IBinnieProxy {
@@ -69,11 +68,6 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy {
return null;
}
// TODO unused method?
public void throwException(String message, Throwable e) {
FMLCommonHandler.instance().raiseException(e, message, true);
}
@Override
public Minecraft getMinecraftInstance() {
return null;
@@ -129,16 +123,6 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy {
return null;
}
// TODO unused method?
public void handleTextureRefresh(IIconRegister register, int type) {
// ignored
}
// TODO unused method?
public void handlePostTextureRefresh(IIconRegister register, int type) {
// ignored
}
public short getUniqueTextureUID() {
uniqueTextureUID++;
return uniqueTextureUID;
src/main/java/binnie/core/proxy/BinnieProxyClient.java
-8
View File
@@ -21,7 +21,6 @@ import net.minecraftforge.client.MinecraftForgeClient;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;
import binnie.Binnie;
import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager;
import binnie.core.resource.BinnieResource;
import cpw.mods.fml.client.FMLClientHandler;
@@ -139,13 +138,6 @@ public class BinnieProxyClient extends BinnieProxy implements IBinnieProxy {
return Minecraft.getMinecraft().thePlayer;
}
// TODO unused method?
public void handlePreTextureRefresh(IIconRegister register, int type) {
if (type == 0) {
Binnie.Liquid.reloadIcons(register);
}
}
@Override
public void preInit() {
IResourceManager manager = Minecraft.getMinecraft().getResourceManager();
src/main/java/binnie/extrabees/ExtraBees.java
+17 -9
View File
@@ -4,6 +4,9 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
import com.gtnewhorizon.gtnhlib.config.ConfigException;
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.core.Tags;
@@ -11,8 +14,7 @@ import binnie.core.gui.IBinnieGUID;
import binnie.core.network.BinniePacketHandler;
import binnie.core.proxy.IProxyCore;
import binnie.extrabees.apiary.ModuleApiary;
import binnie.extrabees.config.ConfigurationMachines;
import binnie.extrabees.config.ConfigurationMain;
import binnie.extrabees.config.EBConfig;
import binnie.extrabees.core.ExtraBeeGUID;
import binnie.extrabees.core.ModuleCore;
import binnie.extrabees.genetics.ModuleGenetics;
@@ -27,13 +29,16 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@Mod(
modid = "ExtraBees",
name = "Extra Bees",
modid = ExtraBees.EB_MODID,
name = ExtraBees.EB_MOD_NAME,
version = Tags.VERSION,
useMetadata = true,
dependencies = "after:BinnieCore")
public class ExtraBees extends AbstractMod {
public static final String EB_MODID = "ExtraBees";
public static final String EB_MOD_NAME = "Extra Bees";
@Mod.Instance("ExtraBees")
public static ExtraBees instance;
@@ -42,6 +47,14 @@ public class ExtraBees extends AbstractMod {
serverSide = "binnie.extrabees.proxy.ExtraBeesProxyServer")
public static ExtraBeesProxy proxy;
static {
try {
ConfigurationManager.registerConfig(EBConfig.class);
} catch (ConfigException e) {
throw new RuntimeException(e);
}
}
public static Block hive;
public static Material materialBeehive;
public static Block ectoplasm;
@@ -81,11 +94,6 @@ public class ExtraBees extends AbstractMod {
return ExtraBeeGUID.values();
}
@Override
public Class<?>[] getConfigs() {
return new Class[] { ConfigurationMain.class, ConfigurationMachines.class };
}
@Override
public IProxyCore getProxy() {
return ExtraBees.proxy;
src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java
-13
View File
@@ -1,10 +1,7 @@
package binnie.extrabees.apiary;
import net.minecraft.item.ItemStack;
import binnie.core.machines.Machine;
import binnie.core.machines.MachineComponent;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
@@ -61,21 +58,11 @@ public class ComponentBeeModifier extends MachineComponent implements IBeeModifi
return false;
}
// TODO unused method?
public void onQueenChange(ItemStack queen) {
// ignored
}
@Override
public void wearOutEquipment(int amount) {
// ignored
}
// TODO unused method?
public boolean onEggLaid(IBee queen) {
return false;
}
@Override
public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
return 1.0f;
src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java
-5
View File
@@ -46,11 +46,6 @@ public enum AlvearyMachine implements IMachineType {
return new ItemStack(ModuleApiary.blockComponent, size, ordinal());
}
@Override
public boolean isActive() {
return true;
}
public abstract static class AlvearyPackage extends MachinePackage {
protected BinnieResource machineTexture;
src/main/java/binnie/extrabees/config/ConfigurationMachines.java
-24
View File
@@ -1,24 +0,0 @@
package binnie.extrabees.config;
import binnie.core.mod.config.ConfigFile;
import binnie.core.mod.config.ConfigProperty;
import binnie.core.mod.config.PropDouble;
import binnie.core.mod.config.PropPercentage;
@ConfigFile(filename = "/config/forestry/extrabees/machines.conf")
public class ConfigurationMachines {
@ConfigProperty(
key = "isolatorConsumptionChance",
comment = { "Percentage chance of Isolator consuming bee, in x%." })
@PropPercentage
public static int isolatorConsumptionChance = 30;
@ConfigProperty(
key = "geneticErrorModifier",
comment = { "Modifier that changes how severe splicer/inoculator erros are.",
"0 would result in no errors, even for awful serums.",
"2.0 would result in twice as severe errors" })
@PropDouble
public static double geneticErrorModifier = 1.0;
}
src/main/java/binnie/extrabees/config/ConfigurationMain.java
-30
View File
@@ -1,30 +0,0 @@
package binnie.extrabees.config;
import binnie.core.mod.config.ConfigFile;
import binnie.core.mod.config.ConfigProperty;
import binnie.core.mod.config.PropBoolean;
import binnie.core.mod.config.PropInteger;
@ConfigFile(filename = "/config/forestry/extrabees/main.conf")
public class ConfigurationMain {
@ConfigProperty(key = "canQuarryMineHives")
@PropBoolean
public static boolean canQuarryMineHives = true;
@ConfigProperty(key = "waterHiveRate")
@PropInteger
public static int waterHiveRate = 1;
@ConfigProperty(key = "rockHiveRate")
@PropInteger
public static int rockHiveRate = 2;
@ConfigProperty(key = "netherHiveRate")
@PropInteger
public static int netherHiveRate = 2;
@ConfigProperty(key = "marbleHiveRate")
@PropInteger
public static int marbleHiveRate = 2;
}
src/main/java/binnie/extrabees/config/EBConfig.java
+28
View File
@@ -0,0 +1,28 @@
package binnie.extrabees.config;
import static binnie.extrabees.ExtraBees.EB_MODID;
import com.gtnewhorizon.gtnhlib.config.Config;
@Config(modid = EB_MODID)
public class EBConfig {
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean canQuarryMineHives;
@Config.Comment("Attempt to generate this many hives per chunk.")
@Config.RangeInt(min = 0)
@Config.DefaultInt(1)
public static int waterHiveRate;
@Config.Comment("Attempt to generate this many hives per chunk.")
@Config.RangeInt(min = 0)
@Config.DefaultInt(2)
public static int rockHiveRate;
@Config.Comment("Attempt to generate this many hives per chunk.")
@Config.RangeInt(min = 0)
@Config.DefaultInt(2)
public static int netherHiveRate;
}
src/main/java/binnie/extrabees/config/EBConfigMachines.java
+14
View File
@@ -0,0 +1,14 @@
package binnie.extrabees.config;
import static binnie.extrabees.ExtraBees.EB_MODID;
import com.gtnewhorizon.gtnhlib.config.Config;
@Config(modid = EB_MODID)
public class EBConfigMachines {
@Config.Comment("Percentage chance of Isolator consuming bee. 0 never consumes, 1 always does.")
@Config.RangeFloat(min = 0f, max = 1f)
@Config.DefaultFloat(0.05f)
public static float isolatorConsumptionChance;
}
src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java
+7 -13
View File
@@ -1,5 +1,7 @@
package binnie.extrabees.worldgen;
import static binnie.core.Mods.buildcraftCore;
import java.util.Random;
import net.minecraft.world.World;
@@ -7,7 +9,7 @@ import net.minecraft.world.chunk.IChunkProvider;
import binnie.core.IInitializable;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.config.ConfigurationMain;
import binnie.extrabees.config.EBConfig;
import binnie.extrabees.genetics.ExtraBeeDefinition;
import buildcraft.api.core.BuildCraftAPI;
import cpw.mods.fml.common.IWorldGenerator;
@@ -16,11 +18,6 @@ import forestry.apiculture.genetics.BeeDefinition;
public class ModuleGeneration implements IWorldGenerator, IInitializable {
protected static int waterRate = 2;
protected static int rockRate = 2;
protected static int netherRate = 2;
protected static int marbleRate = 2;
@Override
public void preInit() {
ExtraBees.materialBeehive = new MaterialBeehive();
@@ -30,11 +27,8 @@ public class ModuleGeneration implements IWorldGenerator, IInitializable {
@Override
public void init() {
ModuleGeneration.waterRate = ConfigurationMain.waterHiveRate;
ModuleGeneration.rockRate = ConfigurationMain.rockHiveRate;
ModuleGeneration.netherRate = ConfigurationMain.netherHiveRate;
GameRegistry.registerWorldGenerator(new ModuleGeneration(), 0);
if (!ConfigurationMain.canQuarryMineHives) {
if (!EBConfig.canQuarryMineHives && buildcraftCore.active()) {
BuildCraftAPI.softBlocks.add(ExtraBees.hive);
}
}
@@ -62,21 +56,21 @@ public class ModuleGeneration implements IWorldGenerator, IInitializable {
chunkX <<= 4;
chunkZ <<= 4;
for (int i = 0; i < ModuleGeneration.waterRate; ++i) {
for (int i = 0; i < EBConfig.waterHiveRate; ++i) {
int randPosX = chunkX + rand.nextInt(16);
int randPosY = rand.nextInt(50) + 20;
int randPosZ = chunkZ + rand.nextInt(16);
new WorldGenHiveWater().generate(world, rand, randPosX, randPosY, randPosZ);
}
for (int i = 0; i < ModuleGeneration.rockRate; ++i) {
for (int i = 0; i < EBConfig.rockHiveRate; ++i) {
int randPosX = chunkX + rand.nextInt(16);
int randPosY = rand.nextInt(50) + 20;
int randPosZ = chunkZ + rand.nextInt(16);
new WorldGenHiveRock().generate(world, rand, randPosX, randPosY, randPosZ);
}
for (int i = 0; i < ModuleGeneration.netherRate; ++i) {
for (int i = 0; i < EBConfig.netherHiveRate; ++i) {
int randPosX = chunkX + rand.nextInt(16);
int randPosY = rand.nextInt(50) + 20;
int randPosZ = chunkZ + rand.nextInt(16);
src/main/java/binnie/extratrees/ExtraTrees.java
+21 -8
View File
@@ -1,8 +1,14 @@
package binnie.extratrees;
import static binnie.extratrees.ExtraTrees.EB_MOD_NAME;
import static binnie.extratrees.ExtraTrees.ET_MODID;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import com.gtnewhorizon.gtnhlib.config.ConfigException;
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.core.Tags;
@@ -16,7 +22,7 @@ import binnie.extratrees.block.decor.BlockMultiFence;
import binnie.extratrees.carpentry.BlockCarpentry;
import binnie.extratrees.carpentry.BlockStainedDesign;
import binnie.extratrees.carpentry.ModuleCarpentry;
import binnie.extratrees.config.ConfigurationMain;
import binnie.extratrees.config.ETConfig;
import binnie.extratrees.core.ExtraTreesGUID;
import binnie.extratrees.core.ModuleCore;
import binnie.extratrees.genetics.ModuleGenetics;
@@ -31,19 +37,30 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@Mod(
modid = "ExtraTrees",
name = "Extra Trees",
modid = ET_MODID,
name = EB_MOD_NAME,
version = Tags.VERSION,
useMetadata = true,
dependencies = "after:BinnieCore")
public class ExtraTrees extends AbstractMod {
public static final String ET_MODID = "ExtraTrees";
public static final String EB_MOD_NAME = "Extra Trees";
@Mod.Instance("ExtraTrees")
public static ExtraTrees instance;
@SidedProxy(clientSide = "binnie.extratrees.proxy.ProxyClient", serverSide = "binnie.extratrees.proxy.ProxyServer")
public static Proxy proxy;
static {
try {
ConfigurationManager.registerConfig(ETConfig.class);
} catch (ConfigException e) {
throw new RuntimeException(e);
}
}
public static Item itemDictionary;
public static Item itemDictionaryLepi;
public static Item itemMisc;
@@ -101,11 +118,6 @@ public class ExtraTrees extends AbstractMod {
return ExtraTreesGUID.values();
}
@Override
public Class<?>[] getConfigs() {
return new Class[] { ConfigurationMain.class };
}
@Override
public String getChannel() {
return "ET";
@@ -116,6 +128,7 @@ public class ExtraTrees extends AbstractMod {
return ExtraTrees.proxy;
}
// Concerningly, this isn't the same as the MODID
@Override
public String getModID() {
return "extratrees";
src/main/java/binnie/extratrees/config/ConfigurationMain.java
-15
View File
@@ -1,15 +0,0 @@
package binnie.extratrees.config;
import binnie.core.mod.config.ConfigFile;
import binnie.core.mod.config.ConfigProperty;
import binnie.core.mod.config.PropBoolean;
@ConfigFile(filename = "/config/forestry/extratrees/main.conf")
public class ConfigurationMain {
@ConfigProperty(
key = "lemon.citrus.family",
comment = { "Uses reflection to convert the Forestry lemon tree to the Citrus family." })
@PropBoolean
public static boolean alterLemon = true;
}
src/main/java/binnie/extratrees/config/ETConfig.java
+14
View File
@@ -0,0 +1,14 @@
package binnie.extratrees.config;
import static binnie.extratrees.ExtraTrees.ET_MODID;
import com.gtnewhorizon.gtnhlib.config.Config;
@Config(modid = ET_MODID)
public class ETConfig {
@Config.Comment("Uses reflection to convert the Forestry lemon tree to the Citrus family.")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean alterLemon;
}
src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java
+2 -2
View File
@@ -17,7 +17,7 @@ import binnie.Binnie;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.FruitPod;
import binnie.extratrees.config.ConfigurationMain;
import binnie.extratrees.config.ETConfig;
import binnie.extratrees.item.Food;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -254,7 +254,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
ExtraTreeFruitGene.Candlenut.addProduct(Food.Candlenut.get(1), 1.0f);
ExtraTreeFruitGene.Candlenut.setFamily(familyJungle);
if (ConfigurationMain.alterLemon) {
if (ETConfig.alterLemon) {
try {
IAlleleFruit lemon = (IAlleleFruit) AlleleManager.alleleRegistry.getAllele("forestry.fruitLemon");
FruitProviderNone prov = (FruitProviderNone) lemon.getProvider();
src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java
-14
View File
@@ -1,7 +1,6 @@
package binnie.extratrees.genetics;
import java.awt.Color;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
@@ -690,19 +689,6 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
.setFertility(EnumAllele.Saplings.LOW).setMaturation(EnumAllele.Maturation.SLOWER);
}
// TODO unused method?
static ItemStack getEBXLStack(String name) {
try {
Class elements = Class.forName("extrabiomes.lib.Element");
Method getElementMethod = elements.getMethod("valueOf", String.class);
Method getItemStack = elements.getMethod("get");
Object element = getElementMethod.invoke(null, "SAPLING_AUTUMN_YELLOW");
return (ItemStack) getItemStack.invoke(element);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
private ExtraTreeSpecies addFamily(IFruitFamily family) {
families.add(family);
return this;
src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java
-9
View File
@@ -7,7 +7,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.machines.IMachineType;
import binnie.core.machines.Machine;
import binnie.core.machines.MachineComponent;
@@ -43,14 +42,6 @@ public enum ExtraTreeMachine implements IMachineType {
return cls;
}
@Override
public boolean isActive() {
if (this == ExtraTreeMachine.Tileworker) {
return BinnieCore.isBotanyActive();
}
return true;
}
public ItemStack get(int i) {
return new ItemStack(ExtraTrees.blockMachine, i, ordinal());
}
src/main/java/binnie/genetics/Genetics.java
+1 -2
View File
@@ -3,7 +3,6 @@ package binnie.genetics;
import net.minecraft.item.Item;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.core.Tags;
import binnie.core.gui.IBinnieGUID;
import binnie.core.machines.MachineGroup;
@@ -106,7 +105,7 @@ public class Genetics extends AbstractMod {
@Override
public boolean isActive() {
return BinnieCore.isGeneticsActive();
return true;
}
public static class PacketHandler extends BinniePacketHandler {
src/main/java/binnie/genetics/GeneticsCreativeTab.java
+1 -5
View File
@@ -11,11 +11,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class GeneticsCreativeTab extends CreativeTabs {
public static CreativeTabs instance;
static {
GeneticsCreativeTab.instance = new GeneticsCreativeTab();
}
public static CreativeTabs instance = new GeneticsCreativeTab();
public GeneticsCreativeTab() {
super("Genetics");
src/main/java/binnie/genetics/config/ConfigurationMain.java
-7
View File
@@ -1,7 +0,0 @@
package binnie.genetics.config;
import binnie.core.mod.config.ConfigFile;
@ConfigFile(filename = "/config/forestry/genetics/main.conf")
public class ConfigurationMain {
}
src/main/java/binnie/genetics/item/ModuleItem.java
+1 -1
View File
@@ -306,7 +306,7 @@ public class ModuleItem implements IInitializable {
// as above, there are only 24 permutations here; let's find a way to just get those recipes rather than trying
// 256 combinations in an n^4 loop. This will help performance and maybe be a bit more maintainable.
if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) {
if (BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) {
// 24 full recipe lines is a bit much to maintain; so we'll use a loop here, but we're only going
// to run it 24 times. Start by making an array of all 24 valid dictionary permutations...
String[] permutations = new String[] { "btlf", "btfl", "bltf", "blft", "bftl", "bflt", "tblf", "tbfl",
src/main/java/binnie/genetics/machine/AdvGeneticMachine.java
-5
View File
@@ -23,11 +23,6 @@ public enum AdvGeneticMachine implements IMachineType {
return cls;
}
@Override
public boolean isActive() {
return true;
}
public ItemStack get(int i) {
return new ItemStack(Genetics.packageAdvGenetic.getBlock(), i, ordinal());
}
src/main/java/binnie/genetics/machine/ComponentGUIHolder.java
+2 -3
View File
@@ -116,9 +116,8 @@ public class ComponentGUIHolder extends MachineComponent implements INetwork.Til
}
List<Item> validSelections = new ArrayList<>();
if (BinnieCore.isBotanyActive()) {
validSelections.add(Botany.database);
}
validSelections.add(Botany.database);
if (BinnieCore.isExtraBeesActive()) {
validSelections.add(ExtraBees.dictionary);
}
src/main/java/binnie/genetics/machine/GeneticMachine.java
-5
View File
@@ -28,11 +28,6 @@ public enum GeneticMachine implements IMachineType {
return clss;
}
@Override
public boolean isActive() {
return true;
}
public ItemStack get(int i) {
return new ItemStack(Genetics.packageGenetic.getBlock(), i, ordinal());
}
src/main/java/binnie/genetics/machine/LaboratoryMachine.java
-5
View File
@@ -30,11 +30,6 @@ public enum LaboratoryMachine implements IMachineType {
return clss;
}
@Override
public boolean isActive() {
return true;
}
public ItemStack get(int i) {
return new ItemStack(Genetics.packageLabMachine.getBlock(), i, ordinal());
}
src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java
+9 -11
View File
@@ -106,17 +106,15 @@ public class Acclimatiser {
ToleranceType.Temperature);
}
if (BinnieCore.isBotanyActive()) {
addTolerance(
Binnie.Genetics.getFlowerRoot().getUID(),
EnumFlowerChromosome.HUMIDITY_TOLERANCE,
ToleranceType.Humidity);
addTolerance(
Binnie.Genetics.getFlowerRoot().getUID(),
EnumFlowerChromosome.TEMPERATURE_TOLERANCE,
ToleranceType.Temperature);
addTolerance(Binnie.Genetics.getFlowerRoot().getUID(), EnumFlowerChromosome.PH_TOLERANCE, ToleranceType.PH);
}
addTolerance(
Binnie.Genetics.getFlowerRoot().getUID(),
EnumFlowerChromosome.HUMIDITY_TOLERANCE,
ToleranceType.Humidity);
addTolerance(
Binnie.Genetics.getFlowerRoot().getUID(),
EnumFlowerChromosome.TEMPERATURE_TOLERANCE,
ToleranceType.Temperature);
addTolerance(Binnie.Genetics.getFlowerRoot().getUID(), EnumFlowerChromosome.PH_TOLERANCE, ToleranceType.PH);
addTemperatureItem(new ItemStack(Items.blaze_powder), 0.5f);
addTemperatureItem(new ItemStack(Items.blaze_rod), 0.75f);
src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java
+2 -1
View File
@@ -14,6 +14,7 @@ import binnie.core.machines.power.ComponentProcessSetCost;
import binnie.core.machines.power.ErrorState;
import binnie.core.machines.power.IProcess;
import binnie.core.util.I18N;
import binnie.extrabees.config.EBConfigMachines;
import binnie.genetics.item.ItemSequence;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
@@ -104,7 +105,7 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I
ItemStack serum = ItemSequence.create(gene);
getUtil().setStack(Isolator.SLOT_RESULT, serum);
getUtil().decreaseStack(Isolator.SLOT_SEQUENCER_VIAL, 1);
if (rand.nextFloat() < 0.05f) {
if (rand.nextFloat() < EBConfigMachines.isolatorConsumptionChance) {
getUtil().decreaseStack(Isolator.SLOT_TARGET, 1);
}
getUtil().drainTank(Isolator.TANK_ETHANOL, (int) ethanolPerProcess);
src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java
+8 -10
View File
@@ -37,11 +37,10 @@ public class AcclimatiserRecipeHandler extends RecipeHandlerBase {
targets.add(Mods.forestry.stack("caterpillarGE", 1, OreDictionary.WILDCARD_VALUE));
targets.add(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE));
}
if (BinnieCore.isBotanyActive()) {
targets.add(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE));
targets.add(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE));
targets.add(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE));
}
targets.add(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE));
targets.add(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE));
targets.add(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE));
recipes.add(new AcclimatiserRecipe(targets, resource, effect, ToleranceType.Temperature));
});
Acclimatiser.humidityItems.forEach((resource, effect) -> {
@@ -57,11 +56,10 @@ public class AcclimatiserRecipeHandler extends RecipeHandlerBase {
targets.add(Mods.forestry.stack("caterpillarGE", 1, OreDictionary.WILDCARD_VALUE));
targets.add(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE));
}
if (BinnieCore.isBotanyActive()) {
targets.add(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE));
targets.add(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE));
targets.add(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE));
}
targets.add(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE));
targets.add(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE));
targets.add(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE));
recipes.add(new AcclimatiserRecipe(targets, resource, effect, ToleranceType.Humidity));
});
}
src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java
+4 -5
View File
@@ -42,11 +42,10 @@ public class AnalyserRecipeHandler extends RecipeHandlerBase {
recipes.add(new AnalyserRecipe(Mods.forestry.stack("caterpillarGE", 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new AnalyserRecipe(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)));
}
if (BinnieCore.isBotanyActive()) {
recipes.add(new AnalyserRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new AnalyserRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new AnalyserRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)));
}
recipes.add(new AnalyserRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new AnalyserRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new AnalyserRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)));
}
@Override
src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java
+4 -5
View File
@@ -44,11 +44,10 @@ public class GenepoolRecipeHandler extends RecipeHandlerBase {
recipes.add(new GenepoolRecipe(Mods.forestry.stack("caterpillarGE", 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new GenepoolRecipe(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)));
}
if (BinnieCore.isBotanyActive()) {
recipes.add(new GenepoolRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new GenepoolRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new GenepoolRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)));
}
recipes.add(new GenepoolRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new GenepoolRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new GenepoolRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)));
}
@Override
src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java
+2 -2
View File
@@ -44,8 +44,8 @@ public class InoculatorRecipeHandler extends RecipeHandlerBase {
createInoculatorRecipeForNEI(Mods.forestry.stack("pollenFertile", 1, OreDictionary.WILDCARD_VALUE));
if (BinnieCore.isLepidopteryActive())
createInoculatorRecipeForNEI(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE));
if (BinnieCore.isBotanyActive())
createInoculatorRecipeForNEI(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE));
createInoculatorRecipeForNEI(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE));
}
@Override
src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java
+4 -5
View File
@@ -50,11 +50,10 @@ public class IsolatorRecipeHandler extends RecipeHandlerBase {
recipes.add(new IsolatorRecipe(Mods.forestry.stack("caterpillarGE", 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new IsolatorRecipe(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE)));
}
if (BinnieCore.isBotanyActive()) {
recipes.add(new IsolatorRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new IsolatorRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new IsolatorRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)));
}
recipes.add(new IsolatorRecipe(new ItemStack(Botany.flowerItem, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new IsolatorRecipe(new ItemStack(Botany.seed, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new IsolatorRecipe(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE)));
}
@Override
src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java
+2 -2
View File
@@ -44,8 +44,8 @@ public class SplicerRecipeHandler extends RecipeHandlerBase {
createSplicerRecipeForNEI(Mods.forestry.stack("pollenFertile", 1, OreDictionary.WILDCARD_VALUE));
if (BinnieCore.isLepidopteryActive())
createSplicerRecipeForNEI(Mods.forestry.stack("serumGE", 1, OreDictionary.WILDCARD_VALUE));
if (BinnieCore.isBotanyActive())
createSplicerRecipeForNEI(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE));
createSplicerRecipeForNEI(new ItemStack(Botany.pollen, 1, OreDictionary.WILDCARD_VALUE));
}
@Override