mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-18 11:29:23 +00:00
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
This commit is contained in:
commit
9f04dc7ed0
82 files changed
+207
-599
No files matched your search
@@ -13,23 +13,12 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public final class Binnie {
|
||||
public static final List<ManagerBase> Managers;
|
||||
public static final ManagerLanguage Language;
|
||||
public static final ManagerGenetics Genetics;
|
||||
public static final ManagerConfig Configuration;
|
||||
public static final ManagerLiquid Liquid;
|
||||
public static final ManagerMachine Machine;
|
||||
public static final ManagerItem Item;
|
||||
public static final ManagerResource Resource;
|
||||
|
||||
static {
|
||||
Managers = new ArrayList<>();
|
||||
Language = new ManagerLanguage();
|
||||
Genetics = new ManagerGenetics();
|
||||
Configuration = new ManagerConfig();
|
||||
Liquid = new ManagerLiquid();
|
||||
Machine = new ManagerMachine();
|
||||
Item = new ManagerItem();
|
||||
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 Machine = new ManagerMachine();
|
||||
public static final ManagerItem Item = new ManagerItem();
|
||||
public static final ManagerResource Resource = new ManagerResource();
|
||||
}
|
||||
@@ -8,7 +8,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
public class CreativeTabBotany extends CreativeTabs {
|
||||
public static CreativeTabs instance;
|
||||
public static CreativeTabs instance = new CreativeTabBotany();
|
||||
|
||||
@Override
|
||||
public ItemStack getIconItemStack() {
|
||||
@@ -36,7 +36,4 @@ public class CreativeTabBotany extends CreativeTabs {
|
||||
return Item.getItemFromBlock(Blocks.YELLOW_FLOWER);
|
||||
}
|
||||
|
||||
static {
|
||||
CreativeTabBotany.instance = new CreativeTabBotany();
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ public enum EnumFlowerStage implements ISpeciesType {
|
||||
SEED("Seed"),
|
||||
POLLEN("Pollen");
|
||||
|
||||
public static final EnumFlowerStage[] VALUES;
|
||||
public static final EnumFlowerStage[] VALUES = values();
|
||||
String name;
|
||||
|
||||
EnumFlowerStage(final String name) {
|
||||
@@ -26,7 +26,4 @@ public enum EnumFlowerStage implements ISpeciesType {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
static {
|
||||
VALUES = values();
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class CeramicDesignSystem implements IDesignSystem {
|
||||
public static CeramicDesignSystem instance;
|
||||
public static CeramicDesignSystem instance = new CeramicDesignSystem();
|
||||
// Map<Integer, IIcon> primary;
|
||||
// Map<Integer, IIcon> secondary;
|
||||
|
||||
@@ -83,7 +83,4 @@ public class CeramicDesignSystem implements IDesignSystem {
|
||||
return (itemStack.getItem() == Item.getItemFromBlock(Botany.ceramic)) ? this.getMaterial(itemStack.getItemDamage()) : null;
|
||||
}
|
||||
|
||||
static {
|
||||
CeramicDesignSystem.instance = new CeramicDesignSystem();
|
||||
}
|
||||
}
|
||||
@@ -27,10 +27,10 @@ import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class Gardening {
|
||||
public static final Map<ItemStack, Integer> fertiliserAcid = new LinkedHashMap<>();
|
||||
public static final Map<ItemStack, Integer> fertiliserAlkaline = new LinkedHashMap<>();
|
||||
public static final Map<ItemStack, Integer> fertiliserNutrient = new LinkedHashMap<>();
|
||||
|
||||
public static final Map<ItemStack, Integer> fertiliserAcid = new LinkedHashMap<>();
|
||||
public static final Map<ItemStack, Integer> fertiliserAlkaline = new LinkedHashMap<>();
|
||||
public static final Map<ItemStack, Integer> fertiliserNutrient = new LinkedHashMap<>();
|
||||
|
||||
public static boolean isSoil(final Block block) {
|
||||
return block instanceof IBlockSoil;
|
||||
}
|
||||
|
||||
@@ -31,9 +31,9 @@ import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class ModuleGardening implements IInitializable {
|
||||
public static HashMap<ItemStack, Integer> queuedAcidFertilisers;
|
||||
public static HashMap<ItemStack, Integer> queuedAlkalineFertilisers;
|
||||
public static HashMap<ItemStack, Integer> queuedNutrientFertilisers;
|
||||
public static HashMap<ItemStack, Integer> queuedAcidFertilisers = new HashMap<>();
|
||||
public static HashMap<ItemStack, Integer> queuedAlkalineFertilisers = new HashMap<>();
|
||||
public static HashMap<ItemStack, Integer> queuedNutrientFertilisers = new HashMap<>();
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
@@ -263,9 +263,4 @@ public class ModuleGardening implements IInitializable {
|
||||
}
|
||||
}
|
||||
|
||||
static {
|
||||
ModuleGardening.queuedAcidFertilisers = new HashMap<>();
|
||||
ModuleGardening.queuedAlkalineFertilisers = new HashMap<>();
|
||||
ModuleGardening.queuedNutrientFertilisers = new HashMap<>();
|
||||
}
|
||||
}
|
||||
@@ -14,12 +14,12 @@ import net.minecraft.world.World;
|
||||
import java.util.*;
|
||||
|
||||
public class FlowerRoot extends SpeciesRoot implements IFlowerRoot {
|
||||
public static int flowerSpeciesCount;
|
||||
public static int flowerSpeciesCount = -1;
|
||||
static final String UID = "rootFlowers";
|
||||
public static ArrayList<IFlower> flowerTemplates;
|
||||
private static ArrayList<IFlowerMutation> flowerMutations;
|
||||
public static ArrayList<IFlower> flowerTemplates = new ArrayList<>();
|
||||
private static ArrayList<IFlowerMutation> flowerMutations = new ArrayList<>();
|
||||
Map<ItemStack, IFlower> conversions;
|
||||
private static ArrayList<IColourMix> colourMixes;
|
||||
private static ArrayList<IColourMix> colourMixes = new ArrayList<>();
|
||||
|
||||
public FlowerRoot() {
|
||||
this.conversions = new HashMap<>();
|
||||
@@ -258,12 +258,4 @@ public class FlowerRoot extends SpeciesRoot implements IFlowerRoot {
|
||||
return FlowerRoot.colourMixes;
|
||||
}
|
||||
|
||||
static {
|
||||
FlowerRoot.flowerSpeciesCount = -1;
|
||||
FlowerRoot.flowerTemplates = new ArrayList<>();
|
||||
FlowerRoot.flowerMutations = new ArrayList<>();
|
||||
FlowerRoot.colourMixes = new ArrayList<>();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -18,7 +18,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||
|
||||
public class ModuleGenetics implements IInitializable {
|
||||
static AlleleEffectNone alleleEffectNone;
|
||||
static AlleleEffectNone alleleEffectNone = new AlleleEffectNone();
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
@@ -59,7 +59,4 @@ public class ModuleGenetics implements IInitializable {
|
||||
RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getLiquidStack("water", 2000), null, new ItemStack(Botany.database), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', Items.GOLD_NUGGET, 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD);
|
||||
}
|
||||
|
||||
static {
|
||||
ModuleGenetics.alleleEffectNone = new AlleleEffectNone();
|
||||
}
|
||||
}
|
||||
@@ -53,7 +53,7 @@ public final class BinnieCore extends AbstractMod {
|
||||
@SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer")
|
||||
public static BinnieProxy proxy;
|
||||
public static int multipassRenderID;
|
||||
private static List<AbstractMod> modList;
|
||||
private static List<AbstractMod> modList = new ArrayList<>();
|
||||
public static MachineGroup packageCompartment;
|
||||
public static ItemGenesis genesis;
|
||||
public static ItemFieldKit fieldKit;
|
||||
@@ -221,10 +221,6 @@ public final class BinnieCore extends AbstractMod {
|
||||
return true;
|
||||
}
|
||||
|
||||
static {
|
||||
BinnieCore.modList = new ArrayList<>();
|
||||
}
|
||||
|
||||
public static class PacketHandler extends BinniePacketHandler {
|
||||
public PacketHandler() {
|
||||
super(BinnieCore.instance);
|
||||
|
||||
@@ -12,10 +12,17 @@ import net.minecraftforge.fml.common.versioning.Restriction;
|
||||
import java.util.Objects;
|
||||
|
||||
public class Mods {
|
||||
public static Mod Forestry;
|
||||
public static Mod IC2;
|
||||
public static Mod Botania;
|
||||
private static boolean WARN;
|
||||
public static Mod Forestry = new Mod("forestry") {
|
||||
@Override
|
||||
public boolean dev() {
|
||||
final String forVersion = Loader.instance().getIndexedModList().get("forestry").getVersion();
|
||||
final Restriction rest = new Restriction(new DefaultArtifactVersion("3.6"), true, null, false);
|
||||
return rest.containsVersion(new DefaultArtifactVersion(forVersion));
|
||||
}
|
||||
};
|
||||
public static Mod IC2 = new Mod("IC2");
|
||||
public static Mod Botania = new Mod("Botania");
|
||||
private static boolean WARN = true;
|
||||
|
||||
private static Item findItem(final String modId, final String name) {
|
||||
final Item stack = Item.REGISTRY.getObject(new ResourceLocation(modId, name));
|
||||
@@ -42,20 +49,6 @@ public class Mods {
|
||||
return stack;
|
||||
}
|
||||
|
||||
static {
|
||||
Mods.Forestry = new Mod("forestry") {
|
||||
@Override
|
||||
public boolean dev() {
|
||||
final String forVersion = Loader.instance().getIndexedModList().get("forestry").getVersion();
|
||||
final Restriction rest = new Restriction(new DefaultArtifactVersion("3.6"), true, null, false);
|
||||
return rest.containsVersion(new DefaultArtifactVersion(forVersion));
|
||||
}
|
||||
};
|
||||
Mods.IC2 = new Mod("IC2");
|
||||
Mods.Botania = new Mod("Botania");
|
||||
Mods.WARN = true;
|
||||
}
|
||||
|
||||
public static class Mod {
|
||||
private String id;
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class BlockMetadata extends BlockContainer implements IBlockMetadata {
|
||||
static int temporyMeta;
|
||||
static int temporyMeta = -1;
|
||||
|
||||
public BlockMetadata(final Material material) {
|
||||
super(material);
|
||||
@@ -127,7 +127,4 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {
|
||||
// return getPickBlock(world, x, y, z);
|
||||
// }
|
||||
|
||||
static {
|
||||
BlockMetadata.temporyMeta = -1;
|
||||
}
|
||||
}
|
||||
@@ -19,15 +19,15 @@ import java.util.Map;
|
||||
|
||||
public class ItemFluidContainer extends ItemFood {
|
||||
private FluidContainer container;
|
||||
public static int LiquidExtraBee;
|
||||
public static int LiquidExtraTree;
|
||||
public static int LiquidJuice;
|
||||
public static int LiquidAlcohol;
|
||||
public static int LiquidSpirit;
|
||||
public static int LiquidLiqueuer;
|
||||
public static int LiquidGenetics;
|
||||
private static Map<Integer, String> idToFluid;
|
||||
private static Map<String, Integer> fluidToID;
|
||||
public static int LiquidExtraBee = 64;
|
||||
public static int LiquidExtraTree = 128;
|
||||
public static int LiquidJuice = 256;
|
||||
public static int LiquidAlcohol = 384;
|
||||
public static int LiquidSpirit = 512;
|
||||
public static int LiquidLiqueuer = 640;
|
||||
public static int LiquidGenetics = 768;
|
||||
private static Map<Integer, String> idToFluid = new HashMap<>();
|
||||
private static Map<String, Integer> fluidToID = new HashMap<>();
|
||||
|
||||
public static void registerFluid(final IFluidType fluid, final int id) {
|
||||
ItemFluidContainer.idToFluid.put(id, fluid.getIdentifier().toLowerCase());
|
||||
@@ -166,15 +166,4 @@ public class ItemFluidContainer extends ItemFood {
|
||||
return liquid != null && liquid.isConsumable();
|
||||
}
|
||||
|
||||
static {
|
||||
ItemFluidContainer.LiquidExtraBee = 64;
|
||||
ItemFluidContainer.LiquidExtraTree = 128;
|
||||
ItemFluidContainer.LiquidJuice = 256;
|
||||
ItemFluidContainer.LiquidAlcohol = 384;
|
||||
ItemFluidContainer.LiquidSpirit = 512;
|
||||
ItemFluidContainer.LiquidLiqueuer = 640;
|
||||
ItemFluidContainer.LiquidGenetics = 768;
|
||||
ItemFluidContainer.idToFluid = new HashMap<>();
|
||||
ItemFluidContainer.fluidToID = new HashMap<>();
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class MachineRendererBlock {
|
||||
public static MachineRendererBlock instance;
|
||||
public static MachineRendererBlock instance = new MachineRendererBlock();
|
||||
private BinnieResource texture;
|
||||
private ModelBlock model;
|
||||
|
||||
@@ -28,7 +28,4 @@ public class MachineRendererBlock {
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
static {
|
||||
MachineRendererBlock.instance = new MachineRendererBlock();
|
||||
}
|
||||
}
|
||||
@@ -6,12 +6,12 @@ import java.util.Collection;
|
||||
import java.util.EnumSet;
|
||||
|
||||
public class MachineSide {
|
||||
private static EnumSet<EnumFacing> All;
|
||||
public static EnumSet<EnumFacing> TopAndBottom;
|
||||
public static EnumSet<EnumFacing> None;
|
||||
public static EnumSet<EnumFacing> Top;
|
||||
public static EnumSet<EnumFacing> Bottom;
|
||||
public static EnumSet<EnumFacing> Sides;
|
||||
private static EnumSet<EnumFacing> All = EnumSet.of(EnumFacing.UP, EnumFacing.DOWN, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST);
|
||||
public static EnumSet<EnumFacing> TopAndBottom = EnumSet.of(EnumFacing.UP, EnumFacing.DOWN);
|
||||
public static EnumSet<EnumFacing> None = EnumSet.noneOf(EnumFacing.class);
|
||||
public static EnumSet<EnumFacing> Top = EnumSet.of(EnumFacing.UP);
|
||||
public static EnumSet<EnumFacing> Bottom = EnumSet.of(EnumFacing.DOWN);
|
||||
public static EnumSet<EnumFacing> Sides = EnumSet.of(EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST);
|
||||
|
||||
public static String asString(final Collection<EnumFacing> sides) {
|
||||
if (sides.containsAll(MachineSide.All)) {
|
||||
@@ -67,12 +67,4 @@ public class MachineSide {
|
||||
return text;
|
||||
}
|
||||
|
||||
static {
|
||||
MachineSide.All = EnumSet.of(EnumFacing.UP, EnumFacing.DOWN, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST);
|
||||
MachineSide.TopAndBottom = EnumSet.of(EnumFacing.UP, EnumFacing.DOWN);
|
||||
MachineSide.None = EnumSet.noneOf(EnumFacing.class);
|
||||
MachineSide.Top = EnumSet.of(EnumFacing.UP);
|
||||
MachineSide.Bottom = EnumSet.of(EnumFacing.DOWN);
|
||||
MachineSide.Sides = EnumSet.of(EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.EAST, EnumFacing.WEST);
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@ import net.minecraftforge.fluids.IFluidTank;
|
||||
public class TankSlot extends BaseSlot<FluidStack> {
|
||||
public static final String NameJuice = "Juice Tank";
|
||||
public static final String NameWater = "Water Tank";
|
||||
public static String NameCupboard;
|
||||
public static String NameCupboard = "Cupboard Slot";
|
||||
private FluidTank tank;
|
||||
|
||||
public TankSlot(final int index, final String name, final int capacity) {
|
||||
@@ -51,7 +51,4 @@ public class TankSlot extends BaseSlot<FluidStack> {
|
||||
return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + this.unlocName);
|
||||
}
|
||||
|
||||
static {
|
||||
TankSlot.NameCupboard = "Cupboard Slot";
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,7 @@ import org.lwjgl.opengl.GL11;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
class MachineRendererCompartment {
|
||||
public static MachineRendererCompartment instance;
|
||||
public static MachineRendererCompartment instance = new MachineRendererCompartment();
|
||||
private ModelCompartment model;
|
||||
|
||||
public MachineRendererCompartment() {
|
||||
@@ -35,7 +35,4 @@ class MachineRendererCompartment {
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
static {
|
||||
MachineRendererCompartment.instance = new MachineRendererCompartment();
|
||||
}
|
||||
}
|
||||
@@ -4,21 +4,14 @@ package binnie.core.mod.config;
|
||||
public class ConfigurationMods {
|
||||
@ConfigProperty(key = "extraBees", comment = {"Enables the Extra Bees Mod."})
|
||||
@PropBoolean
|
||||
public static boolean extraBees;
|
||||
public static boolean extraBees = true;
|
||||
@ConfigProperty(key = "extraTrees", comment = {"Enables the Extra Trees Mod."})
|
||||
@PropBoolean
|
||||
public static boolean extraTrees;
|
||||
public static boolean extraTrees = true;
|
||||
@ConfigProperty(key = "botany", comment = {"Enables the Botany Mod."})
|
||||
@PropBoolean
|
||||
public static boolean botany;
|
||||
public static boolean botany = true;
|
||||
@ConfigProperty(key = "genetics", comment = {"Enables the Genetics Mod."})
|
||||
@PropBoolean
|
||||
public static boolean genetics;
|
||||
|
||||
static {
|
||||
ConfigurationMods.extraBees = true;
|
||||
ConfigurationMods.extraTrees = true;
|
||||
ConfigurationMods.botany = true;
|
||||
ConfigurationMods.genetics = true;
|
||||
}
|
||||
public static boolean genetics = true;
|
||||
}
|
||||
@@ -7,7 +7,7 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
|
||||
public abstract class FieldParser {
|
||||
public static Collection<FieldParser> parsers;
|
||||
public static Collection<FieldParser> parsers = new ArrayList<>();;
|
||||
|
||||
public abstract boolean isHandled(final Field p0, final AbstractMod p1);
|
||||
|
||||
@@ -43,8 +43,4 @@ public abstract class FieldParser {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static {
|
||||
FieldParser.parsers = new ArrayList<>();
|
||||
}
|
||||
}
|
||||
@@ -9,12 +9,9 @@ import java.util.List;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class TextureManager {
|
||||
static List<Icon> textures;
|
||||
static List<Icon> textures = new ArrayList<>();
|
||||
|
||||
public static void init() {
|
||||
}
|
||||
|
||||
static {
|
||||
TextureManager.textures = new ArrayList<>();
|
||||
}
|
||||
}
|
||||
@@ -9,8 +9,8 @@ import binnie.craftgui.resource.minecraft.CraftGUITextureSheet;
|
||||
import binnie.craftgui.resource.minecraft.StandardTexture;
|
||||
|
||||
public class ControlColourMixSymbol extends Control implements ITooltip {
|
||||
static Texture MutationPlus;
|
||||
static Texture MutationArrow;
|
||||
static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
|
||||
static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2);
|
||||
IColourMix value;
|
||||
int type;
|
||||
|
||||
@@ -44,8 +44,4 @@ public class ControlColourMixSymbol extends Control implements ITooltip {
|
||||
}
|
||||
}
|
||||
|
||||
static {
|
||||
ControlColourMixSymbol.MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
|
||||
ControlColourMixSymbol.MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package binnie.craftgui.core.geometry;
|
||||
|
||||
public class IBorder {
|
||||
public static final IBorder ZERO;
|
||||
public static final IBorder ZERO = new IBorder(0.0f);
|
||||
float t;
|
||||
float b;
|
||||
float l;
|
||||
@@ -99,7 +99,4 @@ public class IBorder {
|
||||
return this.t() + "-" + this.r() + "-" + this.b() + "-" + this.l();
|
||||
}
|
||||
|
||||
static {
|
||||
ZERO = new IBorder(0.0f);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package binnie.craftgui.core.geometry;
|
||||
|
||||
public class IPoint {
|
||||
public static final IPoint ZERO;
|
||||
public static final IPoint ZERO = new IPoint(0.0f, 0.0f);
|
||||
float x;
|
||||
float y;
|
||||
|
||||
@@ -68,7 +68,4 @@ public class IPoint {
|
||||
return this.x() == other.x() && this.y() == other.y();
|
||||
}
|
||||
|
||||
static {
|
||||
ZERO = new IPoint(0.0f, 0.0f);
|
||||
}
|
||||
}
|
||||
@@ -20,8 +20,8 @@ import org.lwjgl.opengl.GL11;
|
||||
import java.util.Collections;
|
||||
|
||||
public class ControlBreweryProgress extends ControlProgressBase {
|
||||
static Texture Brewery;
|
||||
static Texture BreweryOverlay;
|
||||
static Texture Brewery = new StandardTexture(0, 69, 34, 39, ExtraTreeTexture.Gui);
|
||||
static Texture BreweryOverlay = new StandardTexture(34, 69, 34, 39, ExtraTreeTexture.Gui);
|
||||
|
||||
@Override
|
||||
public void onRenderBackground() {
|
||||
@@ -82,8 +82,4 @@ public class ControlBreweryProgress extends ControlProgressBase {
|
||||
// GL11.glDisable(3042);
|
||||
}
|
||||
|
||||
static {
|
||||
ControlBreweryProgress.Brewery = new StandardTexture(0, 69, 34, 39, ExtraTreeTexture.Gui);
|
||||
ControlBreweryProgress.BreweryOverlay = new StandardTexture(34, 69, 34, 39, ExtraTreeTexture.Gui);
|
||||
}
|
||||
}
|
||||
@@ -18,10 +18,10 @@ import net.minecraftforge.fluids.FluidStack;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class ControlDistilleryProgress extends ControlProgressBase {
|
||||
static Texture DistilleryBase;
|
||||
static Texture DistilleryOverlay;
|
||||
static Texture LiquidFlow;
|
||||
static Texture Output;
|
||||
static Texture DistilleryBase = new StandardTexture(43, 0, 58, 66, ExtraTreeTexture.Gui);
|
||||
static Texture DistilleryOverlay = new StandardTexture(139, 0, 18, 66, ExtraTreeTexture.Gui);
|
||||
static Texture LiquidFlow = new StandardTexture(101, 0, 38, 66, ExtraTreeTexture.Gui);
|
||||
static Texture Output = new StandardTexture(68, 66, 17, 7, ExtraTreeTexture.Gui);
|
||||
|
||||
@Override
|
||||
public void onRenderBackground() {
|
||||
@@ -85,10 +85,4 @@ public class ControlDistilleryProgress extends ControlProgressBase {
|
||||
GL11.glDisable(3042);
|
||||
}
|
||||
|
||||
static {
|
||||
ControlDistilleryProgress.DistilleryBase = new StandardTexture(43, 0, 58, 66, ExtraTreeTexture.Gui);
|
||||
ControlDistilleryProgress.DistilleryOverlay = new StandardTexture(139, 0, 18, 66, ExtraTreeTexture.Gui);
|
||||
ControlDistilleryProgress.LiquidFlow = new StandardTexture(101, 0, 38, 66, ExtraTreeTexture.Gui);
|
||||
ControlDistilleryProgress.Output = new StandardTexture(68, 66, 17, 7, ExtraTreeTexture.Gui);
|
||||
}
|
||||
}
|
||||
@@ -18,8 +18,8 @@ import net.minecraftforge.fluids.Fluid;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class ControlFruitPressProgress extends ControlProgressBase {
|
||||
static Texture PressTexture;
|
||||
static Texture PressSlot;
|
||||
static Texture PressTexture = new StandardTexture(6, 0, 24, 52, ExtraTreeTexture.Gui);
|
||||
static Texture PressSlot = new StandardTexture(9, 52, 34, 17, ExtraTreeTexture.Gui);
|
||||
|
||||
@Override
|
||||
public void onRenderBackground() {
|
||||
@@ -70,8 +70,4 @@ public class ControlFruitPressProgress extends ControlProgressBase {
|
||||
});
|
||||
}
|
||||
|
||||
static {
|
||||
ControlFruitPressProgress.PressTexture = new StandardTexture(6, 0, 24, 52, ExtraTreeTexture.Gui);
|
||||
ControlFruitPressProgress.PressSlot = new StandardTexture(9, 52, 34, 17, ExtraTreeTexture.Gui);
|
||||
}
|
||||
}
|
||||
@@ -20,8 +20,8 @@ import org.lwjgl.opengl.GL11;
|
||||
public class ControlLumbermillProgress extends ControlProgressBase {
|
||||
float oldProgress;
|
||||
float animation;
|
||||
static Texture Saw;
|
||||
static Texture Saw2;
|
||||
static Texture Saw = new StandardTexture(0, 0, 6, 32, ExtraTreeTexture.Gui);
|
||||
static Texture Saw2 = new StandardTexture(2, 0, 4, 32, ExtraTreeTexture.Gui);
|
||||
|
||||
@Override
|
||||
public void onUpdateClient() {
|
||||
@@ -85,8 +85,4 @@ public class ControlLumbermillProgress extends ControlProgressBase {
|
||||
new Panel(this, 0.0f, 0.0f, 66.0f, 18.0f, MinecraftGUI.PanelType.Black);
|
||||
}
|
||||
|
||||
static {
|
||||
ControlLumbermillProgress.Saw = new StandardTexture(0, 0, 6, 32, ExtraTreeTexture.Gui);
|
||||
ControlLumbermillProgress.Saw2 = new StandardTexture(2, 0, 4, 32, ExtraTreeTexture.Gui);
|
||||
}
|
||||
}
|
||||
@@ -14,12 +14,12 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
||||
public class WindowAcclimatiser extends WindowMachine {
|
||||
static Texture ProgressBase;
|
||||
static Texture Progress;
|
||||
public static final int[] slotReserve;
|
||||
static Texture ProgressBase = new StandardTexture(64, 0, 130, 21, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
static Texture Progress = new StandardTexture(64, 21, 130, 21, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
public static final int[] slotReserve = new int[]{0, 1, 2, 3};
|
||||
public static final int slotTarget = 4;
|
||||
public static final int[] slotAcclimatiser;
|
||||
public static final int[] slotDone;
|
||||
public static final int[] slotAcclimatiser = new int[]{5, 6, 7};
|
||||
public static final int[] slotDone = new int[]{8, 9, 10, 11};
|
||||
|
||||
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
|
||||
return new WindowAcclimatiser(player, inventory, side);
|
||||
@@ -60,11 +60,4 @@ public class WindowAcclimatiser extends WindowMachine {
|
||||
return "Acclimatiser";
|
||||
}
|
||||
|
||||
static {
|
||||
WindowAcclimatiser.ProgressBase = new StandardTexture(64, 0, 130, 21, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
WindowAcclimatiser.Progress = new StandardTexture(64, 21, 130, 21, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
slotReserve = new int[]{0, 1, 2, 3};
|
||||
slotAcclimatiser = new int[]{5, 6, 7};
|
||||
slotDone = new int[]{8, 9, 10, 11};
|
||||
}
|
||||
}
|
||||
@@ -18,8 +18,8 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
||||
public class WindowAnalyser extends WindowMachine {
|
||||
static Texture ProgressBase;
|
||||
static Texture Progress;
|
||||
static Texture ProgressBase = new StandardTexture(0, 218, 142, 17, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
static Texture Progress = new StandardTexture(0, 201, 142, 17, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
|
||||
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
|
||||
return new WindowAnalyser(player, inventory, side);
|
||||
@@ -72,8 +72,4 @@ public class WindowAnalyser extends WindowMachine {
|
||||
return "Analyser";
|
||||
}
|
||||
|
||||
static {
|
||||
WindowAnalyser.ProgressBase = new StandardTexture(0, 218, 142, 17, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
WindowAnalyser.Progress = new StandardTexture(0, 201, 142, 17, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
}
|
||||
}
|
||||
@@ -15,8 +15,8 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
||||
public class WindowGenepool extends WindowMachine {
|
||||
static Texture ProgressBase;
|
||||
static Texture Progress;
|
||||
static Texture ProgressBase = new StandardTexture(64, 0, 130, 21, ExtraBeeTexture.GUIProgress.getTexture());;
|
||||
static Texture Progress = new StandardTexture(64, 21, 130, 21, ExtraBeeTexture.GUIProgress.getTexture());;
|
||||
|
||||
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
|
||||
return new WindowGenepool(player, inventory, side);
|
||||
@@ -65,8 +65,4 @@ public class WindowGenepool extends WindowMachine {
|
||||
return "Genepool";
|
||||
}
|
||||
|
||||
static {
|
||||
WindowGenepool.ProgressBase = new StandardTexture(64, 0, 130, 21, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
WindowGenepool.Progress = new StandardTexture(64, 21, 130, 21, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
}
|
||||
}
|
||||
@@ -15,8 +15,8 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
||||
public class WindowIncubator extends WindowMachine {
|
||||
static Texture ProgressBase;
|
||||
static Texture Progress;
|
||||
static Texture ProgressBase = new StandardTexture(0, 91, 38, 32, GeneticsTexture.GUIProcess);
|
||||
static Texture Progress = new StandardTexture(38, 91, 38, 32, GeneticsTexture.GUIProcess);
|
||||
|
||||
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
|
||||
return new WindowIncubator(player, inventory, side);
|
||||
@@ -68,8 +68,4 @@ public class WindowIncubator extends WindowMachine {
|
||||
return "Incubator";
|
||||
}
|
||||
|
||||
static {
|
||||
WindowIncubator.ProgressBase = new StandardTexture(0, 91, 38, 32, GeneticsTexture.GUIProcess);
|
||||
WindowIncubator.Progress = new StandardTexture(38, 91, 38, 32, GeneticsTexture.GUIProcess);
|
||||
}
|
||||
}
|
||||
@@ -17,8 +17,8 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
||||
public class WindowInoculator extends WindowMachine {
|
||||
static Texture ProgressBase;
|
||||
static Texture Progress;
|
||||
static Texture ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUIProcess2.getTexture());
|
||||
static Texture Progress = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUIProcess2.getTexture());
|
||||
|
||||
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
|
||||
return new WindowInoculator(player, inventory, side);
|
||||
@@ -63,8 +63,4 @@ public class WindowInoculator extends WindowMachine {
|
||||
return "Inoculator";
|
||||
}
|
||||
|
||||
static {
|
||||
WindowInoculator.ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUIProcess2.getTexture());
|
||||
WindowInoculator.Progress = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUIProcess2.getTexture());
|
||||
}
|
||||
}
|
||||
@@ -15,8 +15,8 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
||||
public class WindowIsolator extends WindowMachine {
|
||||
static Texture ProgressBase;
|
||||
static Texture Progress;
|
||||
static Texture ProgressBase = new StandardTexture(0, 218, 142, 17, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
static Texture Progress = new StandardTexture(0, 201, 142, 17, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
|
||||
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
|
||||
return new WindowIsolator(player, inventory, side);
|
||||
@@ -73,8 +73,4 @@ public class WindowIsolator extends WindowMachine {
|
||||
return "Isolator";
|
||||
}
|
||||
|
||||
static {
|
||||
WindowIsolator.ProgressBase = new StandardTexture(0, 218, 142, 17, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
WindowIsolator.Progress = new StandardTexture(0, 201, 142, 17, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
}
|
||||
}
|
||||
@@ -15,8 +15,8 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
||||
public class WindowPolymeriser extends WindowMachine {
|
||||
static Texture ProgressBase;
|
||||
static Texture Progress;
|
||||
static Texture ProgressBase = new StandardTexture(76, 170, 160, 79, GeneticsTexture.GUIProcess.getTexture());
|
||||
static Texture Progress = new StandardTexture(76, 91, 160, 79, GeneticsTexture.GUIProcess.getTexture());
|
||||
|
||||
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
|
||||
return new WindowPolymeriser(player, inventory, side);
|
||||
@@ -64,8 +64,4 @@ public class WindowPolymeriser extends WindowMachine {
|
||||
return "Polymeriser";
|
||||
}
|
||||
|
||||
static {
|
||||
WindowPolymeriser.ProgressBase = new StandardTexture(76, 170, 160, 79, GeneticsTexture.GUIProcess.getTexture());
|
||||
WindowPolymeriser.Progress = new StandardTexture(76, 91, 160, 79, GeneticsTexture.GUIProcess.getTexture());
|
||||
}
|
||||
}
|
||||
@@ -20,8 +20,8 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
||||
public class WindowSequencer extends WindowMachine {
|
||||
static Texture ProgressBase;
|
||||
static Texture Progress;
|
||||
static Texture ProgressBase = new StandardTexture(64, 114, 98, 9, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
static Texture Progress = new StandardTexture(64, 123, 98, 9, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
ControlText slotText;
|
||||
|
||||
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
|
||||
@@ -79,8 +79,4 @@ public class WindowSequencer extends WindowMachine {
|
||||
return "Sequencer";
|
||||
}
|
||||
|
||||
static {
|
||||
WindowSequencer.ProgressBase = new StandardTexture(64, 114, 98, 9, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
WindowSequencer.Progress = new StandardTexture(64, 123, 98, 9, ExtraBeeTexture.GUIProgress.getTexture());
|
||||
}
|
||||
}
|
||||
@@ -18,8 +18,8 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
||||
public class WindowSplicer extends WindowMachine {
|
||||
static Texture ProgressBase;
|
||||
static Texture Progress;
|
||||
static Texture ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUIProcess2.getTexture());
|
||||
static Texture Progress = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUIProcess2.getTexture());
|
||||
|
||||
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
|
||||
return new WindowSplicer(player, inventory, side);
|
||||
@@ -62,8 +62,4 @@ public class WindowSplicer extends WindowMachine {
|
||||
return "Inoculator";
|
||||
}
|
||||
|
||||
static {
|
||||
WindowSplicer.ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUIProcess2.getTexture());
|
||||
WindowSplicer.Progress = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUIProcess2.getTexture());
|
||||
}
|
||||
}
|
||||
@@ -24,7 +24,7 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class ControlLiquidTank extends Control implements ITooltip {
|
||||
public static List<Integer> tankError;
|
||||
public static List<Integer> tankError = new ArrayList<>();
|
||||
private int tankID;
|
||||
private boolean horizontal;
|
||||
|
||||
@@ -164,7 +164,4 @@ public class ControlLiquidTank extends Control implements ITooltip {
|
||||
return (tank != null) ? tank.getTankSlot(this.tankID) : null;
|
||||
}
|
||||
|
||||
static {
|
||||
ControlLiquidTank.tankError = new ArrayList<>();
|
||||
}
|
||||
}
|
||||
@@ -28,8 +28,8 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class ControlSlot extends ControlSlotBase {
|
||||
public static Map<EnumHighlighting, List<Integer>> highlighting;
|
||||
public static boolean shiftClickActive;
|
||||
public static Map<EnumHighlighting, List<Integer>> highlighting = new HashMap<>();
|
||||
public static boolean shiftClickActive = false;
|
||||
public Slot slot;
|
||||
|
||||
public ControlSlot(final IWidget parent, final float x, final float y) {
|
||||
@@ -194,8 +194,6 @@ public class ControlSlot extends ControlSlotBase {
|
||||
}
|
||||
|
||||
static {
|
||||
ControlSlot.highlighting = new HashMap<>();
|
||||
ControlSlot.shiftClickActive = false;
|
||||
for (final EnumHighlighting h : EnumHighlighting.values()) {
|
||||
ControlSlot.highlighting.put(h, new ArrayList<>());
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ import binnie.craftgui.resource.minecraft.CraftGUITextureSheet;
|
||||
import binnie.craftgui.resource.minecraft.StandardTexture;
|
||||
|
||||
class ControlBreedingProgress extends Control {
|
||||
private static Texture Progress;
|
||||
private static Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2);
|
||||
private float percentage;
|
||||
private int colour;
|
||||
|
||||
@@ -30,8 +30,4 @@ class ControlBreedingProgress extends Control {
|
||||
CraftGUI.Render.colour(this.colour);
|
||||
CraftGUI.Render.texture(ControlBreedingProgress.Progress, area);
|
||||
}
|
||||
|
||||
static {
|
||||
ControlBreedingProgress.Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2);
|
||||
}
|
||||
}
|
||||
@@ -12,8 +12,8 @@ import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IMutation;
|
||||
|
||||
class ControlMutationSymbol extends Control implements ITooltip {
|
||||
private static Texture MutationPlus;
|
||||
private static Texture MutationArrow;
|
||||
private static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
|
||||
private static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2);
|
||||
private IMutation value;
|
||||
private boolean discovered;
|
||||
private int type;
|
||||
@@ -62,9 +62,4 @@ class ControlMutationSymbol extends Control implements ITooltip {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static {
|
||||
ControlMutationSymbol.MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
|
||||
ControlMutationSymbol.MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2);
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@ package binnie.craftgui.resource;
|
||||
import binnie.craftgui.core.CraftGUI;
|
||||
|
||||
public class StyleSheetManager {
|
||||
static IStyleSheet defaultSS;
|
||||
static IStyleSheet defaultSS = new DefaultStyleSheet();
|
||||
|
||||
public static Texture getTexture(final Object key) {
|
||||
return StyleSheetManager.defaultSS.getTexture(key);
|
||||
@@ -13,10 +13,6 @@ public class StyleSheetManager {
|
||||
return StyleSheetManager.defaultSS;
|
||||
}
|
||||
|
||||
static {
|
||||
StyleSheetManager.defaultSS = new DefaultStyleSheet();
|
||||
}
|
||||
|
||||
private static class DefaultStyleSheet implements IStyleSheet {
|
||||
@Override
|
||||
public Texture getTexture(final Object key) {
|
||||
|
||||
@@ -6,7 +6,7 @@ import binnie.craftgui.core.geometry.IBorder;
|
||||
import binnie.craftgui.core.geometry.Position;
|
||||
|
||||
public class Texture {
|
||||
public static final Texture NULL;
|
||||
public static final Texture NULL = null;
|
||||
IArea area;
|
||||
IBorder padding;
|
||||
IBorder border;
|
||||
@@ -108,8 +108,4 @@ public class Texture {
|
||||
}
|
||||
return out + "]";
|
||||
}
|
||||
|
||||
static {
|
||||
NULL = null;
|
||||
}
|
||||
}
|
||||
@@ -15,11 +15,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class AlvearyFrame {
|
||||
public static int slotFrame;
|
||||
|
||||
static {
|
||||
AlvearyFrame.slotFrame = 0;
|
||||
}
|
||||
public static int slotFrame = 0;
|
||||
|
||||
public static class PackageAlvearyFrame extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
|
||||
public PackageAlvearyFrame() {
|
||||
|
||||
@@ -19,11 +19,7 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import java.util.Random;
|
||||
|
||||
public class AlvearyHatchery {
|
||||
public static int[] slotLarvae;
|
||||
|
||||
static {
|
||||
AlvearyHatchery.slotLarvae = new int[]{0, 1, 2, 3, 4};
|
||||
}
|
||||
public static int[] slotLarvae = new int[]{0, 1, 2, 3, 4};
|
||||
|
||||
public static class PackageAlvearyHatchery extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
|
||||
public PackageAlvearyHatchery() {
|
||||
|
||||
@@ -21,8 +21,8 @@ import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class AlvearyMutator {
|
||||
public static int slotMutator;
|
||||
static Map<ItemStack, Float> mutations;
|
||||
public static int slotMutator = 0;
|
||||
static Map<ItemStack, Float> mutations = new HashMap<>();
|
||||
|
||||
public static boolean isMutationItem(final ItemStack item) {
|
||||
return getMutationMult(item) > 0.0f;
|
||||
@@ -51,11 +51,6 @@ public class AlvearyMutator {
|
||||
return AlvearyMutator.mutations.keySet();
|
||||
}
|
||||
|
||||
static {
|
||||
AlvearyMutator.slotMutator = 0;
|
||||
AlvearyMutator.mutations = new HashMap<>();
|
||||
}
|
||||
|
||||
public static class PackageAlvearyMutator extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
|
||||
public PackageAlvearyMutator() {
|
||||
super("mutator", ExtraBeeTexture.AlvearyMutator.getTexture(), false);
|
||||
|
||||
@@ -27,11 +27,7 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class AlvearyStimulator {
|
||||
public static int slotCircuit;
|
||||
|
||||
static {
|
||||
AlvearyStimulator.slotCircuit = 0;
|
||||
}
|
||||
public static int slotCircuit = 0;
|
||||
|
||||
public static class PackageAlvearyStimulator extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
|
||||
public PackageAlvearyStimulator() {
|
||||
|
||||
@@ -9,13 +9,8 @@ import binnie.core.mod.config.PropPercentage;
|
||||
public class ConfigurationMachines {
|
||||
@ConfigProperty(key = "isolatorConsumptionChance", comment = {"Percentage chance of Isolator consuming bee, in x%."})
|
||||
@PropPercentage
|
||||
public static int isolatorConsumptionChance;
|
||||
public static int isolatorConsumptionChance = 30;
|
||||
@ConfigProperty(key = "geneticErrorModifier", comment = {"Modifier that changes how severe splicer/inoculator erros are.", "0 would result in no errors, even for awful serums.", "2.0 would result in twice as severe errors"})
|
||||
@PropDouble
|
||||
public static double geneticErrorModifier;
|
||||
|
||||
static {
|
||||
ConfigurationMachines.isolatorConsumptionChance = 30;
|
||||
ConfigurationMachines.geneticErrorModifier = 1.0;
|
||||
}
|
||||
public static double geneticErrorModifier = 1.0;
|
||||
}
|
||||
@@ -9,25 +9,18 @@ import binnie.core.mod.config.PropInteger;
|
||||
public class ConfigurationMain {
|
||||
@ConfigProperty(key = "canQuarryMineHives")
|
||||
@PropBoolean
|
||||
public static boolean canQuarryMineHives;
|
||||
public static boolean canQuarryMineHives = true;
|
||||
@ConfigProperty(key = "waterHiveRate")
|
||||
@PropInteger
|
||||
public static int waterHiveRate;
|
||||
public static int waterHiveRate = 1;
|
||||
@ConfigProperty(key = "rockHiveRate")
|
||||
@PropInteger
|
||||
public static int rockHiveRate;
|
||||
public static int rockHiveRate = 2;
|
||||
@ConfigProperty(key = "netherHiveRate")
|
||||
@PropInteger
|
||||
public static int netherHiveRate;
|
||||
public static int netherHiveRate = 2;
|
||||
@ConfigProperty(key = "marbleHiveRate")
|
||||
@PropInteger
|
||||
public static int marbleHiveRate;
|
||||
public static int marbleHiveRate = 2;
|
||||
|
||||
static {
|
||||
ConfigurationMain.canQuarryMineHives = true;
|
||||
ConfigurationMain.waterHiveRate = 1;
|
||||
ConfigurationMain.rockHiveRate = 2;
|
||||
ConfigurationMain.netherHiveRate = 2;
|
||||
ConfigurationMain.marbleHiveRate = 2;
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,7 @@ import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
public class ExtraBeeMutation implements IBeeMutation {
|
||||
public static List<IBeeMutation> mutations;
|
||||
public static List<IBeeMutation> mutations = new ArrayList<>();
|
||||
MutationRequirement req;
|
||||
IAlleleBeeSpecies species0;
|
||||
IAlleleBeeSpecies species1;
|
||||
@@ -281,10 +281,6 @@ public class ExtraBeeMutation implements IBeeMutation {
|
||||
return Binnie.Genetics.getBeeRoot();
|
||||
}
|
||||
|
||||
static {
|
||||
ExtraBeeMutation.mutations = new ArrayList<>();
|
||||
}
|
||||
|
||||
abstract static class MutationRequirement {
|
||||
public abstract String[] tooltip();
|
||||
|
||||
|
||||
@@ -15,8 +15,8 @@ import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
public class ControlPunnett extends Control {
|
||||
static int boxWidth;
|
||||
static int boxHeight;
|
||||
static int boxWidth = 80;
|
||||
static int boxHeight = 28;
|
||||
|
||||
protected ControlPunnett(final IWidget parent, final float x, final float y) {
|
||||
super(parent, x, y, ControlPunnett.boxWidth * 3, ControlPunnett.boxWidth * 3);
|
||||
@@ -70,8 +70,4 @@ public class ControlPunnett extends Control {
|
||||
new ControlText(this, new IArea(0.0f, ControlPunnett.boxHeight * 2, ControlPunnett.boxWidth, ControlPunnett.boxHeight), primary2.getName(), TextJustification.TopCenter).setColour(11184810);
|
||||
}
|
||||
|
||||
static {
|
||||
ControlPunnett.boxWidth = 80;
|
||||
ControlPunnett.boxHeight = 28;
|
||||
}
|
||||
}
|
||||
@@ -15,10 +15,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import java.util.Random;
|
||||
|
||||
public class ModuleGeneration implements IWorldGenerator, IInitializable {
|
||||
static int waterRate;
|
||||
static int rockRate;
|
||||
static int netherRate;
|
||||
static int marbleRate;
|
||||
static int waterRate = 2;
|
||||
static int rockRate = 2;
|
||||
static int netherRate = 2;
|
||||
static int marbleRate = 2;
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
@@ -76,11 +76,4 @@ public class ModuleGeneration implements IWorldGenerator, IInitializable {
|
||||
}
|
||||
}
|
||||
|
||||
static {
|
||||
ModuleGeneration.waterRate = 2;
|
||||
ModuleGeneration.rockRate = 2;
|
||||
ModuleGeneration.netherRate = 2;
|
||||
ModuleGeneration.marbleRate = 2;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -38,7 +38,7 @@ public enum Cocktail {
|
||||
Vesper("Vesper", Glassware.Cocktail, 15658732),
|
||||
SexOnTheBeach("Sex on the Beach", Glassware.Highball, 16677426);
|
||||
|
||||
static final Map<String, ICocktailIngredient> cocktailIngredients;
|
||||
static final Map<String, ICocktailIngredient> cocktailIngredients = new HashMap<>();
|
||||
public String name;
|
||||
public Glassware glassware;
|
||||
public int colour;
|
||||
@@ -84,7 +84,6 @@ public enum Cocktail {
|
||||
}
|
||||
|
||||
static {
|
||||
cocktailIngredients = new HashMap<>();
|
||||
Cocktail.Bellini.add(Alcohol.SparklingWine, 2);
|
||||
Cocktail.Bellini.add(Juice.Peach, 1);
|
||||
Cocktail.BlackRussian.add(Spirit.Vodka, 5);
|
||||
|
||||
@@ -7,7 +7,7 @@ import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class DrinkManager {
|
||||
static Map<String, IDrinkLiquid> drinkLiquids;
|
||||
static Map<String, IDrinkLiquid> drinkLiquids = new HashMap<>();
|
||||
|
||||
public static IDrinkLiquid getLiquid(final String id) {
|
||||
return DrinkManager.drinkLiquids.get(id.toLowerCase());
|
||||
@@ -26,7 +26,4 @@ public class DrinkManager {
|
||||
return (fluid != null) ? getLiquid(fluid.getFluid()) : null;
|
||||
}
|
||||
|
||||
static {
|
||||
DrinkManager.drinkLiquids = new HashMap<>();
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,7 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class NBTShapedRecipes implements IRecipe {
|
||||
static List<NBTShapedRecipe> recipes;
|
||||
static List<NBTShapedRecipe> recipes = new ArrayList<>();
|
||||
|
||||
@Override
|
||||
public boolean matches(final InventoryCrafting inventory, final World world) {
|
||||
@@ -51,7 +51,4 @@ public class NBTShapedRecipes implements IRecipe {
|
||||
NBTShapedRecipes.recipes.add(nbtShapedRecipe);
|
||||
}
|
||||
|
||||
static {
|
||||
NBTShapedRecipes.recipes = new ArrayList<>();
|
||||
}
|
||||
}
|
||||
@@ -24,7 +24,7 @@ import java.util.List;
|
||||
|
||||
public abstract class BlockDesign extends BlockMetadata implements IMultipassBlock {
|
||||
IDesignSystem designSystem;
|
||||
public static final EnumFacing[] RENDER_DIRECTIONS;
|
||||
public static final EnumFacing[] RENDER_DIRECTIONS = new EnumFacing[]{EnumFacing.DOWN, EnumFacing.UP, EnumFacing.EAST, EnumFacing.WEST, EnumFacing.NORTH, EnumFacing.SOUTH};
|
||||
|
||||
@SubscribeEvent
|
||||
public void onClick(final PlayerInteractEvent.RightClickBlock event) {
|
||||
@@ -157,7 +157,4 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
|
||||
return 2;
|
||||
}
|
||||
|
||||
static {
|
||||
RENDER_DIRECTIONS = new EnumFacing[]{EnumFacing.DOWN, EnumFacing.UP, EnumFacing.EAST, EnumFacing.WEST, EnumFacing.NORTH, EnumFacing.SOUTH};
|
||||
}
|
||||
}
|
||||
@@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack;
|
||||
import java.util.*;
|
||||
|
||||
public class CarpentryInterface implements ICarpentryInterface {
|
||||
static Map<Integer, IDesignMaterial> woodMap;
|
||||
static Map<Integer, IDesign> designMap;
|
||||
static Map<String, IDesignCategory> designCategories;
|
||||
static Map<Integer, IDesignMaterial> woodMap = new LinkedHashMap<>();
|
||||
static Map<Integer, IDesign> designMap = new LinkedHashMap<>();
|
||||
static Map<String, IDesignCategory> designCategories = new HashMap<>();
|
||||
|
||||
@Override
|
||||
public boolean registerCarpentryWood(final int index, final IDesignMaterial wood) {
|
||||
@@ -102,9 +102,4 @@ public class CarpentryInterface implements ICarpentryInterface {
|
||||
return null;
|
||||
}
|
||||
|
||||
static {
|
||||
CarpentryInterface.woodMap = new LinkedHashMap<>();
|
||||
CarpentryInterface.designMap = new LinkedHashMap<>();
|
||||
CarpentryInterface.designCategories = new HashMap<>();
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
public class DesignerManager {
|
||||
public static DesignerManager instance;
|
||||
public static DesignerManager instance = new DesignerManager();;
|
||||
List<IDesignSystem> systems;
|
||||
|
||||
public DesignerManager() {
|
||||
@@ -26,7 +26,4 @@ public class DesignerManager {
|
||||
this.systems.add(system);
|
||||
}
|
||||
|
||||
static {
|
||||
DesignerManager.instance = new DesignerManager();
|
||||
}
|
||||
}
|
||||
@@ -8,9 +8,6 @@ import binnie.core.mod.config.PropBoolean;
|
||||
public class ConfigurationMain {
|
||||
@ConfigProperty(key = "lemon.citrus.family", comment = {"Uses reflection to convert the Forestry lemon tree to the Citrus family."})
|
||||
@PropBoolean
|
||||
public static boolean alterLemon;
|
||||
public static boolean alterLemon = true;
|
||||
|
||||
static {
|
||||
ConfigurationMain.alterLemon = true;
|
||||
}
|
||||
}
|
||||
@@ -12,15 +12,15 @@ public enum ExtraTreeTexture implements IBinnieTexture {
|
||||
|
||||
String texture;
|
||||
ResourceType type;
|
||||
public static String carpenterTexture;
|
||||
public static String panelerTexture;
|
||||
public static String tileworkerTexture;
|
||||
public static String incubatorTexture;
|
||||
public static String lumbermillTexture;
|
||||
public static String pressTexture;
|
||||
public static String distilleryTexture;
|
||||
public static String breweryTexture;
|
||||
public static String infuserTexture;
|
||||
public static String carpenterTexture = "extratrees/carpenter_";
|
||||
public static String panelerTexture = "extratrees/paneler_";
|
||||
public static String tileworkerTexture = "extratrees/tileworker_";
|
||||
public static String incubatorTexture = "extratrees/incubator_";
|
||||
public static String lumbermillTexture = "extratrees/sawmill_";
|
||||
public static String pressTexture = "extratrees/press_";
|
||||
public static String distilleryTexture = "extratrees/distillery_";
|
||||
public static String breweryTexture = "extratrees/brewery_";
|
||||
public static String infuserTexture = "extratrees/infuser_";
|
||||
|
||||
ExtraTreeTexture(final ResourceType base, final String texture) {
|
||||
this.texture = texture;
|
||||
@@ -32,15 +32,4 @@ public enum ExtraTreeTexture implements IBinnieTexture {
|
||||
return Binnie.Resource.getPNG(ExtraTrees.instance, this.type, this.texture);
|
||||
}
|
||||
|
||||
static {
|
||||
ExtraTreeTexture.carpenterTexture = "extratrees/carpenter_";
|
||||
ExtraTreeTexture.panelerTexture = "extratrees/paneler_";
|
||||
ExtraTreeTexture.tileworkerTexture = "extratrees/tileworker_";
|
||||
ExtraTreeTexture.incubatorTexture = "extratrees/incubator_";
|
||||
ExtraTreeTexture.lumbermillTexture = "extratrees/sawmill_";
|
||||
ExtraTreeTexture.pressTexture = "extratrees/press_";
|
||||
ExtraTreeTexture.distilleryTexture = "extratrees/distillery_";
|
||||
ExtraTreeTexture.breweryTexture = "extratrees/brewery_";
|
||||
ExtraTreeTexture.infuserTexture = "extratrees/infuser_";
|
||||
}
|
||||
}
|
||||
@@ -7,8 +7,8 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class MachineRendererKitchen {
|
||||
static int level;
|
||||
public static MachineRendererKitchen instance;
|
||||
static int level = 0;
|
||||
public static MachineRendererKitchen instance = new MachineRendererKitchen();;
|
||||
BinnieResource texture;
|
||||
|
||||
public void renderMachine(final Machine machine, final BinnieResource texture, final double x, final double y, final double z, final float var8) {
|
||||
@@ -85,8 +85,4 @@ public class MachineRendererKitchen {
|
||||
// }
|
||||
}
|
||||
|
||||
static {
|
||||
MachineRendererKitchen.level = 0;
|
||||
MachineRendererKitchen.instance = new MachineRendererKitchen();
|
||||
}
|
||||
}
|
||||
@@ -32,13 +32,13 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class Brewery {
|
||||
public static int[] slotRecipeGrains;
|
||||
public static int slotRecipeInput;
|
||||
public static int slotRecipeYeast;
|
||||
public static int[] slotInventory;
|
||||
public static int tankInput;
|
||||
public static int tankOutput;
|
||||
private static List<IBreweryRecipe> recipes;
|
||||
public static int[] slotRecipeGrains = new int[]{0, 1, 2};
|
||||
public static int slotRecipeInput = 3;
|
||||
public static int slotRecipeYeast = 4;
|
||||
public static int[] slotInventory = new int[]{5, 6, 7, 8, 9, 10, 11, 12, 13};
|
||||
public static int tankInput = 0;
|
||||
public static int tankOutput = 1;
|
||||
private static List<IBreweryRecipe> recipes = new ArrayList<>();
|
||||
|
||||
public static boolean isValidGrain(final ItemStack itemstack) {
|
||||
for (final IBreweryRecipe recipe : Brewery.recipes) {
|
||||
@@ -125,16 +125,6 @@ public class Brewery {
|
||||
Brewery.recipes.add(new BeerRecipe());
|
||||
}
|
||||
|
||||
static {
|
||||
Brewery.slotRecipeGrains = new int[]{0, 1, 2};
|
||||
Brewery.slotRecipeInput = 3;
|
||||
Brewery.slotRecipeYeast = 4;
|
||||
Brewery.slotInventory = new int[]{5, 6, 7, 8, 9, 10, 11, 12, 13};
|
||||
Brewery.tankInput = 0;
|
||||
Brewery.tankOutput = 1;
|
||||
Brewery.recipes = new ArrayList<>();
|
||||
}
|
||||
|
||||
public static class PackageBrewery extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation {
|
||||
public PackageBrewery() {
|
||||
super("brewery", ExtraTreeTexture.breweryTexture, true);
|
||||
@@ -453,11 +443,11 @@ public class Brewery {
|
||||
public static class BeerRecipe implements IBreweryRecipe {
|
||||
Map<ItemStack, String> grainCrops;
|
||||
List<FluidStack> outputs;
|
||||
static String barley;
|
||||
static String wheat;
|
||||
static String rye;
|
||||
static String corn;
|
||||
static String roasted;
|
||||
static String barley = "seedBarley";
|
||||
static String wheat = "seedWheat";
|
||||
static String rye = "seedRye";
|
||||
static String corn = "seedCorn";
|
||||
static String roasted = "seedRoasted";
|
||||
String[] grains;
|
||||
FluidStack water;
|
||||
ItemStack hops;
|
||||
@@ -570,14 +560,6 @@ public class Brewery {
|
||||
public ItemStack[] getYeasts() {
|
||||
return new ItemStack[]{ExtraTreeItems.Yeast.get(1), ExtraTreeItems.LagerYeast.get(1)};
|
||||
}
|
||||
|
||||
static {
|
||||
BeerRecipe.barley = "seedBarley";
|
||||
BeerRecipe.wheat = "seedWheat";
|
||||
BeerRecipe.rye = "seedRye";
|
||||
BeerRecipe.corn = "seedCorn";
|
||||
BeerRecipe.roasted = "seedRoasted";
|
||||
}
|
||||
}
|
||||
|
||||
private interface IBreweryRecipe {
|
||||
|
||||
@@ -23,15 +23,9 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||
import java.util.Map;
|
||||
|
||||
public abstract class Designer {
|
||||
public static int beeswaxSlot;
|
||||
public static int design1Slot;
|
||||
public static int design2Slot;
|
||||
|
||||
static {
|
||||
Designer.beeswaxSlot = 0;
|
||||
Designer.design1Slot = 1;
|
||||
Designer.design2Slot = 2;
|
||||
}
|
||||
public static int beeswaxSlot = 0;
|
||||
public static int design1Slot = 1;
|
||||
public static int design2Slot = 2;
|
||||
|
||||
public static class PackageWoodworker extends PackageCarpenter {
|
||||
public PackageWoodworker() {
|
||||
|
||||
@@ -27,8 +27,8 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class Distillery {
|
||||
public static int tankInput;
|
||||
public static int tankOutput;
|
||||
public static int tankInput = 0;
|
||||
public static int tankOutput = 1;
|
||||
static List<Map<Fluid, FluidStack>> recipes;
|
||||
|
||||
public static FluidStack getOutput(final FluidStack fluid, final int level) {
|
||||
@@ -63,8 +63,6 @@ public class Distillery {
|
||||
}
|
||||
|
||||
static {
|
||||
Distillery.tankInput = 0;
|
||||
Distillery.tankOutput = 1;
|
||||
(Distillery.recipes = new ArrayList<>()).add(new HashMap<>());
|
||||
Distillery.recipes.add(new HashMap<>());
|
||||
Distillery.recipes.add(new HashMap<>());
|
||||
|
||||
@@ -22,9 +22,9 @@ import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class Infuser {
|
||||
public static int tankInput;
|
||||
public static int tankOutput;
|
||||
static Map<Fluid, FluidStack> recipes;
|
||||
public static int tankInput = 0;
|
||||
public static int tankOutput = 1;
|
||||
static Map<Fluid, FluidStack> recipes = new HashMap<>();
|
||||
|
||||
public static FluidStack getOutput(final FluidStack fluid, final ItemStack stack) {
|
||||
if (fluid == null) {
|
||||
@@ -50,12 +50,6 @@ public class Infuser {
|
||||
Infuser.recipes.put(input.getFluid(), output);
|
||||
}
|
||||
|
||||
static {
|
||||
Infuser.tankInput = 0;
|
||||
Infuser.tankOutput = 1;
|
||||
Infuser.recipes = new HashMap<>();
|
||||
}
|
||||
|
||||
public static class PackageInfuser extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation {
|
||||
public PackageInfuser() {
|
||||
super("infuser", ExtraTreeTexture.infuserTexture, true);
|
||||
|
||||
@@ -29,12 +29,12 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||
import java.util.*;
|
||||
|
||||
public class Lumbermill {
|
||||
public static int slotWood;
|
||||
public static int slotPlanks;
|
||||
public static int slotBark;
|
||||
public static int slotSawdust;
|
||||
public static int tankWater;
|
||||
static Map<ItemStack, ItemStack> recipes;
|
||||
public static int slotWood = 0;
|
||||
public static int slotPlanks = 1;
|
||||
public static int slotBark = 2;
|
||||
public static int slotSawdust = 3;
|
||||
public static int tankWater = 0;
|
||||
static Map<ItemStack, ItemStack> recipes = new HashMap<>();
|
||||
|
||||
public static ItemStack getPlankProduct(final ItemStack item) {
|
||||
ItemStack stack = null;
|
||||
@@ -103,15 +103,6 @@ public class Lumbermill {
|
||||
return list;
|
||||
}
|
||||
|
||||
static {
|
||||
Lumbermill.slotWood = 0;
|
||||
Lumbermill.slotPlanks = 1;
|
||||
Lumbermill.slotBark = 2;
|
||||
Lumbermill.slotSawdust = 3;
|
||||
Lumbermill.tankWater = 0;
|
||||
Lumbermill.recipes = new HashMap<>();
|
||||
}
|
||||
|
||||
public static class PackageLumbermill extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation {
|
||||
public PackageLumbermill() {
|
||||
super("lumbermill", ExtraTreeTexture.lumbermillTexture, true);
|
||||
|
||||
@@ -8,7 +8,7 @@ import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class MachineRendererForestry {
|
||||
static Map<String, Object> instances;
|
||||
static Map<String, Object> instances = new HashMap<>();
|
||||
static Method renderMethod;
|
||||
|
||||
private static void loadMethod(final String file, final boolean waterTank, final boolean productTank) {
|
||||
@@ -34,7 +34,4 @@ public class MachineRendererForestry {
|
||||
}
|
||||
}
|
||||
|
||||
static {
|
||||
MachineRendererForestry.instances = new HashMap<>();
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ import binnie.extratrees.ExtraTrees;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class MachineRendererNursery {
|
||||
public static MachineRendererNursery instance;
|
||||
public static MachineRendererNursery instance = new MachineRendererNursery();;
|
||||
BinnieResource texture;
|
||||
//private IModelCustom casinoMachine;
|
||||
private ModelNursery model;
|
||||
@@ -26,7 +26,4 @@ public class MachineRendererNursery {
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
static {
|
||||
MachineRendererNursery.instance = new MachineRendererNursery();
|
||||
}
|
||||
}
|
||||
@@ -6,11 +6,7 @@ import binnie.extratrees.core.ExtraTreeTexture;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
public class Nursery {
|
||||
public static int slotCaterpillar;
|
||||
|
||||
static {
|
||||
Nursery.slotCaterpillar = 0;
|
||||
}
|
||||
public static int slotCaterpillar = 0;
|
||||
|
||||
public static class PackageNursery extends ExtraTreeMachine.PackageExtraTreeMachine {
|
||||
public PackageNursery() {
|
||||
|
||||
@@ -21,10 +21,10 @@ import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class Press {
|
||||
public static int slotFruit;
|
||||
public static int slotCurrent;
|
||||
public static int tankWater;
|
||||
private static Map<ItemStack, FluidStack> pressRecipes;
|
||||
public static int slotFruit = 0;
|
||||
public static int slotCurrent = 1;
|
||||
public static int tankWater = 0;
|
||||
private static Map<ItemStack, FluidStack> pressRecipes = new HashMap<>();
|
||||
|
||||
public static boolean isInput(final ItemStack itemstack) {
|
||||
return getOutput(itemstack) != null;
|
||||
@@ -49,13 +49,6 @@ public class Press {
|
||||
Press.pressRecipes.put(stack, fluid);
|
||||
}
|
||||
|
||||
static {
|
||||
Press.slotFruit = 0;
|
||||
Press.slotCurrent = 1;
|
||||
Press.tankWater = 0;
|
||||
Press.pressRecipes = new HashMap<>();
|
||||
}
|
||||
|
||||
public static class PackagePress extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation {
|
||||
public PackagePress() {
|
||||
super("press", ExtraTreeTexture.pressTexture, true);
|
||||
|
||||
@@ -9,7 +9,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
public class CreativeTabGenetics extends CreativeTabs {
|
||||
public static CreativeTabs instance;
|
||||
public static CreativeTabs instance = new CreativeTabGenetics();
|
||||
|
||||
@Override
|
||||
public ItemStack getIconItemStack() {
|
||||
@@ -37,7 +37,4 @@ public class CreativeTabGenetics extends CreativeTabs {
|
||||
return null;
|
||||
}
|
||||
|
||||
static {
|
||||
CreativeTabGenetics.instance = new CreativeTabGenetics();
|
||||
}
|
||||
}
|
||||
@@ -25,12 +25,12 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||
|
||||
@Mod(modid = Constants.GENETICS_MOD_ID, name = "Binnie's Genetics", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
|
||||
public class Genetics extends AbstractMod {
|
||||
public static ItemSerumArray itemSerumArray;
|
||||
public static ItemSerumArray itemSerumArray = null;
|
||||
@Mod.Instance(Constants.GENETICS_MOD_ID)
|
||||
public static Genetics instance;
|
||||
@SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer")
|
||||
public static Proxy proxy;
|
||||
public static String channel;
|
||||
public static String channel = "GEN";
|
||||
public static Item itemGenetics;
|
||||
public static Item itemSerum;
|
||||
public static Item itemSequencer;
|
||||
@@ -100,11 +100,6 @@ public class Genetics extends AbstractMod {
|
||||
return BinnieCore.isGeneticsActive();
|
||||
}
|
||||
|
||||
static {
|
||||
Genetics.itemSerumArray = null;
|
||||
Genetics.channel = "GEN";
|
||||
}
|
||||
|
||||
public static class PacketHandler extends BinniePacketHandler {
|
||||
public PacketHandler() {
|
||||
super(Genetics.instance);
|
||||
|
||||
@@ -26,7 +26,7 @@ public enum GeneticsTexture implements IBinnieTexture {
|
||||
|
||||
String texture;
|
||||
ResourceType type;
|
||||
public static BinnieIcon dnaIcon;
|
||||
public static BinnieIcon dnaIcon = Binnie.Resource.getItemIcon(Genetics.instance, "dna");
|
||||
|
||||
GeneticsTexture(final ResourceType base, final String texture) {
|
||||
this.texture = texture;
|
||||
@@ -38,7 +38,4 @@ public enum GeneticsTexture implements IBinnieTexture {
|
||||
return Binnie.Resource.getPNG(Genetics.instance, this.type, this.texture);
|
||||
}
|
||||
|
||||
static {
|
||||
GeneticsTexture.dnaIcon = Binnie.Resource.getItemIcon(Genetics.instance, "dna");
|
||||
}
|
||||
}
|
||||
@@ -31,13 +31,13 @@ import javax.annotation.Nullable;
|
||||
import java.util.*;
|
||||
|
||||
public class Acclimatiser {
|
||||
public static final int[] slotReserve;
|
||||
public static final int[] slotReserve = new int[]{0, 1, 2, 3};
|
||||
public static final int slotTarget = 4;
|
||||
public static final int[] slotAcclimatiser;
|
||||
public static final int[] slotDone;
|
||||
private static List<ToleranceSystem> toleranceSystems;
|
||||
private static Map<ItemStack, Float> temperatureItems;
|
||||
private static Map<ItemStack, Float> humidityItems;
|
||||
public static final int[] slotAcclimatiser = new int[]{5, 6, 7};
|
||||
public static final int[] slotDone = new int[]{8, 9, 10, 11};
|
||||
private static List<ToleranceSystem> toleranceSystems = new ArrayList<>();
|
||||
private static Map<ItemStack, Float> temperatureItems = new HashMap<>();
|
||||
private static Map<ItemStack, Float> humidityItems = new HashMap<>();
|
||||
|
||||
@Nullable
|
||||
private static ToleranceSystem getToleranceSystem(final ItemStack stack, final ItemStack acclim) {
|
||||
@@ -169,15 +169,6 @@ public class Acclimatiser {
|
||||
return Tolerance.get(both[avg]);
|
||||
}
|
||||
|
||||
static {
|
||||
slotReserve = new int[]{0, 1, 2, 3};
|
||||
slotAcclimatiser = new int[]{5, 6, 7};
|
||||
slotDone = new int[]{8, 9, 10, 11};
|
||||
Acclimatiser.toleranceSystems = new ArrayList<>();
|
||||
Acclimatiser.temperatureItems = new HashMap<>();
|
||||
Acclimatiser.humidityItems = new HashMap<>();
|
||||
}
|
||||
|
||||
public static class PackageAcclimatiser extends GeneticMachine.PackageGeneticBase implements IMachineInformation {
|
||||
public PackageAcclimatiser() {
|
||||
super("acclimatiser", GeneticsTexture.Acclimatiser, 9857609, true);
|
||||
|
||||
@@ -36,9 +36,9 @@ import org.lwjgl.opengl.GL11;
|
||||
import java.util.Random;
|
||||
|
||||
public class Analyser {
|
||||
public static final int[] slotReserve;
|
||||
public static final int[] slotReserve = new int[]{0, 1, 2, 3, 4, 5};
|
||||
public static final int slotTarget = 6;
|
||||
public static final int[] slotFinished;
|
||||
public static final int[] slotFinished = new int[]{7, 8, 9, 10, 11, 12};
|
||||
public static final int slotDye = 13;
|
||||
|
||||
public static boolean isAnalysable(final ItemStack stack) {
|
||||
@@ -74,11 +74,6 @@ public class Analyser {
|
||||
return stack;
|
||||
}
|
||||
|
||||
static {
|
||||
slotReserve = new int[]{0, 1, 2, 3, 4, 5};
|
||||
slotFinished = new int[]{7, 8, 9, 10, 11, 12};
|
||||
}
|
||||
|
||||
public static class PackageAnalyser extends GeneticMachine.PackageGeneticBase implements IMachineInformation {
|
||||
public PackageAnalyser() {
|
||||
super("analyser", GeneticsTexture.Analyser, 9961727, true);
|
||||
|
||||
@@ -29,15 +29,11 @@ import java.util.Random;
|
||||
|
||||
public class Genepool {
|
||||
public static final int slotBee = 0;
|
||||
public static final int[] slotReserve;
|
||||
public static final int[] slotReserve = new int[]{1, 2, 3, 4, 5, 6};
|
||||
public static final int tankDNA = 0;
|
||||
public static final int tankEthanol = 1;
|
||||
public static final int slotEnzyme = 7;
|
||||
|
||||
static {
|
||||
slotReserve = new int[]{1, 2, 3, 4, 5, 6};
|
||||
}
|
||||
|
||||
public static class PackageGenepool extends GeneticMachine.PackageGeneticBase implements IMachineInformation {
|
||||
public PackageGenepool() {
|
||||
super("genepool", GeneticsTexture.Genepool, 12661942, true);
|
||||
|
||||
@@ -33,12 +33,12 @@ import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
public class Incubator {
|
||||
public static final int[] slotQueue;
|
||||
public static final int[] slotQueue = new int[]{0, 1, 2};
|
||||
public static final int slotIncubator = 3;
|
||||
public static final int[] slotOutput;
|
||||
public static final int[] slotOutput = new int[]{4, 5, 6};
|
||||
public static final int tankInput = 0;
|
||||
public static final int tankOutput = 1;
|
||||
private static List<IIncubatorRecipe> RECIPES;
|
||||
private static List<IIncubatorRecipe> RECIPES = new ArrayList<>();
|
||||
|
||||
public static void addRecipes() {
|
||||
Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), Binnie.Liquid.getLiquidStack("water", 25), GeneticLiquid.GrowthMedium.get(25), 0.2f));
|
||||
@@ -66,12 +66,6 @@ public class Incubator {
|
||||
return Collections.unmodifiableList(RECIPES);
|
||||
}
|
||||
|
||||
static {
|
||||
slotQueue = new int[]{0, 1, 2};
|
||||
slotOutput = new int[]{4, 5, 6};
|
||||
Incubator.RECIPES = new ArrayList<>();
|
||||
}
|
||||
|
||||
public static class PackageIncubator extends GeneticMachine.PackageGeneticBase implements IMachineInformation {
|
||||
public PackageIncubator() {
|
||||
super("incubator", GeneticsTexture.Incubator, 16767313, true);
|
||||
|
||||
@@ -44,11 +44,11 @@ import java.util.Random;
|
||||
|
||||
public class Inoculator {
|
||||
public static final int slotSerumVial = 0;
|
||||
public static final int[] slotSerumReserve;
|
||||
public static final int[] slotSerumExpended;
|
||||
public static final int[] slotReserve;
|
||||
public static final int[] slotSerumReserve = new int[]{1, 2};
|
||||
public static final int[] slotSerumExpended = new int[]{3, 4};
|
||||
public static final int[] slotReserve = new int[]{5, 6, 7, 8};
|
||||
public static final int slotTarget = 9;
|
||||
public static final int[] slotFinished;
|
||||
public static final int[] slotFinished = new int[]{10, 11, 12, 13};
|
||||
public static final int tankVector = 0;
|
||||
|
||||
public static void setGene(final IGene gene, final ItemStack target, final int chromoN) {
|
||||
@@ -69,13 +69,6 @@ public class Inoculator {
|
||||
target.setTagCompound(beeNBT);
|
||||
}
|
||||
|
||||
static {
|
||||
slotSerumReserve = new int[]{1, 2};
|
||||
slotSerumExpended = new int[]{3, 4};
|
||||
slotReserve = new int[]{5, 6, 7, 8};
|
||||
slotFinished = new int[]{10, 11, 12, 13};
|
||||
}
|
||||
|
||||
public static class PackageInoculator extends GeneticMachine.PackageGeneticBase implements IMachineInformation {
|
||||
public PackageInoculator() {
|
||||
super("inoculator", GeneticsTexture.Inoculator, 14819893, true);
|
||||
|
||||
@@ -30,17 +30,12 @@ import java.util.Random;
|
||||
public class Isolator {
|
||||
public static final int slotEnzyme = 0;
|
||||
public static final int slotSequencerVial = 1;
|
||||
public static final int[] slotReserve;
|
||||
public static final int[] slotReserve = new int[]{2, 3, 4};
|
||||
public static final int slotTarget = 5;
|
||||
public static final int slotResult = 6;
|
||||
public static final int[] slotFinished;
|
||||
public static final int[] slotFinished = new int[]{7, 8, 9, 10, 11, 12};
|
||||
public static final int tankEthanol = 0;
|
||||
|
||||
static {
|
||||
slotReserve = new int[]{2, 3, 4};
|
||||
slotFinished = new int[]{7, 8, 9, 10, 11, 12};
|
||||
}
|
||||
|
||||
public static class PackageIsolator extends GeneticMachine.PackageGeneticBase implements IMachineInformation {
|
||||
public PackageIsolator() {
|
||||
super("isolator", GeneticsTexture.Isolator, 16740111, true);
|
||||
|
||||
@@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class MachineRendererGenetics {
|
||||
public static MachineRendererGenetics instance;
|
||||
public static MachineRendererGenetics instance = new MachineRendererGenetics();
|
||||
public final RenderItem customRenderItem;
|
||||
private ModelMachine model;
|
||||
|
||||
@@ -62,7 +62,4 @@ public class MachineRendererGenetics {
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
static {
|
||||
MachineRendererGenetics.instance = new MachineRendererGenetics();
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class MachineRendererLab {
|
||||
public static MachineRendererLab instance;
|
||||
public static MachineRendererLab instance = new MachineRendererLab();
|
||||
private final EntityItem dummyEntityItem;
|
||||
private final EntityItem[] itemSides;
|
||||
// private final RenderItem customRenderItem;
|
||||
@@ -106,7 +106,4 @@ public class MachineRendererLab {
|
||||
// GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
static {
|
||||
MachineRendererLab.instance = new MachineRendererLab();
|
||||
}
|
||||
}
|
||||
@@ -31,13 +31,8 @@ public class Polymeriser {
|
||||
public static final int tankDNA = 1;
|
||||
public static final int slotSerum = 0;
|
||||
public static final int slotGold = 1;
|
||||
public static final int[] slotSerumReserve;
|
||||
public static final int[] slotSerumFinished;
|
||||
|
||||
static {
|
||||
slotSerumReserve = new int[]{2, 3, 4, 5};
|
||||
slotSerumFinished = new int[]{6, 7, 8, 9};
|
||||
}
|
||||
public static final int[] slotSerumReserve = new int[]{2, 3, 4, 5};
|
||||
public static final int[] slotSerumFinished = new int[]{6, 7, 8, 9};
|
||||
|
||||
public static class PackagePolymeriser extends GeneticMachine.PackageGeneticBase implements IMachineInformation {
|
||||
public PackagePolymeriser() {
|
||||
@@ -112,7 +107,7 @@ public class Polymeriser {
|
||||
}
|
||||
|
||||
public static class ComponentPolymeriserLogic extends ComponentProcessSetCost implements IProcess {
|
||||
private static float chargePerProcess;
|
||||
private static float chargePerProcess = 0.4f;
|
||||
private float dnaDrain;
|
||||
private float bacteriaDrain;
|
||||
|
||||
@@ -197,10 +192,6 @@ public class Polymeriser {
|
||||
super.onFinishTask();
|
||||
this.getUtil().damageItem(0, -1);
|
||||
}
|
||||
|
||||
static {
|
||||
ComponentPolymeriserLogic.chargePerProcess = 0.4f;
|
||||
}
|
||||
}
|
||||
|
||||
public static class SlotValidatorUnfilledSerum extends SlotValidator {
|
||||
|
||||
@@ -29,7 +29,7 @@ import java.util.Random;
|
||||
|
||||
public class Sequencer {
|
||||
public static final int slotDye = 0;
|
||||
public static final int[] slotReserve;
|
||||
public static final int[] slotReserve = new int[]{1, 2, 3, 4};
|
||||
public static final int slotTarget = 5;
|
||||
public static final int slotDone = 6;
|
||||
public static BinnieIcon fxSeqA;
|
||||
@@ -37,10 +37,6 @@ public class Sequencer {
|
||||
public static BinnieIcon fxSeqT;
|
||||
public static BinnieIcon fxSeqC;
|
||||
|
||||
static {
|
||||
slotReserve = new int[]{1, 2, 3, 4};
|
||||
}
|
||||
|
||||
public static class PackageSequencer extends GeneticMachine.PackageGeneticBase implements IMachineInformation {
|
||||
public PackageSequencer() {
|
||||
super("sequencer", GeneticsTexture.Sequencer, 12058418, true);
|
||||
|
||||
@@ -45,11 +45,11 @@ import java.util.Random;
|
||||
|
||||
public class Splicer {
|
||||
public static final int slotSerumVial = 0;
|
||||
public static final int[] slotSerumReserve;
|
||||
public static final int[] slotSerumExpended;
|
||||
public static final int[] slotReserve;
|
||||
public static final int[] slotSerumReserve = new int[]{1, 2};
|
||||
public static final int[] slotSerumExpended = new int[]{3, 4};
|
||||
public static final int[] slotReserve = new int[]{5, 6, 7, 8, 9};
|
||||
public static final int slotTarget = 9;
|
||||
public static final int[] slotFinished;
|
||||
public static final int[] slotFinished = new int[]{10, 11, 12, 13};
|
||||
|
||||
public static void setGene(final IGene gene, final ItemStack target, final int chromoN) {
|
||||
int chromosomeID;
|
||||
@@ -69,13 +69,6 @@ public class Splicer {
|
||||
target.setTagCompound(beeNBT);
|
||||
}
|
||||
|
||||
static {
|
||||
slotSerumReserve = new int[]{1, 2};
|
||||
slotSerumExpended = new int[]{3, 4};
|
||||
slotReserve = new int[]{5, 6, 7, 8, 9};
|
||||
slotFinished = new int[]{10, 11, 12, 13};
|
||||
}
|
||||
|
||||
public static class PackageSplicer extends AdvGeneticMachine.PackageAdvGeneticBase implements IMachineInformation {
|
||||
public PackageSplicer() {
|
||||
super("splicer", GeneticsTexture.Splicer, 14819893, true);
|
||||
|
||||
Reference in new issue
Block a user