Remove ExtraTrees dependency from Botany

Move shared code to a new Design library mod
This commit is contained in:
mezz committed 2017-08-19 12:49:58 -07:00
1 parent 3fc36f8e37
commit 6873c36d81
125 files changed
+1151 -752

No files matched your search

+1 -3
View File
@@ -5,7 +5,5 @@ dependencies {
compile project(":botany-api")
compile project(":extratrees-api")
compile project(":genetics-api")
// TODO: remove
compile project(":extratrees")
compile project(":design")
}
@@ -28,7 +28,8 @@ import binnie.genetics.api.acclimatiser.IAcclimatiserManager;
name = "Binnie's Botany",
acceptedMinecraftVersions = "[1.12, 1.12.1]",
dependencies = "required-after:" + Constants.CORE_MOD_ID + ";"
+ "after:" + Constants.GENETICS_MOD_ID
+ "after:" + Constants.GENETICS_MOD_ID + ";"
+ "after:" + Constants.DESIGN_MOD_ID + ";"
)
public class Botany extends BlankModuleContainer {
public static final float AGE_CHANCE = 0.2f;
@@ -1,5 +1,8 @@
package binnie.botany.blocks;
import binnie.design.DesignHelper;
import binnie.design.blocks.BlockDesign;
import binnie.design.blocks.DesignBlock;
import net.minecraft.block.material.Material;
import net.minecraft.item.ItemStack;
@@ -7,10 +10,7 @@ import binnie.botany.ceramic.CeramicColor;
import binnie.botany.ceramic.CeramicDesignSystem;
import binnie.botany.api.genetics.EnumFlowerColor;
import binnie.core.util.I18N;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.blocks.BlockDesign;
import binnie.extratrees.carpentry.DesignBlock;
import binnie.extratrees.modules.ModuleCarpentry;
import binnie.design.api.IDesign;
public class BlockCeramicPatterned extends BlockDesign {
public BlockCeramicPatterned() {
@@ -22,7 +22,7 @@ public class BlockCeramicPatterned extends BlockDesign {
@Override
public ItemStack getCreativeStack(IDesign design) {
return ModuleCarpentry.getItemStack(this, CeramicColor.get(EnumFlowerColor.White), CeramicColor.get(EnumFlowerColor.Black), design);
return DesignHelper.getItemStack(this, CeramicColor.get(EnumFlowerColor.White), CeramicColor.get(EnumFlowerColor.Black), design);
}
@Override
@@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack;
import binnie.botany.api.genetics.EnumFlowerColor;
import binnie.botany.modules.ModuleCeramic;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.api.IDesignMaterial;
import binnie.design.api.IDesignMaterial;
public class CeramicColor implements IDesignMaterial {
private final static Map<EnumFlowerColor, CeramicColor> map = new LinkedHashMap<>();
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
import binnie.design.Design;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
@@ -18,11 +19,10 @@ import binnie.botany.Botany;
import binnie.botany.api.genetics.EnumFlowerColor;
import binnie.botany.items.CeramicItems;
import binnie.botany.modules.ModuleCeramic;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.IPattern;
import binnie.extratrees.api.carpentry.DesignerManager;
import binnie.extratrees.api.carpentry.EnumPattern;
import binnie.design.api.IDesignMaterial;
import binnie.design.api.IDesignSystem;
import binnie.design.api.IPattern;
import binnie.design.EnumPattern;
public class CeramicDesignSystem implements IDesignSystem {
public static CeramicDesignSystem instance = new CeramicDesignSystem();
@@ -32,7 +32,7 @@ public class CeramicDesignSystem implements IDesignSystem {
CeramicDesignSystem() {
primary = new HashMap<>();
secondary = new HashMap<>();
DesignerManager.instance.registerDesignSystem(this);
Design.getDesignManager().registerDesignSystem(this);
}
@Override
@@ -1,6 +1,10 @@
package binnie.botany.gui;
import binnie.design.gui.WindowDesigner;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
@@ -11,17 +15,27 @@ import binnie.core.gui.minecraft.Window;
public enum BotanyGUI implements IBinnieGUID {
DATABASE,
DATABASE_MASTER;
DATABASE_MASTER,
TILEWORKER;
@Override
public Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side) {
Window window = null;
final TileEntity tileEntity = world.getTileEntity(new BlockPos(x, y, z));
IInventory inventory = null;
if (tileEntity instanceof IInventory) {
inventory = (IInventory) tileEntity;
}
switch (this) {
case DATABASE:
case DATABASE_MASTER: {
window = WindowBotanistDatabase.create(player, side, this != BotanyGUI.DATABASE);
break;
}
case TILEWORKER: {
window = WindowDesigner.create(player, inventory, side);
break;
}
}
return window;
}
@@ -39,9 +39,9 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
return;
}
IFlower tree = BotanyAPI.flowerRoot.templateAsIndividual(template);
IFlowerGenome genome = tree.getGenome();
IAlleleFlowerSpecies treeSpecies = genome.getPrimary();
IFlower flower = BotanyAPI.flowerRoot.templateAsIndividual(template);
IFlowerGenome genome = flower.getGenome();
IAlleleFlowerSpecies flowerSpecies = genome.getPrimary();
int w = 144;
int h = 176;
new ControlText(this, new Area(0, 4, w, 16), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".title"), TextJustification.MIDDLE_CENTER);
@@ -54,15 +54,15 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
int th = 14;
int th2 = 18;
new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".temp"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFT);
new ControlText(contents, new Area(w2, y, w3, th), flowerSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFT);
y += th;
new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".moist"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getMoisture().getLocalisedName(false), TextJustification.MIDDLE_LEFT);
new ControlText(contents, new Area(w2, y, w3, th), flowerSpecies.getMoisture().getLocalisedName(false), TextJustification.MIDDLE_LEFT);
y += th;
new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".ph"), TextJustification.MIDDLE_RIGHT);
new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getPH().getLocalisedName(false), TextJustification.MIDDLE_LEFT);
new ControlText(contents, new Area(w2, y, w3, th), flowerSpecies.getPH().getLocalisedName(false), TextJustification.MIDDLE_LEFT);
y += th;
new ControlText(contents, new Area(0, y, w2, th), I18N.localise(DatabaseConstants.BOTANY_GENOME_KEY + ".fertility"), TextJustification.MIDDLE_RIGHT);
@@ -82,7 +82,7 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
int x = w2;
int tot = 0;
for (IIndividual vid : BotanyCore.getFlowerRoot().getIndividualTemplates()) {
if (vid.getGenome().getPrimary() == treeSpecies) {
if (vid.getGenome().getPrimary() == flowerSpecies) {
if (tot > 0 && tot % 3 == 0) {
x -= 54;
y += 18;
@@ -132,11 +132,11 @@ public class ItemFlowerGE extends Item implements IColoredItem, IItemModelRegist
}
private IAlleleFlowerSpecies getPrimarySpecies(ItemStack itemstack) {
IFlower tree = BotanyCore.getFlowerRoot().getMember(itemstack);
if (tree == null) {
IFlower flower = BotanyCore.getFlowerRoot().getMember(itemstack);
if (flower == null) {
return (IAlleleFlowerSpecies) BotanyCore.getFlowerRoot().getDefaultTemplate()[EnumFlowerChromosome.SPECIES.ordinal()];
}
return tree.getGenome().getPrimary();
return flower.getGenome().getPrimary();
}
@Override
@@ -2,25 +2,15 @@ package binnie.botany.machines;
import java.util.function.Supplier;
import binnie.botany.Botany;
import binnie.botany.machines.designer.PackageDesigner;
import binnie.botany.machines.designer.Tileworker;
import binnie.botany.modules.ModuleMachine;
import binnie.core.Constants;
import binnie.core.machines.IMachineType;
import binnie.core.machines.Machine;
import binnie.core.machines.MachineComponent;
import binnie.core.machines.MachinePackage;
import binnie.core.machines.TileEntityMachine;
import binnie.core.machines.component.IInteraction;
import binnie.core.modules.BotanyModuleUIDs;
import binnie.core.modules.ModuleManager;
import binnie.extratrees.gui.ExtraTreesGUID;
import binnie.extratrees.machines.designer.PackageDesigner;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public enum BotanyMachine implements IMachineType {
Tileworker(() -> {
@@ -45,33 +35,4 @@ public enum BotanyMachine implements IMachineType {
return new ItemStack(ModuleMachine.blockMachine, i, this.ordinal());
}
public static class ComponentExtraTreeGUI extends MachineComponent implements IInteraction.RightClick {
ExtraTreesGUID id;
public ComponentExtraTreeGUI(final Machine machine, final ExtraTreesGUID id) {
super(machine);
this.id = id;
}
@Override
public void onRightClick(World p0, EntityPlayer p1, BlockPos pos) {
Botany.proxy.openGui(this.id, p1, pos);
}
}
public abstract static class PackageExtraTreeMachine extends MachinePackage {
protected PackageExtraTreeMachine(final String uid, final boolean powered) {
super(uid, powered);
}
@Override
public TileEntity createTileEntity() {
return new TileEntityMachine(this);
}
@Override
public void register() {
}
}
}
@@ -0,0 +1,24 @@
package binnie.botany.machines;
import binnie.botany.Botany;
import binnie.botany.gui.BotanyGUI;
import binnie.core.machines.Machine;
import binnie.core.machines.MachineComponent;
import binnie.core.machines.component.IInteraction;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
public class ComponentBotanyGUI extends MachineComponent implements IInteraction.RightClick {
BotanyGUI id;
public ComponentBotanyGUI(final Machine machine, final BotanyGUI id) {
super(machine);
this.id = id;
}
@Override
public void onRightClick(World p0, EntityPlayer p1, BlockPos pos) {
Botany.proxy.openGui(this.id, p1, pos);
}
}
@@ -0,0 +1,49 @@
package binnie.botany.machines.designer;
import binnie.botany.gui.BotanyGUI;
import binnie.botany.machines.ComponentBotanyGUI;
import binnie.core.Constants;
import binnie.core.gui.minecraft.IMachineInformation;
import binnie.core.machines.Machine;
import binnie.core.machines.MachinePackage;
import binnie.core.machines.TileEntityMachine;
import binnie.core.machines.inventory.ComponentInventorySlots;
import binnie.core.machines.inventory.InventorySlot;
import binnie.design.api.IDesignerType;
import binnie.design.gui.ComponentDesignerRecipe;
import binnie.design.gui.DesignerSlots;
import binnie.design.gui.SlotValidatorDesignAdhesive;
import binnie.design.gui.SlotValidatorDesignMaterial;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
public final class PackageDesigner extends MachinePackage implements IMachineInformation {
private final IDesignerType type;
public PackageDesigner(final IDesignerType type) {
super(type.getName(), false);
this.type = type;
}
@Override
public TileEntity createTileEntity() {
return new TileEntityMachine(this);
}
@Override
public void createMachine(final Machine machine) {
new ComponentBotanyGUI(machine, BotanyGUI.TILEWORKER);
final ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
InventorySlot mortarSlot = inventory.addSlot(DesignerSlots.ADHESIVE_SLOT, new ResourceLocation(Constants.BOTANY_MOD_ID, "gui.slot.mortar"));
mortarSlot.setValidator(new SlotValidatorDesignAdhesive(this.type));
InventorySlot ceramicSlot1 = inventory.addSlot(DesignerSlots.DESIGN_SLOT_1, new ResourceLocation(Constants.BOTANY_MOD_ID, "gui.slot.ceramic"));
ceramicSlot1.setValidator(new SlotValidatorDesignMaterial(this.type));
InventorySlot ceramicSlot2 = inventory.addSlot(DesignerSlots.DESIGN_SLOT_2, new ResourceLocation(Constants.BOTANY_MOD_ID, "gui.slot.ceramic"));
ceramicSlot2.setValidator(new SlotValidatorDesignMaterial(this.type));
new ComponentDesignerRecipe(machine, this.type);
}
@Override
public void register() {
}
}
@@ -1,17 +1,17 @@
package binnie.botany.machines.designer;
import binnie.extratrees.machines.designer.IDesignerType;
import binnie.design.DesignHelper;
import binnie.design.EnumDesign;
import binnie.design.api.IDesignerType;
import binnie.design.blocks.BlockDesign;
import net.minecraft.item.ItemStack;
import binnie.botany.ceramic.CeramicDesignSystem;
import binnie.botany.modules.ModuleCeramic;
import binnie.core.util.I18N;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.blocks.BlockDesign;
import binnie.extratrees.carpentry.EnumDesign;
import binnie.extratrees.modules.ModuleCarpentry;
import binnie.design.api.IDesign;
import binnie.design.api.IDesignMaterial;
import binnie.design.api.IDesignSystem;
public class Tileworker implements IDesignerType {
private static final String name = "tileworker";
@@ -28,7 +28,7 @@ public class Tileworker implements IDesignerType {
type2 = type1;
stackSize = 1;
}
final ItemStack stack = ModuleCarpentry.getItemStack(this.getBlock(), type1, type2, design);
final ItemStack stack = DesignHelper.getItemStack(this.getBlock(), type1, type2, design);
stack.setCount(stackSize);
return stack;
}
@@ -44,7 +44,7 @@ public class Tileworker implements IDesignerType {
@Override
public String getMaterialTooltip() {
return I18N.localise("extratrees.machine.machine.designer.material.tile");
return I18N.localise("botany.machine.machine.designer.material.tile");
}
@Override
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.botany.machines.designer;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.botany.machines;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -33,10 +33,10 @@ import binnie.core.modules.BotanyModuleUIDs;
import binnie.core.modules.Module;
import binnie.core.modules.ModuleManager;
import binnie.core.util.RecipeUtil;
import binnie.extratrees.items.ItemDesign;
import binnie.design.items.ItemDesign;
@BinnieModule(moduleID = BotanyModuleUIDs.CERAMIC, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Ceramic", unlocalizedDescription = "botany.module.ceramic")
public class ModuleCeramic extends Module {
public class ModuleCeramic implements Module {
public static BlockCeramic ceramic;
public static BlockCeramicPatterned ceramicTile;
public static BlockStainedGlass stained;
@@ -6,7 +6,7 @@ import binnie.core.modules.BotanyModuleUIDs;
import binnie.core.modules.Module;
@BinnieModule(moduleID = BotanyModuleUIDs.CORE, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Core", coreModule = true)
public class ModuleCore extends Module {
public class ModuleCore implements Module {
@Override
public void preInit() {
// ignored
@@ -22,7 +22,7 @@ import binnie.core.modules.BotanyModuleUIDs;
import binnie.core.modules.Module;
@BinnieModule(moduleID = BotanyModuleUIDs.DATABASE, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Database", unlocalizedDescription = "botany.module.database")
public class ModuleDatabase extends Module {
public class ModuleDatabase implements Module {
public static ItemDatabaseBotany database;
@Override
@@ -22,7 +22,7 @@ import binnie.core.modules.Module;
import binnie.core.util.RecipeUtil;
@BinnieModule(moduleID = BotanyModuleUIDs.FARMING, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Farming", unlocalizedDescription = "botany.module.farming")
public class ModuleFarming extends Module {
public class ModuleFarming implements Module {
public ItemInsulatedTube insulatedTube;
@Override
@@ -59,7 +59,7 @@ import binnie.core.util.RecipeUtil;
import binnie.core.util.TileUtil;
@BinnieModule(moduleID = BotanyModuleUIDs.FLOWERS, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Flowers", unlocalizedDescription = "botany.module.flowers")
public class ModuleFlowers extends Module {
public class ModuleFlowers implements Module {
public static AlleleEffectNone alleleEffectNone = new AlleleEffectNone();
@Nullable
public static Item botanistBackpack;
@@ -49,7 +49,7 @@ import binnie.core.util.OreDictionaryUtil;
import binnie.core.util.RecipeUtil;
@BinnieModule(moduleID = BotanyModuleUIDs.GARDENING, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Gardening", unlocalizedDescription = "botany.module.gardening")
public class ModuleGardening extends Module {
public class ModuleGardening implements Module {
public static BlockPlant plant;
public static ItemTrowel trowelWood;
public static ItemTrowel trowelStone;
@@ -1,11 +1,5 @@
package binnie.botany.modules;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import forestry.api.core.Tabs;
import binnie.botany.Botany;
import binnie.botany.machines.BotanyMachine;
import binnie.core.Constants;
@@ -13,14 +7,19 @@ import binnie.core.Mods;
import binnie.core.machines.MachineGroup;
import binnie.core.modules.BinnieModule;
import binnie.core.modules.BotanyModuleUIDs;
import binnie.core.modules.ExtraTreesModuleUIDs;
import binnie.core.modules.Module;
import binnie.core.modules.ModuleManager;
import binnie.core.util.RecipeUtil;
import binnie.extratrees.items.ExtraTreeItems;
import forestry.api.core.Tabs;
import net.minecraft.block.Block;
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;
@BinnieModule(moduleID = BotanyModuleUIDs.MACHINES, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Machines", unlocalizedDescription = "botany.module.machines")
public class ModuleMachine extends Module {
public class ModuleMachine implements Module {
public static Block blockMachine;
@Override
@@ -33,8 +32,19 @@ public class ModuleMachine extends Module {
@Override
public void init() {
RecipeUtil recipeUtil = new RecipeUtil(Constants.BOTANY_MOD_ID);
if (ModuleManager.isModuleEnabled(Constants.EXTRA_TREES_MOD_ID, ExtraTreesModuleUIDs.CARPENTRY)) {
recipeUtil.addRecipe("tileworker", BotanyMachine.Tileworker.get(1), "wGw", "GsG", "ggg", 'G', Blocks.GLASS, 'g', ExtraTreeItems.PROVEN_GEAR.get(1), 'w', Items.CLAY_BALL, 's', Mods.Forestry.stack("impregnated_casing"));
ItemStack tileworkerBase;
Item provenGear = ForgeRegistries.ITEMS.getValue(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "proven_gear"));
if (provenGear != null) {
tileworkerBase = new ItemStack(provenGear);
} else {
tileworkerBase = Mods.Forestry.stack("oak_stick");
}
recipeUtil.addRecipe("tileworker", BotanyMachine.Tileworker.get(1),
"wGw", "GsG", "ggg",
'G', Blocks.GLASS,
'g', tileworkerBase,
'w', Items.CLAY_BALL,
's', Mods.Forestry.stack("impregnated_casing")
);
}
}
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.botany.modules;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -8,6 +8,9 @@ botany.module.flowers=Adds an entirely new breeding system to Forestry: Flowers.
botany.machine.machine.tileworker=Tileworker
botany.machine.machine.tileworker.info=The Tileworker creates patterned ceramic tiles.
botany.machine.machine.designer.material.tile=Ceramic Block
botany.gui.slot.mortar=Mortar Slot
botany.gui.slot.ceramic=Ceramic Block Slot
botany.ph=PH
botany.ph.acid=Acidic
@@ -6,6 +6,7 @@ public final class Constants {
public static final String CORE_MOD_ID = "binniecore";
public static final String BOTANY_MOD_ID = "botany";
public static final String DESIGN_MOD_ID = "binniedesign";
public static final String EXTRA_TREES_MOD_ID = "extratrees";
public static final String GENETICS_MOD_ID = "genetics";
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.IFluidHandler;
@@ -33,6 +34,11 @@ class DefaultTankContainer implements ITankMachine {
return null;
}
@Override
public TankSlot addTank(int index, ResourceLocation name, int capacity) {
return null;
}
@Override
public IFluidTank getTank(final int index) {
return null;
@@ -8,6 +8,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.fluids.FluidStack;
@@ -108,6 +109,11 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi
return this.getTankContainer().addTank(index, name, capacity);
}
@Override
public TankSlot addTank(final int index, final ResourceLocation name, final int capacity) {
return this.getTankContainer().addTank(index, name, capacity);
}
@Override
public IFluidTank getTank(final int index) {
return this.getTankContainer().getTank(index);
@@ -10,22 +10,21 @@ import forestry.api.core.INbtReadable;
import forestry.api.core.INbtWritable;
import binnie.core.util.IValidator;
import net.minecraft.util.ResourceLocation;
public abstract class BaseSlot<T> implements INbtWritable, INbtReadable, IValidator<T> {
protected String unlocName;
@Nullable
protected ResourceLocation unlocLocation;
@Nullable
Validator<T> validator;
private SidedAccess access;
private boolean readOnly;
private int index;
public BaseSlot(final int index, final String unlocName) {
public BaseSlot(final int index, final ResourceLocation unlocLocation) {
this.access = new SidedAccess();
this.validator = null;
this.readOnly = false;
this.unlocName = "";
this.setIndex(index);
this.setUnlocalisedName(unlocName);
this.unlocLocation = unlocLocation;
}
public void setReadOnly() {
@@ -100,10 +99,6 @@ public abstract class BaseSlot<T> implements INbtWritable, INbtReadable, IValida
}
}
public void setUnlocalisedName(final String name) {
this.unlocName = name;
}
public abstract String getName();
@Nullable
@@ -6,12 +6,14 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import binnie.core.Constants;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentString;
@@ -158,12 +160,32 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
return nbttagcompound;
}
public final InventorySlot addSlot(final int index, final String unlocName) {
InventorySlot slot = new InventorySlot(index, unlocName);
public final InventorySlot addSlot(final int index, final ResourceLocation unlocLocation) {
InventorySlot slot = new InventorySlot(index, unlocLocation);
this.inventory.put(index, slot);
return slot;
}
/**
* @deprecated use {@link #addSlot(int, ResourceLocation)}
*/
@Deprecated
public final InventorySlot addSlot(final int index, final String unlocName) {
ResourceLocation unlocLocation = new ResourceLocation(Constants.CORE_MOD_ID, "gui.slot." + unlocName);
return addSlot(index, unlocLocation);
}
public final InventorySlot[] addSlotArray(final int[] indexes, final ResourceLocation unlocName) {
for (final int k : indexes) {
this.addSlot(k, unlocName);
}
return this.getSlots(indexes);
}
/**
* @deprecated use {@link #addSlotArray(int[], ResourceLocation)}
*/
@Deprecated
public final InventorySlot[] addSlotArray(final int[] indexes, final String unlocName) {
for (final int k : indexes) {
this.addSlot(k, unlocName);
@@ -11,6 +11,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.FluidTankProperties;
@@ -43,6 +44,13 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
return tank;
}
@Override
public final TankSlot addTank(final int index, final ResourceLocation name, final int capacity) {
TankSlot tank = new TankSlot(index, name, capacity);
this.tanks.put(index, tank);
return tank;
}
private int fill(final int tankIndex, final FluidStack resource, final boolean doFill) {
if (!this.tanks.containsKey(tankIndex)) {
return 0;
@@ -6,13 +6,14 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import binnie.core.util.I18N;
import net.minecraft.util.ResourceLocation;
public class InventorySlot extends BaseSlot<ItemStack> {
private ItemStack itemStack;
private Type type;
public InventorySlot(final int index, final String unlocName) {
super(index, unlocName);
public InventorySlot(final int index, final ResourceLocation unlocLocation) {
super(index, unlocLocation);
this.itemStack = ItemStack.EMPTY;
this.type = Type.Standard;
}
@@ -86,7 +87,10 @@ public class InventorySlot extends BaseSlot<ItemStack> {
@Override
public String getName() {
return I18N.localise("binniecore.gui.slot." + this.unlocName);
if (this.unlocLocation == null) {
return "";
}
return I18N.localise(this.unlocLocation);
}
public enum Type {
@@ -1,7 +1,9 @@
package binnie.core.machines.inventory;
import binnie.core.Constants;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.IFluidTank;
@@ -11,7 +13,12 @@ import binnie.core.util.I18N;
public class TankSlot extends BaseSlot<FluidStack> {
private FluidTank tank;
@Deprecated
public TankSlot(final int index, final String name, final int capacity) {
this(index, new ResourceLocation(Constants.CORE_MOD_ID, "gui.slot." + name), capacity);
}
public TankSlot(final int index, final ResourceLocation name, final int capacity) {
super(index, name);
this.tank = new FluidTank(capacity);
}
@@ -45,6 +52,9 @@ public class TankSlot extends BaseSlot<FluidStack> {
@Override
public String getName() {
return I18N.localise("binniecore.gui.slot." + this.unlocName);
if (this.unlocLocation == null) {
return "";
}
return I18N.localise(this.unlocLocation);
}
}
@@ -13,10 +13,14 @@ public class ValidatorSprite {
private List<BinnieSprite> spritesOutput;
public ValidatorSprite(final AbstractMod mod, final String pathInput, final String pathOutput) {
this(mod.getModId(), pathInput, pathOutput);
}
public ValidatorSprite(final String modId, final String pathInput, final String pathOutput) {
this.spritesInput = new ArrayList<>();
this.spritesOutput = new ArrayList<>();
this.spritesInput.add(Binnie.RESOURCE.getItemSprite(mod, pathInput));
this.spritesOutput.add(Binnie.RESOURCE.getItemSprite(mod, pathOutput));
this.spritesInput.add(Binnie.RESOURCE.getItemSprite(modId, pathInput));
this.spritesOutput.add(Binnie.RESOURCE.getItemSprite(modId, pathOutput));
}
public BinnieSprite getSprite(final boolean input) {
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.IFluidHandler;
@@ -15,7 +16,13 @@ public interface ITankMachine extends IValidatedTankContainer {
IFluidTank[] getTanks();
TankSlot addTank(final int index, final String p1, final int p2);
/**
* @deprecated use {@link #addTank(int, ResourceLocation, int)}
*/
@Deprecated
TankSlot addTank(final int index, final String name, final int capacity);
TankSlot addTank(final int index, final ResourceLocation name, final int capacity);
IFluidTank getTank(final int index);
@@ -3,39 +3,39 @@ package binnie.core.modules;
import java.util.Collections;
import java.util.Set;
public abstract class Module{
public String getFailMessage(){
public interface Module {
default String getFailMessage(){
return "";
}
public Set<String> getDependencyUids(){
default Set<String> getDependencyUids(){
return Collections.emptySet();
}
public boolean canBeDisabled(){
default boolean canBeDisabled(){
return true;
}
public boolean isAvailable(){
default boolean isAvailable(){
return true;
}
public void setupAPI(){
default void setupAPI(){
}
public void disabledSetupAPI(){
default void disabledSetupAPI(){
}
public void registerItemsAndBlocks(){
default void registerItemsAndBlocks(){
}
public void preInit() {
default void preInit() {
}
public void init() {
default void init() {
}
public void postInit() {
default void postInit() {
}
}
@@ -31,7 +31,7 @@ public class ModuleHelper {
Map<String, List<Module>> modules = new LinkedHashMap<>();
for(Module module : instances){
BinnieModule info = module.getClass().getAnnotation(BinnieModule.class);
modules.computeIfAbsent(info.moduleContainerID(), k-> new ArrayList()).add(module);
modules.computeIfAbsent(info.moduleContainerID(), k-> new ArrayList<>()).add(module);
}
return modules;
@@ -40,6 +40,10 @@ public class ManagerResource {
return new BinnieSprite(mod, ResourceType.ITEM, iconFile);
}
public BinnieSprite getItemSprite(final String modId, final String iconFile) {
return new BinnieSprite(modId, ResourceType.ITEM, iconFile);
}
public BinnieSprite getBlockSprite(final AbstractMod mod, final String iconFile) {
return new BinnieSprite(mod, ResourceType.Block, iconFile);
}
@@ -2,6 +2,7 @@ package binnie.core.util;
import java.util.IllegalFormatException;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.translation.I18n;
public class I18N {
@@ -19,6 +20,10 @@ public class I18N {
return I18n.translateToFallback(key);
}
}
public static String localise(ResourceLocation key) {
return localise(key.getResourceDomain() + "." + key.getResourcePath());
}
@SuppressWarnings("deprecation")
public static boolean canLocalise(String key) {
@@ -35,4 +40,8 @@ public class I18N {
return errorMessage;
}
}
public static String localise(ResourceLocation key, Object... format) {
return localise(key.getResourceDomain() + "." + key.getResourcePath(), format);
}
}
@@ -218,9 +218,6 @@ binniecore.errors.invalid.recipe.name=Invalid Recipe
binniecore.errors.no.recipe.name=No Recipe
binniecore.errors.no.recipe.desc=There is no valid recipe
< %1$s is the name of the pattern >
binniecore.gui.designer.pattern=%1$s Pattern
binniecore.gui.database.nodescription=No Description Provided.
binniecore.gui.database.mode.species=Species
@@ -264,8 +261,6 @@ binniecore.gui.humidity.short=Humid.
binniecore.gui.tolerated=Tolerated
binniecore.gui.nottolerated=Not Tolerated
binniecore.gui.design=Design
binniecore.gui.genesis.title=Genesis
binniecore.gui.fieldkit.title=Field Kit
+1
View File
@@ -0,0 +1 @@
archivesBaseName = 'design-api-' + mcversion
@@ -0,0 +1,8 @@
package binnie.design.api;
import javax.annotation.Nullable;
public class DesignAPI {
@Nullable
public static IDesignManager manager;
}
@@ -0,0 +1,5 @@
package binnie.design.api;
public interface IBlockDesign {
IDesignSystem getDesignSystem();
}
@@ -1,4 +1,4 @@
package binnie.extratrees.api.carpentry;
package binnie.design.api;
public interface IBlockDesignProperties {
}
@@ -1,4 +1,4 @@
package binnie.extratrees.api;
package binnie.design.api;
public interface IDesign {
String getName();
@@ -1,4 +1,4 @@
package binnie.extratrees.api;
package binnie.design.api;
import java.util.List;
@@ -0,0 +1,22 @@
package binnie.design.api;
import java.util.Collection;
import java.util.List;
public interface IDesignManager {
void registerDesignSystem(final IDesignSystem system);
Collection<IDesignSystem> getDesignSystems();
boolean registerDesign(final int index, final IDesign design);
int getDesignIndex(final IDesign design);
IDesign getDesign(final int index);
boolean registerDesignCategory(final IDesignCategory category);
Collection<IDesignCategory> getAllDesignCategories();
List<IDesign> getSortedDesigns();
}
@@ -1,4 +1,4 @@
package binnie.extratrees.api;
package binnie.design.api;
import net.minecraft.item.ItemStack;
@@ -1,4 +1,4 @@
package binnie.extratrees.api;
package binnie.design.api;
import javax.annotation.Nullable;
@@ -1,8 +1,5 @@
package binnie.extratrees.machines.designer;
package binnie.design.api;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.IDesignSystem;
import net.minecraft.item.ItemStack;
public interface IDesignerType {
@@ -1,4 +1,4 @@
package binnie.extratrees.api;
package binnie.design.api;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -1,4 +1,4 @@
package binnie.extratrees.api;
package binnie.design.api;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -1,4 +1,4 @@
package binnie.extratrees.api;
package binnie.design.api;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
+7
View File
@@ -0,0 +1,7 @@
archivesBaseName = 'design-' + mcversion
dependencies {
compile project(":core")
compile project(":core-api")
compile project(":design-api")
}
@@ -0,0 +1,53 @@
package binnie.design;
import javax.annotation.Nullable;
import java.util.Objects;
import binnie.core.Constants;
import binnie.core.machines.inventory.ValidatorSprite;
import binnie.design.api.DesignAPI;
import binnie.design.api.IDesignManager;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@Mod(
modid = Constants.DESIGN_MOD_ID,
name = "Binnie's Design",
acceptedMinecraftVersions = "[1.12, 1.12.1]",
dependencies = "required-after:" + Constants.CORE_MOD_ID + ";"
)
public class Design {
@SuppressWarnings("NullableProblems")
@Mod.Instance(Constants.DESIGN_MOD_ID)
public static Design instance;
@Nullable
private static ValidatorSprite spritePolish;
@Nullable
private static IDesignManager designManager;
public static IDesignManager getDesignManager() {
Objects.requireNonNull(designManager);
return designManager;
}
public static ValidatorSprite getSpritePolish() {
Objects.requireNonNull(spritePolish);
return spritePolish;
}
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
DesignAPI.manager = designManager = new DesignerManager();
spritePolish = new ValidatorSprite(Constants.DESIGN_MOD_ID, "validator/polish.0", "validator/polish.1");
}
@Mod.EventHandler
public void postInit(FMLPostInitializationEvent event) {
IDesignManager designManager = getDesignManager();
for (EnumDesign design : EnumDesign.values()) {
designManager.registerDesign(design.ordinal(), design);
}
}
}
@@ -0,0 +1,75 @@
package binnie.design;
import javax.annotation.Nullable;
import binnie.core.block.TileEntityMetadata;
import binnie.design.api.IDesign;
import binnie.design.api.IDesignMaterial;
import binnie.design.api.IDesignSystem;
import binnie.design.blocks.BlockDesign;
import binnie.design.blocks.DesignBlock;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
public final class DesignHelper {
private DesignHelper() {}
public static DesignBlock getDesignBlock(final IDesignSystem system, final int meta) {
final int plankID1 = meta & 0xFF;
final int plankID2 = meta >> 8 & 0xFF;
final int tile = meta >> 16 & 0x3FF;
final int rotation = meta >> 26 & 0x3;
final int axis = meta >> 28 & 0x7;
final IDesignMaterial type1 = system.getMaterial(plankID1);
final IDesignMaterial type2 = system.getMaterial(plankID2);
final IDesign type3 = Design.getDesignManager().getDesign(tile);
return new DesignBlock(system, type1, type2, type3, rotation, EnumFacing.VALUES[axis]);
}
public static int getBlockMetadata(final IDesignSystem system, final DesignBlock block) {
final int plank1 = system.getMaterialIndex(block.getPrimaryMaterial());
final int plank2 = system.getMaterialIndex(block.getSecondaryMaterial());
final int design = Design.getDesignManager().getDesignIndex(block.getDesign());
final int rotation = block.getRotation();
final int facing = block.getFacing().ordinal();
return getMetadata(plank1, plank2, design, rotation, facing);
}
public static int getItemMetadata(final IDesignSystem system, final DesignBlock block) {
final int plank1 = system.getMaterialIndex(block.getPrimaryMaterial());
final int plank2 = system.getMaterialIndex(block.getSecondaryMaterial());
final int design = Design.getDesignManager().getDesignIndex(block.getDesign());
return getMetadata(plank1, plank2, design, 0, EnumFacing.UP.ordinal());
}
public static ItemStack getItemStack(final BlockDesign block, final IDesignMaterial type1, final IDesignMaterial type2, final IDesign design) {
int designIndex = Design.getDesignManager().getDesignIndex(design);
int materialIndex1 = block.getDesignSystem().getMaterialIndex(type1);
int materialIndex2 = block.getDesignSystem().getMaterialIndex(type2);
return getItemStack(block, materialIndex1, materialIndex2, designIndex);
}
public static ItemStack getItemStack(final BlockDesign block, final int type1, final int type2, final int design) {
return TileEntityMetadata.getItemStack(block, getMetadata(type1, type2, design, 0, EnumFacing.UP.ordinal()));
}
public static ItemStack getItemStack(final BlockDesign blockC, final DesignBlock block) {
return getItemStack(blockC, block.getPrimaryMaterial(), block.getSecondaryMaterial(), block.getDesign());
}
public static int getMetadata(final int plank1, final int plank2, final int design, final int rotation, final int facing) {
return plank1 + (plank2 << 8) + (design << 16) + (rotation << 26) + (facing << 28);
}
public static boolean isValidPanelPlacement(IBlockAccess world, BlockPos pos, @Nullable EnumFacing facing) {
if (facing == null) {
return false;
}
pos = pos.offset(facing);
IBlockState state = world.getBlockState(pos);
return state.isSideSolid(world, pos, facing.getOpposite());
}
}
@@ -0,0 +1,77 @@
package binnie.design;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import binnie.design.api.IDesign;
import binnie.design.api.IDesignCategory;
import binnie.design.api.IDesignManager;
import binnie.design.api.IDesignSystem;
public final class DesignerManager implements IDesignManager {
private static Map<Integer, IDesign> designMap = new LinkedHashMap<>();
private static Map<String, IDesignCategory> designCategories = new HashMap<>();
private final List<IDesignSystem> systems = new ArrayList<>();
DesignerManager() {
}
public void registerDesignSystem(final IDesignSystem system) {
this.systems.add(system);
}
public Collection<IDesignSystem> getDesignSystems() {
return this.systems;
}
@Override
public boolean registerDesign(final int index, final IDesign design) {
return designMap.put(index, design) == null;
}
@Override
public int getDesignIndex(final IDesign design) {
for (final Integer integer : designMap.keySet()) {
if (designMap.get(integer).equals(design)) {
return integer;
}
}
return -1;
}
@Override
public IDesign getDesign(final int index) {
return designMap.get(index);
}
@Override
public boolean registerDesignCategory(final IDesignCategory category) {
return designCategories.put(category.getId(), category) == null;
}
@Override
public Collection<IDesignCategory> getAllDesignCategories() {
final List<IDesignCategory> categories = new ArrayList<>();
for (final IDesignCategory category : designCategories.values()) {
if (category.getDesigns().size() > 0) {
categories.add(category);
}
}
return categories;
}
@Override
public List<IDesign> getSortedDesigns() {
final List<IDesign> designs = new ArrayList<>();
for (final IDesignCategory category : this.getAllDesignCategories()) {
designs.addAll(category.getDesigns());
}
return designs;
}
}
@@ -1,15 +1,14 @@
package binnie.extratrees.carpentry;
package binnie.design;
import java.util.ArrayList;
import java.util.List;
import binnie.core.Constants;
import binnie.core.util.I18N;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignCategory;
import binnie.extratrees.api.ILayout;
import binnie.extratrees.api.carpentry.EnumPattern;
import binnie.extratrees.api.carpentry.Layout;
import binnie.design.api.IDesign;
import binnie.design.api.IDesignCategory;
import binnie.design.api.ILayout;
import net.minecraft.util.ResourceLocation;
public enum EnumDesign implements IDesign {
Blank("blank"),
@@ -115,80 +114,80 @@ public enum EnumDesign implements IDesign {
OverlappedSplitBarred("overlapped.split.barred");
static {
Category.Design.addDesign(EnumDesign.Blank);
Category.Design.addDesign(EnumDesign.Octagon);
Category.Design.addDesign(EnumDesign.Diamond);
Category.Design.addDesign(EnumDesign.Ringed);
Category.Design.addDesign(EnumDesign.Squared);
Category.Design.addDesign(EnumDesign.Multiply);
Category.Design.addDesign(EnumDesign.Plus);
Category.Design.addDesign(EnumDesign.Circle);
Category.Design.addDesign(EnumDesign.Emblem1);
Category.Design.addDesign(EnumDesign.Emblem2);
Category.Design.addDesign(EnumDesign.Emblem3);
Category.Design.addDesign(EnumDesign.Emblem4);
Category.Design.addDesign(EnumDesign.Emblem5);
Category.Design.addDesign(EnumDesign.Creeper);
Category.Stripes.addDesign(EnumDesign.Chequered);
Category.Stripes.addDesign(EnumDesign.ChequeredB);
Category.Stripes.addDesign(EnumDesign.Tiled);
Category.Stripes.addDesign(EnumDesign.TiledB);
Category.Stripes.addDesign(EnumDesign.Striped);
Category.Stripes.addDesign(EnumDesign.ThinStriped);
Category.Stripes.addDesign(EnumDesign.ThinStripedCorner);
Category.Stripes.addDesign(EnumDesign.StripedCorner);
Category.Stripes.addDesign(EnumDesign.OrnateStripedCorner);
Category.Edges.addDesign(EnumDesign.Halved);
Category.Edges.addDesign(EnumDesign.Corner);
Category.Edges.addDesign(EnumDesign.ThickCorner);
Category.Edges.addDesign(EnumDesign.Edged);
Category.Edges.addDesign(EnumDesign.ThinCorner);
Category.Edges.addDesign(EnumDesign.ThinEdged);
Category.Edges.addDesign(EnumDesign.VeryThinCorner);
Category.Edges.addDesign(EnumDesign.ThinCurvedCorner);
Category.Edges.addDesign(EnumDesign.CurvedCorner);
Category.Barred.addDesign(EnumDesign.ThinBarred);
Category.Barred.addDesign(EnumDesign.ThinBarredCorner);
Category.Barred.addDesign(EnumDesign.ThinTSection);
Category.Barred.addDesign(EnumDesign.ThinCrossed);
Category.Barred.addDesign(EnumDesign.ThinBarredEnd);
Category.Barred.addDesign(EnumDesign.OrnateThinBarred);
Category.Barred.addDesign(EnumDesign.Barred);
Category.Barred.addDesign(EnumDesign.BarredCorner);
Category.Barred.addDesign(EnumDesign.TSection);
Category.Barred.addDesign(EnumDesign.Crossed);
Category.Barred.addDesign(EnumDesign.BarredEnd);
Category.Barred.addDesign(EnumDesign.OverlappedBarred);
Category.Barred.addDesign(EnumDesign.OrnateBarred);
Category.Barred.addDesign(EnumDesign.ThickBarred);
Category.Barred.addDesign(EnumDesign.ThickBarredCorner);
Category.Barred.addDesign(EnumDesign.ThickTSection);
Category.Barred.addDesign(EnumDesign.ThickCrossed);
Category.Barred.addDesign(EnumDesign.ThickBarredEnd);
Category.Barred.addDesign(EnumDesign.ThinCurvedBarredCorner);
Category.Barred.addDesign(EnumDesign.CurvedBarredCorner);
Category.Barred.addDesign(EnumDesign.ThinCurvedTSection);
Category.Barred.addDesign(EnumDesign.CurvedTSection);
Category.Barred.addDesign(EnumDesign.ThinCurvedCrossed);
Category.Barred.addDesign(EnumDesign.SplitBarred);
Category.Barred.addDesign(EnumDesign.SplitBarredCorner);
Category.Barred.addDesign(EnumDesign.SplitBarredTSection);
Category.Barred.addDesign(EnumDesign.SplitCrossed);
Category.Barred.addDesign(EnumDesign.SplitBarredEnd);
Category.Barred.addDesign(EnumDesign.OverlappedSplitBarred);
Category.Diagonal.addDesign(EnumDesign.ThinSaltire);
Category.Diagonal.addDesign(EnumDesign.Diagonal);
Category.Diagonal.addDesign(EnumDesign.DiagonalCorner);
Category.Diagonal.addDesign(EnumDesign.DiagonalTSection);
Category.Diagonal.addDesign(EnumDesign.DiagonalCurvedCorner);
Category.Diagonal.addDesign(EnumDesign.DiagonalCurvedTSection);
Category.Diagonal.addDesign(EnumDesign.Saltire);
Category.Diagonal.addDesign(EnumDesign.ThickDiagonal);
Category.Diagonal.addDesign(EnumDesign.ThickSaltire);
Category.Diagonal.addDesign(EnumDesign.DiagonalHalved);
Category.Diagonal.addDesign(EnumDesign.Diagonal1Edged);
Category.Diagonal.addDesign(EnumDesign.Diagonal2Edged);
Category.Diagonal.addDesign(EnumDesign.ThickDiagonal1Edged);
Category.DESIGN.addDesign(EnumDesign.Blank);
Category.DESIGN.addDesign(EnumDesign.Octagon);
Category.DESIGN.addDesign(EnumDesign.Diamond);
Category.DESIGN.addDesign(EnumDesign.Ringed);
Category.DESIGN.addDesign(EnumDesign.Squared);
Category.DESIGN.addDesign(EnumDesign.Multiply);
Category.DESIGN.addDesign(EnumDesign.Plus);
Category.DESIGN.addDesign(EnumDesign.Circle);
Category.DESIGN.addDesign(EnumDesign.Emblem1);
Category.DESIGN.addDesign(EnumDesign.Emblem2);
Category.DESIGN.addDesign(EnumDesign.Emblem3);
Category.DESIGN.addDesign(EnumDesign.Emblem4);
Category.DESIGN.addDesign(EnumDesign.Emblem5);
Category.DESIGN.addDesign(EnumDesign.Creeper);
Category.STRIPES.addDesign(EnumDesign.Chequered);
Category.STRIPES.addDesign(EnumDesign.ChequeredB);
Category.STRIPES.addDesign(EnumDesign.Tiled);
Category.STRIPES.addDesign(EnumDesign.TiledB);
Category.STRIPES.addDesign(EnumDesign.Striped);
Category.STRIPES.addDesign(EnumDesign.ThinStriped);
Category.STRIPES.addDesign(EnumDesign.ThinStripedCorner);
Category.STRIPES.addDesign(EnumDesign.StripedCorner);
Category.STRIPES.addDesign(EnumDesign.OrnateStripedCorner);
Category.EDGES.addDesign(EnumDesign.Halved);
Category.EDGES.addDesign(EnumDesign.Corner);
Category.EDGES.addDesign(EnumDesign.ThickCorner);
Category.EDGES.addDesign(EnumDesign.Edged);
Category.EDGES.addDesign(EnumDesign.ThinCorner);
Category.EDGES.addDesign(EnumDesign.ThinEdged);
Category.EDGES.addDesign(EnumDesign.VeryThinCorner);
Category.EDGES.addDesign(EnumDesign.ThinCurvedCorner);
Category.EDGES.addDesign(EnumDesign.CurvedCorner);
Category.BARRED.addDesign(EnumDesign.ThinBarred);
Category.BARRED.addDesign(EnumDesign.ThinBarredCorner);
Category.BARRED.addDesign(EnumDesign.ThinTSection);
Category.BARRED.addDesign(EnumDesign.ThinCrossed);
Category.BARRED.addDesign(EnumDesign.ThinBarredEnd);
Category.BARRED.addDesign(EnumDesign.OrnateThinBarred);
Category.BARRED.addDesign(EnumDesign.Barred);
Category.BARRED.addDesign(EnumDesign.BarredCorner);
Category.BARRED.addDesign(EnumDesign.TSection);
Category.BARRED.addDesign(EnumDesign.Crossed);
Category.BARRED.addDesign(EnumDesign.BarredEnd);
Category.BARRED.addDesign(EnumDesign.OverlappedBarred);
Category.BARRED.addDesign(EnumDesign.OrnateBarred);
Category.BARRED.addDesign(EnumDesign.ThickBarred);
Category.BARRED.addDesign(EnumDesign.ThickBarredCorner);
Category.BARRED.addDesign(EnumDesign.ThickTSection);
Category.BARRED.addDesign(EnumDesign.ThickCrossed);
Category.BARRED.addDesign(EnumDesign.ThickBarredEnd);
Category.BARRED.addDesign(EnumDesign.ThinCurvedBarredCorner);
Category.BARRED.addDesign(EnumDesign.CurvedBarredCorner);
Category.BARRED.addDesign(EnumDesign.ThinCurvedTSection);
Category.BARRED.addDesign(EnumDesign.CurvedTSection);
Category.BARRED.addDesign(EnumDesign.ThinCurvedCrossed);
Category.BARRED.addDesign(EnumDesign.SplitBarred);
Category.BARRED.addDesign(EnumDesign.SplitBarredCorner);
Category.BARRED.addDesign(EnumDesign.SplitBarredTSection);
Category.BARRED.addDesign(EnumDesign.SplitCrossed);
Category.BARRED.addDesign(EnumDesign.SplitBarredEnd);
Category.BARRED.addDesign(EnumDesign.OverlappedSplitBarred);
Category.DIAGONAL.addDesign(EnumDesign.ThinSaltire);
Category.DIAGONAL.addDesign(EnumDesign.Diagonal);
Category.DIAGONAL.addDesign(EnumDesign.DiagonalCorner);
Category.DIAGONAL.addDesign(EnumDesign.DiagonalTSection);
Category.DIAGONAL.addDesign(EnumDesign.DiagonalCurvedCorner);
Category.DIAGONAL.addDesign(EnumDesign.DiagonalCurvedTSection);
Category.DIAGONAL.addDesign(EnumDesign.Saltire);
Category.DIAGONAL.addDesign(EnumDesign.ThickDiagonal);
Category.DIAGONAL.addDesign(EnumDesign.ThickSaltire);
Category.DIAGONAL.addDesign(EnumDesign.DiagonalHalved);
Category.DIAGONAL.addDesign(EnumDesign.Diagonal1Edged);
Category.DIAGONAL.addDesign(EnumDesign.Diagonal2Edged);
Category.DIAGONAL.addDesign(EnumDesign.ThickDiagonal1Edged);
EnumDesign.Octagon.setAllPatterns(EnumPattern.Octagon.layout());
EnumDesign.Diamond.setAllPatterns(EnumPattern.Diamond.layout());
EnumDesign.Ringed.setAllPatterns(EnumPattern.Ringed.layout());
@@ -419,7 +418,7 @@ public enum EnumDesign implements IDesign {
@Override
public String getName() {
return I18N.localise("extratrees.carpentry.design." + this.name);
return I18N.localise(new ResourceLocation(Constants.DESIGN_MOD_ID, "pattern." + this.name));
}
public void setName(final String name) {
@@ -481,12 +480,12 @@ public enum EnumDesign implements IDesign {
}
enum Category implements IDesignCategory {
Design("Designs & Emblems"),
Stripes("Squares & Stripes"),
Edges("Edges"),
Barred("Bars"),
Letters("Letters"),
Diagonal("Diagonals");
DESIGN("Designs & Emblems"),
STRIPES("Squares & Stripes"),
EDGES("Edges"),
BARRED("Bars"),
LETTERS("Letters"),
DIAGONAL("Diagonals");
String name;
List<IDesign> designs;
@@ -494,7 +493,7 @@ public enum EnumDesign implements IDesign {
Category(final String name) {
this.designs = new ArrayList<>();
this.name = name;
CarpentryManager.carpentryInterface.registerDesignCategory(this);
Design.getDesignManager().registerDesignCategory(this);
}
@Override
@@ -1,5 +1,8 @@
package binnie.extratrees.api.carpentry;
package binnie.design;
import binnie.design.api.IDesignSystem;
import binnie.design.api.ILayout;
import binnie.design.api.IPattern;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
@@ -7,11 +10,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.ITextureManager;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.ILayout;
import binnie.extratrees.api.IPattern;
// TODO: move out of API
public enum EnumPattern implements IPattern {
Blank,
Octagon,
@@ -1,14 +1,13 @@
package binnie.extratrees.api.carpentry;
package binnie.design;
import binnie.design.api.IDesignSystem;
import binnie.design.api.ILayout;
import binnie.design.api.IPattern;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.ILayout;
import binnie.extratrees.api.IPattern;
public class Layout implements ILayout {
IPattern pattern;
boolean inverted;
@@ -1,8 +1,13 @@
package binnie.extratrees.blocks;
package binnie.design.blocks;
import javax.annotation.Nullable;
import java.util.List;
import binnie.design.Design;
import binnie.design.DesignHelper;
import binnie.design.api.IDesign;
import binnie.design.api.IDesignSystem;
import binnie.design.api.IToolHammer;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
@@ -52,14 +57,6 @@ import binnie.core.models.DefaultStateMapper;
import binnie.core.models.ModelManager;
import binnie.core.models.ModelMutlipass;
import binnie.core.util.TileUtil;
import binnie.extratrees.CreativeTabCarpentry;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.IToolHammer;
import binnie.extratrees.api.carpentry.DesignerManager;
import binnie.extratrees.carpentry.DesignBlock;
import binnie.extratrees.modules.ModuleCarpentry;
public abstract class BlockDesign extends BlockMetadata implements IMultipassBlock<BlockDesign.Key>, IColoredBlock, ISpriteRegister, IItemModelRegister, IStateMapperRegister {
public static final EnumFacing[] RENDER_DIRECTIONS = new EnumFacing[]{EnumFacing.DOWN, EnumFacing.UP, EnumFacing.EAST, EnumFacing.WEST, EnumFacing.NORTH, EnumFacing.SOUTH};
@@ -68,7 +65,6 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
public BlockDesign(final IDesignSystem system, final Material material) {
super(material);
this.setCreativeTab(CreativeTabCarpentry.instance);
this.designSystem = system;
}
@@ -109,7 +105,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
@Override
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> itemList) {
for (final IDesign design : CarpentryManager.carpentryInterface.getSortedDesigns()) {
for (final IDesign design : Design.getDesignManager().getSortedDesigns()) {
itemList.add(this.getCreativeStack(design));
}
}
@@ -120,14 +116,14 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
@Override
public String getDisplayName(final ItemStack itemStack) {
final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack));
final DesignBlock block = DesignHelper.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack));
return this.getBlockName(block);
}
public abstract String getBlockName(final DesignBlock p0);
public DesignBlock getCarpentryBlock(final IBlockAccess world, final BlockPos pos) {
return ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getTileMetadata(world, pos));
return DesignHelper.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getTileMetadata(world, pos));
}
@Override
@@ -151,7 +147,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, @Nullable World player, List<String> tooltip, ITooltipFlag advanced) {
DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
DesignBlock block = DesignHelper.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) {
tooltip.add(block.getPrimaryMaterial().getDesignMaterialName() + " and " + block.getSecondaryMaterial().getDesignMaterialName());
} else {
@@ -160,12 +156,12 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
}
public int primaryColor(final int damage) {
final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), damage);
final DesignBlock block = DesignHelper.getDesignBlock(this.getDesignSystem(), damage);
return block.getPrimaryColour();
}
public int secondaryColor(final int damage) {
final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), damage);
final DesignBlock block = DesignHelper.getDesignBlock(this.getDesignSystem(), damage);
return block.getSecondaryColour();
}
@@ -175,7 +171,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
@Override
public int getDroppedMeta(IBlockState state, int tileMetadata) {
final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), tileMetadata);
final DesignBlock block = DesignHelper.getDesignBlock(this.getDesignSystem(), tileMetadata);
return block.getItemMetadata(this.getDesignSystem());
}
@@ -241,7 +237,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
if(key.item){
renderDirections = RENDER_DIRECTIONS_ITEM;
}
DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), key.metadata);
DesignBlock block = DesignHelper.getDesignBlock(this.getDesignSystem(), key.metadata);
if (facing == null) {
return block.getPrimarySprite(getDesignSystem(), renderDirections[0]);
@@ -280,7 +276,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
@SideOnly(Side.CLIENT)
@Override
public void registerSprites(ITextureManager manager) {
for (IDesignSystem system : DesignerManager.instance.getDesignSystems()) {
for (IDesignSystem system : Design.getDesignManager().getDesignSystems()) {
system.registerSprites();
}
}
@@ -1,7 +1,9 @@
package binnie.extratrees.carpentry;
package binnie.design.blocks;
import javax.annotation.Nullable;
import binnie.design.DesignHelper;
import binnie.design.EnumDesign;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -12,13 +14,12 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.ILayout;
import binnie.extratrees.api.IToolHammer;
import binnie.extratrees.blocks.BlockCarpentryPanel;
import binnie.extratrees.modules.ModuleCarpentry;
import binnie.design.api.IDesign;
import binnie.design.api.IDesignMaterial;
import binnie.design.api.IDesignSystem;
import binnie.design.api.ILayout;
import binnie.design.api.IToolHammer;
public class DesignBlock {
private static final int[][] ROTATION_MATRIX = {
@@ -428,7 +429,7 @@ public class DesignBlock {
do {
newFacing = getNewFacing(newFacing.ordinal() + 1);
}
while (newFacing != this.getFacing() && !BlockCarpentryPanel.isValidPanelPlacement(world, pos, newFacing));
while (newFacing != this.getFacing() && !DesignHelper.isValidPanelPlacement(world, pos, newFacing));
if (newFacing != this.getFacing()) {
hammerI.onHammerUsed(hammer, player);
}
@@ -459,11 +460,11 @@ public class DesignBlock {
}
public int getBlockMetadata(final IDesignSystem system) {
return ModuleCarpentry.getBlockMetadata(system, this);
return DesignHelper.getBlockMetadata(system, this);
}
public int getItemMetadata(final IDesignSystem system) {
return ModuleCarpentry.getItemMetadata(system, this);
return DesignHelper.getItemMetadata(system, this);
}
public void setPanel() {
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.design.blocks;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,9 +1,10 @@
package binnie.extratrees.machines.designer.window;
package binnie.design.gui;
import javax.annotation.Nullable;
import java.util.Map;
import binnie.extratrees.machines.designer.IDesignerType;
import binnie.design.Design;
import binnie.design.api.IDesignerType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.InventoryPlayer;
@@ -16,12 +17,9 @@ import binnie.core.machines.component.IComponentRecipe;
import binnie.core.machines.errors.ErrorState;
import binnie.core.machines.errors.IErrorStateSource;
import binnie.core.machines.network.INetwork;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.carpentry.EnumDesign;
import binnie.extratrees.machines.ExtraTreesErrorCode;
import binnie.extratrees.machines.designer.Designer;
import binnie.design.api.IDesign;
import binnie.design.api.IDesignMaterial;
import binnie.design.EnumDesign;
public class ComponentDesignerRecipe extends ComponentRecipe implements IComponentRecipe, INetwork.GuiNBT, IErrorStateSource {
public IDesignerType type;
@@ -36,13 +34,13 @@ public class ComponentDesignerRecipe extends ComponentRecipe implements ICompone
@Override
public void readFromNBT(final NBTTagCompound nbttagcompound) {
super.readFromNBT(nbttagcompound);
this.setDesign(CarpentryManager.carpentryInterface.getDesign(nbttagcompound.getInteger("design")));
this.setDesign(Design.getDesignManager().getDesign(nbttagcompound.getInteger("design")));
}
@Override
public NBTTagCompound writeToNBT(final NBTTagCompound nbttagcompound1) {
NBTTagCompound nbttagcompound = super.writeToNBT(nbttagcompound1);
nbttagcompound.setInteger("design", CarpentryManager.carpentryInterface.getDesignIndex(this.design));
nbttagcompound.setInteger("design", Design.getDesignManager().getDesignIndex(this.design));
return nbttagcompound;
}
@@ -53,8 +51,8 @@ public class ComponentDesignerRecipe extends ComponentRecipe implements ICompone
@Override
public ItemStack getProduct() {
final ItemStack plank1 = this.getUtil().getStack(Designer.DESIGN_SLOT_1);
final ItemStack plank2 = this.getUtil().getStack(Designer.DESIGN_SLOT_2);
final ItemStack plank1 = this.getUtil().getStack(DesignerSlots.DESIGN_SLOT_1);
final ItemStack plank2 = this.getUtil().getStack(DesignerSlots.DESIGN_SLOT_2);
if (plank1.isEmpty() || plank2.isEmpty()) {
return ItemStack.EMPTY;
}
@@ -74,13 +72,13 @@ public class ComponentDesignerRecipe extends ComponentRecipe implements ICompone
}
final ItemStack product = this.getProduct();
if (takeItem) {
final ItemStack a = this.getUtil().decreaseStack(Designer.DESIGN_SLOT_1, 1);
final ItemStack a = this.getUtil().decreaseStack(DesignerSlots.DESIGN_SLOT_1, 1);
if (a.isEmpty()) {
this.getUtil().decreaseStack(Designer.DESIGN_SLOT_2, 1);
this.getUtil().decreaseStack(DesignerSlots.DESIGN_SLOT_2, 1);
} else if (this.design != EnumDesign.Blank) {
this.getUtil().decreaseStack(Designer.DESIGN_SLOT_2, 1);
this.getUtil().decreaseStack(DesignerSlots.DESIGN_SLOT_2, 1);
}
this.getUtil().decreaseStack(Designer.BEESWAX_SLOT, 1);
this.getUtil().decreaseStack(DesignerSlots.ADHESIVE_SLOT, 1);
}
return product;
}
@@ -96,8 +94,8 @@ public class ComponentDesignerRecipe extends ComponentRecipe implements ICompone
@Override
@Nullable
public ErrorState canWork() {
if (this.getUtil().isSlotEmpty(Designer.BEESWAX_SLOT)) {
return new ErrorState(ExtraTreesErrorCode.DESIGNER_NO_ADHESIVE, Designer.BEESWAX_SLOT);
if (this.getUtil().isSlotEmpty(DesignerSlots.ADHESIVE_SLOT)) {
return new ErrorState(DesignErrorCode.DESIGNER_NO_ADHESIVE, DesignerSlots.ADHESIVE_SLOT);
}
return null;
}
@@ -111,14 +109,14 @@ public class ComponentDesignerRecipe extends ComponentRecipe implements ICompone
@Override
public void sendGuiNBTToClient(final Map<String, NBTTagCompound> nbt) {
final NBTTagCompound tag = new NBTTagCompound();
tag.setShort("d", (short) CarpentryManager.carpentryInterface.getDesignIndex(this.getDesign()));
tag.setShort("d", (short) Design.getDesignManager().getDesignIndex(this.getDesign()));
nbt.put("design", tag);
}
@Override
public void receiveGuiNBTOnClient(EntityPlayer player, String name, NBTTagCompound nbt) {
if (name.equals("design")) {
this.setDesign(CarpentryManager.carpentryInterface.getDesign(nbt.getShort("d")));
this.setDesign(Design.getDesignManager().getDesign(nbt.getShort("d")));
}
}
@@ -144,7 +142,7 @@ public class ComponentDesignerRecipe extends ComponentRecipe implements ICompone
}
}
} else if (name.equals("design")) {
setDesign(CarpentryManager.carpentryInterface.getDesign(nbt.getInteger("d")));
setDesign(Design.getDesignManager().getDesign(nbt.getInteger("d")));
}
}
@@ -1,4 +1,4 @@
package binnie.extratrees.machines.designer.window;
package binnie.design.gui;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -1,4 +1,4 @@
package binnie.extratrees.machines.designer.window;
package binnie.design.gui;
import java.util.ArrayList;
import java.util.HashMap;
@@ -6,11 +6,14 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import binnie.core.Constants;
import binnie.design.api.DesignAPI;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -30,17 +33,16 @@ import binnie.core.gui.renderer.RenderUtil;
import binnie.core.gui.resource.textures.CraftGUITexture;
import binnie.core.machines.TileEntityMachine;
import binnie.core.util.I18N;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignCategory;
import binnie.extratrees.carpentry.EnumDesign;
import binnie.design.api.IDesign;
import binnie.design.api.IDesignCategory;
import binnie.design.EnumDesign;
public class ControlTileSelect extends Control implements IControlValue<IDesign>, IControlScrollable {
IDesign value;
float shownHeight;
protected ControlTileSelect(final IWidget parent, final int x, final int y) {
super(parent, x, y, 102, 20 * (CarpentryManager.carpentryInterface.getSortedDesigns().size() / 4) + 22);
super(parent, x, y, 102, 20 * (DesignAPI.manager.getSortedDesigns().size() / 4) + 22);
this.value = EnumDesign.Blank;
this.shownHeight = 92.0f;
this.refresh("");
@@ -91,7 +93,7 @@ public class ControlTileSelect extends Control implements IControlValue<IDesign>
int cx = 2;
int cy = 2;
final Map<IDesignCategory, List<IDesign>> designs = new HashMap<>();
for (final IDesignCategory category : CarpentryManager.carpentryInterface.getAllDesignCategories()) {
for (final IDesignCategory category : DesignAPI.manager.getAllDesignCategories()) {
designs.put(category, new ArrayList<>());
for (final IDesign tile : category.getDesigns()) {
if (Objects.equals(filterText, "") || tile.getName().toLowerCase().contains(filterText)) {
@@ -140,14 +142,14 @@ public class ControlTileSelect extends Control implements IControlValue<IDesign>
// TODO: why is recipe unused here?
ComponentDesignerRecipe recipe = tile.getMachine().getComponent(ComponentDesignerRecipe.class);
final NBTTagCompound nbt = new NBTTagCompound();
nbt.setShort("d", (short) CarpentryManager.carpentryInterface.getDesignIndex(ControlTile.this.getValue()));
nbt.setShort("d", (short) DesignAPI.manager.getDesignIndex(ControlTile.this.getValue()));
Window.get(ControlTile.this.getWidget()).sendClientAction("design", nbt);
});
}
@Override
public void getTooltip(final Tooltip tooltip, ITooltipFlag tooltipFlag) {
tooltip.add(I18N.localise("binniecore.gui.designer.pattern", this.getValue().getName()));
tooltip.add(I18N.localise(new ResourceLocation(Constants.DESIGN_MOD_ID, "gui.designer.pattern"), this.getValue().getName()));
}
@Override
@@ -0,0 +1,57 @@
package binnie.design.gui;
import javax.annotation.Nullable;
import binnie.core.Constants;
import binnie.core.machines.errors.CoreErrorCode;
import binnie.core.machines.errors.EnumErrorType;
import binnie.core.machines.errors.ErrorStateRegistry;
import binnie.core.machines.errors.IErrorStateDefinition;
import binnie.core.util.I18N;
import net.minecraft.util.ResourceLocation;
public enum DesignErrorCode implements IErrorStateDefinition {
DESIGNER_NO_ADHESIVE("designer.no.adhesive", CoreErrorCode.NO_ITEM);
String name;
@Nullable
IErrorStateDefinition parent;
@Nullable
EnumErrorType type;
DesignErrorCode(String name, IErrorStateDefinition parent) {
this(name, parent, EnumErrorType.NONE);
}
DesignErrorCode(String name, IErrorStateDefinition parent, EnumErrorType type) {
this.name = name;
this.parent = parent;
this.type = type;
ErrorStateRegistry.registerErrorState(this);
}
@Override
public String getUID() {
return Constants.DESIGN_MOD_ID + ":" + name;
}
public String getDescription(){
return I18N.localise(new ResourceLocation(Constants.DESIGN_MOD_ID, "errors." + name + ".desc"));
}
public String getName(){
if (parent != null){
return parent.getName();
}
return I18N.localise(new ResourceLocation(Constants.DESIGN_MOD_ID, "errors." + name + ".name"));
}
@Override
@Nullable
public EnumErrorType getType() {
if (parent != null){
return parent.getType();
}
return type;
}
}
@@ -0,0 +1,7 @@
package binnie.design.gui;
public abstract class DesignerSlots {
public static int ADHESIVE_SLOT = 0;
public static int DESIGN_SLOT_1 = 1;
public static int DESIGN_SLOT_2 = 2;
}
@@ -1,16 +1,16 @@
package binnie.extratrees.machines.designer.window;
package binnie.design.gui;
import binnie.extratrees.machines.designer.IDesignerType;
import binnie.design.Design;
import binnie.design.api.IDesignerType;
import net.minecraft.item.ItemStack;
import binnie.core.machines.inventory.SlotValidator;
import binnie.extratrees.modules.ModuleMachine;
public class SlotValidatorBeeswax extends SlotValidator {
public class SlotValidatorDesignAdhesive extends SlotValidator {
private final IDesignerType type;
public SlotValidatorBeeswax(final IDesignerType type) {
super(ModuleMachine.spritePolish);
public SlotValidatorDesignAdhesive(final IDesignerType type) {
super(Design.getSpritePolish());
this.type = type;
}
@@ -1,15 +1,15 @@
package binnie.extratrees.machines.designer.window;
package binnie.design.gui;
import binnie.extratrees.machines.designer.IDesignerType;
import binnie.design.api.IDesignerType;
import net.minecraft.item.ItemStack;
import binnie.core.machines.inventory.SlotValidator;
import binnie.extratrees.api.IDesignMaterial;
import binnie.design.api.IDesignMaterial;
public class SlotValidatorPlanks extends SlotValidator {
public class SlotValidatorDesignMaterial extends SlotValidator {
private final IDesignerType type;
public SlotValidatorPlanks(final IDesignerType type) {
public SlotValidatorDesignMaterial(final IDesignerType type) {
super(SlotValidator.spriteBlock);
this.type = type;
}
@@ -1,12 +1,14 @@
package binnie.extratrees.machines.designer.window;
package binnie.design.gui;
import javax.annotation.Nullable;
import binnie.core.Constants;
import binnie.core.api.gui.events.EventHandlerOrigin;
import binnie.extratrees.machines.designer.IDesignerType;
import binnie.design.api.IDesignerType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -25,14 +27,12 @@ import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.gui.window.Panel;
import binnie.core.machines.Machine;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.machines.designer.Designer;
public class WindowDesigner extends Window {
ControlTextEdit textEdit;
ControlTileSelect tileSelect;
private ControlTextEdit textEdit;
private ControlTileSelect tileSelect;
public WindowDesigner(final EntityPlayer player, final IInventory inventory, final Side side) {
public WindowDesigner(EntityPlayer player, IInventory inventory, Side side) {
super(320, 216, player, inventory, side);
this.addEventHandler(EventTextEdit.class, EventHandlerOrigin.DIRECT_CHILD, this, event -> {
WindowDesigner.this.tileSelect.refresh(event.getValue());
@@ -40,7 +40,7 @@ public class WindowDesigner extends Window {
}
@Nullable
public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) {
public static Window create(EntityPlayer player, @Nullable IInventory inventory, Side side) {
if (inventory == null) {
return null;
}
@@ -51,7 +51,7 @@ public class WindowDesigner extends Window {
@SideOnly(Side.CLIENT)
public void initialiseClient() {
this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName());
new ControlText(this, new Area(190, 36, 114, 10), I18N.localise("binniecore.gui.design"), TextJustification.TOP_CENTER).setColor(4473924);
new ControlText(this, new Area(190, 36, 114, 10), I18N.localise(new ResourceLocation(Constants.DESIGN_MOD_ID, "gui.design")), TextJustification.TOP_CENTER).setColor(4473924);
new Panel(this, 188, 48, 118, 126, MinecraftGUI.PanelType.GRAY);
this.textEdit = new ControlTextEdit(this, 188, 178, 118, 12);
final ControlScrollableContent scroll = new ControlScrollableContent(this, 190, 50, 114, 122, 12);
@@ -59,21 +59,21 @@ public class WindowDesigner extends Window {
new ControlPlayerInventory(this).setPosition(new Point(14, 96));
new ControlErrorState(this, 76, 65);
if (this.getInventory() != null) {
final ControlSlot slotWood1 = new ControlSlot.Builder(this, 22, 34).assign(Designer.DESIGN_SLOT_1);
final ControlSlot slotWood2 = new ControlSlot.Builder(this, 62, 34).assign(Designer.DESIGN_SLOT_2);
final ControlSlot slotBeeswax = new ControlSlot.Builder(this, 42, 64).assign(Designer.BEESWAX_SLOT);
final ControlRecipeSlot slotFinished = new ControlRecipeSlot(this, 112, 34);
new ControlSlot.Builder(this, 22, 34).assign(DesignerSlots.DESIGN_SLOT_1);
new ControlSlot.Builder(this, 62, 34).assign(DesignerSlots.DESIGN_SLOT_2);
new ControlSlot.Builder(this, 42, 64).assign(DesignerSlots.ADHESIVE_SLOT);
new ControlRecipeSlot(this, 112, 34);
}
}
@Override
protected String getModId() {
return ExtraTrees.instance.getModId();
return Constants.DESIGN_MOD_ID;
}
@Override
protected String getBackgroundTextureName() {
return "Woodworker";
return "Designer";
}
public IDesignerType getDesignerType() {
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.design.gui;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,5 +1,8 @@
package binnie.extratrees.items;
package binnie.design.items;
import binnie.design.DesignHelper;
import binnie.design.blocks.BlockDesign;
import binnie.design.blocks.DesignBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
@@ -9,9 +12,6 @@ import forestry.core.items.IColoredItem;
import binnie.core.block.ItemMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.blocks.BlockDesign;
import binnie.extratrees.carpentry.DesignBlock;
import binnie.extratrees.modules.ModuleCarpentry;
public class ItemDesign extends ItemMetadata implements IColoredItem {
@@ -22,7 +22,7 @@ public class ItemDesign extends ItemMetadata implements IColoredItem {
@SideOnly(Side.CLIENT)
@Override
public int getColorFromItemstack(ItemStack stack, int tintIndex) {
DesignBlock block = ModuleCarpentry.getDesignBlock(((BlockDesign) this.block).getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
DesignBlock block = DesignHelper.getDesignBlock(((BlockDesign) this.block).getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
if (tintIndex > 0) {
return block.getSecondaryColour();
}
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.design.items;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,7 +1,9 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.extratrees.api.carpentry;
@FieldsAreNonnullByDefault
package binnie.design;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -0,0 +1,112 @@
binniedesign.errors.designer.no.adhesive.desc=Requires Adhesive to Function
< %1$s is the name of the pattern >
binniedesign.gui.designer.pattern=%1$s Pattern
binniedesign.gui.design=Design
##################################################
## Design Patterns
##################################################
binniedesign.pattern.blank=Blank
binniedesign.pattern.octagon=Octagon
binniedesign.pattern.diamond=Diamond
binniedesign.pattern.ringed=Ringed
binniedesign.pattern.squared=Squared
binniedesign.pattern.multiply=Multiply
binniedesign.pattern.halved=Halved
binniedesign.pattern.striped=Striped
binniedesign.pattern.thin.striped=Thin Striped
binniedesign.pattern.full.chequered=Full Chequered
binniedesign.pattern.full.tiled=Full Tiled
binniedesign.pattern.chequered=Chequered
binniedesign.pattern.tiled=Tiled
binniedesign.pattern.very.thin.cornered=Very Thin Cornered
binniedesign.pattern.thin.cornered=Thin Cornered
binniedesign.pattern.cornered=Cornered
binniedesign.pattern.thick.cornered=Thick Cornered
binniedesign.pattern.edged=Edged
binniedesign.pattern.thin.edged=Thin Edged
binniedesign.pattern.thin.barred=Thin Barred
binniedesign.pattern.barred=Barred
binniedesign.pattern.thick.barred=Thick Barred
binniedesign.pattern.diagonal=Diagonal
binniedesign.pattern.thick.diagonal=Thick Diagonal
binniedesign.pattern.thin.saltire=Thin Saltire
binniedesign.pattern.saltire=Saltire
binniedesign.pattern.thick.saltire=Thick Saltire
binniedesign.pattern.thin.crossed=Thin Crossed
binniedesign.pattern.crossed=Crossed
binniedesign.pattern.thick.crossed=Thick Crossed
binniedesign.pattern.thin.t.section=Thin T Section
binniedesign.pattern.t.section=T Section
binniedesign.pattern.thick.t.section=Thick T Section
binniedesign.pattern.thin.barred.corner=Thin Barred Corner
binniedesign.pattern.barred.corner=Barred Corner
binniedesign.pattern.thick.barred.corner=Thick Barred Corner
binniedesign.pattern.thin.striped.corner=Thin Striped Corner
binniedesign.pattern.striped.corner=Striped Corner
binniedesign.pattern.emblem.1=Emblem 1
binniedesign.pattern.emblem.2=Emblem 2
binniedesign.pattern.emblem.3=Emblem 3
binniedesign.pattern.emblem.4=Emblem 4
binniedesign.pattern.emblem.5=Emblem 5
binniedesign.pattern.letter.a=Letter A
binniedesign.pattern.letter.b=Letter B
binniedesign.pattern.letter.c=Letter C
binniedesign.pattern.letter.d=Letter D
binniedesign.pattern.letter.e=Letter E
binniedesign.pattern.letter.f=Letter F
binniedesign.pattern.letter.g=Letter G
binniedesign.pattern.letter.h=Letter H
binniedesign.pattern.letter.i=Letter I
binniedesign.pattern.letter.j=Letter J
binniedesign.pattern.letter.k=Letter K
binniedesign.pattern.letter.l=Letter L
binniedesign.pattern.letter.m=Letter M
binniedesign.pattern.letter.n=Letter N
binniedesign.pattern.letter.o=Letter O
binniedesign.pattern.letter.p=Letter P
binniedesign.pattern.letter.q=Letter Q
binniedesign.pattern.letter.r=Letter R
binniedesign.pattern.letter.s=Letter S
binniedesign.pattern.letter.t=Letter T
binniedesign.pattern.letter.u=Letter U
binniedesign.pattern.letter.v=Letter V
binniedesign.pattern.letter.w=Letter W
binniedesign.pattern.letter.x=Letter X
binniedesign.pattern.letter.y=Letter Y
binniedesign.pattern.letter.z=Letter Z
binniedesign.pattern.thin.curved.crossed=Thin Curved Crossed
binniedesign.pattern.thin.curved.barred.corner=Thin Curved Barred Corner
binniedesign.pattern.curved.barred.corner=Curved Barred Corner
binniedesign.pattern.thin.curved.corner=Thin Curved Corner
binniedesign.pattern.curved.corner=Curved Corner
binniedesign.pattern.thin.curved.t.section=Thin Curved T Section
binniedesign.pattern.curved.t.section=Curved T Section
binniedesign.pattern.barred.end=Barred End
binniedesign.pattern.diagonal.corner=Diagonal Corner
binniedesign.pattern.diagonal.t.section=Diagonal T Section
binniedesign.pattern.diagonal.curved.corner=Diagonal Curved Corner
binniedesign.pattern.diagonal.curved.t.section=Diagonal Curved T Section
binniedesign.pattern.ornate.barred=Ornate Barred
binniedesign.pattern.split.barred=Split Barred
binniedesign.pattern.split.barred.corner=Split Barred Corner
binniedesign.pattern.split.barred.t.section=Split Barred T Section
binniedesign.pattern.split.crossed=Split Crossed
binniedesign.pattern.split.barred.end=Split Barred End
binniedesign.pattern.ornate.thin.barred=Ornate Thin Barred
binniedesign.pattern.circle=Circle
binniedesign.pattern.plus=Plus
binniedesign.pattern.creeper=Creeper
binniedesign.pattern.ornate.striped.corner=Ornate Striped Corner
binniedesign.pattern.testing.block=Testing Block
binniedesign.pattern.diagonal.halved=Diagonal Halved
binniedesign.pattern.cornered.diagonal=Cornered Diagonal
binniedesign.pattern.opposite.cornered.diagonal=Opposite Cornered Diagonal
binniedesign.pattern.thick.cornered.diagonal=Thick Cornered Diagonal
binniedesign.pattern.thin.barred.end=Thin Barred End
binniedesign.pattern.thick.barred.end=Thick Barred End
binniedesign.pattern.overlapped.barred=Overlapped Barred
binniedesign.pattern.overlapped.split.barred=Overlapped Split Barred
File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

+1
View File
@@ -2,4 +2,5 @@ archivesBaseName = 'extratrees-api-' + mcversion
dependencies {
compile project(":core-api")
compile project(":design-api")
}
@@ -1,9 +1,8 @@
package binnie.extratrees.api;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.List;
import binnie.design.api.IDesignMaterial;
import net.minecraft.item.ItemStack;
public interface ICarpentryInterface {
@@ -13,18 +12,9 @@ public interface ICarpentryInterface {
IDesignMaterial getWoodMaterial(final int p0);
boolean registerDesign(final int p0, final IDesign p1);
int getDesignIndex(final IDesign p0);
IDesign getDesign(final int p0);
@Nullable
IDesignMaterial getWoodMaterial(final ItemStack stack);
boolean registerDesignCategory(final IDesignCategory p0);
Collection<IDesignCategory> getAllDesignCategories();
List<IDesign> getSortedDesigns();
}
@@ -1,25 +0,0 @@
package binnie.extratrees.api.carpentry;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import binnie.extratrees.api.IDesignSystem;
public final class DesignerManager {
public static DesignerManager instance = new DesignerManager();
private final List<IDesignSystem> systems;
private DesignerManager() {
this.systems = new ArrayList<>();
}
public void registerDesignSystem(final IDesignSystem system) {
this.systems.add(system);
}
public Collection<IDesignSystem> getDesignSystems() {
return this.systems;
}
}
@@ -1,7 +0,0 @@
package binnie.extratrees.api.carpentry;
import binnie.extratrees.api.IDesignSystem;
public interface IBlockDesign {
IDesignSystem getDesignSystem();
}
+2
View File
@@ -6,4 +6,6 @@ dependencies {
compile project(":extratrees-api")
compile project(":botany-api")
compile project(":genetics-api")
compile project(":design")
compile project(":design-api")
}
@@ -31,7 +31,8 @@ import binnie.extratrees.proxy.Proxy;
modid = Constants.EXTRA_TREES_MOD_ID,
name = "Binnie's Extra Trees",
acceptedMinecraftVersions = "[1.12, 1.12.1]",
dependencies = "required-after:" + Constants.CORE_MOD_ID
dependencies = "required-after:" + Constants.CORE_MOD_ID + ";"
+ "after:" + Constants.DESIGN_MOD_ID + ";"
)
public class ExtraTrees extends BlankModuleContainer {
@@ -1,20 +1,23 @@
package binnie.extratrees.blocks;
import binnie.design.DesignHelper;
import binnie.design.blocks.BlockDesign;
import binnie.extratrees.CreativeTabCarpentry;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.item.ItemStack;
import binnie.core.util.I18N;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.carpentry.DesignBlock;
import binnie.design.api.IDesign;
import binnie.design.blocks.DesignBlock;
import binnie.extratrees.carpentry.DesignSystem;
import binnie.extratrees.modules.ModuleCarpentry;
import binnie.extratrees.wood.planks.ExtraTreePlanks;
import binnie.extratrees.wood.planks.VanillaPlanks;
public class BlockCarpentry extends BlockDesign {
public BlockCarpentry(String name) {
super(DesignSystem.Wood, Material.WOOD);
this.setCreativeTab(CreativeTabCarpentry.instance);
this.setRegistryName(name);
this.setResistance(5.0f);
this.setHardness(2.0f);
@@ -23,7 +26,7 @@ public class BlockCarpentry extends BlockDesign {
@Override
public ItemStack getCreativeStack(final IDesign design) {
return ModuleCarpentry.getItemStack(this, ExtraTreePlanks.Apple, VanillaPlanks.BIRCH, design);
return DesignHelper.getItemStack(this, ExtraTreePlanks.Apple, VanillaPlanks.BIRCH, design);
}
@Override
@@ -1,7 +1,6 @@
package binnie.extratrees.blocks;
import javax.annotation.Nullable;
import binnie.design.DesignHelper;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
@@ -15,7 +14,7 @@ import net.minecraft.world.World;
import binnie.core.block.BlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.carpentry.DesignBlock;
import binnie.design.blocks.DesignBlock;
import binnie.extratrees.modules.ModuleCarpentry;
public class BlockCarpentryPanel extends BlockCarpentry {
@@ -25,15 +24,6 @@ public class BlockCarpentryPanel extends BlockCarpentry {
this.setLightOpacity(0);
}
public static boolean isValidPanelPlacement(IBlockAccess world, BlockPos pos, @Nullable EnumFacing facing) {
if (facing == null) {
return false;
}
pos = pos.offset(facing);
IBlockState state = world.getBlockState(pos);
return state.isSideSolid(world, pos, facing.getOpposite());
}
@Override
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> itemList) {
}
@@ -71,7 +61,7 @@ public class BlockCarpentryPanel extends BlockCarpentry {
@Override
public String getDisplayName(final ItemStack itemStack) {
final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack));
final DesignBlock block = DesignHelper.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack));
return I18N.localise("extratrees.block.woodenpanel.name", block.getDesign().getName());
}
@@ -95,10 +85,10 @@ public class BlockCarpentryPanel extends BlockCarpentry {
final DesignBlock block = ModuleCarpentry.getCarpentryPanel(this.getDesignSystem(), TileEntityMetadata.getItemDamage(item));
EnumFacing facing = clickedBlock;
boolean valid = true;
if (!isValidPanelPlacement(world, pos, facing)) {
if (!DesignHelper.isValidPanelPlacement(world, pos, facing)) {
valid = false;
for (EnumFacing direction : EnumFacing.VALUES) {
if (isValidPanelPlacement(world, pos, direction)) {
if (DesignHelper.isValidPanelPlacement(world, pos, direction)) {
facing = direction;
valid = true;
break;
@@ -122,7 +112,7 @@ public class BlockCarpentryPanel extends BlockCarpentry {
super.onNeighborChange(blockAccess, pos, neighbor);
World world = (World) blockAccess;
final DesignBlock block = this.getCarpentryBlock(blockAccess, pos);
if (!isValidPanelPlacement(blockAccess, pos, block.getFacing())) {
if (!DesignHelper.isValidPanelPlacement(blockAccess, pos, block.getFacing())) {
NonNullList<ItemStack> drops = NonNullList.create();
BlockMetadata.getDrops(drops, this, blockAccess, pos);
for (ItemStack stack : drops) {
@@ -3,6 +3,8 @@ package binnie.extratrees.blocks;
import javax.annotation.Nullable;
import java.util.Random;
import binnie.design.DesignHelper;
import binnie.design.blocks.BlockDesign;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
@@ -27,11 +29,10 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.carpentry.DesignBlock;
import binnie.design.api.IDesign;
import binnie.design.blocks.DesignBlock;
import binnie.extratrees.carpentry.DesignSystem;
import binnie.extratrees.carpentry.GlassType;
import binnie.extratrees.modules.ModuleCarpentry;
public class BlockStainedDesign extends BlockDesign {
public BlockStainedDesign() {
@@ -104,7 +105,7 @@ public class BlockStainedDesign extends BlockDesign {
@Override
public ItemStack getCreativeStack(final IDesign design) {
return ModuleCarpentry.getItemStack(this, GlassType.get(0), GlassType.get(1), design);
return DesignHelper.getItemStack(this, GlassType.get(0), GlassType.get(1), design);
}
@Override
@@ -1,24 +1,16 @@
package binnie.extratrees.carpentry;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.item.ItemStack;
import binnie.extratrees.api.ICarpentryInterface;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignCategory;
import binnie.extratrees.api.IDesignMaterial;
import binnie.design.api.IDesignMaterial;
public class CarpentryInterface implements ICarpentryInterface {
private static Map<Integer, IDesignMaterial> woodMap = new LinkedHashMap<>();
private static Map<Integer, IDesign> designMap = new LinkedHashMap<>();
private static Map<String, IDesignCategory> designCategories = new HashMap<>();
@Override
public boolean registerCarpentryWood(final int index, final IDesignMaterial wood) {
@@ -40,50 +32,7 @@ public class CarpentryInterface implements ICarpentryInterface {
return CarpentryInterface.woodMap.get(index);
}
@Override
public boolean registerDesign(final int index, final IDesign wood) {
return CarpentryInterface.designMap.put(index, wood) == null;
}
@Override
public int getDesignIndex(final IDesign wood) {
for (final Integer integer : CarpentryInterface.designMap.keySet()) {
if (CarpentryInterface.designMap.get(integer).equals(wood)) {
return integer;
}
}
return -1;
}
@Override
public IDesign getDesign(final int index) {
return CarpentryInterface.designMap.get(index);
}
@Override
public boolean registerDesignCategory(final IDesignCategory category) {
return CarpentryInterface.designCategories.put(category.getId(), category) == null;
}
@Override
public Collection<IDesignCategory> getAllDesignCategories() {
final List<IDesignCategory> categories = new ArrayList<>();
for (final IDesignCategory category : CarpentryInterface.designCategories.values()) {
if (category.getDesigns().size() > 0) {
categories.add(category);
}
}
return categories;
}
@Override
public List<IDesign> getSortedDesigns() {
final List<IDesign> designs = new ArrayList<>();
for (final IDesignCategory category : this.getAllDesignCategories()) {
designs.addAll(category.getDesigns());
}
return designs;
}
@Override
@Nullable
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
import binnie.design.api.DesignAPI;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
@@ -15,11 +16,10 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.api.IDesignSystem;
import binnie.extratrees.api.IPattern;
import binnie.extratrees.api.carpentry.DesignerManager;
import binnie.extratrees.api.carpentry.EnumPattern;
import binnie.design.api.IDesignMaterial;
import binnie.design.api.IDesignSystem;
import binnie.design.api.IPattern;
import binnie.design.EnumPattern;
import binnie.extratrees.items.ExtraTreeItems;
import binnie.extratrees.wood.planks.ExtraTreePlanks;
@@ -33,7 +33,7 @@ public enum DesignSystem implements IDesignSystem {
DesignSystem() {
this.primary = new HashMap<>();
this.secondary = new HashMap<>();
DesignerManager.instance.registerDesignSystem(this);
DesignAPI.manager.registerDesignSystem(this);
}
@Override
@@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import binnie.botany.api.genetics.EnumFlowerColor;
import binnie.core.Constants;
import binnie.core.block.TileEntityMetadata;
import binnie.extratrees.api.IDesignMaterial;
import binnie.design.api.IDesignMaterial;
public class GlassType implements IDesignMaterial {
private static Map<Integer, GlassType> types;
@@ -3,6 +3,9 @@ package binnie.extratrees.genetics;
import java.awt.Color;
import java.lang.reflect.Field;
import binnie.core.Binnie;
import binnie.core.api.genetics.IBreedingSystem;
import forestry.api.arboriculture.TreeManager;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -22,7 +25,6 @@ import binnie.extratrees.genetics.fruits.ETFruitProviderRipening;
import binnie.extratrees.genetics.fruits.FruitPod;
import binnie.extratrees.genetics.fruits.FruitSprite;
import binnie.extratrees.items.Food;
import binnie.extratrees.modules.ModuleWood;
import static binnie.extratrees.genetics.fruits.ETFruitFamily.BERRY;
import static binnie.extratrees.genetics.fruits.ETFruitFamily.CITRUS;
import static forestry.api.arboriculture.EnumFruitFamily.JUNGLE;
@@ -427,7 +429,8 @@ public enum AlleleETFruitDefinition {
throw new RuntimeException(e);
}
}
for (IAlleleSpecies tree : ModuleWood.treeBreedingSystem.getAllSpecies()) {
IBreedingSystem treeSystem = Binnie.GENETICS.getSystem(TreeManager.treeRoot);
for (IAlleleSpecies tree : treeSystem.getAllSpecies()) {
if (tree instanceof AlleleTreeSpecies && ((IAlleleTreeSpecies) tree).getSuitableFruit().contains(PRUNES)) {
((AlleleTreeSpecies) tree).addFruitFamily(CITRUS);
}
@@ -5,6 +5,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import binnie.core.api.genetics.IBreedingSystem;
import binnie.core.api.gui.IArea;
import binnie.core.api.gui.ITitledWidget;
import binnie.core.gui.controls.core.Control;
@@ -29,7 +30,6 @@ import binnie.core.gui.geometry.Point;
import binnie.core.gui.minecraft.control.ControlItemDisplay;
import binnie.core.util.I18N;
import binnie.core.util.UniqueItemStackSet;
import binnie.extratrees.modules.ModuleWood;
import binnie.genetics.api.analyst.AnalystConstants;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -43,7 +43,9 @@ public class AnalystPageFruit extends Control implements ITitledWidget {
int y = 4;
new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColor(getColor());
y += 12;
new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.FRUIT_KEY + ".yield") + ": " + ModuleWood.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD))).setColor(getColor());
IBreedingSystem treeSystem = Binnie.GENETICS.getSystem(TreeManager.treeRoot);
String yieldAlleleName = treeSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD));
new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.FRUIT_KEY + ".yield") + ": " + yieldAlleleName).setColor(getColor());
y += 20;
Collection<ItemStack> products = new UniqueItemStackSet();
Collection<ItemStack> specialties = new UniqueItemStackSet();
@@ -1,9 +1,12 @@
package binnie.extratrees.genetics.gui.analyst;
import binnie.core.Binnie;
import binnie.core.api.genetics.IBreedingSystem;
import binnie.core.api.gui.IArea;
import binnie.core.api.gui.ITitledWidget;
import binnie.core.gui.controls.core.Control;
import binnie.core.util.TimeUtil;
import forestry.api.arboriculture.TreeManager;
import net.minecraft.util.text.TextFormatting;
import forestry.api.arboriculture.EnumTreeChromosome;
@@ -14,7 +17,6 @@ import forestry.api.genetics.IIndividual;
import binnie.core.api.gui.IWidget;
import binnie.core.gui.controls.ControlTextCentered;
import binnie.core.util.I18N;
import binnie.extratrees.modules.ModuleWood;
import binnie.genetics.api.analyst.AnalystConstants;
public class AnalystPageGrowth extends Control implements ITitledWidget {
@@ -32,9 +34,10 @@ public class AnalystPageGrowth extends Control implements ITitledWidget {
y += 12;
new ControlTextCentered(this, y, TextFormatting.BOLD + TimeUtil.getTimeString(Math.round(1373.3999f * mat))).setColor(getColor());
y += 22;
new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".height") + ": " + ModuleWood.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColor(getColor());
IBreedingSystem treeSystem = Binnie.GENETICS.getSystem(TreeManager.treeRoot);
new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".height") + ": " + treeSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColor(getColor());
y += 12;
new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".girth") + ": " + ModuleWood.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColor(getColor());
new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".girth") + ": " + treeSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColor(getColor());
}
}
@@ -2,20 +2,22 @@ package binnie.extratrees.genetics.gui.analyst;
import java.util.List;
import binnie.core.Binnie;
import binnie.core.Constants;
import binnie.core.api.genetics.IBreedingSystem;
import binnie.core.api.gui.IArea;
import binnie.core.api.gui.ITitledWidget;
import binnie.core.api.gui.IWidget;
import binnie.core.gui.controls.ControlTextCentered;
import binnie.core.util.I18N;
import binnie.core.util.TimeUtil;
import binnie.extratrees.modules.ModuleWood;
import binnie.genetics.api.analyst.IAnalystManager;
import binnie.genetics.api.analyst.IAnalystPagePlugin;
import binnie.genetics.api.analyst.IBiologyPlugin;
import binnie.genetics.api.analyst.AnalystConstants;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.ITree;
import forestry.api.arboriculture.TreeManager;
import forestry.api.genetics.IIndividual;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.fml.relauncher.Side;
@@ -40,7 +42,8 @@ public class TreeAnalystPagePlugin implements IAnalystPagePlugin<ITree> {
@Override
@SideOnly(Side.CLIENT)
public int addBiologyPages(ITree tree, IWidget parent, int y, IAnalystManager analystManager) {
String alleleName = ModuleWood.treeBreedingSystem.getAlleleName(EnumTreeChromosome.SAPPINESS, tree.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS));
IBreedingSystem treeSystem = Binnie.GENETICS.getSystem(TreeManager.treeRoot);
String alleleName = treeSystem.getAlleleName(EnumTreeChromosome.SAPPINESS, tree.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS));
new ControlTextCentered(parent, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".sappiness", alleleName))
.setColor(parent.getColor());
y += 20;
@@ -14,7 +14,7 @@ import binnie.extratrees.gui.database.WindowArboristDatabase;
import binnie.extratrees.gui.database.WindowLepidopteristDatabase;
import binnie.extratrees.kitchen.craftgui.WindowBottleRack;
import binnie.extratrees.machines.brewery.window.WindowBrewery;
import binnie.extratrees.machines.designer.window.WindowDesigner;
import binnie.design.gui.WindowDesigner;
import binnie.extratrees.machines.distillery.window.WindowDistillery;
import binnie.extratrees.machines.fruitpress.window.WindowPress;
import binnie.extratrees.machines.lumbermill.window.WindowLumbermill;
@@ -38,9 +38,9 @@ public enum ExtraTreesGUID implements IBinnieGUID {
public Window getWindow(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) {
Window window = null;
final TileEntity tileEntity = world.getTileEntity(new BlockPos(x, y, z));
IInventory object = null;
IInventory inventory = null;
if (tileEntity instanceof IInventory) {
object = (IInventory) tileEntity;
inventory = (IInventory) tileEntity;
}
switch (this) {
case DATABASE:
@@ -49,27 +49,27 @@ public enum ExtraTreesGUID implements IBinnieGUID {
break;
}
case WOODWORKER: {
window = WindowDesigner.create(player, object, side);
window = WindowDesigner.create(player, inventory, side);
break;
}
case LUMBERMILL: {
window = WindowLumbermill.create(player, object, side);
window = WindowLumbermill.create(player, inventory, side);
break;
}
case KITCHEN_BOTTLE_RACK: {
window = WindowBottleRack.create(player, object, side);
window = WindowBottleRack.create(player, inventory, side);
break;
}
case PRESS: {
window = WindowPress.create(player, object, side);
window = WindowPress.create(player, inventory, side);
break;
}
case BREWERY: {
window = WindowBrewery.create(player, object, side);
window = WindowBrewery.create(player, inventory, side);
break;
}
case DISTILLERY: {
window = WindowDistillery.create(player, object, side);
window = WindowDistillery.create(player, inventory, side);
break;
}
case MOTH_DATABASE:
@@ -2,6 +2,7 @@ package binnie.extratrees.gui.database;
import java.util.Collection;
import binnie.genetics.api.ITreeBreedingSystem;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
@@ -9,7 +10,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.genetics.IAlleleSpecies;
import binnie.extratrees.genetics.TreeBreedingSystem;
import binnie.core.api.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.database.ControlSpeciesBox;
@@ -35,7 +35,7 @@ public class PageFruit extends PageAbstract<ItemStack> {
this.deleteAllChildren();
final WindowAbstractDatabase database = Window.get(this);
new ControlText(this, new Area(0, 0, this.getSize().xPos(), 24), I18N.localise("extratrees.gui.database.tab.fruit." + (this.treesThatBearFruit ? "natural" : "potential")), TextJustification.MIDDLE_CENTER);
TreeBreedingSystem breedingSystem = (TreeBreedingSystem) database.getBreedingSystem();
ITreeBreedingSystem breedingSystem = (ITreeBreedingSystem) database.getBreedingSystem();
final Collection<IAlleleSpecies> trees;
if (this.treesThatBearFruit) {
trees = breedingSystem.getTreesThatBearFruit(species, database.isMaster(), database.getWorld(), database.getUsername());
@@ -1,15 +1,25 @@
package binnie.extratrees.gui.database;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import binnie.core.Binnie;
import binnie.core.api.genetics.IBreedingSystem;
import binnie.extratrees.machines.lumbermill.recipes.LumbermillRecipeManager;
import com.mojang.authlib.GameProfile;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.arboriculture.ITreeRoot;
import forestry.api.arboriculture.TreeManager;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.genetics.IAlleleSpecies;
import binnie.extratrees.genetics.TreeBreedingSystem;
import binnie.core.api.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.database.ControlSpeciesBox;
@@ -31,8 +41,28 @@ public class PagePlanksTrees extends PageAbstract<ItemStack> {
this.deleteAllChildren();
final WindowAbstractDatabase database = Window.get(this);
new ControlText(this, new Area(0, 0, this.getSize().xPos(), 24), species.getDisplayName(), TextJustification.MIDDLE_CENTER);
TreeBreedingSystem breedingSystem = (TreeBreedingSystem) database.getBreedingSystem();
final Collection<IAlleleSpecies> trees = breedingSystem.getTreesThatMakePlanks(species, database.isMaster(), database.getWorld(), database.getUsername());
final Collection<IAlleleSpecies> trees = getTreesThatMakePlanks(species, database.isMaster(), database.getWorld(), database.getUsername());
new ControlSpeciesBox(this, 4, 24, this.getSize().xPos() - 8, this.getSize().yPos() - 4 - 24).setOptions(trees);
}
private static Collection<IAlleleSpecies> getTreesThatMakePlanks(final ItemStack fruit, final boolean nei, final World world, final GameProfile player) {
if (fruit == null) {
return new ArrayList<>();
}
ITreeRoot treeRoot = TreeManager.treeRoot;
IBreedingSystem system = Binnie.GENETICS.getSystem(treeRoot);
final Collection<IAlleleSpecies> set = nei ? system.getAllSpecies() : system.getDiscoveredSpecies(world, player);
final List<IAlleleSpecies> found = new ArrayList<>();
for (final IAlleleSpecies species : set) {
final IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species;
ITreeGenome genome = treeRoot.templateAsGenome(treeRoot.getTemplate(tSpecies));
IAlleleTreeSpecies treeSpecies = genome.getPrimary();
final ItemStack woodStack = treeSpecies.getWoodProvider().getWoodStack();
ItemStack plankProduct = LumbermillRecipeManager.getPlankProduct(woodStack, world);
if (!plankProduct.isEmpty() && fruit.isItemEqual(plankProduct)) {
found.add(species);
}
}
return found;
}
}
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import binnie.core.Binnie;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
@@ -37,7 +38,6 @@ import binnie.core.gui.geometry.Point;
import binnie.core.gui.geometry.TextJustification;
import binnie.core.gui.minecraft.control.ControlItemDisplay;
import binnie.core.util.I18N;
import binnie.extratrees.modules.ModuleWood;
@SideOnly(Side.CLIENT)
public class PageSpeciesTreeGenome extends PageSpecies {
@@ -75,7 +75,7 @@ public class PageSpeciesTreeGenome extends PageSpecies {
int y = 0;
final int th = 14;
final int th2 = 18;
final IBreedingSystem syst = ModuleWood.treeBreedingSystem;
final IBreedingSystem syst = Binnie.GENETICS.getSystem(TreeManager.treeRoot);
new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getPlantType().toString(), TextJustification.MIDDLE_LEFT);
y += th;
new ControlText(contents, new Area(0, y, w2, th), I18N.localise("binniecore.gui.temperature.short") + " : ", TextJustification.MIDDLE_RIGHT);
@@ -2,6 +2,7 @@ package binnie.extratrees.gui.database;
import java.util.Collection;
import binnie.genetics.api.ITreeBreedingSystem;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
@@ -9,7 +10,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.genetics.IAlleleSpecies;
import binnie.extratrees.genetics.TreeBreedingSystem;
import binnie.core.api.gui.IWidget;
import binnie.core.gui.controls.ControlText;
import binnie.core.gui.database.ControlSpeciesBox;
@@ -31,7 +31,7 @@ public class PageWood extends PageAbstract<ItemStack> {
this.deleteAllChildren();
final WindowAbstractDatabase database = Window.get(this);
new ControlText(this, new Area(0, 0, this.getSize().xPos(), 24), this.getValue().toString(), TextJustification.MIDDLE_CENTER);
TreeBreedingSystem breedingSystem = (TreeBreedingSystem) database.getBreedingSystem();
ITreeBreedingSystem breedingSystem = (ITreeBreedingSystem) database.getBreedingSystem();
final Collection<IAlleleSpecies> trees = breedingSystem.getTreesThatHaveWood(species, database.isMaster(), database.getWorld(), database.getUsername());
new ControlSpeciesBox(this, 4, 24, this.getSize().xPos() - 8, this.getSize().yPos() - 4 - 24).setOptions(trees);
}
@@ -2,14 +2,16 @@ package binnie.extratrees.gui.database;
import java.util.stream.Collectors;
import binnie.core.Binnie;
import binnie.core.api.gui.IArea;
import binnie.genetics.api.ITreeBreedingSystem;
import forestry.api.arboriculture.TreeManager;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.extratrees.genetics.TreeBreedingSystem;
import binnie.core.api.gui.IWidget;
import binnie.core.gui.controls.listbox.ControlListBox;
import binnie.core.gui.database.ControlItemStackOption;
@@ -26,13 +28,12 @@ import binnie.core.gui.database.WindowAbstractDatabase;
import binnie.core.gui.minecraft.Window;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.modules.ModuleWood;
import binnie.design.api.IDesignMaterial;
import binnie.extratrees.wood.WoodManager;
public class WindowArboristDatabase extends WindowAbstractDatabase {
public WindowArboristDatabase(final EntityPlayer player, final Side side, final boolean nei) {
super(player, side, nei, ModuleWood.treeBreedingSystem, 120);
super(player, side, nei, Binnie.GENETICS.getSystem(TreeManager.treeRoot), 120);
}
public static Window create(final EntityPlayer player, final Side side, final boolean nei) {
@@ -60,8 +61,8 @@ public class WindowArboristDatabase extends WindowAbstractDatabase {
return new ControlItemStackOption(this.getContent(), value, y);
}
};
TreeBreedingSystem breedingSystem = (TreeBreedingSystem) WindowArboristDatabase.this.getBreedingSystem();
controlListBox.setOptions(breedingSystem.allFruits);
ITreeBreedingSystem breedingSystem = (ITreeBreedingSystem) WindowArboristDatabase.this.getBreedingSystem();
controlListBox.setOptions(breedingSystem.getAllFruits());
this.listBox = controlListBox;
}
});
@@ -75,8 +76,8 @@ public class WindowArboristDatabase extends WindowAbstractDatabase {
return new ControlItemStackOption(this.getContent(), value, y);
}
};
TreeBreedingSystem breedingSystem = (TreeBreedingSystem) WindowArboristDatabase.this.getBreedingSystem();
controlListBox.setOptions(breedingSystem.allWoods);
ITreeBreedingSystem breedingSystem = (ITreeBreedingSystem) WindowArboristDatabase.this.getBreedingSystem();
controlListBox.setOptions(breedingSystem.getAllWoods());
this.listBox = controlListBox;
}
});
Loaded 100 of 125 files, more files were not shown because too many files have changed in this diff. Show more