mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 11:59:11 +00:00
Auto-fix formatting
This commit is contained in:
1 parent
697ccabf53
commit
975309598a
25 files changed
+89
-104
No files matched your search
@@ -18,7 +18,7 @@ public class CircuitGarden extends BinnieCircuit {
|
||||
private EnumMoisture moisture;
|
||||
private EnumAcidity acidity;
|
||||
private GardenLogic logic;
|
||||
|
||||
|
||||
public CircuitGarden(EnumMoisture moisture, EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe, ItemStack icon) {
|
||||
super(getName(moisture, ph, manual, fertilised), 4, manual ? ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual") : ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"), recipe);
|
||||
this.isFertilised = false;
|
||||
@@ -30,34 +30,34 @@ public class CircuitGarden extends BinnieCircuit {
|
||||
this.logic = new GardenLogic(this.moisture, this.acidity, this.isManual, this.isFertilised, this.icon, Binnie.Language.localise(this.getUnlocalizedName()));
|
||||
String info = "";
|
||||
if (moisture != EnumMoisture.Normal) {
|
||||
info+=TextFormatting.GRAY + Binnie.Language.localise("botany.moisture") + ": " + moisture.getTranslated(true);
|
||||
info += TextFormatting.GRAY + Binnie.Language.localise("botany.moisture") + ": " + moisture.getTranslated(true);
|
||||
}
|
||||
if (info.length() > 0) {
|
||||
info += ", ";
|
||||
}
|
||||
if (ph != null) {
|
||||
info+=TextFormatting.GRAY + Binnie.Language.localise("botany.ph") + ": " + ph.getTranslated(true);
|
||||
info += TextFormatting.GRAY + Binnie.Language.localise("botany.ph") + ": " + ph.getTranslated(true);
|
||||
}
|
||||
if (info.length() > 0) {
|
||||
info = " (" + info + TextFormatting.RESET + ")";
|
||||
}
|
||||
this.addTooltipString("Flowers" + info);
|
||||
}
|
||||
|
||||
private static String getName(EnumMoisture moisture, EnumAcidity ph, boolean manual, boolean fertilised){
|
||||
|
||||
private static String getName(EnumMoisture moisture, EnumAcidity ph, boolean manual, boolean fertilised) {
|
||||
String name = "garden." + moisture.getName();
|
||||
if(ph != null){
|
||||
if (ph != null) {
|
||||
name += "." + ph.getName();
|
||||
}
|
||||
if(manual){
|
||||
if (manual) {
|
||||
name += ".manual";
|
||||
}
|
||||
if(fertilised){
|
||||
if (fertilised) {
|
||||
name += ".fert";
|
||||
}
|
||||
return name;
|
||||
}
|
||||
|
||||
|
||||
public CircuitGarden setManual() {
|
||||
isManual = true;
|
||||
return this;
|
||||
|
||||
@@ -65,14 +65,14 @@ public class GardenLogic extends FarmLogic {
|
||||
public boolean isAcceptedResource(final ItemStack itemstack) {
|
||||
return Gardening.isSoil(itemstack.getItem()) || itemstack.getItem() == Item.getItemFromBlock(Blocks.SAND) || itemstack.getItem() == Item.getItemFromBlock(Blocks.DIRT) || Gardening.isAcidFertiliser(itemstack) || Gardening.isAlkalineFertiliser(itemstack);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Collection<ItemStack> collect(World world, IFarmHousing farmHousing) {
|
||||
final Collection<ItemStack> products = this.produce;
|
||||
this.produce = new ArrayList<ItemStack>();
|
||||
return products;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean cultivate(World world, IFarmHousing farmHousing, BlockPos pos, FarmDirection direction, int extent) {
|
||||
return this.maintainSoil(world, pos, direction, extent, farmHousing) || (!this.isManual && this.maintainWater(world, pos, direction, extent, farmHousing)) || this.maintainCrops(world, pos.up(), direction, extent, farmHousing);
|
||||
@@ -93,22 +93,21 @@ public class GardenLogic extends FarmLogic {
|
||||
}
|
||||
if (getBlock(world, position.up()) == Botany.plant) {
|
||||
world.setBlockToAir(position.up());
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (this.acidity != null && Gardening.isSoil(getBlock(world, position))) {
|
||||
IBlockSoil soil = (IBlockSoil) getBlock(world, position);
|
||||
EnumAcidity pH = soil.getPH(world, position);
|
||||
if (pH.ordinal() < this.acidity.ordinal()) {
|
||||
ItemStack stack = this.getAvailableAlkaline(housing);
|
||||
if (stack != null && soil.setPH(world, position, EnumAcidity.values()[pH.ordinal() + 1])) {
|
||||
housing.getFarmInventory().removeResources(new ItemStack[] { stack });
|
||||
housing.getFarmInventory().removeResources(new ItemStack[]{stack});
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (pH.ordinal() > this.acidity.ordinal()) {
|
||||
final ItemStack stack = this.getAvailableAcid(housing);
|
||||
if (stack != null && soil.setPH(world, position, EnumAcidity.values()[pH.ordinal() - 1])) {
|
||||
housing.getFarmInventory().removeResources(new ItemStack[] { stack });
|
||||
housing.getFarmInventory().removeResources(new ItemStack[]{stack});
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@@ -121,8 +120,7 @@ public class GardenLogic extends FarmLogic {
|
||||
this.setBlock(world, position, Blocks.AIR, 0);
|
||||
return trySetSoil(world, position, loam, housing);
|
||||
}
|
||||
}
|
||||
else if (!this.isManual) {
|
||||
} else if (!this.isManual) {
|
||||
if (!this.isWaterBlock(world, position)) {
|
||||
if (i % 2 == 0) {
|
||||
return trySetSoil(world, position, housing);
|
||||
@@ -130,11 +128,9 @@ public class GardenLogic extends FarmLogic {
|
||||
FarmDirection cclock = FarmDirection.EAST;
|
||||
if (direction == FarmDirection.EAST) {
|
||||
cclock = FarmDirection.SOUTH;
|
||||
}
|
||||
else if (direction == FarmDirection.SOUTH) {
|
||||
} else if (direction == FarmDirection.SOUTH) {
|
||||
cclock = FarmDirection.EAST;
|
||||
}
|
||||
else if (direction == FarmDirection.WEST) {
|
||||
} else if (direction == FarmDirection.WEST) {
|
||||
cclock = FarmDirection.SOUTH;
|
||||
}
|
||||
BlockPos previous = position.offset(cclock.getFacing());
|
||||
@@ -157,14 +153,11 @@ public class GardenLogic extends FarmLogic {
|
||||
boolean isEnclosed = true;
|
||||
if (world.isAirBlock(position.east())) {
|
||||
isEnclosed = false;
|
||||
}
|
||||
else if (world.isAirBlock(position.west())) {
|
||||
} else if (world.isAirBlock(position.west())) {
|
||||
isEnclosed = false;
|
||||
}
|
||||
else if (world.isAirBlock(position.south())) {
|
||||
} else if (world.isAirBlock(position.south())) {
|
||||
isEnclosed = false;
|
||||
}
|
||||
else if (world.isAirBlock(position.north())) {
|
||||
} else if (world.isAirBlock(position.north())) {
|
||||
isEnclosed = false;
|
||||
}
|
||||
isEnclosed = (isEnclosed || this.moisture != EnumMoisture.Damp);
|
||||
@@ -257,12 +250,12 @@ public class GardenLogic extends FarmLogic {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Collection<ICrop> harvest(World world, BlockPos pos, FarmDirection direction, int extent) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ResourceLocation getTextureMap() {
|
||||
return TextureMap.LOCATION_BLOCKS_TEXTURE;
|
||||
@@ -293,17 +286,17 @@ public class GardenLogic extends FarmLogic {
|
||||
|
||||
private boolean trySetCrop(World world, BlockPos position, IFarmHousing housing) {
|
||||
for (IFarmable farmable : this.farmables) {
|
||||
if(housing.plantGermling(farmable, world, position)){
|
||||
if (housing.plantGermling(farmable, world, position)) {
|
||||
if (housing instanceof IOwnedTile) {
|
||||
TileEntity tile = world.getTileEntity(position);
|
||||
if (tile instanceof TileEntityFlower) {
|
||||
TileEntityFlower flower = (TileEntityFlower) tile;
|
||||
IOwnedTile owned = (IOwnedTile) housing;
|
||||
|
||||
|
||||
flower.setOwner(owned.getOwnerHandler().getOwner());
|
||||
}
|
||||
}
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package binnie.botany.flower;
|
||||
|
||||
import binnie.botany.Botany;
|
||||
import binnie.botany.CreativeTabBotany;
|
||||
import binnie.core.item.ItemCore;
|
||||
import forestry.api.core.IModelManager;
|
||||
|
||||
@@ -155,15 +155,15 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister {
|
||||
world.setBlockState(pos.up(), Botany.plant.getStateFromMeta(BlockPlant.Type.Weeds.ordinal()), 2);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn){
|
||||
super.neighborChanged(state, worldIn, pos, blockIn);
|
||||
|
||||
if (worldIn.getBlockState(pos.up()).getMaterial().isSolid()){
|
||||
worldIn.setBlockState(pos, Blocks.DIRT.getDefaultState());
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) {
|
||||
super.neighborChanged(state, worldIn, pos, blockIn);
|
||||
|
||||
if (worldIn.getBlockState(pos.up()).getMaterial().isSolid()) {
|
||||
worldIn.setBlockState(pos, Blocks.DIRT.getDefaultState());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOpaqueCube(IBlockState state) {
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
package binnie.botany.gardening;
|
||||
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import binnie.Constants;
|
||||
import binnie.botany.Botany;
|
||||
import binnie.botany.CreativeTabBotany;
|
||||
import binnie.botany.api.EnumAcidity;
|
||||
import binnie.botany.api.EnumMoisture;
|
||||
import binnie.botany.api.EnumSoilType;
|
||||
import com.google.common.collect.Multimap;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -72,18 +71,18 @@ public class ItemTrowel extends Item implements IItemModelRegister {
|
||||
stack.damageItem(1, player);
|
||||
return EnumActionResult.SUCCESS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Multimap<String, AttributeModifier> getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot){
|
||||
Multimap<String, AttributeModifier> multimap = super.getItemAttributeModifiers(equipmentSlot);
|
||||
|
||||
if (equipmentSlot == EntityEquipmentSlot.MAINHAND){
|
||||
multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Tool modifier", theToolMaterial.getDamageVsEntity() + 0.5, 0));
|
||||
multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", -1.5, 0));
|
||||
}
|
||||
@Override
|
||||
public Multimap<String, AttributeModifier> getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot) {
|
||||
Multimap<String, AttributeModifier> multimap = super.getItemAttributeModifiers(equipmentSlot);
|
||||
|
||||
return multimap;
|
||||
}
|
||||
if (equipmentSlot == EntityEquipmentSlot.MAINHAND) {
|
||||
multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Tool modifier", theToolMaterial.getDamageVsEntity() + 0.5, 0));
|
||||
multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", -1.5, 0));
|
||||
}
|
||||
|
||||
return multimap;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -112,11 +112,11 @@ public class ModuleGardening implements IInitializable {
|
||||
for (boolean fertilised : new boolean[]{true, false}) {
|
||||
for (EnumMoisture moist : EnumMoisture.values()) {
|
||||
ItemStack icon;
|
||||
if(moist == EnumMoisture.Dry){
|
||||
if (moist == EnumMoisture.Dry) {
|
||||
icon = yellow;
|
||||
}else if(moist == EnumMoisture.Normal){
|
||||
} else if (moist == EnumMoisture.Normal) {
|
||||
icon = red;
|
||||
}else{
|
||||
} else {
|
||||
icon = blue;
|
||||
}
|
||||
int insulate = 2 - moist.ordinal();
|
||||
|
||||
@@ -261,9 +261,9 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
|
||||
if (capability == CapabilityEnergy.ENERGY) {
|
||||
return CapabilityEnergy.ENERGY.cast(this);
|
||||
}else if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY){
|
||||
} else if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
|
||||
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(new InvWrapper(getInventory()));
|
||||
}else if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY){
|
||||
} else if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
|
||||
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(getHandler(facing));
|
||||
}
|
||||
return super.getCapability(capability, facing);
|
||||
|
||||
@@ -27,7 +27,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
|
||||
super(machine);
|
||||
this.tanks = new LinkedHashMap<>();
|
||||
this.handlers = new EnumMap<>(EnumFacing.class);
|
||||
for(EnumFacing facing : EnumFacing.VALUES){
|
||||
for (EnumFacing facing : EnumFacing.VALUES) {
|
||||
handlers.put(facing, new TankContainer(facing));
|
||||
}
|
||||
}
|
||||
@@ -153,19 +153,19 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
|
||||
this.getMachine().markDirty();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public IFluidHandler getHandler(EnumFacing from) {
|
||||
return handlers.get(from);
|
||||
}
|
||||
|
||||
private class TankContainer implements IFluidHandler{
|
||||
|
||||
private class TankContainer implements IFluidHandler {
|
||||
EnumFacing from;
|
||||
|
||||
|
||||
public TankContainer(EnumFacing from) {
|
||||
this.from = from;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public final int fill(final FluidStack resource, final boolean doFill) {
|
||||
final int index = getTankIndexToFill(from, resource);
|
||||
@@ -174,7 +174,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public FluidStack drain(final FluidStack resource, final boolean doDrain) {
|
||||
final int index = getTankIndexToDrain(from, null);
|
||||
@@ -192,7 +192,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public IFluidTankProperties[] getTankProperties() {
|
||||
final IFluidTankProperties[] properties = new IFluidTankProperties[getTanks().length];
|
||||
|
||||
@@ -219,7 +219,7 @@ public class ContainerCraftGUI extends Container {
|
||||
final int index = action.getShort("i");
|
||||
final int slotNumber = action.getShort("n");
|
||||
this.createServerSlot(InventoryType.values()[type % 4], index, slotNumber);
|
||||
for(IContainerListener listener : listeners){
|
||||
for (IContainerListener listener : listeners) {
|
||||
listener.updateCraftingInventory(this, this.getInventory());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ public class GeneItem implements INbtReadable, INbtWritable, IGeneItem {
|
||||
@Override
|
||||
public void getInfo(final List list) {
|
||||
final String chromosomeName = this.getBreedingSystem().getChromosomeName(this.gene.getChromosome());
|
||||
list.add(TextFormatting.GOLD +chromosomeName + TextFormatting.GRAY + ": " + this.gene.getName());
|
||||
list.add(TextFormatting.GOLD + chromosomeName + TextFormatting.GRAY + ": " + this.gene.getName());
|
||||
}
|
||||
|
||||
public BreedingSystem getBreedingSystem() {
|
||||
|
||||
@@ -37,7 +37,7 @@ public abstract class ControlToleranceBar<T extends Enum<T>> extends Control imp
|
||||
final int type = (int) ((int) this.getRelativeMousePosition().x() / (this.getSize().x() / types));
|
||||
for (final T tol : this.fullSet) {
|
||||
if (tol.ordinal() - ((this.enumClass == EnumTemperature.class) ? 1 : 0) == type) {
|
||||
list.add((this.tolerated.contains(tol) ? "" : TextFormatting.DARK_GRAY ) + this.getName(tol));
|
||||
list.add((this.tolerated.contains(tol) ? "" : TextFormatting.DARK_GRAY) + this.getName(tol));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -133,7 +133,7 @@ public class ModuleItem implements IInitializable {
|
||||
'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1),
|
||||
'a', Mods.Forestry.item("portableAlyzer"),
|
||||
'd', new ItemStack(Items.DIAMOND));
|
||||
|
||||
|
||||
final Item[] dbs = {ExtraBees.dictionary, ExtraTrees.itemDictionary, ExtraTrees.itemDictionaryLepi, Botany.database};
|
||||
if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) {
|
||||
for (final Item a2 : dbs) {
|
||||
@@ -141,7 +141,7 @@ public class ModuleItem implements IInitializable {
|
||||
for (final Item c2 : dbs) {
|
||||
for (final Item d : dbs) {
|
||||
if (a2 != b2 && a2 != c2 && a2 != d && b2 != c2 && b2 != d && c2 != d) {
|
||||
GameRegistry.addShapedRecipe(new ItemStack(Genetics.registry), new Object[] { " b ", "fct", " l ", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'b', a2, 't', b2, 'f', c2, 'l', d });
|
||||
GameRegistry.addShapedRecipe(new ItemStack(Genetics.registry), new Object[]{" b ", "fct", " l ", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'b', a2, 't', b2, 'f', c2, 'l', d});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package binnie.genetics.machine;
|
||||
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.IInitializable;
|
||||
import binnie.core.Mods;
|
||||
import binnie.core.machines.MachineGroup;
|
||||
|
||||
@@ -3,7 +3,6 @@ package binnie.genetics.machine.acclimatiser;
|
||||
import binnie.Binnie;
|
||||
import binnie.botany.api.EnumFlowerChromosome;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.Mods;
|
||||
import binnie.core.genetics.Tolerance;
|
||||
import binnie.core.liquid.FluidContainer;
|
||||
import forestry.api.apiculture.EnumBeeChromosome;
|
||||
@@ -16,7 +15,6 @@ import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidUtil;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
package binnie.genetics.machine.acclimatiser;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import binnie.core.machines.IMachine;
|
||||
import binnie.core.machines.power.ComponentProcessIndefinate;
|
||||
import binnie.core.machines.power.ErrorState;
|
||||
import binnie.genetics.Genetics;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class AcclimatiserLogic extends ComponentProcessIndefinate {
|
||||
public AcclimatiserLogic(final IMachine machine) {
|
||||
super(machine, 2.0f);
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package binnie.genetics.machine.acclimatiser;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import binnie.core.genetics.Gene;
|
||||
import binnie.core.genetics.Tolerance;
|
||||
import binnie.genetics.machine.inoculator.Inoculator;
|
||||
@@ -13,6 +11,8 @@ import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
class ToleranceSystem {
|
||||
String uid;
|
||||
IChromosomeType chromosomeOrdinal;
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
package binnie.genetics.machine.analyser;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.machines.IMachine;
|
||||
import binnie.core.machines.MachineComponent;
|
||||
@@ -19,6 +15,9 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class AnalyserFX extends MachineComponent implements IRender.DisplayTick, IRender.Render, INetwork.TilePacketSync {
|
||||
private final EntityItem dummyEntityItem;
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package binnie.genetics.machine.genepool;
|
||||
|
||||
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 GenepoolFX extends MachineComponent implements IRender.DisplayTick {
|
||||
public GenepoolFX(final IMachine machine) {
|
||||
super(machine);
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package binnie.genetics.machine.incubator;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import binnie.core.machines.Machine;
|
||||
import binnie.core.machines.power.ComponentProcessIndefinate;
|
||||
import binnie.core.machines.power.ErrorState;
|
||||
@@ -12,6 +10,8 @@ import binnie.genetics.api.IIncubatorRecipe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class IncubatorLogic extends ComponentProcessIndefinate implements IProcess {
|
||||
IIncubatorRecipe recipe;
|
||||
private Random rand;
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
package binnie.genetics.machine.inoculator;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.machines.IMachine;
|
||||
import binnie.core.machines.MachineComponent;
|
||||
@@ -19,6 +15,9 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class InoculatorFX extends MachineComponent implements IRender.DisplayTick, IRender.Render, INetwork.TilePacketSync {
|
||||
private final EntityItem dummyEntityItem;
|
||||
|
||||
@@ -38,9 +38,9 @@ public class InoculatorLogic extends ComponentProcessSetCost implements IProcess
|
||||
@Override
|
||||
public String getTooltip() {
|
||||
int n = this.getNumberOfGenes();
|
||||
if(n > 1){
|
||||
if (n > 1) {
|
||||
return String.format(Genetics.proxy.localise("genetics.machine.machine.inoculator.tooltips.logic.genes"), Integer.valueOf(n).toString());
|
||||
}else{
|
||||
} else {
|
||||
return Genetics.proxy.localise("genetics.machine.machine.inoculator.tooltips.logic.gene");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package binnie.genetics.machine.isolator;
|
||||
|
||||
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 IsolaterFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick {
|
||||
public IsolaterFX(final IMachine machine) {
|
||||
super(machine);
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package binnie.genetics.machine.isolator;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import binnie.core.machines.Machine;
|
||||
import binnie.core.machines.TileEntityMachine;
|
||||
import binnie.core.machines.inventory.ComponentChargedSlots;
|
||||
@@ -24,6 +22,8 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public class PackageIsolator extends GeneticMachine.PackageGeneticBase implements IMachineInformation {
|
||||
public PackageIsolator() {
|
||||
super("isolator", GeneticsTexture.Isolator, 16740111, true);
|
||||
@@ -36,7 +36,7 @@ public class PackageIsolator extends GeneticMachine.PackageGeneticBase implement
|
||||
InventorySlot slotEnzyme = inventory.addSlot(Isolator.SLOT_ENZYME, "enzyme");
|
||||
slotEnzyme.setValidator(new SlotValidator.Item(GeneticsItems.Enzyme.get(1), ModuleMachine.IconEnzyme));
|
||||
slotEnzyme.forbidExtraction();
|
||||
InventorySlot slotSequencer= inventory.addSlot(Isolator.SLOT_SEQUENCER_VIAL, "sequencervial");
|
||||
InventorySlot slotSequencer = inventory.addSlot(Isolator.SLOT_SEQUENCER_VIAL, "sequencervial");
|
||||
slotSequencer.setValidator(new SlotValidator.Item(GeneticsItems.EmptySequencer.get(1), ModuleMachine.IconSequencer));
|
||||
slotSequencer.forbidExtraction();
|
||||
for (InventorySlot slot : inventory.addSlotArray(Isolator.SLOT_RESERVE, "input")) {
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package binnie.genetics.machine.polymeriser;
|
||||
|
||||
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 PolymeriserFX extends MachineComponent implements IRender.DisplayTick {
|
||||
public PolymeriserFX(final IMachine machine) {
|
||||
super(machine);
|
||||
@@ -49,8 +49,7 @@ public class PolymeriserFX extends MachineComponent implements IRender.DisplayTi
|
||||
if (this.particleAge > 60) {
|
||||
if (this.particleAge > 120) {
|
||||
dist = 0.1;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
dist = 0.2 - 0.1 * ((this.particleAge - 60.0f) / 60.0f);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,9 +72,9 @@ public class PolymeriserLogic extends ComponentProcessSetCost implements IProces
|
||||
public String getTooltip() {
|
||||
final ItemStack serum = this.getUtil().getStack(Polymeriser.SLOT_SERUM);
|
||||
int n = getNumberOfGenes(serum);
|
||||
if(n > 1){
|
||||
if (n > 1) {
|
||||
return String.format(Genetics.proxy.localise("genetics.machine.machine.polymeriser.tooltips.logic.genes"), Integer.valueOf(n).toString());
|
||||
}else{
|
||||
} else {
|
||||
return Genetics.proxy.localise("genetics.machine.machine.polymeriser.tooltips.logic.gene");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user