mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 13:09:47 +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
@@ -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<>();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user