Clean Up extra tree modules and add wood fences and fence gates

This commit is contained in:
Nedelosk committed 2017-01-24 18:41:35 +01:00
1 parent 1276bd4b18
commit 7666e96542
182 files changed
+990 -1096

No files matched your search

+7 -7
View File
@@ -12,11 +12,11 @@ import java.util.ArrayList;
import java.util.List;
public final class Binnie {
public static final List<ManagerBase> Managers = new ArrayList<>();
public static final ManagerLanguage Language = new ManagerLanguage();
public static final ManagerGenetics Genetics = new ManagerGenetics();
public static final ManagerConfig Configuration = new ManagerConfig();
public static final ManagerLiquid Liquid = new ManagerLiquid();
public static final ManagerMachine Machine = new ManagerMachine();
public static final ManagerResource Resource = new ManagerResource();
public static final List<ManagerBase> MANAGERS = new ArrayList<>();
public static final ManagerLanguage LANGUAGE = new ManagerLanguage();
public static final ManagerGenetics GENETICS = new ManagerGenetics();
public static final ManagerConfig CONFIGURATION = new ManagerConfig();
public static final ManagerLiquid LIQUID = new ManagerLiquid();
public static final ManagerMachine MCHINE = new ManagerMachine();
public static final ManagerResource RESOURCE = new ManagerResource();
}
@@ -66,7 +66,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored
List<ItemStack> list = new ArrayList<>();
TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos);
if (tile != null && !tile.hasDroppedBlock()) {
int meta = getDroppedMeta(getMetaFromState(state), tile.getTileMetadata());
int meta = getDroppedMeta(state, tile.getTileMetadata());
list.add(TileEntityMetadata.getItemStack(this, meta));
}
return list;
@@ -109,22 +109,18 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored
public int getPlacedMeta(final ItemStack stack, final World world, final BlockPos pos, final EnumFacing clickedBlock) {
return TileEntityMetadata.getItemDamage(stack);
}
@Override
public int getDroppedMeta(final int blockMeta, final int tileMeta) {
return tileMeta;
public int getDroppedMeta(IBlockState state, int tileMetadata) {
return tileMetadata;
}
@Override
public String getBlockName(final ItemStack par1ItemStack) {
public String getDisplayName(final ItemStack par1ItemStack) {
final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
return EnumFlowerColor.get(meta).getColourName() + " Pigmented Glass";
}
@Override
public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) {
}
@Override
public void dropAsStack(World world, BlockPos pos, ItemStack itemStack) {
spawnAsEntity(world, pos, itemStack);
@@ -31,8 +31,8 @@ public class PigmentRecipe implements IRecipe {
if (++n > 1) {
return null;
}
if (Binnie.Genetics.getFlowerRoot().isMember(crafting.getStackInSlot(i))) {
final IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(crafting.getStackInSlot(i));
if (Binnie.GENETICS.getFlowerRoot().isMember(crafting.getStackInSlot(i))) {
final IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(crafting.getStackInSlot(i));
if (flower.getAge() >= 1) {
stack = new ItemStack(Botany.pigment, 1, flower.getGenome().getPrimaryColor().getID());
}
@@ -18,6 +18,6 @@ public enum BotanyTexture implements IBinnieTexture {
@Override
public BinnieResource getTexture() {
return Binnie.Resource.getPNG(ExtraBees.instance, this.type, this.texture);
return Binnie.RESOURCE.getPNG(ExtraBees.instance, this.type, this.texture);
}
}
@@ -11,13 +11,13 @@ public class ModuleCore implements IInitializable {
@Override
public void preInit() {
for (final EnumAcidity pH : EnumAcidity.values()) {
Binnie.Language.addObjectName(pH, Binnie.Language.unlocalised(Botany.instance, "ph." + pH.getName()));
Binnie.LANGUAGE.addObjectName(pH, Binnie.LANGUAGE.unlocalised(Botany.instance, "ph." + pH.getName()));
}
for (final EnumMoisture pH2 : EnumMoisture.values()) {
Binnie.Language.addObjectName(pH2, Binnie.Language.unlocalised(Botany.instance, "moisture." + pH2.getName()));
Binnie.LANGUAGE.addObjectName(pH2, Binnie.LANGUAGE.unlocalised(Botany.instance, "moisture." + pH2.getName()));
}
for (final EnumSoilType pH3 : EnumSoilType.values()) {
Binnie.Language.addObjectName(pH3, Binnie.Language.unlocalised(Botany.instance, "soil." + pH3.getName()));
Binnie.LANGUAGE.addObjectName(pH3, Binnie.LANGUAGE.unlocalised(Botany.instance, "soil." + pH3.getName()));
}
}
@@ -30,11 +30,11 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
@Override
public void onValueChanged(final IAlleleSpecies species) {
this.deleteAllChildren();
final IAllele[] template = Binnie.Genetics.getFlowerRoot().getTemplate(species.getUID());
final IAllele[] template = Binnie.GENETICS.getFlowerRoot().getTemplate(species.getUID());
if (template == null) {
return;
}
final IFlower tree = Binnie.Genetics.getFlowerRoot().templateAsIndividual(template);
final IFlower tree = Binnie.GENETICS.getFlowerRoot().templateAsIndividual(template);
if (tree == null) {
return;
}
@@ -55,10 +55,10 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MiddleLeft);
y += th;
new ControlText(contents, new IArea(0.0f, y, w2, th), "Moist. : ", TextJustification.MiddleRight);
new ControlText(contents, new IArea(w2, y, w3, th), Binnie.Language.localise(treeSpecies.getMoisture()), TextJustification.MiddleLeft);
new ControlText(contents, new IArea(w2, y, w3, th), Binnie.LANGUAGE.localise(treeSpecies.getMoisture()), TextJustification.MiddleLeft);
y += th;
new ControlText(contents, new IArea(0.0f, y, w2, th), "pH. : ", TextJustification.MiddleRight);
new ControlText(contents, new IArea(w2, y, w3, th), Binnie.Language.localise(treeSpecies.getPH()), TextJustification.MiddleLeft);
new ControlText(contents, new IArea(w2, y, w3, th), Binnie.LANGUAGE.localise(treeSpecies.getPH()), TextJustification.MiddleLeft);
y += th;
new ControlText(contents, new IArea(0.0f, y, w2, th), "Fertility : ", TextJustification.MiddleRight);
new ControlText(contents, new IArea(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MiddleLeft);
@@ -30,7 +30,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
ControlListBox<EnumFlowerColor> selectionBoxColors;
public WindowBotanistDatabase(final EntityPlayer player, final Side side, final boolean nei) {
super(player, side, nei, Binnie.Genetics.flowerBreedingSystem, 130.0f);
super(player, side, nei, Binnie.GENETICS.flowerBreedingSystem, 130.0f);
}
public static Window create(final EntityPlayer player, final Side side, final boolean nei) {
@@ -27,16 +27,16 @@ public class CircuitGarden extends BinnieCircuit {
this.moisture = moisture;
this.acidity = ph;
this.icon = icon;
this.logic = new GardenLogic(this.moisture, this.acidity, this.isManual, this.isFertilised, this.icon, Binnie.Language.localise(this.getUnlocalizedName()));
this.logic = new GardenLogic(this.moisture, this.acidity, this.isManual, this.isFertilised, this.icon, Binnie.LANGUAGE.localise(this.getUnlocalizedName()));
String info = "";
if (moisture != EnumMoisture.Normal) {
info += TextFormatting.GRAY + Binnie.Language.localise("botany.moisture") + ": " + moisture.getTranslated(true);
info += TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisture.getTranslated(true);
}
if (info.length() > 0) {
info += ", ";
}
if (ph != null) {
info += TextFormatting.GRAY + Binnie.Language.localise("botany.ph") + ": " + ph.getTranslated(true);
info += TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(true);
}
if (info.length() > 0) {
info = " (" + info + TextFormatting.RESET + ")";
@@ -215,7 +215,7 @@ public class GardenLogic extends FarmLogic {
}
private boolean trySetWater(World world, BlockPos position, IFarmHousing housing) {
final FluidStack water = Binnie.Liquid.getFluidStack("water", 1000);
final FluidStack water = Binnie.LIQUID.getFluidStack("water", 1000);
if (this.moisture == EnumMoisture.Damp) {
if (!housing.hasLiquid(water)) {
return false;
@@ -86,7 +86,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister
}
IFlower individual = (IFlower) this.getIndividual(itemStack);
if (individual == null || individual.getGenome() == null) {
list.add(TextFormatting.DARK_RED + Binnie.Language.localise("botany.flower.destroy"));
list.add(TextFormatting.DARK_RED + Binnie.LANGUAGE.localise("botany.flower.destroy"));
return;
}
IFlowerGenome genome = individual.getGenome();
@@ -96,9 +96,9 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister
String stemColor = genome.getStemColor().getColourName();
String colorInfo;
if (!primaryColor.equals(secondaryColor)) {
colorInfo = Binnie.Language.localise("botany.grammar.flower.secondary");
colorInfo = Binnie.LANGUAGE.localise("botany.grammar.flower.secondary");
} else {
colorInfo = Binnie.Language.localise("botany.grammar.flower");
colorInfo = Binnie.LANGUAGE.localise("botany.grammar.flower");
}
list.add(TextFormatting.YELLOW + colorInfo.replaceAll("%PRIMARY", primaryColor).replaceAll("%SECONDARY", secondaryColor).replaceAll("%STEM", stemColor));
@@ -106,10 +106,10 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister
if (BinnieCore.proxy.isShiftDown()) {
individual.addTooltip(list);
} else {
list.add(TextFormatting.ITALIC + "<" + Binnie.Language.localise("for.gui.tooltip.tmi") + ">");
list.add(TextFormatting.ITALIC + "<" + Binnie.LANGUAGE.localise("for.gui.tooltip.tmi") + ">");
}
} else {
list.add("<" + Binnie.Language.localise("for.gui.unknown") + ">");
list.add("<" + Binnie.LANGUAGE.localise("for.gui.unknown") + ">");
}
}
@@ -128,13 +128,13 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister
@Override
public String getItemStackDisplayName(final ItemStack itemstack) {
if (!itemstack.hasTagCompound()) {
return Binnie.Language.localise("item.botany.flower.corrupted.name");
return Binnie.LANGUAGE.localise("item.botany.flower.corrupted.name");
}
IIndividual individual = this.getIndividual(itemstack);
if (individual != null && individual.getGenome() != null) {
return individual.getDisplayName() + (!tag.isEmpty() ? " " + Binnie.Language.localise("item.botany." + tag + ".name") : "");
return individual.getDisplayName() + (!tag.isEmpty() ? " " + Binnie.LANGUAGE.localise("item.botany." + tag + ".name") : "");
}
return Binnie.Language.localise("item.botany.flower.corrupted.name");
return Binnie.LANGUAGE.localise("item.botany.flower.corrupted.name");
}
@Override
@@ -187,7 +187,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister
@Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
if (type == EnumFlowerStage.POLLEN) {
final IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(stack);
final IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(stack);
final TileEntity target = world.getTileEntity(pos);
if (!(target instanceof IPollinatable)) {
return EnumActionResult.PASS;
@@ -81,7 +81,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
}
if (nbtCompound.hasKey("CATER") && BinnieCore.isLepidopteryActive()) {
this.matureTime = nbtCompound.getInteger("caterTime");
this.caterpillar = Binnie.Genetics.getButterflyRoot().getMember(nbtCompound.getCompoundTag("cater"));
this.caterpillar = Binnie.GENETICS.getButterflyRoot().getMember(nbtCompound.getCompoundTag("cater"));
}
super.readFromNBT(nbtCompound);
}
@@ -321,7 +321,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
if (this.flower == null) {
return null;
}
return Binnie.Genetics.getFlowerRoot().getMemberStack(this.getFlower(), EnumFlowerStage.getStage(getFlower()));
return Binnie.GENETICS.getFlowerRoot().getMemberStack(this.getFlower(), EnumFlowerStage.getStage(getFlower()));
}
private TileEntityFlower getRoot() {
@@ -466,7 +466,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
private void attemptButterflySpawn(final World world, final IButterfly butterfly, final double x, final double y, final double z) {
if (BinnieCore.isLepidopteryActive()) {
Binnie.Genetics.getButterflyRoot().spawnButterflyInWorld(world, butterfly.copy(), x, y + 0.10000000149011612, z);
Binnie.GENETICS.getButterflyRoot().spawnButterflyInWorld(world, butterfly.copy(), x, y + 0.10000000149011612, z);
}
}
@@ -259,7 +259,7 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister {
return "";
}
}
return TextFormatting.GRAY + Binnie.Language.localise("botany.ph") + ": " + ph.getTranslated(withColor);
return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(withColor);
}
public static String getMoisture(ItemStack stack, boolean withColor, boolean byNormalNone) {
@@ -269,7 +269,7 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister {
return "";
}
}
return TextFormatting.GRAY + Binnie.Language.localise("botany.moisture") + ": " + moisure.getTranslated(withColor);
return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisure.getTranslated(withColor);
}
@Override
@@ -35,7 +35,7 @@ public class ItemSoil extends ItemBlock {
tooltip.add(info);
}
if (this.noWeed) {
tooltip.add(TextFormatting.GREEN + Binnie.Language.localise("botany.soil.weedkiller"));
tooltip.add(TextFormatting.GREEN + Binnie.LANGUAGE.localise("botany.soil.weedkiller"));
}
}
@@ -51,11 +51,11 @@ public class ItemSoilMeter extends Item implements IItemModelRegister {
}
if (Gardening.isSoil(block) && !BinnieCore.proxy.isSimulating(world)) {
IBlockSoil soil = (IBlockSoil) block;
String info = Binnie.Language.localise("botany.soil.type") + ": ";
String info = Binnie.LANGUAGE.localise("botany.soil.type") + ": ";
info = info + soil.getType(world, pos).getTranslated(true);
info += ", " + TextFormatting.WHITE + Binnie.Language.localise("botany.moisture") + ": ";
info += ", " + TextFormatting.WHITE + Binnie.LANGUAGE.localise("botany.moisture") + ": ";
info = info + soil.getMoisture(world, pos).getTranslated(true);
info += ", " + TextFormatting.WHITE + Binnie.Language.localise("botany.ph") + ": ";
info += ", " + TextFormatting.WHITE + Binnie.LANGUAGE.localise("botany.ph") + ": ";
info = info + soil.getPH(world, pos).getTranslated(true);
ITextComponent chat = new TextComponentString(info);
player.addChatMessage(chat);
@@ -70,7 +70,7 @@ public class ItemSoilMeter extends Item implements IItemModelRegister {
return "";
}
}
return TextFormatting.GRAY + Binnie.Language.localise("botany.ph") + ": " + ph.getTranslated(withColor);
return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(withColor);
}
public static String getMoisture(ItemStack stack, boolean withColor, boolean byNormalNone) {
@@ -80,7 +80,7 @@ public class ItemSoilMeter extends Item implements IItemModelRegister {
return "";
}
}
return TextFormatting.GRAY + Binnie.Language.localise("botany.moisture") + ": " + moisure.getTranslated(withColor);
return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisure.getTranslated(withColor);
}
@Override
@@ -14,7 +14,7 @@ public class ItemWeed extends ItemBlock {
@Override
public String getItemStackDisplayName(final ItemStack stack) {
return Binnie.Language.localise("botany.plant." + BlockPlant.Type.values()[stack.getItemDamage()].getName());
return Binnie.LANGUAGE.localise("botany.plant." + BlockPlant.Type.values()[stack.getItemDamage()].getName());
}
@Override
@@ -76,7 +76,7 @@ public class ModuleGardening implements IInitializable {
Botany.proxy.registerItem(Botany.trowelDiamond);
Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold");
Botany.proxy.registerItem(Botany.trowelGold);
Botany.misc = new ItemMisc(CreativeTabBotany.instance, (IItemMiscProvider[]) BotanyItems.values());
Botany.misc = new ItemMisc(CreativeTabBotany.instance, BotanyItems.values());
Botany.proxy.registerItem(Botany.misc);
Botany.pigment = new ItemPigment();
Botany.proxy.registerItem(Botany.pigment);
@@ -18,7 +18,7 @@ public class BotanistTracker extends BreedingTracker implements IBotanistTracker
@Override
protected IBreedingTracker getBreedingTracker(final EntityPlayer player) {
return Binnie.Genetics.getFlowerRoot().getBreedingTracker(player.worldObj, player.getGameProfile());
return Binnie.GENETICS.getFlowerRoot().getBreedingTracker(player.worldObj, player.getGameProfile());
}
@Override
@@ -24,8 +24,8 @@ import java.util.TreeSet;
public class FlowerBreedingSystem extends BreedingSystem {
public FlowerBreedingSystem() {
this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee");
this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee");
this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee");
this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/discoveredBee");
}
@Override
@@ -35,7 +35,7 @@ public class FlowerBreedingSystem extends BreedingSystem {
@Override
public ISpeciesRoot getSpeciesRoot() {
return Binnie.Genetics.getFlowerRoot();
return Binnie.GENETICS.getFlowerRoot();
}
@Override
@@ -52,16 +52,16 @@ public class FlowerBreedingSystem extends BreedingSystem {
public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) {
if (chromosome == EnumFlowerChromosome.FERTILITY) {
if (allele.getUID().contains("Low")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.low");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.low");
}
if (allele.getUID().contains("Normal")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.normal");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.normal");
}
if (allele.getUID().contains("High")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.high");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.high");
}
if (allele.getUID().contains("Maximum")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.maximum");
}
}
return super.getAlleleName(chromosome, allele);
@@ -121,7 +121,7 @@ public class FlowerGenome extends Genome implements IFlowerGenome {
@Override
public boolean canTolerate(final EnumAcidity ePH) {
final int pH = ePH.ordinal();
final int[] pHTol = Binnie.Genetics.getTolerance(this.getTolerancePH());
final int[] pHTol = Binnie.GENETICS.getTolerance(this.getTolerancePH());
final int fPH = this.getPrimary().getPH().ordinal();
return pH >= fPH + pHTol[0] && pH <= fPH + pHTol[1];
}
@@ -129,7 +129,7 @@ public class FlowerGenome extends Genome implements IFlowerGenome {
@Override
public boolean canTolerate(final EnumMoisture eMoisture) {
final int moisture = eMoisture.ordinal();
final int[] moistTol = Binnie.Genetics.getTolerance(this.getToleranceMoisture());
final int[] moistTol = Binnie.GENETICS.getTolerance(this.getToleranceMoisture());
final int fMoisture = this.getPrimary().getMoisture().ordinal();
return moisture >= fMoisture + moistTol[0] && moisture <= fMoisture + moistTol[1];
}
@@ -137,7 +137,7 @@ public class FlowerGenome extends Genome implements IFlowerGenome {
@Override
public boolean canTolerate(final EnumTemperature eTemp) {
final int temp = eTemp.ordinal();
final int[] tempTol = Binnie.Genetics.getTolerance(this.getToleranceTemperature());
final int[] tempTol = Binnie.GENETICS.getTolerance(this.getToleranceTemperature());
final int fTemp = this.getPrimary().getTemperature().ordinal();
return temp >= fTemp + tempTol[0] && temp <= fTemp + tempTol[1];
}
@@ -51,7 +51,7 @@ public class ModuleGenetics implements IInitializable {
@Override
public void postInit() {
FlowerManager.flowerRegistry.registerAcceptableFlower(Botany.flower, "flowersVanilla");
RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getFluidStack("water", 2000), null, new ItemStack(Botany.database),
RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(Botany.database),
"X#X",
"YEY",
"RDR",
@@ -25,7 +25,7 @@ public enum PacketID implements IPacketID {
EntityPlayer player = BinnieCore.proxy.getPlayer();
String info = "";
if (data.hasNoTags()) {
info += Binnie.Language.localise("botany.flowers.species.not.discover");
info += Binnie.LANGUAGE.localise("botany.flowers.species.not.discover");
} else {
IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species"));
IAlleleFlowerSpecies secondary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species2"));
@@ -53,13 +53,13 @@ public enum PacketID implements IPacketID {
if (primary == secondary) {
info = info + " " + primary.getName();
} else {
info = info + " " + primary.getName() + "-" + secondary.getName() + " " + Binnie.Language.localise("botany.flowers.species.hybrid");
info = info + " " + primary.getName() + "-" + secondary.getName() + " " + Binnie.LANGUAGE.localise("botany.flowers.species.hybrid");
}
if (age == 0.0f) {
info += " " + Binnie.Language.localise("botany.flowers.species.germling");
info += " " + Binnie.LANGUAGE.localise("botany.flowers.species.germling");
}
if (data.getBoolean("Wilting")) {
info += ". " + Binnie.Language.localise("botany.flowers.species.wilting");
info += ". " + Binnie.LANGUAGE.localise("botany.flowers.species.wilting");
}
}
player.addChatMessage(new TextComponentString(info));
+1 -1
View File
@@ -64,7 +64,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
registerModules();
if (this.getConfigs() != null) {
for (final Class cls : this.getConfigs()) {
Binnie.Configuration.registerConfiguration(cls, this);
Binnie.CONFIGURATION.registerConfiguration(cls, this);
}
}
this.getProxy().preInit();
+4 -4
View File
@@ -67,8 +67,8 @@ public final class BinnieCore extends AbstractMod {
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
MinecraftForge.EVENT_BUS.register(Binnie.Liquid);
Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this);
MinecraftForge.EVENT_BUS.register(Binnie.LIQUID);
Binnie.CONFIGURATION.registerConfiguration(ConfigurationMods.class, this);
for (final FluidContainer container : FluidContainer.values()) {
final Item item = new ItemFluidContainer(container);
BinnieCore.proxy.registerItem(item);
@@ -95,7 +95,7 @@ public final class BinnieCore extends AbstractMod {
@Override
protected void registerModules() {
for (final ManagerBase baseManager : Binnie.Managers) {
for (final ManagerBase baseManager : Binnie.MANAGERS) {
this.addModule(baseManager);
}
this.addModule(new ModuleCraftGUI());
@@ -165,7 +165,7 @@ public final class BinnieCore extends AbstractMod {
// if (event.map.getTextureType() == 0) {
// Binnie.Liquid.reloadIcons(event.map);
// }
Binnie.Resource.registerIcons();
Binnie.RESOURCE.registerIcons();
}
@SubscribeEvent
+1 -1
View File
@@ -4,7 +4,7 @@ import binnie.Binnie;
public abstract class ManagerBase implements IInitializable {
public ManagerBase() {
Binnie.Managers.add(this);
Binnie.MANAGERS.add(this);
}
@Override
@@ -9,10 +9,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import binnie.core.BinnieCore;
@@ -26,7 +28,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {
@Override
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
return getBlockDropped(this, world, pos);
return getBlockDroppedAsList(this, world, pos);
}
@Override
@@ -43,28 +45,16 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {
public boolean hasTileEntity(IBlockState state) {
return true;
}
// @Override
// public boolean onBlockEventReceived(final World par1World, final BlockPos pos, final int par5, final int par6) {
// super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6);
// final TileEntity tileentity = par1World.getTileEntity(pos);
// return tileentity != null && tileentity.receiveClientEvent(par5, par6);
// }
//
// @Override
// public IIcon getIcon(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4, final int par5) {
// final int metadata = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3, par4);
// return this.getIcon(par5, metadata);
// }
@Override
public String getBlockName(final ItemStack par1ItemStack) {
return this.getLocalizedName();
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
return getPickBlock(world, pos);
}
/* IBLOCKMETADATA */
@Override
public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) {
public String getDisplayName(final ItemStack par1ItemStack) {
return this.getLocalizedName();
}
@Override
@@ -72,60 +62,48 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {
final int damage = TileEntityMetadata.getItemDamage(item);
return damage;
}
@Override
public int getDroppedMeta(final int tileMeta, final int blockMeta) {
return tileMeta;
public int getDroppedMeta(IBlockState state, int tileMetadata) {
return getMetaFromState(state);
}
public static ArrayList<ItemStack> getBlockDropped(final IBlockMetadata block, final IBlockAccess world, final BlockPos pos) {
final ArrayList<ItemStack> array = new ArrayList<>();
final TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos);
public static ItemStack getBlockDropped(IBlockMetadata block, IBlockAccess world, BlockPos pos) {
TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos);
if (tile != null && !tile.hasDroppedBlock()) {
//final int meta = block.getDroppedMeta(world.getBlockMetadata(x, y, z), tile.getTileMetadata());
//array.add(TileEntityMetadata.getItemStack((Block) block, meta));
int meta = block.getDroppedMeta(world.getBlockState(pos), tile.getTileMetadata());
return TileEntityMetadata.getItemStack((Block) block, meta);
}
return array;
return null;
}
public static boolean breakBlock(final IBlockMetadata block, final EntityPlayer player, final World world, final BlockPos pos) {
public static List<ItemStack> getBlockDroppedAsList(IBlockMetadata block, IBlockAccess world, BlockPos pos) {
ItemStack drop = getBlockDropped(block, world, pos);
if(drop != null){
return Collections.singletonList(getBlockDropped(block, world, pos));
}
return Collections.emptyList();
}
public static boolean breakBlock(IBlockMetadata blockMetadata, EntityPlayer player, World world, BlockPos pos) {
List<ItemStack> drops = new ArrayList<>();
final Block block2 = (Block) block;
final TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos);
Block block = (Block) blockMetadata;
TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos);
if (tile != null && !tile.hasDroppedBlock()) {
drops = block2.getDrops(world, pos, world.getBlockState(pos), 0);
drops = block.getDrops(world, pos, world.getBlockState(pos), 0);
}
final boolean hasBeenBroken = world.setBlockToAir(pos);
boolean hasBeenBroken = world.setBlockToAir(pos);
if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
for (final ItemStack drop : drops) {
block.dropAsStack(world, pos, drop);
for(ItemStack drop : drops) {
spawnAsEntity(world, pos, drop);
}
tile.dropBlock();
}
return hasBeenBroken;
}
@Override
public void dropAsStack(final World world, BlockPos pos, final ItemStack drop) {
//this.dropBlockAsItem(world, pos, drop);
public static ItemStack getPickBlock(World world, BlockPos pos) {
return getBlockDropped((IBlockMetadata) world.getBlockState(pos).getBlock(), world, pos);
}
// @Override
// public void breakBlock(final World par1World, final BlockPos pos, final Block par5, final int par6) {
//// super.breakBlock(par1World, par2, par3, par4, par5, par6);
//// par1World.removeTileEntity(par2, par3, par4);
// }
//
//TODO DROP
public static ItemStack getPickBlock(final World world, final BlockPos pos) {
//final List<ItemStack> list = getBlockDropped((IBlockMetadata) world.getBlockState(pos).getBlock(), world, pos, world.getBlockMetadata(x, y, z));
//return list.isEmpty() ? null : list.get(0);
return null;
}
// @Override
// public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) {
// return getPickBlock(world, x, y, z);
// }
}
@@ -1,21 +1,16 @@
package binnie.core.block;
import net.minecraft.block.ITileEntityProvider;
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.World;
import java.util.List;
public interface IBlockMetadata extends ITileEntityProvider {
int getPlacedMeta(final ItemStack p0, final World p1, BlockPos pos, final EnumFacing p5);
int getPlacedMeta(ItemStack itemStack, World world, BlockPos pos, EnumFacing facing);
int getDroppedMeta(final int p0, final int p1);
int getDroppedMeta(IBlockState state, int tileMetadata);
String getBlockName(final ItemStack p0);
void getBlockTooltip(final ItemStack p0, final List p1);
void dropAsStack(final World p0, BlockPos pos, final ItemStack p4);
String getDisplayName(ItemStack itemStack);
}
@@ -11,8 +11,6 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class ItemMetadata extends ItemBlock {
public ItemMetadata(final Block block) {
super(block);
@@ -48,13 +46,7 @@ public class ItemMetadata extends ItemBlock {
@Override
@SideOnly(Side.CLIENT)
public String getItemStackDisplayName(final ItemStack par1ItemStack) {
return ((IBlockMetadata) block).getBlockName(par1ItemStack);
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
((IBlockMetadata) block).getBlockTooltip(stack, tooltip);
public String getItemStackDisplayName(ItemStack itemStack) {
return ((IBlockMetadata) block).getDisplayName(itemStack);
}
}
@@ -1,6 +1,5 @@
package binnie.core.block;
import binnie.core.network.packet.MessageMetadata;
import binnie.core.network.packet.PacketMetadata;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
@@ -9,10 +8,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityCommandBlock;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.BlockSnapshot;
public class TileEntityMetadata extends TileEntity {
private int meta;
@@ -32,13 +32,13 @@ public class BinnieCircuitLayout implements ICircuitLayout {
@Nonnull
@Override
public String getName() {
return Binnie.Language.localise(this.mod, "circuit.layout." + this.uid.toLowerCase());
return Binnie.LANGUAGE.localise(this.mod, "circuit.layout." + this.uid.toLowerCase());
}
@Nonnull
@Override
public String getUsage() {
return Binnie.Language.localise(this.mod, "circuit.layout." + this.uid.toLowerCase() + ".usage");
return Binnie.LANGUAGE.localise(this.mod, "circuit.layout." + this.uid.toLowerCase() + ".usage");
}
@Nonnull
@@ -22,8 +22,8 @@ import java.util.TreeSet;
class BeeBreedingSystem extends BreedingSystem {
public BeeBreedingSystem() {
this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee");
this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee");
this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee");
this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/discoveredBee");
}
@Override
@@ -39,7 +39,7 @@ class BeeBreedingSystem extends BreedingSystem {
@Override
public ISpeciesRoot getSpeciesRoot() {
return Binnie.Genetics.getBeeRoot();
return Binnie.GENETICS.getBeeRoot();
}
@Override
@@ -56,16 +56,16 @@ class BeeBreedingSystem extends BreedingSystem {
public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) {
if (chromosome == EnumBeeChromosome.FERTILITY) {
if (allele.getUID().contains("Low")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.low");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.low");
}
if (allele.getUID().contains("Normal")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.normal");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.normal");
}
if (allele.getUID().contains("High")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.high");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.high");
}
if (allele.getUID().contains("Maximum")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.maximum");
}
}
return super.getAlleleName(chromosome, allele);
@@ -66,7 +66,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive {
this.furtherMutations = new HashMap<>();
this.allResultantMutations = new HashMap<>();
this.allFurtherMutations = new HashMap<>();
Binnie.Genetics.registerBreedingSystem(this);
Binnie.GENETICS.registerBreedingSystem(this);
MinecraftForge.EVENT_BUS.register(this);
}
@@ -153,7 +153,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive {
if (this.getSpeciesRoot().getMutations(false) != null) {
final Set<IMutation> mutations = new LinkedHashSet<>();
mutations.addAll(this.getSpeciesRoot().getMutations(false));
if (this == Binnie.Genetics.beeBreedingSystem) {
if (this == Binnie.GENETICS.beeBreedingSystem) {
mutations.addAll(ExtraBeeMutation.mutations);
}
for (final IMutation mutation : mutations) {
@@ -425,10 +425,10 @@ public abstract class BreedingSystem implements IItemStackRepresentitive {
public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) {
if (allele instanceof IAlleleBoolean) {
return ((IAlleleBoolean) allele).getValue() ? Binnie.Language.localise(BinnieCore.instance, "allele.true") : Binnie.Language.localise(BinnieCore.instance, "allele.false");
return ((IAlleleBoolean) allele).getValue() ? Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.true") : Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.false");
}
if (Objects.equals(allele.getName(), "for.gui.maximum")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.maximum");
}
return allele.getName();
}
@@ -473,7 +473,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive {
}
public final Collection<IChromosomeType> getActiveKaryotype() {
return Binnie.Genetics.getActiveChromosomes(this.getSpeciesRoot());
return Binnie.GENETICS.getActiveChromosomes(this.getSpeciesRoot());
}
public ItemStack getDefaultMember(final String uid) {
@@ -12,6 +12,6 @@ public enum EnumBeeModifier {
GeneticDecay;
public String getName() {
return Binnie.Language.localise(BinnieCore.instance, "beemodifier." + this.name().toLowerCase());
return Binnie.LANGUAGE.localise(BinnieCore.instance, "beemodifier." + this.name().toLowerCase());
}
}
@@ -235,7 +235,7 @@ public class ForestryAllele {
}
public IAllele[] getTemplate() {
return Binnie.Genetics.getBeeRoot().getTemplate(this.getAllele().getUID());
return Binnie.GENETICS.getBeeRoot().getTemplate(this.getAllele().getUID());
}
}
}
+2 -2
View File
@@ -76,11 +76,11 @@ public class Gene implements IGene, INbtReadable, INbtWritable {
@Override
public String getName() {
return Binnie.Genetics.getSystem(this.root).getAlleleName(this.chromosome, this.allele);
return Binnie.GENETICS.getSystem(this.root).getAlleleName(this.chromosome, this.allele);
}
public BreedingSystem getSystem() {
return Binnie.Genetics.getSystem(this.root);
return Binnie.GENETICS.getSystem(this.root);
}
@Override
@@ -35,7 +35,7 @@ interface IBreedingMessage {
@Override
public String getTitle() {
return Binnie.Language.localise(BinnieCore.instance, "gui.breedingmessage.species");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.breedingmessage.species");
}
@Override
@@ -70,7 +70,7 @@ interface IBreedingMessage {
@Override
public String getTitle() {
return Binnie.Language.localise(BinnieCore.instance, "gui.breedingmessage.branch");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.breedingmessage.branch");
}
@Override
@@ -95,7 +95,7 @@ interface IBreedingMessage {
@Override
public String getTitle() {
return Binnie.Language.localise(BinnieCore.instance, "gui.breedingmessage.epithet");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.breedingmessage.epithet");
}
@Override
@@ -157,7 +157,7 @@ public class ManagerGenetics extends ManagerBase {
private void refreshData() {
this.loadAlleles();
for (final BreedingSystem system : Binnie.Genetics.getActiveSystems()) {
for (final BreedingSystem system : Binnie.GENETICS.getActiveSystems()) {
system.calculateArrays();
}
}
@@ -20,8 +20,8 @@ import java.util.TreeSet;
class MothBreedingSystem extends BreedingSystem {
public MothBreedingSystem() {
this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredMoth");
this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredMoth");
this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/undiscoveredMoth");
this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/discoveredMoth");
}
@Override
@@ -31,7 +31,7 @@ class MothBreedingSystem extends BreedingSystem {
@Override
public ISpeciesRoot getSpeciesRoot() {
return Binnie.Genetics.getButterflyRoot();
return Binnie.GENETICS.getButterflyRoot();
}
@Override
@@ -49,24 +49,24 @@ class MothBreedingSystem extends BreedingSystem {
if (chromosome == EnumButterflyChromosome.METABOLISM) {
final int metabolism = ((IAlleleInteger) allele).getValue();
if (metabolism >= 19) {
return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.highest");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.highest");
}
if (metabolism >= 16) {
return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.higher");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.higher");
}
if (metabolism >= 13) {
return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.high");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.high");
}
if (metabolism >= 10) {
return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.normal");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.normal");
}
if (metabolism >= 7) {
return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.slow");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.slow");
}
if (metabolism >= 4) {
return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.slower");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.slower");
}
return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.slowest");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.slowest");
} else {
if (chromosome == EnumButterflyChromosome.FERTILITY) {
final int metabolism = ((IAlleleInteger) allele).getValue();
@@ -53,8 +53,8 @@ public class TreeBreedingSystem extends BreedingSystem {
this.discoveredFruits = new UniqueItemStackSet();
this.discoveredWoods = new UniqueItemStackSet();
this.discoveredPlanks = new UniqueItemStackSet();
this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredTree");
this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredTree");
this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/undiscoveredTree");
this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/discoveredTree");
}
@Override
@@ -66,7 +66,7 @@ public class TreeBreedingSystem extends BreedingSystem {
@Override
public ISpeciesRoot getSpeciesRoot() {
return Binnie.Genetics.getTreeRoot();
return Binnie.GENETICS.getTreeRoot();
}
@Override
@@ -86,18 +86,18 @@ public class TreeBreedingSystem extends BreedingSystem {
}
if (chromosome == EnumTreeChromosome.PLANT) {
final EnumSet<EnumPlantType> types = ((IAllelePlantType) allele).getPlantTypes();
return types.isEmpty() ? Binnie.Language.localise(BinnieCore.instance, "allele.none") : types.iterator().next().toString();
return types.isEmpty() ? Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.none") : types.iterator().next().toString();
}
if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) {
final IFruitProvider provider = ((IAlleleFruit) allele).getProvider();
return (provider.getProducts().size() == 0) ? Binnie.Language.localise(BinnieCore.instance, "allele.none") : provider.getProducts().keySet().iterator().next().getDisplayName();
return (provider.getProducts().size() == 0) ? Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.none") : provider.getProducts().keySet().iterator().next().getDisplayName();
}
if (chromosome == EnumTreeChromosome.GROWTH) {
if (allele.getUID().contains("Tropical")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.growth.tropical");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.growth.tropical");
}
if (allele.getUID().contains("Lightlevel")) {
return Binnie.Language.localise(BinnieCore.instance, "allele.growth.lightlevel");
return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.growth.lightlevel");
}
}
return super.getAlleleName(chromosome, allele);
@@ -52,7 +52,7 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister,
private FluidStack getLiquid(final ItemStack stack) {
final String liquid = ItemFluidContainer.idToFluid.get(stack.getItemDamage());
return (liquid == null) ? null : Binnie.Liquid.getFluidStack(liquid, 1000);
return (liquid == null) ? null : Binnie.LIQUID.getFluidStack(liquid, 1000);
}
// @Override
@@ -75,7 +75,7 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister,
@Override
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
for (final IFluidType liquid : Binnie.Liquid.fluids.values()) {
for (final IFluidType liquid : Binnie.LIQUID.fluids.values()) {
if (!liquid.canPlaceIn(this.container)) {
continue;
}
@@ -36,14 +36,14 @@ public class MachineComponent implements INbtReadable, INbtWritable {
}
public Class[] getComponentInterfaces() {
return Binnie.Machine.getComponentInterfaces(this.getClass());
return Binnie.MCHINE.getComponentInterfaces(this.getClass());
}
public void onInventoryUpdate() {
}
public final MachinePayload getPayload() {
return new MachinePayload(Binnie.Machine.getNetworkID(this.getClass()));
return new MachinePayload(Binnie.MCHINE.getNetworkID(this.getClass()));
}
public void recieveData(final MachinePayload payload) {
@@ -43,7 +43,7 @@ public class MachineGroup {
}
}
}
Binnie.Machine.registerMachineGroup(this);
Binnie.MCHINE.registerMachineGroup(this);
this.block = new BlockMachine(this, blockName);
mod.getProxy().registerBlock(this.block);
Item i = mod.getProxy().registerItem(new ItemMachine(this.block));
@@ -31,7 +31,7 @@ public abstract class MachinePackage {
public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTicks, int destroyStage);//, final RenderBlocks p5);
public final String getDisplayName() {
return Binnie.Language.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID());
return Binnie.LANGUAGE.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID());
}
public final Integer getMetadata() {
@@ -59,6 +59,6 @@ public abstract class MachinePackage {
}
public final String getInformation() {
return Binnie.Language.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID() + ".info");
return Binnie.LANGUAGE.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID() + ".info");
}
}
@@ -8,7 +8,6 @@ import binnie.core.machines.power.ITankMachine;
import binnie.core.machines.power.PowerSystem;
import binnie.core.util.ItemStackSet;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ItemStackHelper;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
@@ -36,7 +36,7 @@ public class TileEntityMachine extends TileEntityMachineBase implements INetwork
super.readFromNBT(nbtTagCompound);
final String name = nbtTagCompound.getString("name");
final String group = nbtTagCompound.getString("group");
final MachinePackage pack = Binnie.Machine.getPackage(group, name);
final MachinePackage pack = Binnie.MCHINE.getPackage(group, name);
if (pack == null) {
this.invalidate();
return;
@@ -92,7 +92,7 @@ public class InventorySlot extends BaseSlot<ItemStack> {
@Override
public String getName() {
return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + this.unlocName);
return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.slot." + this.unlocName);
}
public enum Type {
@@ -48,7 +48,7 @@ public class TankSlot extends BaseSlot<FluidStack> {
@Override
public String getName() {
return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + this.unlocName);
return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.slot." + this.unlocName);
}
}
@@ -12,7 +12,7 @@ public abstract class TankValidator extends Validator<FluidStack> {
private Fluid fluid;
public Basic(final String name) {
this.fluid = Binnie.Liquid.getFluidStack(name, 1).getFluid();
this.fluid = Binnie.LIQUID.getFluidStack(name, 1).getFluid();
}
@Override
@@ -14,8 +14,8 @@ public class ValidatorIcon {
public ValidatorIcon(final AbstractMod mod, final String pathInput, final String pathOutput) {
this.iconsInput = new ArrayList<>();
this.iconsOutput = new ArrayList<>();
this.iconsInput.add(Binnie.Resource.getItemIcon(mod, pathInput));
this.iconsOutput.add(Binnie.Resource.getItemIcon(mod, pathOutput));
this.iconsInput.add(Binnie.RESOURCE.getItemIcon(mod, pathInput));
this.iconsOutput.add(Binnie.RESOURCE.getItemIcon(mod, pathOutput));
}
public BinnieIcon getIcon(final boolean input) {
@@ -2,7 +2,6 @@ package binnie.core.network.packet;
import java.io.IOException;
import binnie.botany.flower.TileEntityFlower;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.PacketBuffer;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
@@ -114,10 +114,10 @@ public class BinnieModProxy implements IBinnieModProxy {
}
public String localise(final String string) {
return Binnie.Language.localise(this.mod, string);
return Binnie.LANGUAGE.localise(this.mod, string);
}
public String localiseOrBlank(final String string) {
return Binnie.Language.localiseOrBlank(this.mod, string);
return Binnie.LANGUAGE.localiseOrBlank(this.mod, string);
}
}
@@ -13,7 +13,7 @@ public class BinnieIcon extends BinnieResource {
// this.textureSheet = 0;
// this.icon = null;
//this.textureSheet = ((type != ResourceType.Block) ? 1 : 0);
Binnie.Resource.registerIcon(this);
Binnie.RESOURCE.registerIcon(this);
}
// public IIcon getIcon() {
@@ -26,6 +26,6 @@ public enum BinnieCoreTexture implements IBinnieTexture {
@Override
public BinnieResource getTexture() {
return Binnie.Resource.getPNG(BinnieCore.instance, this.type, this.texture);
return Binnie.RESOURCE.getPNG(BinnieCore.instance, this.type, this.texture);
}
}
@@ -4,7 +4,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.List;
@@ -85,7 +85,7 @@ public class WindowFieldKit extends Window {
this.getWindowInventory().setValidator(0, new SlotValidator(null) {
@Override
public boolean isValid(final ItemStack object) {
return AlleleManager.alleleRegistry.isIndividual(object) || Binnie.Genetics.getConversion(object) != null;
return AlleleManager.alleleRegistry.isIndividual(object) || Binnie.GENETICS.getConversion(object) != null;
}
@Override
@@ -184,14 +184,14 @@ public class WindowFieldKit extends Window {
final Random rand = new Random();
this.info.clear();
for (final IChromosomeType type : root.getKaryotype()) {
if (!Binnie.Genetics.isInvalidChromosome(type)) {
if (!Binnie.GENETICS.isInvalidChromosome(type)) {
final IAllele allele = ind.getGenome().getActiveAllele(type);
final List<String> infos = new ArrayList<>();
int i = 0;
for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; Binnie.Language.canLocalise(pref + i); ++i) {
infos.add(Binnie.Language.localise(pref + i));
for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; Binnie.LANGUAGE.canLocalise(pref + i); ++i) {
infos.add(Binnie.LANGUAGE.localise(pref + i));
}
String text = Binnie.Genetics.getSystem(root).getAlleleName(type, allele);
String text = Binnie.GENETICS.getSystem(root).getAlleleName(type, allele);
if (!infos.isEmpty()) {
text = infos.get(rand.nextInt(infos.size()));
}
@@ -92,8 +92,8 @@ public class WindowGenesis extends Window {
};
}
};
tabSystems.setValues(Binnie.Genetics.getActiveSystems());
this.root = Binnie.Genetics.getActiveSystems().iterator().next().getSpeciesRoot();
tabSystems.setValues(Binnie.GENETICS.getActiveSystems());
this.root = Binnie.GENETICS.getActiveSystems().iterator().next().getSpeciesRoot();
this.template = this.root.getDefaultTemplate();
final IArea one = new IArea(32.0f, 28.0f, 170.0f, 100.0f);
final IArea two = new IArea(214.0f, 28.0f, 100.0f, 100.0f);
@@ -122,7 +122,7 @@ public class WindowGenesis extends Window {
this.geneList.addEventHandler(new EventValueChanged.Handler() {
@Override
public void onEvent(final EventValueChanged event) {
final Map<IChromosomeType, List<IAllele>> map = Binnie.Genetics.getChromosomeMap(WindowGenesis.this.root);
final Map<IChromosomeType, List<IAllele>> map = Binnie.GENETICS.getChromosomeMap(WindowGenesis.this.root);
final List<Gene> opts = new ArrayList<>();
final IChromosomeType chromo = event.value != null ? ((Gene) event.value).getChromosome() : null;
if (chromo != null)// fix NPE
@@ -153,7 +153,7 @@ public class WindowGenesis extends Window {
private void refreshTemplate(final IChromosomeType selection) {
final List<Gene> genes = new ArrayList<>();
final IChromosomeType[] arr$;
final IChromosomeType[] chromos = arr$ = Binnie.Genetics.getChromosomeMap(this.root).keySet().toArray(new IChromosomeType[0]);
final IChromosomeType[] chromos = arr$ = Binnie.GENETICS.getChromosomeMap(this.root).keySet().toArray(new IChromosomeType[0]);
for (final IChromosomeType type : arr$) {
final IAllele allele = this.template[type.ordinal()];
if (allele == null) {
@@ -161,7 +161,7 @@ public class WindowGenesis extends Window {
}
genes.add(new Gene(allele, type, this.root));
}
final Map<IChromosomeType, List<IAllele>> map = Binnie.Genetics.getChromosomeMap(this.root);
final Map<IChromosomeType, List<IAllele>> map = Binnie.GENETICS.getChromosomeMap(this.root);
this.geneList.setOptions(genes);
if (selection != null) {
this.geneList.setValue(new Gene(this.template[selection.ordinal()], selection, this.root));
@@ -174,7 +174,7 @@ public class WindowGenesis extends Window {
private void refreshPickup() {
this.panelPickup.deleteAllChildren();
int i = 0;
for (final ISpeciesType type : Binnie.Genetics.getSystem(this.root).getActiveTypes()) {
for (final ISpeciesType type : Binnie.GENETICS.getSystem(this.root).getActiveTypes()) {
final IIndividual ind = this.root.templateAsIndividual(this.template);
ind.analyze();
final ItemStack stack = this.root.getMemberStack(ind, type);
@@ -15,7 +15,6 @@ import binnie.extratrees.core.ExtraTreeTexture;
import binnie.extratrees.machines.brewery.BreweryLogic;
import binnie.extratrees.machines.brewery.BreweryRecipes;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import org.lwjgl.opengl.GL11;
import java.util.Collections;
@@ -15,7 +15,6 @@ import binnie.extratrees.core.ExtraTreeTexture;
import binnie.extratrees.machines.distillery.DistilleryLogic;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
import org.lwjgl.opengl.GL11;
public class ControlDistilleryProgress extends ControlProgressBase {
public static final Texture DISTILLERY_BASE = new StandardTexture(43, 0, 58, 66, ExtraTreeTexture.Gui);
@@ -12,17 +12,11 @@ import binnie.craftgui.resource.minecraft.StandardTexture;
import binnie.extratrees.core.ExtraTreeTexture;
import binnie.extratrees.machines.fruitpress.FruitPressRecipes;
import binnie.extratrees.machines.fruitpress.FruitPressMachine;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import org.lwjgl.opengl.GL11;
public class ControlFruitPressProgress extends ControlProgressBase {
static Texture PressTexture = new StandardTexture(6, 0, 24, 52, ExtraTreeTexture.Gui);
static Texture PressSlot = new StandardTexture(9, 52, 34, 17, ExtraTreeTexture.Gui);
@@ -143,7 +143,7 @@ public class ControlTileSelect extends Control implements IControlValue<IDesign>
@Override
public void getTooltip(final Tooltip tooltip) {
tooltip.add(Binnie.Language.localise(BinnieCore.instance, "gui.designer.pattern", this.getValue().getName()));
tooltip.add(Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.designer.pattern", this.getValue().getName()));
}
@Override
@@ -34,11 +34,11 @@ public class PageSpeciesTreeGenome extends PageSpecies {
@Override
public void onValueChanged(final IAlleleSpecies species) {
this.deleteAllChildren();
final IAllele[] template = Binnie.Genetics.getTreeRoot().getTemplate(species.getUID());
final IAllele[] template = Binnie.GENETICS.getTreeRoot().getTemplate(species.getUID());
if (template == null) {
return;
}
final ITree tree = Binnie.Genetics.getTreeRoot().templateAsIndividual(template);
final ITree tree = Binnie.GENETICS.getTreeRoot().templateAsIndividual(template);
if (tree == null) {
return;
}
@@ -57,7 +57,7 @@ public class PageSpeciesTreeGenome extends PageSpecies {
int y = 0;
final int th = 14;
final int th2 = 18;
final BreedingSystem syst = Binnie.Genetics.treeBreedingSystem;
final BreedingSystem syst = Binnie.GENETICS.treeBreedingSystem;
new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.PLANT) + " : ", TextJustification.MiddleRight);
new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getPlantType().toString(), TextJustification.MiddleLeft);
y += th;
@@ -29,7 +29,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase {
ControlListBox<ItemStack> selectionBoxPlanks;
public WindowArboristDatabase(final EntityPlayer player, final Side side, final boolean nei) {
super(player, side, nei, Binnie.Genetics.treeBreedingSystem, 120.0f);
super(player, side, nei, Binnie.GENETICS.treeBreedingSystem, 120.0f);
}
public static Window create(final EntityPlayer player, final Side side, final boolean nei) {
@@ -18,7 +18,7 @@ import net.minecraftforge.fml.relauncher.Side;
public class WindowLepidopteristDatabase extends WindowAbstractDatabase {
public WindowLepidopteristDatabase(final EntityPlayer player, final Side side, final boolean nei) {
super(player, side, nei, Binnie.Genetics.mothBreedingSystem, 160.0f);
super(player, side, nei, Binnie.GENETICS.mothBreedingSystem, 160.0f);
}
public static Window create(final EntityPlayer player, final Side side, final boolean nei) {
@@ -23,7 +23,7 @@ public class ControlGene extends Control implements IControlValue<IGene>, IToolt
@Override
public void getTooltip(final Tooltip tooltip) {
final String cName = Binnie.Genetics.getSystem(this.gene.getSpeciesRoot()).getChromosomeName(this.gene.getChromosome());
final String cName = Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot()).getChromosomeName(this.gene.getChromosome());
tooltip.add(cName + ": " + this.gene.getName());
if (this.isMouseOver() && this.canFill(Window.get(this).getHeldItemStack())) {
tooltip.add("Left click to assign gene");
@@ -31,7 +31,7 @@ public class ControlGene extends Control implements IControlValue<IGene>, IToolt
if (existingGene == null) {
return;
}
final String dName = Binnie.Genetics.getSystem(this.gene.getSpeciesRoot()).getChromosomeName(this.gene.getChromosome());
final String dName = Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot()).getChromosomeName(this.gene.getChromosome());
tooltip.add("Will replace " + dName + ": " + existingGene.getName());
}
}
@@ -40,7 +40,7 @@ public class ControlGeneScroll extends Control implements IControlValue<Breeding
public void refresh() {
this.deleteAllChildren();
final GeneTracker tracker = GeneTracker.getTracker(Window.get(this).getWorld(), Window.get(this).getUsername());
final Map<IChromosomeType, List<IAllele>> genes = Binnie.Genetics.getChromosomeMap(this.system.getSpeciesRoot());
final Map<IChromosomeType, List<IAllele>> genes = Binnie.GENETICS.getChromosomeMap(this.system.getSpeciesRoot());
int x = 0;
int y = 0;
final boolean isNEI = ((WindowGeneBank) Window.get(this)).isNei;
@@ -103,7 +103,7 @@ public class WindowGeneBank extends WindowMachine {
}
}.setOrigin(EventHandler.Origin.Self, edit));
scroll.setScrollableContent(this.genes = new ControlGeneScroll(scroll, 1.0f, 1.0f, geneBoxWidth, 116.0f));
this.genes.setGenes(Binnie.Genetics.beeBreedingSystem);
this.genes.setGenes(Binnie.GENETICS.beeBreedingSystem);
final ControlTabBar<BreedingSystem> tabBar = new ControlTabBar<BreedingSystem>(this, boxX, 32.0f, 24.0f, 120.0f, Position.Left) {
@Override
public ControlTab<BreedingSystem> createTab(final float x, final float y, final float w, final float h, final BreedingSystem value) {
@@ -114,7 +114,7 @@ public class WindowGeneBank extends WindowMachine {
int totalGenes = 0;
int seqGenes = 0;
final GeneTracker tracker = GeneTracker.getTracker(WindowGeneBank.this.getWorld(), WindowGeneBank.this.getUsername());
final Map<IChromosomeType, List<IAllele>> genes = Binnie.Genetics.getChromosomeMap(this.getValue().getSpeciesRoot());
final Map<IChromosomeType, List<IAllele>> genes = Binnie.GENETICS.getChromosomeMap(this.getValue().getSpeciesRoot());
for (final Map.Entry<IChromosomeType, List<IAllele>> entry : genes.entrySet()) {
totalGenes += entry.getValue().size();
for (final IAllele allele : entry.getValue()) {
@@ -129,8 +129,8 @@ public class WindowGeneBank extends WindowMachine {
};
}
};
tabBar.setValues(Binnie.Genetics.getActiveSystems());
tabBar.setValue(Binnie.Genetics.beeBreedingSystem);
tabBar.setValues(Binnie.GENETICS.getActiveSystems());
tabBar.setValue(Binnie.GENETICS.beeBreedingSystem);
boxX -= 8;
final ControlTabBar<String> infoTabs = new ControlTabBar<>(this, boxX + 8, 160.0f, 16.0f, 50.0f, Position.Left);
infoTabs.setValues(Arrays.asList("Stats", "Ranking"));
@@ -138,9 +138,9 @@ public class WindowGeneBank extends WindowMachine {
final Panel panelProject = new Panel(this, boxX + 24, 160.0f, geneBoxWidth + 20, 50.0f, MinecraftGUI.PanelType.Black);
int totalGenes = 0;
int seqGenes = 0;
for (final BreedingSystem system : Binnie.Genetics.getActiveSystems()) {
for (final BreedingSystem system : Binnie.GENETICS.getActiveSystems()) {
final GeneTracker tracker = GeneTracker.getTracker(this.getWorld(), this.getUsername());
final Map<IChromosomeType, List<IAllele>> genes = Binnie.Genetics.getChromosomeMap(system.getSpeciesRoot());
final Map<IChromosomeType, List<IAllele>> genes = Binnie.GENETICS.getChromosomeMap(system.getSpeciesRoot());
for (final Map.Entry<IChromosomeType, List<IAllele>> entry : genes.entrySet()) {
totalGenes += entry.getValue().size();
for (final IAllele allele : entry.getValue()) {
@@ -26,7 +26,7 @@ public enum GUIIcon {
}
public void register() {
this.icon = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/" + this.path);
this.icon = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/" + this.path);
}
public BinnieIcon getIcon() {
@@ -25,7 +25,6 @@ import net.minecraft.nbt.JsonToNBT;
import net.minecraft.nbt.NBTException;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -107,7 +107,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG
protected abstract String getBackgroundTextureName();
public BinnieResource getBackgroundTextureFile(final int i) {
return Binnie.Resource.getPNG(this.getMod(), ResourceType.GUI, this.getBackgroundTextureName() + ((i == 1) ? "" : i));
return Binnie.RESOURCE.getPNG(this.getMod(), ResourceType.GUI, this.getBackgroundTextureName() + ((i == 1) ? "" : i));
}
public boolean showHelpButton() {
@@ -23,8 +23,8 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme
}
public void setSpecies(final IAlleleSpecies species, EnumDiscoveryState state) {
final ISpeciesRoot speciesRoot = Binnie.Genetics.getSpeciesRoot(species);
final BreedingSystem system = Binnie.Genetics.getSystem(speciesRoot.getUID());
final ISpeciesRoot speciesRoot = Binnie.GENETICS.getSpeciesRoot(species);
final BreedingSystem system = Binnie.GENETICS.getSystem(speciesRoot.getUID());
final IIndividual ind = system.getSpeciesRoot().templateAsIndividual(system.getSpeciesRoot().getTemplate(species.getUID()));
super.setItemStack(system.getSpeciesRoot().getMemberStack(ind, system.getDefaultType()));
this.species = species;
@@ -18,11 +18,11 @@ public class DatabaseTab implements ITooltipHelp {
@Override
public String toString() {
return Binnie.Language.localise(this.mod, "gui.database.tab." + this.unloc);
return Binnie.LANGUAGE.localise(this.mod, "gui.database.tab." + this.unloc);
}
@Override
public void getHelpTooltip(final Tooltip tooltip) {
tooltip.add(Binnie.Language.localiseOrBlank(this.mod, "gui.database.tab." + this.unloc + ".help"));
tooltip.add(Binnie.LANGUAGE.localiseOrBlank(this.mod, "gui.database.tab." + this.unloc + ".help"));
}
}
@@ -28,16 +28,16 @@ public class PageBranchOverview extends PageBranch {
@Override
public void onValueChanged(final IClassification branch) {
this.pageBranchOverview_branchName.setValue(TextFormatting.UNDERLINE + branch.getName() + Binnie.Language.localise("binniecore.gui.database.branch.branch"));
this.pageBranchOverview_branchScientific.setValue(TextFormatting.ITALIC + Binnie.Language.localise("binniecore.gui.database.branch.apidae") + " " + branch.getScientific());
this.pageBranchOverview_branchAuthority.setValue(Binnie.Language.localise("binniecore.gui.database.discovered") + " " + TextFormatting.BOLD + branch.getMemberSpecies()[0].getAuthority());
this.pageBranchOverview_branchName.setValue(TextFormatting.UNDERLINE + branch.getName() + Binnie.LANGUAGE.localise("binniecore.gui.database.branch.branch"));
this.pageBranchOverview_branchScientific.setValue(TextFormatting.ITALIC + Binnie.LANGUAGE.localise("binniecore.gui.database.branch.apidae") + " " + branch.getScientific());
this.pageBranchOverview_branchAuthority.setValue(Binnie.LANGUAGE.localise("binniecore.gui.database.discovered") + " " + TextFormatting.BOLD + branch.getMemberSpecies()[0].getAuthority());
for (final IWidget widget : this.pageBranchOverview_branchDescription) {
this.deleteChild(widget);
}
this.pageBranchOverview_branchDescription.clear();
String desc = branch.getDescription();
if (desc == null || Objects.equals(desc, "")) {
desc = Binnie.Language.localise("binniecore.gui.database.no.description");
desc = Binnie.LANGUAGE.localise("binniecore.gui.database.no.description");
}
String line = "";
final List<String> descLines = new ArrayList<>();
@@ -19,7 +19,7 @@ public class PageBranchSpecies extends PageBranch {
public PageBranchSpecies(final IWidget parent, final DatabaseTab tab) {
super(parent, tab);
this.pageBranchSpecies_title = new ControlTextCentered(this, 8.0f, Binnie.Language.localise("binniecore.gui.database.species"));
this.pageBranchSpecies_title = new ControlTextCentered(this, 8.0f, Binnie.LANGUAGE.localise("binniecore.gui.database.species"));
this.addEventHandler(new EventValueChanged.Handler() {
@Override
public void onEvent(final EventValueChanged event) {
@@ -24,13 +24,13 @@ public class PageBreeder extends ControlPage<DatabaseTab> {
}
final BreedingSystem system = ((WindowAbstractDatabase) Window.get(this)).getBreedingSystem();
final String descriptor = system.getDescriptor();
new ControlTextCentered(this, 8.0f, TextFormatting.UNDERLINE + system.getDescriptor() + " " + Binnie.Language.localise("binniecore.gui.database.breeder.profile"));
new ControlTextCentered(this, 75.0f, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " " + Binnie.Language.localise("binniecore.gui.database.species"));
new ControlTextCentered(this, 8.0f, TextFormatting.UNDERLINE + system.getDescriptor() + " " + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.profile"));
new ControlTextCentered(this, 75.0f, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " " + Binnie.LANGUAGE.localise("binniecore.gui.database.species"));
new ControlBreedingProgress(this, 20, 87, 102, 14, system, system.discoveredSpeciesPercentage);
new ControlTextCentered(this, 115.0f, "" + system.discoveredBranchCount + "/" + system.totalBranchCount + " " + Binnie.Language.localise("binniecore.gui.database.breeder.branches"));
new ControlTextCentered(this, 115.0f, "" + system.discoveredBranchCount + "/" + system.totalBranchCount + " " + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.branches"));
new ControlBreedingProgress(this, 20, 127, 102, 14, system, system.discoveredBranchPercentage);
if (system.discoveredSecretCount > 0) {
new ControlTextCentered(this, 155.0f, "" + system.discoveredSecretCount + "/" + system.totalSecretCount + " " + Binnie.Language.localise("binniecore.gui.database.breeder.species.secret"));
new ControlTextCentered(this, 155.0f, "" + system.discoveredSecretCount + "/" + system.totalSecretCount + " " + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.species.secret"));
}
new ControlTextCentered(this, 32.0f, this.player.getName());
new ControlTextCentered(this, 44.0f, TextFormatting.ITALIC + system.getEpitome());
@@ -14,7 +14,7 @@ public class PageBreederStats extends Control {
public PageBreederStats(final IWidget parent, final int w, final int h, final String player) {
super(parent, 0.0f, 0.0f, w, h);
this.player = player;
final ControlText pageBranchOverview_branchName = new ControlTextCentered(this, 8.0f, TextFormatting.UNDERLINE + Binnie.Language.localise("binniecore.gui.database.breeder.stats"));
final ControlText pageBranchOverview_branchName = new ControlTextCentered(this, 8.0f, TextFormatting.UNDERLINE + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.stats"));
final BreedingSystem system = ((WindowAbstractDatabase) this.getSuperParent()).getBreedingSystem();
}
}
@@ -12,7 +12,7 @@ public class PageSpeciesMutations extends PageSpecies {
public PageSpeciesMutations(final IWidget parent, final DatabaseTab tab) {
super(parent, tab);
this.pageSpeciesFurther_Title = new ControlTextCentered(this, 8.0f, Binnie.Language.localise("binniecore.gui.database.mutations.further"));
this.pageSpeciesFurther_Title = new ControlTextCentered(this, 8.0f, Binnie.LANGUAGE.localise("binniecore.gui.database.mutations.further"));
this.pageSpeciesFurther_List = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.Further);
}
@@ -43,13 +43,13 @@ public class PageSpeciesOverview extends PageSpecies {
final String branchName = (species.getBranch() != null) ? species.getBranch().getName() : "Unknown";
this.controlName.setValue(TextFormatting.UNDERLINE + species.getName());
this.controlScientific.setValue(TextFormatting.ITALIC + branchBinomial + " " + species.getBinomial());
this.controlAuthority.setValue(Binnie.Language.localise("binniecore.gui.database.discovered") + ": " + TextFormatting.BOLD + species.getAuthority());
this.controlComplexity.setValue(Binnie.Language.localise("binniecore.gui.database.overview.complexity") + ": " + species.getComplexity());
this.controlAuthority.setValue(Binnie.LANGUAGE.localise("binniecore.gui.database.discovered") + ": " + TextFormatting.BOLD + species.getAuthority());
this.controlComplexity.setValue(Binnie.LANGUAGE.localise("binniecore.gui.database.overview.complexity") + ": " + species.getComplexity());
final String desc = species.getDescription();
String descBody = TextFormatting.ITALIC.toString();
String descSig = "";
if (desc == null || Objects.equals(desc, "")) {
descBody += Binnie.Language.localise("binniecore.gui.database.no.description");
descBody += Binnie.LANGUAGE.localise("binniecore.gui.database.no.description");
} else {
final String[] descStrings = desc.split("\\|");
descBody += descStrings[0];
@@ -12,7 +12,7 @@ public class PageSpeciesResultant extends PageSpecies {
public PageSpeciesResultant(final IWidget parent, final DatabaseTab tab) {
super(parent, tab);
this.pageSpeciesResultant_Title = new ControlTextCentered(this, 8.0f, Binnie.Language.localise("binniecore.gui.database.mutations.resultant"));
this.pageSpeciesResultant_Title = new ControlTextCentered(this, 8.0f, Binnie.LANGUAGE.localise("binniecore.gui.database.mutations.resultant"));
this.pageSpeciesResultant_List = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.Resultant);
}
@@ -62,7 +62,7 @@ public class AlvearyFrame {
return;
}
final World world = this.getMachine().getTileEntity().getWorld();
final int wear = Math.round(amount * 5 * Binnie.Genetics.getBeeRoot().getBeekeepingMode(world).getWearModifier());
final int wear = Math.round(amount * 5 * Binnie.GENETICS.getBeeRoot().getBeekeepingMode(world).getWearModifier());
this.getInventory().setInventorySlotContents(AlvearyFrame.slotFrame, this.getHiveFrame().frameUsed(((TileExtraBeeAlveary) this.getMachine().getTileEntity()).getMultiblockLogic().getController(), this.getInventory().getStackInSlot(AlvearyFrame.slotFrame), null, wear));
}
@@ -48,7 +48,7 @@ public class AlvearyHatchery {
@Override
public boolean isValid(final ItemStack itemStack) {
return Binnie.Genetics.getBeeRoot().isMember(itemStack) && Binnie.Genetics.getBeeRoot().getType(itemStack) == EnumBeeType.LARVAE;
return Binnie.GENETICS.getBeeRoot().isMember(itemStack) && Binnie.GENETICS.getBeeRoot().getType(itemStack) == EnumBeeType.LARVAE;
}
@Override
@@ -70,9 +70,9 @@ public class AlvearyHatchery {
final IBeeHousing house = ((TileExtraBeeAlveary) tile).getMultiblockLogic().getController();
if (house != null && !house.getErrorLogic().hasErrors()) {
final ItemStack queenStack = house.getBeeInventory().getQueen();
final IBee queen = (queenStack == null) ? null : Binnie.Genetics.getBeeRoot().getMember(queenStack);
final IBee queen = (queenStack == null) ? null : Binnie.GENETICS.getBeeRoot().getMember(queenStack);
if (queen != null) {
final ItemStack larvae = Binnie.Genetics.getBeeRoot().getMemberStack(Binnie.Genetics.getBeeRoot().getBee(queen.getGenome()), EnumBeeType.LARVAE);
final ItemStack larvae = Binnie.GENETICS.getBeeRoot().getMemberStack(Binnie.GENETICS.getBeeRoot().getBee(queen.getGenome()), EnumBeeType.LARVAE);
new TransferRequest(larvae, this.getInventory()).transfer(true);
}
}
@@ -104,7 +104,7 @@ public enum ExtraBeeItems implements IItemMiscProvider {
if (woodGear != null) {
gear = new ItemStack(woodGear, 1);
}
RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getFluidStack("for.honey", 500), null, ExtraBeeItems.ScentedGear.get(1), " j ", "bgb", " p ", 'j', Mods.Forestry.item("royalJelly"), 'b', Mods.Forestry.item("beeswax"), 'p', Mods.Forestry.item("pollen"), 'g', gear);
RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("for.honey", 500), null, ExtraBeeItems.ScentedGear.get(1), " j ", "bgb", " p ", 'j', Mods.Forestry.item("royalJelly"), 'b', Mods.Forestry.item("beeswax"), 'p', Mods.Forestry.item("pollen"), 'g', gear);
}
ExtraBeeItems(String name, String modelPath) {
@@ -30,6 +30,6 @@ public enum ExtraBeeTexture implements IBinnieTexture {
@Override
public BinnieResource getTexture() {
return Binnie.Resource.getPNG(ExtraBees.instance, this.type, this.texture);
return Binnie.RESOURCE.getPNG(ExtraBees.instance, this.type, this.texture);
}
}
@@ -9,7 +9,7 @@ import forestry.api.core.Tabs;
public class ModuleCore implements IInitializable {
@Override
public void preInit() {
ExtraBees.itemMisc = new ItemMisc(Tabs.tabApiculture, (IItemMiscProvider[]) ExtraBeeItems.values());
ExtraBees.itemMisc = new ItemMisc(Tabs.tabApiculture, ExtraBeeItems.values());
ExtraBees.proxy.registerItem(ExtraBees.itemMisc);
}
@@ -183,7 +183,7 @@ public class ExtraBeeMutation implements IBeeMutation {
new ExtraBeeMutation(ExtraBeesSpecies.SPATIAL, ForestryAllele.BeeSpecies.Spectral.getAllele(), ExtraBeesSpecies.QUANTUM, 5);
new ExtraBeeMutation(ForestryAllele.BeeSpecies.Noble.getAllele(), ForestryAllele.BeeSpecies.Monastic.getAllele(), ExtraBeesSpecies.MYSTICAL, 5);
for (final IBeeMutation mutation : ExtraBeeMutation.mutations) {
Binnie.Genetics.getBeeRoot().registerMutation(mutation);
Binnie.GENETICS.getBeeRoot().registerMutation(mutation);
}
}
@@ -262,7 +262,7 @@ public class ExtraBeeMutation implements IBeeMutation {
}
final int processedChance = Math.round(this.chance * BeeManager.beeRoot.createBeeHousingModifier(housing).getMutationModifier(genome0, genome1, 1.0f)
* Binnie.Genetics.getBeeRoot().getBeekeepingMode(world).getBeeModifier().getMutationModifier(genome0, genome1, 1.0f));
* Binnie.GENETICS.getBeeRoot().getBeekeepingMode(world).getBeeModifier().getMutationModifier(genome0, genome1, 1.0f));
if (this.species0.getUID().equals(allele0.getUID()) && this.species1.getUID().equals(allele1.getUID())) {
return processedChance;
}
@@ -283,7 +283,7 @@ public class ExtraBeeMutation implements IBeeMutation {
@Override
public IBeeRoot getRoot() {
return Binnie.Genetics.getBeeRoot();
return Binnie.GENETICS.getBeeRoot();
}
abstract static class MutationRequirement {
@@ -310,7 +310,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
}
public void registerTemplate() {
Binnie.Genetics.getBeeRoot().registerTemplate(this.getTemplate());
Binnie.GENETICS.getBeeRoot().registerTemplate(this.getTemplate());
if (this.state != State.Active) {
AlleleManager.alleleRegistry.blacklistAllele(this.getUID());
}
@@ -361,7 +361,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
}
public static IAllele[] getDefaultTemplate() {
return Binnie.Genetics.getBeeRoot().getDefaultTemplate();
return Binnie.GENETICS.getBeeRoot().getDefaultTemplate();
}
public IAllele[] getTemplate() {
@@ -908,7 +908,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
@Override
public IBeeRoot getRoot() {
return Binnie.Genetics.getBeeRoot();
return Binnie.GENETICS.getBeeRoot();
}
@Override
@@ -47,11 +47,11 @@ public class ModuleGenetics implements IInitializable {
++ebSpeciesCount;
}
}
RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getFluidStack("water", 2000), null, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD);
RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD);
}
public static IGenome getGenome(final IAlleleBeeSpecies allele0) {
return Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(allele0.getUID()));
return Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(allele0.getUID()));
}
// public static ItemStack getBeeIcon(final IAlleleBeeSpecies species) {
@@ -416,7 +416,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
}
IFluidHandler fluidHandler = TileUtil.getCapability(world, pos, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP);
if (fluidHandler != null) {
fluidHandler.fill(Binnie.Liquid.getFluidStack("water", 100), true);
fluidHandler.fill(Binnie.LIQUID.getFluidStack("water", 100), true);
break;
}
break;
@@ -60,7 +60,7 @@ public class ControlBiomes extends Control implements ITooltip {
if (species == null) {
return;
}
final IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID()));
final IBee bee = Binnie.Genetics.getBeeRoot().getBee(genome);
final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID()));
final IBee bee = Binnie.GENETICS.getBeeRoot().getBee(genome);
}
}
@@ -91,11 +91,11 @@ public class ControlClimateBar extends Control implements ITooltip {
EnumTolerance tolerance;
if (!this.isHumidity) {
main = species.getTemperature().ordinal() - 1;
final IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID()));
final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID()));
tolerance = genome.getToleranceTemp();
} else {
main = species.getHumidity().ordinal();
final IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID()));
final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID()));
tolerance = genome.getToleranceHumid();
}
this.tolerated.add(main);
@@ -31,13 +31,13 @@ public class ControlProductsBox extends ControlListBox<ControlProductsBox.Produc
public void setSpecies(final IAlleleBeeSpecies species) {
if (species != this.species && (this.species = species) != null) {
final IAllele[] template = Binnie.Genetics.getBeeRoot().getTemplate(species.getUID());
final IAllele[] template = Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID());
if (template == null) {
return;
}
final IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template);
final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(template);
final float speed = genome.getSpeed();
final float modeSpeed = Binnie.Genetics.getBeeRoot().getBeekeepingMode(BinnieCore.proxy.getWorld()).getBeeModifier().getProductionModifier(genome, 1.0f);
final float modeSpeed = Binnie.GENETICS.getBeeRoot().getBeekeepingMode(BinnieCore.proxy.getWorld()).getBeeModifier().getProductionModifier(genome, 1.0f);
final List<Product> strings = new ArrayList<>();
if (this.type == Type.Products) {
for (final Map.Entry<ItemStack, Float> entry : species.getProductChances().entrySet()) {
@@ -55,10 +55,10 @@ public class PageSpeciesGenome extends PageSpecies {
@Override
public void onValueChanged(final IAlleleSpecies species) {
final IAllele[] template = Binnie.Genetics.getBeeRoot().getTemplate(species.getUID());
final IAllele[] template = Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID());
if (template != null) {
final IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template);
final IBee bee = Binnie.Genetics.getBeeRoot().getBee(genome);
final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(template);
final IBee bee = Binnie.GENETICS.getBeeRoot().getBee(genome);
this.pageSpeciesGenome_SpeedText.setValue(rateSpeed(genome.getSpeed()));
this.pageSpeciesGenome_LifespanText.setValue(rateLifespan(genome.getLifespan()));
this.pageSpeciesGenome_FertilityText.setValue(genome.getFertility() + " children");
@@ -32,7 +32,7 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase {
}
public WindowApiaristDatabase(final EntityPlayer player, final Side side, final boolean nei) {
super(player, side, nei, Binnie.Genetics.beeBreedingSystem, 110.0f);
super(player, side, nei, Binnie.GENETICS.beeBreedingSystem, 110.0f);
}
public static Window create(final EntityPlayer player, final Side side, final boolean nei) {
@@ -48,7 +48,7 @@ public enum ExtraBeeLiquid implements ILiquidType {
@Override
public FluidStack get(final int amount) {
return Binnie.Liquid.getFluidStack(this.ident, amount);
return Binnie.LIQUID.getFluidStack(this.ident, amount);
}
@Override
@@ -7,7 +7,7 @@ import binnie.core.liquid.ItemFluidContainer;
public class ModuleLiquids implements IInitializable {
@Override
public void preInit() {
Binnie.Liquid.createLiquids(ExtraBeeLiquid.values(), ItemFluidContainer.LiquidExtraBee);
Binnie.LIQUID.createLiquids(ExtraBeeLiquid.values(), ItemFluidContainer.LiquidExtraBee);
}
@Override
@@ -62,7 +62,7 @@ public enum EnumHoneyDrop implements IItemEnum {
}
public void addRecipe() {
final FluidStack liquid = Binnie.Liquid.getFluidStack(this.liquidName, 200);
final FluidStack liquid = Binnie.LIQUID.getFluidStack(this.liquidName, 200);
if (liquid != null) {
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{this.get(1)}, liquid, this.remenant, 100);
}
@@ -36,7 +36,7 @@ public enum EnumPropolis implements IItemEnum {
}
public void addRecipe() {
final FluidStack liquid = Binnie.Liquid.getFluidStack(this.liquidName, 500);
final FluidStack liquid = Binnie.LIQUID.getFluidStack(this.liquidName, 500);
if (liquid != null) {
RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[]{this.get(1)}, liquid, null, 0);
}
@@ -44,7 +44,7 @@ public enum EnumPropolis implements IItemEnum {
@Override
public boolean isActive() {
return this.active && Binnie.Liquid.getFluidStack(this.liquidName, 100) != null;
return this.active && Binnie.LIQUID.getFluidStack(this.liquidName, 100) != null;
}
public static EnumPropolis get(final ItemStack itemStack) {
@@ -19,13 +19,13 @@ public class HiveDrop implements IHiveDrop {
private int chance;
public HiveDrop(final IAlleleBeeSpecies species, final int chance) {
this(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID()), new ItemStack[0], chance);
this(Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID()), new ItemStack[0], chance);
}
public HiveDrop(IAllele[] template, final ItemStack[] bonus, final int chance) {
this.additional = new ArrayList<>();
if (template == null) {
template = Binnie.Genetics.getBeeRoot().getDefaultTemplate();
template = Binnie.GENETICS.getBeeRoot().getDefaultTemplate();
}
this.template = template;
this.chance = chance;
@@ -53,7 +53,7 @@ public class HiveDrop implements IHiveDrop {
@Override
public IBee getBeeType(IBlockAccess world, BlockPos pos) {
return Binnie.Genetics.getBeeRoot().getBee(Binnie.Genetics.getBeeRoot().templateAsGenome(this.template));
return Binnie.GENETICS.getBeeRoot().getBee(Binnie.GENETICS.getBeeRoot().templateAsGenome(this.template));
}
}
+46 -56
View File
@@ -4,23 +4,13 @@ import binnie.Constants;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.core.gui.IBinnieGUID;
import binnie.core.item.ItemMisc;
import binnie.core.models.DoublePassBakedModel;
import binnie.core.network.BinniePacketHandler;
import binnie.core.proxy.IProxyCore;
import binnie.extrabees.ExtraBees;
import binnie.extratrees.alcohol.ModuleAlcohol;
import binnie.extratrees.alcohol.drink.ItemDrink;
import binnie.extratrees.block.BlockETDecorativeLeaves;
import binnie.extratrees.block.ModuleBlocks;
import binnie.extratrees.block.PlankType;
import binnie.extratrees.block.decor.BlockHedge;
import binnie.extratrees.block.decor.BlockMultiFence;
import binnie.extratrees.block.log.BlockETLog;
import binnie.extratrees.block.plank.BlockETPlank;
import binnie.extratrees.block.slab.BlockETSlab;
import binnie.extratrees.carpentry.BlockCarpentry;
import binnie.extratrees.carpentry.BlockStainedDesign;
import binnie.extratrees.carpentry.ModuleCarpentry;
import binnie.extratrees.config.ConfigurationMain;
import binnie.extratrees.core.ExtraTreesGUID;
@@ -32,11 +22,7 @@ import binnie.extratrees.proxy.Proxy;
import forestry.api.arboriculture.ITreeRoot;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.AlleleSpeciesRegisterEvent;
import forestry.arboriculture.blocks.BlockForestryStairs;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
@@ -52,6 +38,10 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import com.google.common.base.Preconditions;
@Mod(modid = Constants.EXTRA_TREES_MOD_ID, name = "Binnie's Extra Trees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
public class ExtraTrees extends AbstractMod {
@@ -59,43 +49,6 @@ public class ExtraTrees extends AbstractMod {
public static ExtraTrees instance;
@SidedProxy(clientSide = "binnie.extratrees.proxy.ProxyClient", serverSide = "binnie.extratrees.proxy.ProxyServer")
public static Proxy proxy;
public static Item itemDictionary;
public static Item itemDictionaryLepi;
public static ItemMisc itemMisc;
public static Item itemFood;
public static List<BlockETLog> logs;
public static List<BlockETLog> logsFireproof;
public static List<BlockETPlank> planks;
public static List<BlockETPlank> planksFireproof;
public static List<BlockETSlab> slabs;
public static List<BlockETSlab> slabsDouble;
public static List<BlockETSlab> slabsFireproof;
public static List<BlockETSlab> slabsDoubleFireproof;
public static List<BlockForestryStairs> stairs;
public static List<BlockForestryStairs> stairsFireproof;
public static List<BlockETDecorativeLeaves> leavesDecorative;
public static Map<String, ItemStack> speciesToLeavesDecorative;
public static Block blockStairs;
public static BlockCarpentry blockCarpentry;
public static Block blockMachine;
public static Block blockFence;
public static BlockCarpentry blockPanel;
public static Block blockKitchen;
public static Item itemHammer;
public static Item itemDurableHammer;
public static Block blockGate;
public static Block blockDoor;
public static Block blockBranch;
public static ItemDrink drink;
public static BlockMultiFence blockMultiFence;
public static Block blockDrink;
public static BlockHedge blockHedge;
public static BlockStainedDesign blockStained;
public static int fruitPodRenderId;
public static int doorRenderId;
public static int branchRenderId;
public static int fenceID;
public static int stairsID;
@Mod.EventHandler
public void onConstruction(FMLConstructionEvent e) {
@@ -116,15 +69,52 @@ public class ExtraTrees extends AbstractMod {
public void postInit(final FMLPostInitializationEvent evt) {
this.postInit();
}
@Nullable
private static ModuleBlocks blocks;
@Nullable
private static ModuleItems items;
@Nullable
private static ModuleAlcohol alcohol;
@Nullable
private static ModuleCarpentry carpentry;
@Nullable
private static ModuleMachine machine;
public static ModuleItems items() {
Preconditions.checkState(items != null);
return items;
}
public static ModuleBlocks blocks() {
Preconditions.checkState(blocks != null);
return blocks;
}
public static ModuleAlcohol alcohol() {
Preconditions.checkState(alcohol != null);
return alcohol;
}
public static ModuleCarpentry carpentry() {
Preconditions.checkState(carpentry != null);
return carpentry;
}
public static ModuleMachine machine() {
Preconditions.checkState(machine != null);
return machine;
}
@Override
protected void registerModules() {
this.addModule(new ModuleBlocks());
this.addModule(new ModuleItems());
this.addModule(new ModuleAlcohol());
this.addModule(blocks = new ModuleBlocks());
this.addModule(items = new ModuleItems());
this.addModule(alcohol = new ModuleAlcohol());
this.addModule(new ModuleGenetics());
this.addModule(new ModuleCarpentry());
this.addModule(new ModuleMachine());
this.addModule(carpentry = new ModuleCarpentry());
this.addModule(machine = new ModuleMachine());
this.addModule(new ModuleCore());
}
@@ -98,7 +98,7 @@ public enum Alcohol implements IFluidType, ICocktailLiquid {
@Override
public FluidStack get(final int amount) {
return Binnie.Liquid.getFluidStack(this.getIdentifier(), amount);
return Binnie.LIQUID.getFluidStack(this.getIdentifier(), amount);
}
@Override
@@ -32,7 +32,7 @@ public enum Glassware {
if (liquid == null) {
return ExtraTrees.proxy.localise("item.glassware." + this.name().toLowerCase());
}
return Binnie.Language.localise(ExtraTrees.instance, "item.glassware." + this.name().toLowerCase() + ".usage", liquid);
return Binnie.LANGUAGE.localise(ExtraTrees.instance, "item.glassware." + this.name().toLowerCase() + ".usage", liquid);
}
public int getCapacity() {
@@ -90,7 +90,7 @@ public enum Juice implements IFluidType, ICocktailLiquid {
@Override
public FluidStack get(final int amount) {
return Binnie.Liquid.getFluidStack(this.getIdentifier(), amount);
return Binnie.LIQUID.getFluidStack(this.getIdentifier(), amount);
}
@Override
Loaded 100 of 182 files, more files were not shown because too many files have changed in this diff. Show more