mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 03:49:07 +00:00
Remove unnecessary modifiers from enums and interfaces
This commit is contained in:
1 parent
55c58cf5d9
commit
507b8fa2d6
80 files changed
+106
-106
No files matched your search
@@ -18,7 +18,7 @@ public enum EnumFlowerChromosome implements IChromosomeType {
|
||||
|
||||
private Class<? extends IAllele> cls;
|
||||
|
||||
private EnumFlowerChromosome(final Class<? extends IAllele> cls) {
|
||||
EnumFlowerChromosome(final Class<? extends IAllele> cls) {
|
||||
this.cls = cls;
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ public enum EnumFlowerStage implements ISpeciesType {
|
||||
public static final EnumFlowerStage[] VALUES;
|
||||
String name;
|
||||
|
||||
private EnumFlowerStage(final String name) {
|
||||
EnumFlowerStage(final String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
|
||||
@@ -191,7 +191,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
|
||||
String name;
|
||||
//IIcon[] icons;
|
||||
|
||||
private TileType(final String id, final String name) {
|
||||
TileType(final String id, final String name) {
|
||||
//this.icons = new IIcon[3];
|
||||
this.id = id;
|
||||
this.name = name;
|
||||
|
||||
@@ -11,7 +11,7 @@ public enum BotanyTexture implements IBinnieTexture {
|
||||
String texture;
|
||||
ResourceType type;
|
||||
|
||||
private BotanyTexture(final ResourceType base, final String texture) {
|
||||
BotanyTexture(final ResourceType base, final String texture) {
|
||||
this.texture = texture;
|
||||
this.type = base;
|
||||
}
|
||||
|
||||
@@ -99,7 +99,7 @@ public class ItemInsulatedTube extends Item {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
private Material(final int color, final String name) {
|
||||
Material(final int color, final String name) {
|
||||
this.color = color;
|
||||
this.name = name;
|
||||
}
|
||||
@@ -128,7 +128,7 @@ public class ItemInsulatedTube extends Item {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
private Insulate(final int color, final String name) {
|
||||
Insulate(final int color, final String name) {
|
||||
this.color = color;
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ public class BlockPlant extends BlockBush {
|
||||
// public IIcon icon;
|
||||
String name;
|
||||
|
||||
private Type(final String name) {
|
||||
Type(final String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
|
||||
@@ -92,11 +92,11 @@ public enum EnumFlowerColor implements IFlowerColour {
|
||||
AlleleColor allele;
|
||||
String ident;
|
||||
|
||||
private EnumFlowerColor(final String ident, final int c) {
|
||||
EnumFlowerColor(final String ident, final int c) {
|
||||
this(c);
|
||||
}
|
||||
|
||||
private EnumFlowerColor(final int c) {
|
||||
EnumFlowerColor(final int c) {
|
||||
this.color = c;
|
||||
this.allele = new AlleleColor(this, "botany.color" + this.name(), this.toString(), this.color);
|
||||
int r = this.color >> 16 & 0xFF;
|
||||
|
||||
@@ -64,11 +64,11 @@ public enum EnumFlowerType implements IFlowerType {
|
||||
// IIcon pollenVariant;
|
||||
// IIcon blank;
|
||||
|
||||
private EnumFlowerType() {
|
||||
EnumFlowerType() {
|
||||
this(1);
|
||||
}
|
||||
|
||||
private EnumFlowerType(final int sections) {
|
||||
EnumFlowerType(final int sections) {
|
||||
this.sections = 1;
|
||||
this.sections = sections;
|
||||
// this.stem = new IIcon[sections];
|
||||
|
||||
@@ -349,11 +349,11 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
|
||||
BotanyCore.getFlowerRoot().registerMutation(new FlowerMutation(dandelion2, tulip2, this.getTemplate(), i));
|
||||
}
|
||||
|
||||
private FlowerSpecies(final String name, final String branch, final String binomial, final IFlowerType type, final EnumFlowerColor colour) {
|
||||
FlowerSpecies(final String name, final String branch, final String binomial, final IFlowerType type, final EnumFlowerColor colour) {
|
||||
this(name, branch, binomial, type, colour, colour);
|
||||
}
|
||||
|
||||
private FlowerSpecies(final String name, final String branch, final String binomial, final IFlowerType type, final EnumFlowerColor primaryColor, final EnumFlowerColor secondaryColor) {
|
||||
FlowerSpecies(final String name, final String branch, final String binomial, final IFlowerType type, final EnumFlowerColor primaryColor, final EnumFlowerColor secondaryColor) {
|
||||
this.stemColor = EnumFlowerColor.Green;
|
||||
this.temperature = EnumTemperature.NORMAL;
|
||||
this.pH = EnumAcidity.Neutral;
|
||||
|
||||
@@ -20,7 +20,7 @@ public enum BotanyItems implements IItemMisc {
|
||||
String name;
|
||||
String iconPath;
|
||||
|
||||
private BotanyItems(final String name, final String iconPath) {
|
||||
BotanyItems(final String name, final String iconPath) {
|
||||
this.name = name;
|
||||
this.iconPath = iconPath;
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ interface IBreedingMessage {
|
||||
|
||||
ItemStack getIcon();
|
||||
|
||||
public static class MessageSpeciesDiscovered implements IBreedingMessage {
|
||||
class MessageSpeciesDiscovered implements IBreedingMessage {
|
||||
IAlleleSpecies species;
|
||||
ItemStack stack;
|
||||
|
||||
@@ -49,7 +49,7 @@ interface IBreedingMessage {
|
||||
}
|
||||
}
|
||||
|
||||
public static class BranchDiscovered implements IBreedingMessage {
|
||||
class BranchDiscovered implements IBreedingMessage {
|
||||
IAlleleSpecies species;
|
||||
IClassification classification;
|
||||
ItemStack stack;
|
||||
@@ -84,7 +84,7 @@ interface IBreedingMessage {
|
||||
}
|
||||
}
|
||||
|
||||
public static class EpithetGained implements IBreedingMessage {
|
||||
class EpithetGained implements IBreedingMessage {
|
||||
String epithet;
|
||||
ItemStack stack;
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ public enum Tolerance {
|
||||
|
||||
private int[] bounds;
|
||||
|
||||
private Tolerance(final int a, final int b) {
|
||||
Tolerance(final int a, final int b) {
|
||||
this.bounds = new int[]{a, b};
|
||||
}
|
||||
|
||||
|
||||
@@ -5,11 +5,11 @@ import binnie.core.triggers.TriggerData;
|
||||
import java.util.List;
|
||||
|
||||
public interface IBuildcraft {
|
||||
public interface TriggerProvider {
|
||||
interface TriggerProvider {
|
||||
void getTriggers(final List<TriggerData> p0);
|
||||
}
|
||||
|
||||
public interface ActionProvider //extends IActionReceptor
|
||||
interface ActionProvider //extends IActionReceptor
|
||||
{
|
||||
// void getActions(final List<IActionExternal> p0);
|
||||
}
|
||||
|
||||
@@ -5,15 +5,15 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public interface IInteraction {
|
||||
public interface ChunkUnload {
|
||||
interface ChunkUnload {
|
||||
void onChunkUnload();
|
||||
}
|
||||
|
||||
public interface Invalidation {
|
||||
interface Invalidation {
|
||||
void onInvalidation();
|
||||
}
|
||||
|
||||
public interface RightClick {
|
||||
interface RightClick {
|
||||
void onRightClick(final World p0, final EntityPlayer p1, final BlockPos pos);
|
||||
}
|
||||
}
|
||||
@@ -8,17 +8,17 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import java.util.Random;
|
||||
|
||||
public interface IRender {
|
||||
public interface DisplayTick {
|
||||
interface DisplayTick {
|
||||
@SideOnly(Side.CLIENT)
|
||||
void onDisplayTick(final World p0, final int p1, final int p2, final int p3, final Random p4);
|
||||
}
|
||||
|
||||
public interface RandomDisplayTick {
|
||||
interface RandomDisplayTick {
|
||||
@SideOnly(Side.CLIENT)
|
||||
void onRandomDisplayTick(final World p0, final int p1, final int p2, final int p3, final Random p4);
|
||||
}
|
||||
|
||||
public interface Render {
|
||||
interface Render {
|
||||
@SideOnly(Side.CLIENT)
|
||||
void renderInWorld(final RenderItem p0, final double p1, final double p2, final double p3);
|
||||
}
|
||||
|
||||
@@ -7,20 +7,20 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||
import java.util.Map;
|
||||
|
||||
public interface INetwork {
|
||||
public interface SendGuiNBT {
|
||||
interface SendGuiNBT {
|
||||
void sendGuiNBT(final Map<String, NBTTagCompound> p0);
|
||||
}
|
||||
|
||||
public interface TilePacketSync {
|
||||
interface TilePacketSync {
|
||||
void syncToNBT(final NBTTagCompound p0);
|
||||
|
||||
void syncFromNBT(final NBTTagCompound p0);
|
||||
}
|
||||
|
||||
public interface RecieveGuiNBT {
|
||||
interface RecieveGuiNBT {
|
||||
void recieveGuiNBT(final Side p0, final EntityPlayer p1, final String p2, final NBTTagCompound p3);
|
||||
}
|
||||
|
||||
public interface GuiNBT extends RecieveGuiNBT, SendGuiNBT {
|
||||
interface GuiNBT extends RecieveGuiNBT, SendGuiNBT {
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@ public enum PowerSystem {
|
||||
|
||||
double conversion;
|
||||
|
||||
private PowerSystem(final double conversion) {
|
||||
PowerSystem(final double conversion) {
|
||||
this.conversion = conversion;
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ enum Compartment implements IMachineType {
|
||||
|
||||
Class<? extends MachinePackage> clss;
|
||||
|
||||
private Compartment(final Class<? extends MachinePackage> clss) {
|
||||
Compartment(final Class<? extends MachinePackage> clss) {
|
||||
this.clss = clss;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ public @interface ConfigProperty {
|
||||
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Target({ElementType.ANNOTATION_TYPE})
|
||||
public @interface Type {
|
||||
@interface Type {
|
||||
Class<? extends PropertyBase> propertyClass();
|
||||
|
||||
String category() default "general";
|
||||
|
||||
@@ -9,7 +9,7 @@ import java.lang.reflect.Field;
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@ConfigProperty.Type(propertyClass = PropBoolean.PropertyBoolean.class)
|
||||
public @interface PropBoolean {
|
||||
public static class PropertyBoolean extends PropertyBase<Boolean, PropBoolean> {
|
||||
class PropertyBoolean extends PropertyBase<Boolean, PropBoolean> {
|
||||
public PropertyBoolean(final Field field, final BinnieConfiguration file, final ConfigProperty configProperty, final PropBoolean annotedProperty) throws IllegalArgumentException, IllegalAccessException {
|
||||
super(field, file, configProperty, annotedProperty);
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import java.lang.reflect.Field;
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@ConfigProperty.Type(propertyClass = PropDouble.PropertyDouble.class)
|
||||
public @interface PropDouble {
|
||||
public static class PropertyDouble extends PropertyBase<Double, PropDouble> {
|
||||
class PropertyDouble extends PropertyBase<Double, PropDouble> {
|
||||
public PropertyDouble(final Field field, final BinnieConfiguration file, final ConfigProperty configProperty, final PropDouble annotedProperty) throws IllegalArgumentException, IllegalAccessException {
|
||||
super(field, file, configProperty, annotedProperty);
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import java.lang.reflect.Field;
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@ConfigProperty.Type(propertyClass = PropInteger.PropertyInteger.class)
|
||||
public @interface PropInteger {
|
||||
public static class PropertyInteger extends PropertyBase<Integer, PropInteger> {
|
||||
class PropertyInteger extends PropertyBase<Integer, PropInteger> {
|
||||
public PropertyInteger(final Field field, final BinnieConfiguration file, final ConfigProperty configProperty, final PropInteger annotedProperty) throws IllegalArgumentException, IllegalAccessException {
|
||||
super(field, file, configProperty, annotedProperty);
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ public @interface PropPercentage {
|
||||
|
||||
int lower() default 0;
|
||||
|
||||
public static class PropertyPercentage extends PropertyBase<Integer, PropPercentage> {
|
||||
class PropertyPercentage extends PropertyBase<Integer, PropPercentage> {
|
||||
public PropertyPercentage(final Field field, final BinnieConfiguration file, final ConfigProperty configProperty, final PropPercentage annotedProperty) throws IllegalArgumentException, IllegalAccessException {
|
||||
super(field, file, configProperty, annotedProperty);
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ public enum ResourceType {
|
||||
|
||||
String name;
|
||||
|
||||
private ResourceType(final String name) {
|
||||
ResourceType(final String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ public enum BinnieCoreTexture implements IBinnieTexture {
|
||||
String texture;
|
||||
ResourceType type;
|
||||
|
||||
private BinnieCoreTexture(final ResourceType base, final String texture) {
|
||||
BinnieCoreTexture(final ResourceType base, final String texture) {
|
||||
this.texture = texture;
|
||||
this.type = base;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ public enum Position {
|
||||
int x;
|
||||
int y;
|
||||
|
||||
private Position(final int x, final int y) {
|
||||
Position(final int x, final int y) {
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ public enum TextJustification {
|
||||
float xOffset;
|
||||
float yOffset;
|
||||
|
||||
private TextJustification(final float xOffset, final float yOffset) {
|
||||
TextJustification(final float xOffset, final float yOffset) {
|
||||
this.xOffset = xOffset;
|
||||
this.yOffset = yOffset;
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ public enum EnumColor {
|
||||
String name;
|
||||
char code;
|
||||
|
||||
private EnumColor(final String name, final int colour, final char code) {
|
||||
EnumColor(final String name, final int colour, final char code) {
|
||||
this.name = name;
|
||||
this.colour = colour;
|
||||
this.code = code;
|
||||
|
||||
@@ -34,7 +34,7 @@ public class MinecraftTooltip extends Tooltip {
|
||||
String mainText;
|
||||
String bodyText;
|
||||
|
||||
private TypeColour(final int outline, final TextFormatting mainText, final TextFormatting bodyText) {
|
||||
TypeColour(final int outline, final TextFormatting mainText, final TextFormatting bodyText) {
|
||||
this.outline = outline;
|
||||
this.mainText = mainText.toString();
|
||||
this.bodyText = bodyText.toString();
|
||||
|
||||
@@ -46,7 +46,7 @@ public enum CraftGUITexture {
|
||||
|
||||
String name;
|
||||
|
||||
private CraftGUITexture(final String name) {
|
||||
CraftGUITexture(final String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ public enum CraftGUITextureSheet implements IBinnieTexture {
|
||||
|
||||
String name;
|
||||
|
||||
private CraftGUITextureSheet(final String name) {
|
||||
CraftGUITextureSheet(final String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier {
|
||||
this.maxDamage = damage;
|
||||
}
|
||||
|
||||
private EnumHiveFrame() {
|
||||
EnumHiveFrame() {
|
||||
this.maxDamage = 240;
|
||||
this.logic = new BeeModifierLogic();
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ public enum IndustrialFrame implements IBeeModifier {
|
||||
int wearMod;
|
||||
int power;
|
||||
|
||||
private IndustrialFrame(final String name, final int wear, final int power) {
|
||||
IndustrialFrame(final String name, final int wear, final int power) {
|
||||
this.territoryMod = 1.0f;
|
||||
this.mutationMod = 1.0f;
|
||||
this.lifespanMod = 1.0f;
|
||||
|
||||
@@ -21,7 +21,7 @@ public enum AlvearyMachine implements IMachineType {
|
||||
|
||||
Class<? extends MachinePackage> clss;
|
||||
|
||||
private AlvearyMachine(final Class<? extends MachinePackage> clss) {
|
||||
AlvearyMachine(final Class<? extends MachinePackage> clss) {
|
||||
this.clss = clss;
|
||||
}
|
||||
|
||||
|
||||
@@ -318,7 +318,7 @@ public class AlvearyStimulator {
|
||||
public int power;
|
||||
BeeModifierLogic logic;
|
||||
|
||||
private CircuitType(final int recipe, final int power) {
|
||||
CircuitType(final int recipe, final int power) {
|
||||
this.logic = new BeeModifierLogic();
|
||||
this.recipe = recipe;
|
||||
this.power = power;
|
||||
|
||||
@@ -106,7 +106,7 @@ public enum ExtraBeeItems implements IItemMisc {
|
||||
RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getLiquidStack("for.honey", 500), (ItemStack) null, ExtraBeeItems.ScentedGear.get(1), new Object[]{" j ", "bgb", " p ", 'j', Mods.Forestry.item("royalJelly"), 'b', Mods.Forestry.item("beeswax"), 'p', Mods.Forestry.item("pollen"), 'g', gear});
|
||||
}
|
||||
|
||||
private ExtraBeeItems(final String name, final String iconPath) {
|
||||
ExtraBeeItems(final String name, final String iconPath) {
|
||||
this.metalString = null;
|
||||
this.gemString = null;
|
||||
this.name = name;
|
||||
|
||||
@@ -23,7 +23,7 @@ public enum ExtraBeeTexture implements IBinnieTexture {
|
||||
String texture;
|
||||
ResourceType type;
|
||||
|
||||
private ExtraBeeTexture(final ResourceType base, final String texture) {
|
||||
ExtraBeeTexture(final ResourceType base, final String texture) {
|
||||
this.texture = texture;
|
||||
this.type = base;
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ public enum ExtraBeesBranch implements IClassification {
|
||||
return ExtraBees.proxy.localiseOrBlank("branch." + this.toString().toLowerCase() + ".desc");
|
||||
}
|
||||
|
||||
private ExtraBeesBranch(final String scientific) {
|
||||
ExtraBeesBranch(final String scientific) {
|
||||
this.uid = "";
|
||||
this.scientific = "";
|
||||
this.speciesSet = new LinkedHashSet<>();
|
||||
|
||||
@@ -33,7 +33,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
|
||||
|
||||
boolean dominant;
|
||||
|
||||
private ExtraBeesFlowers() {
|
||||
ExtraBeesFlowers() {
|
||||
this.dominant = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -175,7 +175,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
|
||||
public State state;
|
||||
boolean nocturnal;
|
||||
|
||||
private ExtraBeesSpecies(final String binomial, final int colour) {
|
||||
ExtraBeesSpecies(final String binomial, final int colour) {
|
||||
this.primaryColor = 16777215;
|
||||
this.secondaryColor = 16768022;
|
||||
this.temperature = EnumTemperature.NORMAL;
|
||||
@@ -199,7 +199,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
|
||||
this.primaryColor = colour;
|
||||
}
|
||||
|
||||
private ExtraBeesSpecies() {
|
||||
ExtraBeesSpecies() {
|
||||
this.primaryColor = 16777215;
|
||||
this.secondaryColor = 16768022;
|
||||
this.temperature = EnumTemperature.NORMAL;
|
||||
|
||||
@@ -77,7 +77,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
|
||||
private String uid;
|
||||
static List<Birthday> birthdays;
|
||||
|
||||
private ExtraBeesEffect() {
|
||||
ExtraBeesEffect() {
|
||||
this.fx = "";
|
||||
this.uid = this.toString().toLowerCase();
|
||||
this.combinable = false;
|
||||
|
||||
@@ -51,7 +51,7 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase {
|
||||
|
||||
public int colour;
|
||||
|
||||
private SpeciesTab(final int colour) {
|
||||
SpeciesTab(final int colour) {
|
||||
this.colour = colour;
|
||||
}
|
||||
}
|
||||
@@ -62,7 +62,7 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase {
|
||||
|
||||
public int colour;
|
||||
|
||||
private BranchesTab(final int colour) {
|
||||
BranchesTab(final int colour) {
|
||||
this.colour = colour;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ public enum ExtraBeeLiquid implements ILiquidType {
|
||||
// IIcon icon;
|
||||
int colour;
|
||||
|
||||
private ExtraBeeLiquid(final String ident, final int colour) {
|
||||
ExtraBeeLiquid(final String ident, final int colour) {
|
||||
this.ident = ident;
|
||||
this.colour = colour;
|
||||
}
|
||||
|
||||
@@ -102,13 +102,13 @@ public enum EnumHoneyComb implements IItemEnum {
|
||||
boolean active;
|
||||
public boolean deprecated;
|
||||
|
||||
private EnumHoneyComb() {
|
||||
EnumHoneyComb() {
|
||||
this(16777215, 16777215);
|
||||
this.active = false;
|
||||
this.deprecated = true;
|
||||
}
|
||||
|
||||
private EnumHoneyComb(final int colour, final int colour2) {
|
||||
EnumHoneyComb(final int colour, final int colour2) {
|
||||
this.colour = new int[0];
|
||||
this.products = new LinkedHashMap<>();
|
||||
this.active = true;
|
||||
|
||||
@@ -49,11 +49,11 @@ public enum EnumHoneyDrop implements IItemEnum {
|
||||
this.deprecated = true;
|
||||
}
|
||||
|
||||
private EnumHoneyDrop() {
|
||||
EnumHoneyDrop() {
|
||||
this(16777215, 16777215, "");
|
||||
}
|
||||
|
||||
private EnumHoneyDrop(final int colour, final int colour2, final String liquid) {
|
||||
EnumHoneyDrop(final int colour, final int colour2, final String liquid) {
|
||||
this.liquidName = "";
|
||||
this.remenant = null;
|
||||
this.deprecated = false;
|
||||
|
||||
@@ -23,12 +23,12 @@ public enum EnumPropolis implements IItemEnum {
|
||||
String liquidName;
|
||||
boolean active;
|
||||
|
||||
private EnumPropolis() {
|
||||
EnumPropolis() {
|
||||
this(16777215, 16777215, "");
|
||||
this.active = false;
|
||||
}
|
||||
|
||||
private EnumPropolis(final int colour, final int colour2, final String liquid) {
|
||||
EnumPropolis(final int colour, final int colour2, final String liquid) {
|
||||
this.colour = new int[0];
|
||||
this.active = true;
|
||||
this.colour = new int[]{colour, colour2};
|
||||
|
||||
@@ -14,7 +14,7 @@ public enum EnumHiveType implements IStringSerializable {
|
||||
|
||||
public List<IHiveDrop> drops;
|
||||
|
||||
private EnumHiveType() {
|
||||
EnumHiveType() {
|
||||
this.drops = new ArrayList<>();
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ public enum Alcohol implements IFluidType, ICocktailLiquid {
|
||||
this.fermentationSolid = oreDict;
|
||||
}
|
||||
|
||||
private Alcohol(final String ident, final int colour, final double transparency, final double abv) {
|
||||
Alcohol(final String ident, final int colour, final double transparency, final double abv) {
|
||||
this.fermentationLiquid = new ArrayList<>();
|
||||
this.fermentationSolid = "";
|
||||
this.ident = ident;
|
||||
|
||||
@@ -43,7 +43,7 @@ public enum Cocktail {
|
||||
public int colour;
|
||||
public Map<ICocktailIngredient, Integer> ingredients;
|
||||
|
||||
private Cocktail(final String name, final Glassware glassware, final int colour) {
|
||||
Cocktail(final String name, final Glassware glassware, final int colour) {
|
||||
this.ingredients = new HashMap<>();
|
||||
this.name = name;
|
||||
this.glassware = glassware;
|
||||
|
||||
@@ -39,7 +39,7 @@ public enum Glassware {
|
||||
return this.capacity;
|
||||
}
|
||||
|
||||
private Glassware(final int capacity, final int contentBottom, final int contentHeight) {
|
||||
Glassware(final int capacity, final int contentBottom, final int contentHeight) {
|
||||
this.capacity = 30 * capacity;
|
||||
this.contentBottom = contentBottom / 32.0f;
|
||||
this.contentHeight = contentHeight / 32.0f;
|
||||
|
||||
@@ -38,7 +38,7 @@ public enum Juice implements IFluidType, ICocktailLiquid {
|
||||
this.squeezing = oreDict;
|
||||
}
|
||||
|
||||
private Juice(final String name, final String ident, final int colour, final double transparency, final String squeezing) {
|
||||
Juice(final String name, final String ident, final int colour, final double transparency, final String squeezing) {
|
||||
this.name = name;
|
||||
this.ident = ident;
|
||||
this.colour = colour;
|
||||
|
||||
@@ -35,11 +35,11 @@ public enum Liqueur implements IFluidType, ICocktailLiquid {
|
||||
private void addFlavour(final String oreDict) {
|
||||
}
|
||||
|
||||
private Liqueur(final String name, final int colour, final double transparency, final double abv) {
|
||||
Liqueur(final String name, final int colour, final double transparency, final double abv) {
|
||||
this(name + " Liqueur", "liqueur" + name, colour, transparency, abv);
|
||||
}
|
||||
|
||||
private Liqueur(final String name, final String ident, final int colour, final double transparency, final double abv) {
|
||||
Liqueur(final String name, final String ident, final int colour, final double transparency, final double abv) {
|
||||
this.name = name;
|
||||
this.ident = ident;
|
||||
this.colour = colour;
|
||||
|
||||
@@ -22,7 +22,7 @@ public enum MiscFluid implements IFluidType, ICocktailLiquid {
|
||||
int colour;
|
||||
float transparency;
|
||||
|
||||
private MiscFluid(final String name, final String ident, final int colour, final double transparency) {
|
||||
MiscFluid(final String name, final String ident, final int colour, final double transparency) {
|
||||
this.name = name;
|
||||
this.ident = ident;
|
||||
this.colour = colour;
|
||||
|
||||
@@ -42,7 +42,7 @@ public enum Spirit implements IFluidType, ICocktailLiquid {
|
||||
float transparency;
|
||||
float abv;
|
||||
|
||||
private Spirit(final String name, final String ident, final int colour, final double transparency, final double abv) {
|
||||
Spirit(final String name, final String ident, final int colour, final double transparency, final double abv) {
|
||||
this.name = name;
|
||||
this.ident = ident;
|
||||
this.colour = colour;
|
||||
|
||||
@@ -15,7 +15,7 @@ public enum DoorType {
|
||||
// IIcon iconDoorUpperFlip;
|
||||
// IIcon iconItem;
|
||||
|
||||
private DoorType(final String iconName) {
|
||||
DoorType(final String iconName) {
|
||||
this.id = iconName;
|
||||
}
|
||||
|
||||
|
||||
@@ -50,12 +50,12 @@ public enum EnumExtraTreeLog implements IWoodType {
|
||||
IDesignMaterial plank;
|
||||
|
||||
|
||||
private EnumExtraTreeLog(final String name) {
|
||||
EnumExtraTreeLog(final String name) {
|
||||
this.plank = null;
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
private EnumExtraTreeLog(final String name, final IDesignMaterial plank) {
|
||||
EnumExtraTreeLog(final String name, final IDesignMaterial plank) {
|
||||
this.name = name;
|
||||
this.plank = plank;
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ public enum FruitPod {
|
||||
short[] textures;
|
||||
// IIcon[] icons;
|
||||
|
||||
private FruitPod() {
|
||||
FruitPod() {
|
||||
this.textures = new short[]{BinnieCore.proxy.getUniqueTextureUID(), BinnieCore.proxy.getUniqueTextureUID(), BinnieCore.proxy.getUniqueTextureUID()};
|
||||
// this.icons = new IIcon[3];
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ public class PlankType {
|
||||
int color;
|
||||
//IIcon icon;
|
||||
|
||||
private ExtraTreePlanks(final int color) {
|
||||
ExtraTreePlanks(final int color) {
|
||||
this.color = color;
|
||||
}
|
||||
|
||||
@@ -121,7 +121,7 @@ public class PlankType {
|
||||
|
||||
int color;
|
||||
|
||||
private VanillaPlanks(final int color) {
|
||||
VanillaPlanks(final int color) {
|
||||
this.color = color;
|
||||
}
|
||||
|
||||
@@ -238,7 +238,7 @@ public class PlankType {
|
||||
|
||||
int color;
|
||||
|
||||
private ExtraBiomesPlank(final int color) {
|
||||
ExtraBiomesPlank(final int color) {
|
||||
this.color = color;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ public enum DesignSystem implements IDesignSystem {
|
||||
// Map<Integer, IIcon> primary;
|
||||
// Map<Integer, IIcon> secondary;
|
||||
|
||||
private DesignSystem() {
|
||||
DesignSystem() {
|
||||
// this.primary = new HashMap<Integer, IIcon>();
|
||||
// this.secondary = new HashMap<Integer, IIcon>();
|
||||
DesignerManager.instance.registerDesignSystem(this);
|
||||
|
||||
@@ -232,7 +232,7 @@ public enum EnumDesign implements IDesign {
|
||||
this.setSouthPattern(edged);
|
||||
}
|
||||
|
||||
private EnumDesign(final String name) {
|
||||
EnumDesign(final String name) {
|
||||
this.topPattern = Layout.get(EnumPattern.Blank, false);
|
||||
this.bottomPattern = Layout.get(EnumPattern.Blank, false);
|
||||
this.northPattern = Layout.get(EnumPattern.Blank, false);
|
||||
@@ -487,7 +487,7 @@ public enum EnumDesign implements IDesign {
|
||||
String name;
|
||||
List<IDesign> designs;
|
||||
|
||||
private Category(final String name) {
|
||||
Category(final String name) {
|
||||
this.designs = new ArrayList<>();
|
||||
this.name = name;
|
||||
CarpentryManager.carpentryInterface.registerDesignCategory(this);
|
||||
|
||||
@@ -221,7 +221,7 @@ public enum EnumPattern implements IPattern {
|
||||
ILayout leftRotation;
|
||||
ILayout horizontalFlip;
|
||||
|
||||
private EnumPattern() {
|
||||
EnumPattern() {
|
||||
this.leftRotation = Layout.get(this, false);
|
||||
this.horizontalFlip = Layout.get(this, false);
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ public class GlassType implements IDesignMaterial {
|
||||
String name;
|
||||
int colour;
|
||||
|
||||
private StandardColor(final String name, final int colour) {
|
||||
StandardColor(final String name, final int colour) {
|
||||
this.name = name;
|
||||
this.colour = colour;
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ public enum ExtraTreeTexture implements IBinnieTexture {
|
||||
public static String breweryTexture;
|
||||
public static String infuserTexture;
|
||||
|
||||
private ExtraTreeTexture(final ResourceType base, final String texture) {
|
||||
ExtraTreeTexture(final ResourceType base, final String texture) {
|
||||
this.texture = texture;
|
||||
this.type = base;
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies {
|
||||
private Map<ItemStack, Float> butterflyLoot;
|
||||
private Map<ItemStack, Float> caterpillarLoot;
|
||||
|
||||
private ButterflySpecies(final String name, final String scientific, final int colour) {
|
||||
ButterflySpecies(final String name, final String scientific, final int colour) {
|
||||
this.butterflyLoot = new HashMap<>();
|
||||
this.caterpillarLoot = new HashMap<>();
|
||||
this.name = name;
|
||||
|
||||
@@ -10,7 +10,7 @@ public enum ExtraTreeFruitFamily implements IFruitFamily {
|
||||
String uid;
|
||||
String scientific;
|
||||
|
||||
private ExtraTreeFruitFamily(final String name, final String uid, final String scientific) {
|
||||
ExtraTreeFruitFamily(final String name, final String uid, final String scientific) {
|
||||
this.name = name;
|
||||
this.uid = uid;
|
||||
this.scientific = scientific;
|
||||
|
||||
@@ -1046,7 +1046,7 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG
|
||||
public final short changedUID;
|
||||
public final String descript;
|
||||
|
||||
private LeafType(final short fancyUID, final short plainUID, final short changedUID, final String descript) {
|
||||
LeafType(final short fancyUID, final short plainUID, final short changedUID, final String descript) {
|
||||
this.fancyUID = fancyUID;
|
||||
this.plainUID = plainUID;
|
||||
this.changedUID = changedUID;
|
||||
|
||||
@@ -26,7 +26,7 @@ public enum ExtraTreeItems implements IItemMisc {
|
||||
String iconPath;
|
||||
// IIcon icon;
|
||||
|
||||
private ExtraTreeItems(final String name, final String iconPath) {
|
||||
ExtraTreeItems(final String name, final String iconPath) {
|
||||
this.name = name;
|
||||
this.iconPath = iconPath;
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ public enum ExtraTreeLiquid implements ILiquidType {
|
||||
// IIcon icon;
|
||||
int colour;
|
||||
|
||||
private ExtraTreeLiquid(final String name, final String ident, final int colour) {
|
||||
ExtraTreeLiquid(final String name, final String ident, final int colour) {
|
||||
this.name = "";
|
||||
this.name = name;
|
||||
this.ident = ident;
|
||||
|
||||
@@ -79,11 +79,11 @@ public enum Food implements IItemMisc {
|
||||
int hunger;
|
||||
private List<String> ores;
|
||||
|
||||
private Food() {
|
||||
Food() {
|
||||
this(0);
|
||||
}
|
||||
|
||||
private Food(final int hunger) {
|
||||
Food(final int hunger) {
|
||||
this.ores = new ArrayList<>();
|
||||
this.hunger = hunger;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ public enum KitchenMachine implements IMachineType {
|
||||
|
||||
Class<? extends MachinePackage> clss;
|
||||
|
||||
private KitchenMachine(final Class<? extends MachinePackage> clss) {
|
||||
KitchenMachine(final Class<? extends MachinePackage> clss) {
|
||||
this.clss = clss;
|
||||
}
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ public enum DesignerType {
|
||||
public String name;
|
||||
public String texture;
|
||||
|
||||
private DesignerType(final String name, final String texture) {
|
||||
DesignerType(final String name, final String texture) {
|
||||
this.name = name;
|
||||
this.texture = texture;
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ public enum ExtraTreeMachine implements IMachineType {
|
||||
|
||||
Class<? extends MachinePackage> clss;
|
||||
|
||||
private ExtraTreeMachine(final Class<? extends MachinePackage> clss) {
|
||||
ExtraTreeMachine(final Class<? extends MachinePackage> clss) {
|
||||
this.clss = clss;
|
||||
}
|
||||
|
||||
|
||||
@@ -32,10 +32,10 @@ public enum GeneticsGUI implements IBinnieGUID {
|
||||
|
||||
Class<? extends Window> windowClass;
|
||||
|
||||
private GeneticsGUI() {
|
||||
GeneticsGUI() {
|
||||
}
|
||||
|
||||
private GeneticsGUI(final Class window) {
|
||||
GeneticsGUI(final Class window) {
|
||||
this.windowClass = window;
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ public enum GeneticsTexture implements IBinnieTexture {
|
||||
ResourceType type;
|
||||
public static BinnieIcon dnaIcon;
|
||||
|
||||
private GeneticsTexture(final ResourceType base, final String texture) {
|
||||
GeneticsTexture(final ResourceType base, final String texture) {
|
||||
this.texture = texture;
|
||||
this.type = base;
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public enum GeneticLiquid implements IFluidType {
|
||||
int colour;
|
||||
float transparency;
|
||||
|
||||
private GeneticLiquid(final String name, final String ident, final int colour) {
|
||||
GeneticLiquid(final String name, final String ident, final int colour) {
|
||||
this.name = name;
|
||||
this.ident = ident;
|
||||
this.colour = colour;
|
||||
|
||||
@@ -24,7 +24,7 @@ public enum GeneticsItems implements IItemMisc {
|
||||
String name;
|
||||
String iconPath;
|
||||
|
||||
private GeneticsItems(final String name, final String iconPath) {
|
||||
GeneticsItems(final String name, final String iconPath) {
|
||||
this.name = name;
|
||||
this.iconPath = iconPath;
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ public enum AdvGeneticMachine implements IMachineType {
|
||||
|
||||
Class<? extends MachinePackage> clss;
|
||||
|
||||
private AdvGeneticMachine(final Class<? extends MachinePackage> clss) {
|
||||
AdvGeneticMachine(final Class<? extends MachinePackage> clss) {
|
||||
this.clss = clss;
|
||||
}
|
||||
|
||||
|
||||
@@ -302,7 +302,7 @@ public abstract class ComponentIndexerInventory<T> extends ComponentInventory im
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static enum Mode {
|
||||
public enum Mode {
|
||||
None,
|
||||
Species,
|
||||
Type;
|
||||
|
||||
@@ -18,7 +18,7 @@ public enum GeneticMachine implements IMachineType {
|
||||
|
||||
Class<? extends MachinePackage> clss;
|
||||
|
||||
private GeneticMachine(final Class<? extends MachinePackage> clss) {
|
||||
GeneticMachine(final Class<? extends MachinePackage> clss) {
|
||||
this.clss = clss;
|
||||
}
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ public enum LaboratoryMachine implements IMachineType {
|
||||
|
||||
Class<? extends MachinePackage> clss;
|
||||
|
||||
private LaboratoryMachine(final Class<? extends MachinePackage> clss) {
|
||||
LaboratoryMachine(final Class<? extends MachinePackage> clss) {
|
||||
this.clss = clss;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user