aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kubatech
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/kubatech')
-rw-r--r--src/main/java/kubatech/api/DynamicInventory.java33
-rw-r--r--src/main/java/kubatech/api/EIGDynamicInventory.java59
-rw-r--r--src/main/java/kubatech/api/Variables.java1
-rw-r--r--src/main/java/kubatech/api/enums/EIGSetupPhase.java2
-rw-r--r--src/main/java/kubatech/api/enums/ItemList.java2
-rw-r--r--src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java4
-rw-r--r--src/main/java/kubatech/api/tea/TeaNetwork.java2
-rw-r--r--src/main/java/kubatech/client/effect/CropRenderer.java2
-rw-r--r--src/main/java/kubatech/loaders/MobHandlerLoader.java1
-rw-r--r--src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java11
-rw-r--r--src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java2
-rw-r--r--src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java13
-rw-r--r--src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java4
-rw-r--r--src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java11
-rw-r--r--src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java5
-rw-r--r--src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java2
16 files changed, 54 insertions, 100 deletions
diff --git a/src/main/java/kubatech/api/DynamicInventory.java b/src/main/java/kubatech/api/DynamicInventory.java
index f718101384..20d9ef23b9 100644
--- a/src/main/java/kubatech/api/DynamicInventory.java
+++ b/src/main/java/kubatech/api/DynamicInventory.java
@@ -266,20 +266,15 @@ public class DynamicInventory<T> {
ItemStack leftover = inventoryInjector.inject(copy);
if (leftover == null) return;
input.stackSize--;
- if (input.stackSize > 0) {
- ((EntityPlayerMP) player).isChangingQuantityOnly = true;
- ((EntityPlayerMP) player).updateHeldItem();
- return;
- } else player.inventory.setItemStack(null);
} else {
ItemStack leftover = inventoryInjector.inject(input);
if (leftover == null) return;
- if (input.stackSize > 0) {
- ((EntityPlayerMP) player).isChangingQuantityOnly = true;
- ((EntityPlayerMP) player).updateHeldItem();
- return;
- } else player.inventory.setItemStack(null);
}
+ if (input.stackSize > 0) {
+ ((EntityPlayerMP) player).isChangingQuantityOnly = true;
+ ((EntityPlayerMP) player).updateHeldItem();
+ return;
+ } else player.inventory.setItemStack(null);
}
((EntityPlayerMP) player).isChangingQuantityOnly = false;
((EntityPlayerMP) player).updateHeldItem();
@@ -367,20 +362,15 @@ public class DynamicInventory<T> {
ItemStack leftover = inventoryInjector.inject(copy);
if (leftover == null) return;
input.stackSize--;
- if (input.stackSize > 0) {
- ((EntityPlayerMP) player).isChangingQuantityOnly = true;
- ((EntityPlayerMP) player).updateHeldItem();
- return;
- } else player.inventory.setItemStack(null);
} else {
ItemStack leftover = inventoryInjector.inject(input);
if (leftover == null) return;
- if (input.stackSize > 0) {
- ((EntityPlayerMP) player).isChangingQuantityOnly = true;
- ((EntityPlayerMP) player).updateHeldItem();
- return;
- } else player.inventory.setItemStack(null);
}
+ if (input.stackSize > 0) {
+ ((EntityPlayerMP) player).isChangingQuantityOnly = true;
+ ((EntityPlayerMP) player).updateHeldItem();
+ return;
+ } else player.inventory.setItemStack(null);
((EntityPlayerMP) player).isChangingQuantityOnly = false;
((EntityPlayerMP) player).updateHeldItem();
return;
@@ -407,8 +397,7 @@ public class DynamicInventory<T> {
DynamicPositionedRow row = new DynamicPositionedRow().setSynced(false);
for (int j = 0, jmax = (i == imax ? (buttons.size() - 1) % perRow : (perRow - 1)); j <= jmax; j++) {
final int finalI = i * perRow;
- final int finalJ = j;
- final int ID = finalI + finalJ;
+ final int ID = finalI + j;
row.widget(buttons.get(ID));
}
dynamicInventoryWidget.widget(row.setPos(0, i * 18));
diff --git a/src/main/java/kubatech/api/EIGDynamicInventory.java b/src/main/java/kubatech/api/EIGDynamicInventory.java
index 1b709a2654..0d4c7d2ec6 100644
--- a/src/main/java/kubatech/api/EIGDynamicInventory.java
+++ b/src/main/java/kubatech/api/EIGDynamicInventory.java
@@ -281,27 +281,18 @@ public class EIGDynamicInventory<T> {
inventoryInjector.inject(copy);
if (copy.stackSize == 1) return;
input.stackSize--;
- if (input.stackSize > 0) {
- // clearing and updating the held item value like this is the only
- // way i found to be able to reliably update the item count in the UI.
- player.inventory.setItemStack(null);
- ((EntityPlayerMP) player).updateHeldItem();
- player.inventory.setItemStack(input);
- ((EntityPlayerMP) player).updateHeldItem();
- return;
- } else player.inventory.setItemStack(null);
} else {
inventoryInjector.inject(input);
- if (input.stackSize > 0) {
- // clearing and updating the held item value like this is the only
- // way i found to be able to reliably update the item count in the UI.
- player.inventory.setItemStack(null);
- ((EntityPlayerMP) player).updateHeldItem();
- player.inventory.setItemStack(input);
- ((EntityPlayerMP) player).updateHeldItem();
- return;
- } else player.inventory.setItemStack(null);
}
+ if (input.stackSize > 0) {
+ // clearing and updating the held item value like this is the only
+ // way I found to be able to reliably update the item count in the UI.
+ player.inventory.setItemStack(null);
+ ((EntityPlayerMP) player).updateHeldItem();
+ player.inventory.setItemStack(input);
+ ((EntityPlayerMP) player).updateHeldItem();
+ return;
+ } else player.inventory.setItemStack(null);
((EntityPlayerMP) player).isChangingQuantityOnly = false;
((EntityPlayerMP) player).updateHeldItem();
return;
@@ -338,7 +329,7 @@ public class EIGDynamicInventory<T> {
for (Object o : stack.getTooltip(player, false)) {
tip.add(o.toString());
}
- if (tip.size() >= 1 && tip.get(0) != null) {
+ if (!tip.isEmpty() && tip.get(0) != null) {
tip.set(0, stack.stackSize + " x " + tip.get(0));
}
return tip;
@@ -387,27 +378,18 @@ public class EIGDynamicInventory<T> {
if (copy.stackSize == 1) return;
input.stackSize--;
- if (input.stackSize > 0) {
- // clearing and updating the held item value like this is the only
- // way i found to be able to reliably update the item count in the UI.
- player.inventory.setItemStack(null);
- ((EntityPlayerMP) player).updateHeldItem();
- player.inventory.setItemStack(input);
- ((EntityPlayerMP) player).updateHeldItem();
- return;
- } else player.inventory.setItemStack(null);
} else {
inventoryInjector.inject(input);
- if (input.stackSize > 0) {
- // clearing and updating the held item value like this is the only
- // way i found to be able to reliably update the item count in the UI.
- player.inventory.setItemStack(null);
- ((EntityPlayerMP) player).updateHeldItem();
- player.inventory.setItemStack(input);
- ((EntityPlayerMP) player).updateHeldItem();
- return;
- } else player.inventory.setItemStack(null);
}
+ if (input.stackSize > 0) {
+ // clearing and updating the held item value like this is the only
+ // way i found to be able to reliably update the item count in the UI.
+ player.inventory.setItemStack(null);
+ ((EntityPlayerMP) player).updateHeldItem();
+ player.inventory.setItemStack(input);
+ ((EntityPlayerMP) player).updateHeldItem();
+ return;
+ } else player.inventory.setItemStack(null);
((EntityPlayerMP) player).isChangingQuantityOnly = false;
((EntityPlayerMP) player).updateHeldItem();
return;
@@ -443,8 +425,7 @@ public class EIGDynamicInventory<T> {
DynamicPositionedRow row = new DynamicPositionedRow().setSynced(false);
for (int j = 0, jmax = (i == imax ? (buttons.size() - 1) % perRow : (perRow - 1)); j <= jmax; j++) {
final int finalI = i * perRow;
- final int finalJ = j;
- final int ID = finalI + finalJ;
+ final int ID = finalI + j;
row.widget(buttons.get(ID));
}
dynamicInventoryWidget.widget(row.setPos(0, i * 18));
diff --git a/src/main/java/kubatech/api/Variables.java b/src/main/java/kubatech/api/Variables.java
index a5821325e2..ee17a1a1b1 100644
--- a/src/main/java/kubatech/api/Variables.java
+++ b/src/main/java/kubatech/api/Variables.java
@@ -51,7 +51,6 @@ public class Variables {
+ EnumChatFormatting.DARK_BLUE
+ "Lib"
+ EnumChatFormatting.RESET
- + ""
+ EnumChatFormatting.GRAY
+ " Hologram Projector on the Controller!";
diff --git a/src/main/java/kubatech/api/enums/EIGSetupPhase.java b/src/main/java/kubatech/api/enums/EIGSetupPhase.java
index 95e8854347..9545bc45dc 100644
--- a/src/main/java/kubatech/api/enums/EIGSetupPhase.java
+++ b/src/main/java/kubatech/api/enums/EIGSetupPhase.java
@@ -9,7 +9,7 @@ public enum EIGSetupPhase {
public final int id;
public final String name;
- private EIGSetupPhase(int id, String name) {
+ EIGSetupPhase(int id, String name) {
this.id = id;
this.name = name;
}
diff --git a/src/main/java/kubatech/api/enums/ItemList.java b/src/main/java/kubatech/api/enums/ItemList.java
index 92a5fca22b..97b42bc2ab 100644
--- a/src/main/java/kubatech/api/enums/ItemList.java
+++ b/src/main/java/kubatech/api/enums/ItemList.java
@@ -171,7 +171,7 @@ public enum ItemList implements IItemContainer {
StringBuilder tCamelCasedDisplayNameBuilder = new StringBuilder();
final String[] tDisplayNameWords = aDisplayName.split("\\W");
for (String tWord : tDisplayNameWords) {
- if (tWord.length() > 0) tCamelCasedDisplayNameBuilder.append(
+ if (!tWord.isEmpty()) tCamelCasedDisplayNameBuilder.append(
tWord.substring(0, 1)
.toUpperCase(Locale.US));
if (tWord.length() > 1) tCamelCasedDisplayNameBuilder.append(
diff --git a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java
index a6305b2f5f..a1afd3561a 100644
--- a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java
+++ b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java
@@ -206,7 +206,7 @@ public abstract class KubaTechGTMultiBlockBase<T extends MTEExtendedPowerMultiBl
}
protected boolean tryOutputAll(List<ItemStack> list) {
- return tryOutputAll(list, l -> Collections.singletonList((ItemStack) l));
+ return tryOutputAll(list, l -> Collections.singletonList(l));
}
protected <Y> boolean tryOutputAll(List<Y> list, Function<Y, List<ItemStack>> mappingFunction) {
@@ -311,7 +311,7 @@ public abstract class KubaTechGTMultiBlockBase<T extends MTEExtendedPowerMultiBl
.setPos(173, 167 - 1));
final DynamicPositionedColumn screenElements = new DynamicPositionedColumn();
- drawTexts(screenElements, slotWidgets.size() > 0 ? slotWidgets.get(0) : null);
+ drawTexts(screenElements, !slotWidgets.isEmpty() ? slotWidgets.get(0) : null);
builder.widget(
new Scrollable().setVerticalScroll()
.widget(screenElements.setPos(10, 0))
diff --git a/src/main/java/kubatech/api/tea/TeaNetwork.java b/src/main/java/kubatech/api/tea/TeaNetwork.java
index 68c8275bfd..e91e3e88a7 100644
--- a/src/main/java/kubatech/api/tea/TeaNetwork.java
+++ b/src/main/java/kubatech/api/tea/TeaNetwork.java
@@ -16,7 +16,7 @@ public class TeaNetwork {
public BigInteger teaAmount = BigInteger.ZERO;
public BigInteger teaLimit = BigInteger.valueOf(Long.MAX_VALUE);
PlayerData owner;
- private HashSet<TeaStorageTile> teaStorageExtenders = new HashSet<>();
+ private final HashSet<TeaStorageTile> teaStorageExtenders = new HashSet<>();
public static TeaNetwork getNetwork(UUID player) {
PlayerData p = PlayerDataManager.getPlayer(player);
diff --git a/src/main/java/kubatech/client/effect/CropRenderer.java b/src/main/java/kubatech/client/effect/CropRenderer.java
index 5dbf229d6f..96f923538f 100644
--- a/src/main/java/kubatech/client/effect/CropRenderer.java
+++ b/src/main/java/kubatech/client/effect/CropRenderer.java
@@ -39,7 +39,7 @@ public class CropRenderer extends EntityFX {
int[] meta = new int[8];
public CropRenderer(World world, int x, int y, int z, int age) {
- super(world, (double) x, ((double) y - 0.0625d), (double) z);
+ super(world, x, ((double) y - 0.0625d), z);
this.prevPosX = this.posX;
this.prevPosY = this.posY;
this.prevPosZ = this.posZ;
diff --git a/src/main/java/kubatech/loaders/MobHandlerLoader.java b/src/main/java/kubatech/loaders/MobHandlerLoader.java
index d54edfa260..11f9965139 100644
--- a/src/main/java/kubatech/loaders/MobHandlerLoader.java
+++ b/src/main/java/kubatech/loaders/MobHandlerLoader.java
@@ -183,7 +183,6 @@ public class MobHandlerLoader {
if (infernalstacks != null) {
ItemStack infernalstack = infernalstacks.get(rnd.nextInt(infernalstacks.size()))
.copy();
- // noinspection ConstantConditions
EnchantmentHelper.addRandomEnchantment(
rnd,
infernalstack,
diff --git a/src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java b/src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java
index 6b18342462..7da2101e84 100644
--- a/src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java
+++ b/src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java
@@ -114,20 +114,15 @@ public class ItemTeaCollection extends ItemProxy {
public void addInformation(ItemStack stack, EntityPlayer entity, List<String> tooltipList, boolean showDebugInfo) {
if (!checkTeaOwner(stack, entity.getCommandSenderName())) {
tooltipList.add(
- EnumChatFormatting.GRAY + ""
- + EnumChatFormatting.BOLD
- + ""
+ EnumChatFormatting.GRAY.toString() + EnumChatFormatting.BOLD
+ EnumChatFormatting.ITALIC
+ StatCollector.translateToLocal("kubaitem.notyours"));
return;
}
tooltipList.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("kubaitem.fromcollection"));
tooltipList.add(
- EnumChatFormatting.GRAY + ""
- + EnumChatFormatting.BOLD
- + ""
+ EnumChatFormatting.GRAY.toString() + EnumChatFormatting.BOLD
+ EnumChatFormatting.ITALIC
- + ""
+ EnumChatFormatting.UNDERLINE
+ StatCollector.translateToLocal("kubaitem.teacollection"));
}
@@ -169,7 +164,7 @@ public class ItemTeaCollection extends ItemProxy {
if (checkTeaOwner(stack, Minecraft.getMinecraft().thePlayer.getCommandSenderName())) {
return super.getDisplayName(stack);
}
- return EnumChatFormatting.GOLD + "" + EnumChatFormatting.BOLD + "" + EnumChatFormatting.ITALIC + "???????";
+ return EnumChatFormatting.GOLD.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.ITALIC + "???????";
}
@Override
diff --git a/src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java b/src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java
index d6df893cd6..3c65f4fefd 100644
--- a/src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java
+++ b/src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java
@@ -87,7 +87,7 @@ public class ItemTeaUltimate extends ItemTeaCollection implements IItemProxyGUI
if (checkTeaOwner(stack, Minecraft.getMinecraft().thePlayer.getCommandSenderName())) {
return getUltimateTeaDisplayName(super.getDisplayName(stack));
}
- return EnumChatFormatting.GOLD + "" + EnumChatFormatting.BOLD + "" + EnumChatFormatting.ITALIC + "???????";
+ return EnumChatFormatting.GOLD.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.ITALIC + "???????";
}
@Override
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java
index 4e90c2634c..eb5b80176a 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java
@@ -54,7 +54,6 @@ import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.EnumCreatureAttribute;
import net.minecraft.entity.SharedMonsterAttributes;
-import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
@@ -75,7 +74,6 @@ import net.minecraftforge.fluids.FluidStack;
import org.jetbrains.annotations.NotNull;
-import com.google.common.collect.Multimap;
import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
@@ -497,8 +495,7 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme
isValid = false;
return;
}
- // noinspection unchecked
- attackDamage = ((Multimap<String, AttributeModifier>) stack.getAttributeModifiers())
+ attackDamage = stack.getAttributeModifiers()
.get(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName())
.stream()
.mapToDouble(
@@ -559,7 +556,7 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme
double attackDamage = DIAMOND_SPIKES_DAMAGE; // damage from spikes
weaponCheck: {
- MTEHatchInputBus inputbus = this.mInputBusses.size() == 0 ? null : this.mInputBusses.get(0);
+ MTEHatchInputBus inputbus = this.mInputBusses.isEmpty() ? null : this.mInputBusses.get(0);
if (inputbus != null && !inputbus.isValid()) inputbus = null;
ItemStack lootingHolder = inputbus == null ? null : inputbus.getStackInSlot(0);
if (lootingHolder == null) break weaponCheck;
@@ -592,7 +589,6 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme
EECPlayer.currentWeapon = weapon;
Item lootingHolderItem = weapon.getItem();
for (int i = 0; i < times + 1; i++) {
- // noinspection ConstantConditions
if (!lootingHolderItem.hitEntity(weapon, recipe.recipe.entity, EECPlayer)) break;
if (weapon.stackSize == 0) {
weaponCache.setStackInSlot(0, null);
@@ -656,9 +652,8 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme
mCasing = 0;
if (!checkPiece(STRUCTURE_PIECE_MAIN, 2, 6, 0)) return false;
if (mCasing < 35 || mMaintenanceHatches.size() != 1
- || mEnergyHatches.size() == 0
- || !(mInputBusses.size() == 0 || (mInputBusses.size() == 1 && mInputBusses.get(0).mTier == 0)))
- return false;
+ || mEnergyHatches.isEmpty()
+ || !(mInputBusses.isEmpty() || (mInputBusses.size() == 1 && mInputBusses.get(0).mTier == 0))) return false;
if (mGlassTier < 8) for (MTEHatchEnergy hatch : mEnergyHatches) if (hatch.mTier > mGlassTier) return false;
if (isInRitualMode) connectToRitual();
return true;
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java
index d0831a17ee..0f0c03484d 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java
@@ -142,7 +142,7 @@ public class MTEExtremeIndustrialGreenhouse extends KubaTechGTMultiBlockBase<MTE
* Summary:
* Accelerators in EIG are a bit cheaper than on the crop field (4 amps instead of 6 amps)
* There are 4 crops touching the accelerator (1 AMP for 1 accelerated crop)
- *
+ * <p>
* Changing T one number down will buff the EIG twice, as well as changing it up will nerf the EIG twice
* (That is because accelerators are imperfectly scaled in game LV = 2x, MV = 4x, ...)
*/
@@ -986,7 +986,7 @@ public class MTEExtremeIndustrialGreenhouse extends KubaTechGTMultiBlockBase<MTE
ItemStack suppertItem = outputs[i];
if (!player.inventory.addItemStackToInventory(suppertItem)) {
player.entityDropItem(suppertItem, 0.f);
- } ;
+ }
}
if (bucket.getSeedCount() <= 0) this.buckets.remove(bucket);
return ret;
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java
index 2d3eb590d9..0de075f497 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java
@@ -219,7 +219,7 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd
.addElement(
'W',
ofChain(ofBlock(Blocks.water, 0), ofBlock(BlocksItems.getFluidBlock(InternalName.fluidDistilledWater), 0)))
- .addElement('F', new IStructureElementNoPlacement<MTEMegaIndustrialApiary>() {
+ .addElement('F', new IStructureElementNoPlacement<>() {
@Override
public boolean check(MTEMegaIndustrialApiary mte, World world, int x, int y, int z) {
@@ -248,7 +248,7 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd
public void onRemoval() {
super.onRemoval();
if (getBaseMetaTileEntity().isServerSide())
- tryOutputAll(mStorage, s -> Collections.singletonList(((BeeSimulator) s).queenStack));
+ tryOutputAll(mStorage, s -> Collections.singletonList(s.queenStack));
}
private boolean isCacheDirty = true;
@@ -467,9 +467,8 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd
if (mStorage.size() >= mMaxSlots) break;
}
updateSlots();
- } else if (mPrimaryMode == 1 && mStorage.size() > 0) {
- if (tryOutputAll(mStorage, s -> Collections.singletonList(((BeeSimulator) s).queenStack)))
- isCacheDirty = true;
+ } else if (mPrimaryMode == 1 && !mStorage.isEmpty()) {
+ if (tryOutputAll(mStorage, s -> Collections.singletonList(s.queenStack))) isCacheDirty = true;
} else return CheckRecipeResultRegistry.NO_RECIPE;
mMaxProgresstime = 10;
mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
@@ -594,7 +593,7 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd
if (this.mGlassTier < 10 && !this.mEnergyHatches.isEmpty())
for (MTEHatchEnergy hatchEnergy : this.mEnergyHatches)
if (this.mGlassTier < hatchEnergy.mTier) return false;
- boolean valid = this.mMaintenanceHatches.size() == 1 && this.mEnergyHatches.size() >= 1 && this.mCasing >= 190;
+ boolean valid = this.mMaintenanceHatches.size() == 1 && !this.mEnergyHatches.isEmpty() && this.mCasing >= 190;
flowersError = valid && !this.flowersCheck.isEmpty();
if (valid) updateMaxSlots();
return valid;
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java
index 8c58f911c5..3314e89356 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.Set;
import net.minecraft.block.Block;
@@ -316,7 +315,6 @@ public class EIGIC2Bucket extends EIGBucket {
ItemStack newSupport = potentialBlockStack.copy();
newSupport.stackSize = 1;
this.supportItems = new ItemStack[] { newSupport };
- keepLooking = false;
crop.updateNutrientsForBlockUnder();
break blockLoop;
}
@@ -602,7 +600,6 @@ public class EIGIC2Bucket extends EIGBucket {
// Create kernel out of our growth speeds
double[] kernel = tabulate(speeds, 1.0d / speeds.length);
double[] convolutionTarget = new double[signal.length];
- LinkedList<Double> P = new LinkedList<Double>();
// Perform convolutions on the signal until it's too weak to be recognised.
double p, avgRolls = 1;
@@ -620,7 +617,7 @@ public class EIGIC2Bucket extends EIGBucket {
/**
* Creates an array that corresponds to the amount of times a number appears in a list.
- *
+ * <p>
* Ex: {1,2,3,4} -> {0,1,1,1,1}, {0,2,2,4} -> {1,0,2,0,1}
*
* @param bin The number list to tabulate
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java
index 831569a4ae..6563bb68da 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java
@@ -203,7 +203,7 @@ public class EIGSeedBucket extends EIGBucket {
return false;
}
- class EIGCraftingSeedFinder extends InventoryCrafting {
+ static class EIGCraftingSeedFinder extends InventoryCrafting {
public ItemStack recipeInput;