mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 20:52:22 +00:00
Auto-format fix imports, tabs/spaces
This commit is contained in:
1 parent
5816af57bc
commit
cce3b7b901
174 files changed
+1025
-1259
No files matched your search
@@ -26,7 +26,6 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
@Mod(modid = Constants.GENETICS_MOD_ID, name = "Binnie's Genetics", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package binnie.genetics.genetics;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.genetics.BreedingSystem;
|
||||
import binnie.core.genetics.Gene;
|
||||
import binnie.genetics.api.IGene;
|
||||
|
||||
@@ -4,8 +4,6 @@ import binnie.Binnie;
|
||||
import binnie.core.genetics.BreedingSystem;
|
||||
import binnie.core.genetics.Gene;
|
||||
import binnie.genetics.api.IGene;
|
||||
import binnie.genetics.item.GeneticsItems;
|
||||
import com.google.common.base.Preconditions;
|
||||
import forestry.api.core.INbtWritable;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -20,7 +20,6 @@ import forestry.api.lepidopterology.EnumButterflyChromosome;
|
||||
import forestry.api.lepidopterology.IButterfly;
|
||||
import net.minecraft.init.Biomes;
|
||||
import net.minecraft.world.biome.Biome;
|
||||
import net.minecraftforge.common.BiomeDictionary;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@@ -23,7 +23,6 @@ import forestry.api.genetics.IIndividual;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Objects;
|
||||
|
||||
@@ -7,8 +7,6 @@ import binnie.craftgui.core.Tooltip;
|
||||
import net.minecraft.world.biome.Biome;
|
||||
import net.minecraftforge.common.BiomeDictionary;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class ControlBiome extends Control implements ITooltip {
|
||||
private final Biome biome;
|
||||
private String iconCategory;
|
||||
|
||||
@@ -4,7 +4,9 @@ import binnie.core.integration.jei.Drawables;
|
||||
import binnie.core.integration.jei.SimpleRecipeHandler;
|
||||
import binnie.genetics.Genetics;
|
||||
import binnie.genetics.api.IItemChargeable;
|
||||
import binnie.genetics.integration.jei.database.DatabaseRecipeCategory;
|
||||
import binnie.genetics.integration.jei.database.DatabaseRecipeMaker;
|
||||
import binnie.genetics.integration.jei.database.DatabaseRecipeWrapper;
|
||||
import binnie.genetics.integration.jei.genepool.GenepoolRecipeCategory;
|
||||
import binnie.genetics.integration.jei.genepool.GenepoolRecipeMaker;
|
||||
import binnie.genetics.integration.jei.genepool.GenepoolRecipeWrapper;
|
||||
@@ -27,8 +29,6 @@ import binnie.genetics.integration.jei.polymeriser.PolymeriserRecipeWrapper;
|
||||
import binnie.genetics.integration.jei.sequencer.SequencerRecipeCategory;
|
||||
import binnie.genetics.integration.jei.sequencer.SequencerRecipeMaker;
|
||||
import binnie.genetics.integration.jei.sequencer.SequencerRecipeWrapper;
|
||||
import binnie.genetics.integration.jei.database.DatabaseRecipeCategory;
|
||||
import binnie.genetics.integration.jei.database.DatabaseRecipeWrapper;
|
||||
import binnie.genetics.machine.AdvGeneticMachine;
|
||||
import binnie.genetics.machine.GeneticMachine;
|
||||
import binnie.genetics.machine.LaboratoryMachine;
|
||||
|
||||
@@ -8,9 +8,6 @@ import mezz.jei.api.gui.IRecipeLayout;
|
||||
import mezz.jei.api.ingredients.IIngredients;
|
||||
import mezz.jei.api.recipe.BlankRecipeCategory;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class DatabaseRecipeCategory extends BlankRecipeCategory<DatabaseRecipeWrapper> {
|
||||
@Override
|
||||
|
||||
@@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.Color;
|
||||
|
||||
public class IncubatorRecipeWrapper extends BlankRecipeWrapper {
|
||||
private final IIncubatorRecipe recipe;
|
||||
|
||||
@@ -14,7 +14,7 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.Color;
|
||||
|
||||
public class IsolatorRecipeCategory extends BlankRecipeCategory<IsolatorRecipeWrapper> {
|
||||
private final IDrawableAnimated arrowAnimated;
|
||||
|
||||
@@ -11,7 +11,7 @@ import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.Color;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@ import binnie.genetics.Genetics;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.List;
|
||||
|
||||
public enum GeneticsItems implements IItemMiscProvider {
|
||||
|
||||
@@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class ItemAnalyst extends ItemCore {
|
||||
|
||||
@@ -12,13 +12,10 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemDatabase extends ItemCore {
|
||||
|
||||
public ItemDatabase() {
|
||||
|
||||
@@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class ItemMasterRegistry extends ItemCore {
|
||||
|
||||
@@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class ItemRegistry extends ItemCore {
|
||||
|
||||
@@ -41,7 +41,8 @@ public class MachineRendererLab {
|
||||
GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f);
|
||||
World world = machine.getWorld();
|
||||
LaboratoryMachine.ComponentGUIHolder holder = Machine.getInterface(LaboratoryMachine.ComponentGUIHolder.class, machine);
|
||||
Label_0591: {
|
||||
Label_0591:
|
||||
{
|
||||
if (world != null && holder != null && !holder.getStack().isEmpty()) {
|
||||
BinnieCore.getBinnieProxy().getMinecraftInstance();
|
||||
if (Minecraft.isFancyGraphicsEnabled()) {
|
||||
|
||||
@@ -8,8 +8,6 @@ import forestry.api.genetics.ISpeciesRoot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class Analyser {
|
||||
public static final int[] SLOT_RESERVE = new int[]{0, 1, 2, 3, 4, 5};
|
||||
public static final int SLOT_TARGET = 6;
|
||||
|
||||
@@ -23,7 +23,7 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
public class PackagePolymeriser extends GeneticMachine.PackageGeneticBase implements IMachineInformation {
|
||||
|
||||
|
||||
public PackagePolymeriser() {
|
||||
super("polymeriser", GeneticsTexture.Polymeriser, 58819, true);
|
||||
}
|
||||
|
||||
@@ -8,5 +8,5 @@ public class Polymeriser {
|
||||
public static final int SLOT_GOLD = 1;
|
||||
public static final int[] SLOT_SERUM_RESERVE = new int[]{2, 3, 4, 5};
|
||||
public static final int[] SLOT_SERUM_FINISHED = new int[]{6, 7, 8, 9};
|
||||
|
||||
|
||||
}
|
||||
@@ -1,7 +1,5 @@
|
||||
package binnie.genetics.machine.sequencer;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.machines.IMachine;
|
||||
import binnie.core.machines.MachineComponent;
|
||||
@@ -12,6 +10,8 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class SequencerFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick {
|
||||
public SequencerFX(final IMachine machine) {
|
||||
super(machine);
|
||||
|
||||
@@ -11,8 +11,6 @@ import binnie.genetics.item.GeneticsItems;
|
||||
import com.google.common.base.Preconditions;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class SequencerLogic extends ComponentProcess implements IProcess {
|
||||
public SequencerLogic(final Machine machine) {
|
||||
super(machine);
|
||||
|
||||
Reference in new issue
Block a user