diff options
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
31 files changed, 238 insertions, 336 deletions
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java index 00f1700d98..60500310e0 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java @@ -48,8 +48,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil public void clickTypeIcon(boolean aRightClick, ItemStack aHandStack) { if (!aRightClick) { IMetaTileEntity mte = GT_Item_Machines.getMetaTileEntity(aHandStack); - if (mte instanceof GT_MetaTileEntity_BasicMachine) { - GT_MetaTileEntity_BasicMachine machine = (GT_MetaTileEntity_BasicMachine) mte; + if (mte instanceof GT_MetaTileEntity_BasicMachine machine) { GT_Recipe.GT_Recipe_Map recipeList = machine.getRecipeList(); if (recipeList != null) { mInventory[SPECIAL_SLOT_INDEX] = machine.getStackForm(1); diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java index b6b293d8d1..0f03f6bee4 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java @@ -192,8 +192,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { if (fillableAmount <= 0) return null; final Item containerItem = SourceItemStack.getItem(); - if (containerItem instanceof IFluidContainerItem) { - IFluidContainerItem equippedIFluidContainerItem = (IFluidContainerItem) containerItem; + if (containerItem instanceof IFluidContainerItem equippedIFluidContainerItem) { destinationIFluidTank.fill(equippedIFluidContainerItem.drain(SourceItemStack, fillableAmount, true), true); return null; } else { @@ -341,22 +340,22 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { y = oY + XSTR_INSTANCE.nextFloat() * 6D / 16D; switch (frontDirection) { - case WEST: + case WEST -> { x = oX - offset; z = oZ + horizontal; - break; - case EAST: + } + case EAST -> { x = oX + offset; z = oZ + horizontal; - break; - case NORTH: + } + case NORTH -> { x = oX + horizontal; z = oZ - offset; - break; - default: // case SOUTH: + } + default -> { // case SOUTH: x = oX + horizontal; z = oZ + offset; - break; + } } ParticleEventBuilder particleEventBuilder = (new ParticleEventBuilder()).setMotion(0D, 0D, 0D) diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java index 42e0fc6117..67e821f636 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java @@ -24,7 +24,7 @@ public class GT_MetaTileEntity_Boiler_Steel extends GT_MetaTileEntity_Boiler_Bro aName, aNameRegional, new String[] { "Faster than the Bronze Boiler", "Produces 300L of Steam per second", - "Causes " + Integer.toString(GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond) + "Causes " + GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond + " Pollution per second" }); } diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java index 491eeea306..391a212115 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java @@ -658,7 +658,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B MagicalEnergyBB(GT_MetaTileEntity_MagicalEnergyAbsorber aAbsorber, int aDefaultTier, int aMaxTier) { mAbsorber = aAbsorber; mListener = aAbsorber; - mMaxTier = Math.max(aMaxTier > 0 ? aMaxTier : 0, aDefaultTier > 0 ? aDefaultTier : 0); + mMaxTier = Math.max(Math.max(aMaxTier, 0), Math.max(aDefaultTier, 0)); mDefaultTier = Math.min(aDefaultTier, mMaxTier); mTier = mDefaultTier; if (THAUMCRAFT_LOADED) mAvailableAspects = new ArrayList<>(Aspect.aspects.size()); @@ -676,11 +676,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B */ int setTier(int aTier) { if (aTier >= 0) { - if (aTier <= mMaxTier) { - mTier = aTier; - } else { - mTier = mMaxTier; - } + mTier = Math.min(aTier, mMaxTier); } else { mTier = 0; } @@ -730,9 +726,9 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B World tWorld = mAbsorber.getBaseMetaTileEntity() .getWorld(); mLivingCrystalIDs.clear(); - for (Object o : tWorld.getEntitiesWithinAABB(EntityEnderCrystal.class, getAxisAlignedBB())) { - if (((EntityEnderCrystal) o).isEntityAlive()) { - mLivingCrystalIDs.add(((EntityEnderCrystal) o).getPersistentID()); + for (EntityEnderCrystal o : tWorld.getEntitiesWithinAABB(EntityEnderCrystal.class, getAxisAlignedBB())) { + if (o.isEntityAlive()) { + mLivingCrystalIDs.add(o.getPersistentID()); } } } diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java index 615f512ff0..b81b0b956b 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java @@ -47,29 +47,23 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe public GT_Recipe.GT_Recipe_Map getRecipes() { GT_Recipe.GT_Recipe_Map ret; switch (mTier) { - case 4: { + case 4 -> { ret = GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels; - break; } - case 5: { + case 5 -> { ret = GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels; - break; } - case 6: { + case 6 -> { ret = GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels; - break; } - case 7: { + case 7 -> { ret = GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels; - break; } - case 8: { + case 8 -> { ret = GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels; - break; } - default: { + default -> { ret = null; - break; } } return ret; diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java index 70a03a9f03..606c0b8157 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java @@ -238,8 +238,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc .storage() .createItemStack(GT_Utility.loadItem((NBTTagCompound) t))); t = aNBT.getTag("cachedItems"); - if (t instanceof NBTTagList) { - NBTTagList l = (NBTTagList) t; + if (t instanceof NBTTagList l) { for (int i = 0; i < l.tagCount(); ++i) { NBTTagCompound tag = l.getCompoundTagAt(i); if (!tag.hasKey("itemStack")) { // legacy #868 diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java index edcbd21b16..780a6c03de 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java @@ -252,8 +252,7 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O super.loadNBTData(aNBT); if (GregTech_API.mAE2) { NBTBase t = aNBT.getTag("cachedFluids"); - if (t instanceof NBTTagList) { - NBTTagList l = (NBTTagList) t; + if (t instanceof NBTTagList l) { for (int i = 0; i < l.tagCount(); ++i) { NBTTagCompound tag = l.getCompoundTagAt(i); NBTTagCompound tagFluidStack = tag.getCompoundTag("fluidStack"); diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java index 28caaef181..f273197026 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java @@ -59,8 +59,7 @@ public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuf super.onPostTick(aBaseMetaTileEntity, aTick); if (this.getBaseMetaTileEntity() instanceof BaseMetaTileEntity) { BaseMetaTileEntity mBaseMetaTileEntity = (BaseMetaTileEntity) getBaseMetaTileEntity(); - if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) { - MetaTileEntity mMetaTileEntity = (MetaTileEntity) mBaseMetaTileEntity.getMetaTileEntity(); + if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity mMetaTileEntity) { // for (int t = 0; t < 6; t++) { if (mMetaTileEntity.dechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) { diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java index 71b01f4cc2..444121cc79 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java @@ -47,7 +47,7 @@ public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine { tList.add(tList.get(0)); int i = 0; for (int j = tList.size() - 1; i < j; i++) { - if (GT_Utility.areStacksEqual(getInputAt(0), (ItemStack) tList.get(i))) { + if (GT_Utility.areStacksEqual(getInputAt(0), tList.get(i))) { this.mOutputItems[0] = GT_Utility.copyAmount(1L, tList.get(i + 1)); calculateOverclockedNess(1, 32); // In case recipe is too OP for that machine diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java index 18929fcb55..021511032b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java @@ -154,7 +154,7 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic && aStack.getItem() == ItemList.Tool_DataStick.getItem()) { this.ready = false; GT_Utility.ItemNBT.setBookTitle(aPlayer.getCurrentEquippedItem(), "Raw Prospection Data"); - List<String> tStringList = new ArrayList<String>(); + List<String> tStringList = new ArrayList<>(); // range by tier int min = -range(); @@ -238,26 +238,20 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic } private int range() { - switch (mTier) { - case 1: - return 16; - case 2: - return 32; - case 3: - return 48; - } - return 0; + return switch (mTier) { + case 1 -> 16; + case 2 -> 32; + case 3 -> 48; + default -> 0; + }; } private int step() { - switch (mTier) { - case 1: - return 1; - case 2: - return 3; - case 3: - return 4; - } - return 1; + return switch (mTier) { + case 1 -> 1; + case 2 -> 3; + case 3 -> 4; + default -> 1; + }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java index 210c55578f..08b5897298 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java @@ -111,8 +111,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank if ((aEntity instanceof EntityWeatherEffect)) { return -1.0F; } - if ((aEntity instanceof EntityPlayer)) { - EntityPlayer tPlayer = (EntityPlayer) aEntity; + if ((aEntity instanceof EntityPlayer tPlayer)) { int tCount = 64; for (int i = 0; i < 36; i++) { if (tPlayer.inventory.getStackInSlot(i) != null) { @@ -366,32 +365,31 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank } } } - List entities_in_box = getBaseMetaTileEntity().getWorld() - .getEntitiesWithinAABB( - Entity.class, - AxisAlignedBB.getBoundingBox( - getBaseMetaTileEntity().getOffsetX( - getBaseMetaTileEntity().getFrontFacing(), - 2) - 1, - getBaseMetaTileEntity().getOffsetY( - getBaseMetaTileEntity().getFrontFacing(), - 2) - 1, - getBaseMetaTileEntity().getOffsetZ( - getBaseMetaTileEntity().getFrontFacing(), - 2) - 1, - getBaseMetaTileEntity().getOffsetX( - getBaseMetaTileEntity().getFrontFacing(), - 2) + 2, - getBaseMetaTileEntity().getOffsetY( - getBaseMetaTileEntity().getFrontFacing(), - 2) + 2, - getBaseMetaTileEntity().getOffsetZ( - getBaseMetaTileEntity().getFrontFacing(), - 2) + 2)); + List<Entity> entities_in_box = getBaseMetaTileEntity().getWorld() + .getEntitiesWithinAABB( + Entity.class, + AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getOffsetX( + getBaseMetaTileEntity().getFrontFacing(), + 2) - 1, + getBaseMetaTileEntity().getOffsetY( + getBaseMetaTileEntity().getFrontFacing(), + 2) - 1, + getBaseMetaTileEntity().getOffsetZ( + getBaseMetaTileEntity().getFrontFacing(), + 2) - 1, + getBaseMetaTileEntity().getOffsetX( + getBaseMetaTileEntity().getFrontFacing(), + 2) + 2, + getBaseMetaTileEntity().getOffsetY( + getBaseMetaTileEntity().getFrontFacing(), + 2) + 2, + getBaseMetaTileEntity().getOffsetZ( + getBaseMetaTileEntity().getFrontFacing(), + 2) + 2)); for (Object tObject : entities_in_box) { - if (((tObject instanceof Entity)) && (!((Entity) tObject).isDead)) { - Entity tEntity = (Entity) tObject; + if (((tObject instanceof Entity tEntity)) && (!((Entity) tObject).isDead)) { // GT_FML_LOGGER.info("teleport"+(Math.pow(tDistance, 1.5))); if (getBaseMetaTileEntity().decreaseStoredEnergyUnits( (long) (Math.pow(tDistance, 1.5) * weightCalculation(tEntity) * sFPowerMultiplyer), diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java index 7d8ae980cd..898d819109 100644 --- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java @@ -240,8 +240,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta // It's not a block - let's see if it's a tile entity TileEntity tTileEntity = world.getTileEntity(aCoords.posX, aCoords.posY, aCoords.posZ); if (tTileEntity != gtTile && tTileEntity instanceof BaseMetaTileEntity - && ((BaseMetaTileEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_LongDistancePipelineBase) { - final GT_MetaTileEntity_LongDistancePipelineBase tGtTile = (GT_MetaTileEntity_LongDistancePipelineBase) ((BaseMetaTileEntity) tTileEntity).getMetaTileEntity(); + && ((BaseMetaTileEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_LongDistancePipelineBase tGtTile) { if (isSameClass(tGtTile) && tWires.contains( tGtTile.getFacingOffset( (BaseMetaTileEntity) tTileEntity, diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index 54551473f3..dbd24fb012 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -379,9 +379,7 @@ public class GT_MetaTileEntity_AssemblyLine extends if (!isValidMetaTileEntity(mInputHatches.get(i))) { continue nextDataStick; } else { - if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput) { - GT_MetaTileEntity_Hatch_MultiInput tMultiHatch = (GT_MetaTileEntity_Hatch_MultiInput) mInputHatches.get( - i); + if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput tMultiHatch) { if (!tMultiHatch.hasFluid(tRecipe.mFluidInputs[i]) || tMultiHatch.getFluidAmount(tRecipe.mFluidInputs[i]) < tRecipe.mFluidInputs[i].amount) { @@ -437,9 +435,7 @@ public class GT_MetaTileEntity_AssemblyLine extends } for (int i = 0; i < tFluids.length; i++) { - if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput) { - GT_MetaTileEntity_Hatch_MultiInput tMultiHatch = (GT_MetaTileEntity_Hatch_MultiInput) mInputHatches.get( - i); + if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput tMultiHatch) { tMultiHatch.getFluid(tFluidSlot[i]).amount -= tFluids[i]; if (tMultiHatch.getFluid(tFluidSlot[i]).amount <= 0) { tMultiHatch.setFluid(null, tFluidSlot[i]); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java index f445d5fea1..7e6ff95da1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java @@ -46,7 +46,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_DieselEngine> implements ISurvivalConstructable { private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DieselEngine>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_DieselEngine>>() { + private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DieselEngine>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_DieselEngine> computeValue(Class<?> type) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java index eb5adfbd3c..716634998f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java @@ -268,30 +268,28 @@ public class GT_MetaTileEntity_DistillationTower long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(0, GT_Utility.getTier(tVoltage)); FluidStack[] tFluids = tFluidList.toArray(new FluidStack[0]); - if (tFluids.length > 0) { - for (FluidStack tFluid : tFluids) { - tRecipe = GT_Recipe.GT_Recipe_Map.sDistillationRecipes.findRecipe( - getBaseMetaTileEntity(), - false, - gregtech.api.enums.GT_Values.V[tTier], - new FluidStack[] { tFluid }, - inputs); - if (tRecipe != null) { - if (tRecipe.isRecipeInputEqual(true, tFluids, inputs)) { - this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); - this.mEfficiencyIncrease = 10000; - calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); - // In case recipe is too OP for that machine - if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false; - if (this.mEUt > 0) { - this.mEUt = (-this.mEUt); - } - this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); - this.mOutputItems = new ItemStack[] { tRecipe.getOutput(0) }; - this.mOutputFluids = tRecipe.mFluidOutputs.clone(); - updateSlots(); - return true; + for (FluidStack tFluid : tFluids) { + tRecipe = GT_Recipe.GT_Recipe_Map.sDistillationRecipes.findRecipe( + getBaseMetaTileEntity(), + false, + gregtech.api.enums.GT_Values.V[tTier], + new FluidStack[] { tFluid }, + inputs); + if (tRecipe != null) { + if (tRecipe.isRecipeInputEqual(true, tFluids, inputs)) { + this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; + calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); + // In case recipe is too OP for that machine + if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false; + if (this.mEUt > 0) { + this.mEUt = (-this.mEUt); } + this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); + this.mOutputItems = new ItemStack[] { tRecipe.getOutput(0) }; + this.mOutputFluids = tRecipe.mFluidOutputs.clone(); + updateSlots(); + return true; } } } @@ -316,10 +314,9 @@ public class GT_MetaTileEntity_DistillationTower protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null || aTileEntity.isDead() - || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output)) + || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output tHatch)) return false; while (mOutputHatchesByLayer.size() < mHeight) mOutputHatchesByLayer.add(new ArrayList<>()); - GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aTileEntity.getMetaTileEntity(); tHatch.updateTexture(aBaseCasingIndex); return mOutputHatchesByLayer.get(mHeight - 1) .add(tHatch); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java index a0c62ae2a7..f7993fd2f4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java @@ -58,7 +58,7 @@ public abstract class GT_MetaTileEntity_DrillerBase private static final Block miningPipeBlock = GT_Utility.getBlockFromStack(miningPipe); private static final Block miningPipeTipBlock = GT_Utility.getBlockFromStack(miningPipeTip); protected static final String STRUCTURE_PIECE_MAIN = "main"; - protected static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DrillerBase>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_DrillerBase>>() { + protected static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DrillerBase>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_DrillerBase> computeValue(Class<?> type) { @@ -252,7 +252,7 @@ public abstract class GT_MetaTileEntity_DrillerBase /** * Added for compability reasons - * + * * @return true if the state is 0 false otherwise. * @deprecated compatibility reason */ @@ -274,10 +274,12 @@ public abstract class GT_MetaTileEntity_DrillerBase protected int tryLowerPipeState(boolean isSimulating) { if (!isHasMiningPipes()) return 2; switch (canLowerPipe()) { - case 1: + case 1 -> { return 1; - case 2: + } + case 2 -> { return 3; + } } Block b = getBaseMetaTileEntity().getBlock(xPipe, yHead - 1, zPipe); @@ -375,30 +377,32 @@ public abstract class GT_MetaTileEntity_DrillerBase protected boolean workingDownward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) { switch (tryLowerPipeState()) { - case 2: + case 2 -> { mMaxProgresstime = 0; return false; - case 3: + } + case 3 -> { workState = STATE_UPWARD; return true; - case 1: + } + case 1 -> { workState = STATE_AT_BOTTOM; return true; - default: + } + default -> { return true; + } } } protected boolean workingAtBottom(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) { - switch (tryLowerPipeState(true)) { - case 0: - workState = STATE_DOWNWARD; - return true; - default: - workState = STATE_UPWARD; - return true; + if (tryLowerPipeState(true) == 0) { + workState = STATE_DOWNWARD; + return true; } + workState = STATE_UPWARD; + return true; } protected boolean workingUpward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, @@ -422,16 +426,12 @@ public abstract class GT_MetaTileEntity_DrillerBase return false; } putMiningPipesFromInputsInController(); - switch (workState) { - case STATE_DOWNWARD: - return workingDownward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); - case STATE_AT_BOTTOM: - return workingAtBottom(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); - case STATE_UPWARD: - return workingUpward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); - default: - return false; - } + return switch (workState) { + case STATE_DOWNWARD -> workingDownward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); + case STATE_AT_BOTTOM -> workingAtBottom(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); + case STATE_UPWARD -> workingUpward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); + default -> false; + }; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index 869e1b53f8..73b26c6a59 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -62,7 +62,7 @@ public abstract class GT_MetaTileEntity_FusionComputer protected FusionPower power; public static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_FusionComputer>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_FusionComputer>>() { + private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_FusionComputer>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_FusionComputer> computeValue(Class<?> type) { @@ -239,8 +239,7 @@ public abstract class GT_MetaTileEntity_FusionComputer private boolean addEnergyInjector(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy)) return false; - GT_MetaTileEntity_Hatch_Energy tHatch = (GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity; + if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy tHatch)) return false; if (tHatch.mTier < tier()) return false; tHatch.updateTexture(aBaseCasingIndex); return mEnergyHatches.add(tHatch); @@ -249,8 +248,7 @@ public abstract class GT_MetaTileEntity_FusionComputer private boolean addInjector(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input)) return false; - GT_MetaTileEntity_Hatch_Input tHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; + if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input tHatch)) return false; if (tHatch.mTier < tier()) return false; tHatch.updateTexture(aBaseCasingIndex); tHatch.mRecipeMap = getRecipeMap(); @@ -261,8 +259,7 @@ public abstract class GT_MetaTileEntity_FusionComputer if (aBaseMetaTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output)) return false; - GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aMetaTileEntity; + if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output tHatch)) return false; if (tHatch.mTier < tier()) return false; tHatch.updateTexture(aBaseCasingIndex); return mOutputHatches.add(tHatch); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java index 832d376dc6..c3321931dd 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java @@ -357,20 +357,16 @@ public class GT_MetaTileEntity_IntegratedOreFactory } private static int getTime(int mode) { - switch (mode) { - case 0: - return 30 * 20; - case 1: - return 15 * 20; - case 2: - return 10 * 20; - case 3: - return 20 * 20; - case 4: - return 17 * 20; - } - // go to hell - return 1000000000; + return switch (mode) { + case 0 -> 30 * 20; + case 1 -> 15 * 20; + case 2 -> 10 * 20; + case 3 -> 20 * 20; + case 4 -> 17 * 20; + default -> + // go to hell + 1000000000; + }; } @Override @@ -438,36 +434,37 @@ public class GT_MetaTileEntity_IntegratedOreFactory sMidProduct = tOres.toArray(new ItemStack[0]); switch (sMode) { - case 0: + case 0 -> { doMac(isOre); doWash(isCrushedOre); doThermal(isCrushedPureOre, isCrushedOre); doMac(isThermal, isOre, isCrushedOre, isCrushedPureOre); - break; - case 1: + } + case 1 -> { doMac(isOre); doWash(isCrushedOre); doMac(isOre, isCrushedOre, isCrushedPureOre); doCentrifuge(isImpureDust, isPureDust); - break; - case 2: + } + case 2 -> { doMac(isOre); doMac(isThermal, isOre, isCrushedOre, isCrushedPureOre); doCentrifuge(isImpureDust, isPureDust); - break; - case 3: + } + case 3 -> { doMac(isOre); doWash(isCrushedOre); doSift(isCrushedPureOre); - break; - case 4: + } + case 4 -> { doMac(isOre); doChemWash(isCrushedOre, isCrushedPureOre); doMac(isCrushedOre, isCrushedPureOre); doCentrifuge(isImpureDust, isPureDust); - break; - default: + } + default -> { return false; + } } this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); @@ -844,37 +841,35 @@ public class GT_MetaTileEntity_IntegratedOreFactory des.add(StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor1") + " "); switch (mode) { - case 0: + case 0 -> { des.add(AQUA + CRUSH + ARROW); des.add(AQUA + WASH + ARROW); des.add(AQUA + THERMAL + ARROW); des.add(AQUA + CRUSH + ' '); - break; - case 1: + } + case 1 -> { des.add(AQUA + CRUSH + ARROW); des.add(AQUA + WASH + ARROW); des.add(AQUA + CENTRIFUGE + ARROW); des.add(AQUA + CRUSH + ' '); - break; - case 2: + } + case 2 -> { des.add(AQUA + CRUSH + ARROW); des.add(AQUA + CRUSH + ARROW); des.add(AQUA + CENTRIFUGE + ' '); - break; - case 3: + } + case 3 -> { des.add(AQUA + CRUSH + ARROW); des.add(AQUA + WASH + ARROW); des.add(AQUA + SIFTER + ' '); - - break; - case 4: + } + case 4 -> { des.add(AQUA + CRUSH + ARROW); des.add(AQUA + CHEM_WASH + ARROW); des.add(AQUA + CRUSH + ARROW); des.add(AQUA + CENTRIFUGE + ' '); - break; - default: - des.add(StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.WRONG_MODE")); + } + default -> des.add(StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.WRONG_MODE")); } des.add(StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor2", getTime(mode) / 20)); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java index d6fdc56854..fa2ebcb2a4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java @@ -47,7 +47,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeBoiler> implements ISurvivalConstructable { private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeBoiler>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeBoiler>>() { + private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeBoiler>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_LargeBoiler> computeValue(Class<?> type) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java index 38c3cc9af7..d14b06313f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java @@ -44,7 +44,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeTurbine> implements ISurvivalConstructable { private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbine>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbine>>() { + private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbine>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_LargeTurbine> computeValue(Class<?> type) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java index 3acf460d3f..6b7abb526e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java @@ -154,13 +154,11 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT if (totalFlow <= 0) return 0; tEU = GT_Utility.safeInt((long) totalFlow * fuelValue); - if (totalFlow == actualOptimalFlow) { - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); - } else { + if (totalFlow != actualOptimalFlow) { float efficiency = getOverflowEfficiency(totalFlow, actualOptimalFlow, overflowMultiplier); tEU *= efficiency; - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); } + tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); // EU/t output cap to properly tier the LGT against the Advanced LGT, will be implemented in a future dev // update diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java index 54787a1914..559f7ae32f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java @@ -158,13 +158,11 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit if (totalFlow <= 0) return 0; tEU = GT_Utility.safeInt((long) totalFlow * fuelValue); - if (totalFlow == actualOptimalFlow) { - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); - } else { + if (totalFlow != actualOptimalFlow) { float efficiency = getOverflowEfficiency(totalFlow, actualOptimalFlow, overflowMultiplier); tEU *= efficiency; - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); } + tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); // If next output is above the maximum the dynamo can handle, set it to the maximum instead of exploding the // turbine diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index 22681138ea..e6a707b9a1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -158,13 +158,11 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar // GT_FML_LOGGER.info(totalFlow+" : "+fuelValue+" : "+aOptFlow+" : "+actualOptimalFlow+" : "+tEU); - if (totalFlow == actualOptimalFlow) { - tEU = GT_Utility.safeInt((long) (aBaseEff / 10000D * tEU)); - } else { + if (totalFlow != actualOptimalFlow) { float efficiency = getOverflowEfficiency(totalFlow, actualOptimalFlow, overflowMultiplier); tEU = (int) (tEU * efficiency); - tEU = GT_Utility.safeInt((long) (aBaseEff / 10000D * tEU)); } + tEU = GT_Utility.safeInt((long) (aBaseEff / 10000D * tEU)); // If next output is above the maximum the dynamo can handle, set it to the maximum instead of exploding the // turbine @@ -347,7 +345,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar + "L", /* 6 */ StatCollector.translateToLocal("GT5U.turbine.dmg") + ": " + EnumChatFormatting.RED - + Integer.toString(tDura) + + tDura + EnumChatFormatting.RESET + "%", /* 7 */ StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java index 4887c95930..c4d4c3548c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java @@ -250,7 +250,7 @@ public class GT_MetaTileEntity_NanoForge extends GT_Recipe.GT_Recipe_Map map = getRecipeMap(); FluidStack[] tFluidInputs = getCompactedFluids(); if (inputSeparation) { - ArrayList<ItemStack> tInputList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> tInputList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) { for (int i = tBus.getSizeInventory() - 1; i >= 0; i--) { if (tBus.getStackInSlot(i) != null) tInputList.add(tBus.getStackInSlot(i)); @@ -303,7 +303,7 @@ public class GT_MetaTileEntity_NanoForge extends this.lEUt *= -1; } - ArrayList<ItemStack> tOutputs = new ArrayList<ItemStack>(); + ArrayList<ItemStack> tOutputs = new ArrayList<>(); for (int i = 0; i < tRecipe.mOutputs.length; i++) { if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(i)) { tOutputs.add(tRecipe.getOutput(i)); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java index c35f387fd1..1f2feb3657 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java @@ -250,8 +250,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - GT_MetaTileEntity_Hatch_Input tHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input tHatch) { tHatch.updateTexture(aBaseCasingIndex); tHatch.mRecipeMap = getRecipeMap(); return mMiddleInputHatches.add(tHatch); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java index f8eb8c7670..310703cd3f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java @@ -178,13 +178,15 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D protected boolean workingAtBottom(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) { switch (tryLowerPipeState(true)) { - case 0: + case 0 -> { workState = STATE_DOWNWARD; setElectricityStats(); return true; - case 3: + } + case 3 -> { workState = STATE_UPWARD; return true; + } } if (reachingVoidOrBedrock() && tryFillChunkList()) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java index c058c8880f..ba6a2604a5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java @@ -113,15 +113,18 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile fillMineListIfEmpty(xDrill, yDrill, zDrill, xPipe, zPipe, yHead); if (oreBlockPositions.isEmpty()) { switch (tryLowerPipeState()) { - case 2: + case 2 -> { mMaxProgresstime = 0; return false; - case 3: + } + case 3 -> { workState = STATE_UPWARD; return true; - case 1: + } + case 1 -> { workState = STATE_AT_BOTTOM; return true; + } } // new layer - fill again fillMineListIfEmpty(xDrill, yDrill, zDrill, xPipe, zPipe, yHead); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java index 7ad3c1b4bf..21432394b4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java @@ -628,7 +628,7 @@ public class GT_MetaTileEntity_PCBFactory extends GT_Recipe.GT_Recipe_Map aMap = getRecipeMap(); FluidStack[] tFluidInputs = getStoredFluids().toArray(new FluidStack[0]); if (inputSeparation) { - ArrayList<ItemStack> tInputList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> tInputList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) { for (int i = tBus.getSizeInventory() - 1; i >= 0; i--) { if (tBus.getStackInSlot(i) != null) tInputList.add(tBus.getStackInSlot(i)); @@ -743,7 +743,7 @@ public class GT_MetaTileEntity_PCBFactory extends } mOutputItems = new ItemStack[tRecipe.mOutputs.length]; - ArrayList<ItemStack> tOutputs = new ArrayList<ItemStack>(); + ArrayList<ItemStack> tOutputs = new ArrayList<>(); int remainingEfficiency = getMaxEfficiency(aStack); for (int j = 0; j < (int) Math.ceil(getMaxEfficiency(aStack) / 10000.0f); j++) { int chanced = getBaseMetaTileEntity().getRandomNumber(10000); @@ -875,43 +875,33 @@ public class GT_MetaTileEntity_PCBFactory extends if (curDirection == ForgeDirection.UP || curDirection == ForgeDirection.DOWN) { switch (curRotation) { - case CLOCKWISE: - case COUNTER_CLOCKWISE: + case CLOCKWISE, COUNTER_CLOCKWISE -> { newFlip = curFlip == Flip.NONE ? Flip.HORIZONTAL : Flip.NONE; newDirection = curDirection == ForgeDirection.UP ? ForgeDirection.NORTH : ForgeDirection.SOUTH; - break; - case NORMAL: + } + case NORMAL -> { newRotation = curDirection == ForgeDirection.UP ? Rotation.CLOCKWISE : Rotation.COUNTER_CLOCKWISE; newDirection = curDirection == ForgeDirection.UP ? ForgeDirection.EAST : ForgeDirection.WEST; newFlip = Flip.NONE; - break; - case UPSIDE_DOWN: + } + case UPSIDE_DOWN -> { newRotation = curDirection == ForgeDirection.UP ? Rotation.COUNTER_CLOCKWISE : Rotation.CLOCKWISE; newDirection = curDirection == ForgeDirection.UP ? ForgeDirection.EAST : ForgeDirection.WEST; newFlip = Flip.NONE; - break; + } } } else if (curRotation == Rotation.CLOCKWISE || curRotation == Rotation.COUNTER_CLOCKWISE) { newFlip = curRotation == Rotation.CLOCKWISE ? curFlip == Flip.NONE ? Flip.NONE : Flip.HORIZONTAL : curFlip != Flip.NONE ? Flip.NONE : Flip.HORIZONTAL; newDirection = curRotation == Rotation.CLOCKWISE ? ForgeDirection.UP : ForgeDirection.DOWN; } else { - switch (curDirection) { - case EAST: - newDirection = ForgeDirection.SOUTH; - break; - case NORTH: - newDirection = ForgeDirection.EAST; - break; - case WEST: - newDirection = ForgeDirection.NORTH; - break; - case SOUTH: - newDirection = ForgeDirection.WEST; - break; - default: - newDirection = curDirection; - } + newDirection = switch (curDirection) { + case EAST -> ForgeDirection.SOUTH; + case NORTH -> ForgeDirection.EAST; + case WEST -> ForgeDirection.NORTH; + case SOUTH -> ForgeDirection.WEST; + default -> curDirection; + }; } if (curRotation == Rotation.UPSIDE_DOWN) { @@ -1059,7 +1049,7 @@ public class GT_MetaTileEntity_PCBFactory extends + StatCollector.translateToLocal("GT5U.multiblock.efficiency") + ": " + EnumChatFormatting.YELLOW - + Float.toString(mEfficiency / 100.0F) + + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", /* 6 */ StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " @@ -1293,7 +1283,7 @@ public class GT_MetaTileEntity_PCBFactory extends .setPos(173, 98)) .widget( new TextFieldWidget().setGetterInt(() -> mSetTier) - .setSetterInt(val -> { mSetTier = val; }) + .setSetterInt(val -> mSetTier = val) .setNumbers(1, 3) .setTextColor(Color.WHITE.normal) .setTextAlignment(Alignment.Center) @@ -1486,10 +1476,8 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> (int) ((1f / mRoughnessMultiplier) * 100f)) .setSetterInt( - val -> { - mRoughnessMultiplier = 100f - / val; - }) + val -> mRoughnessMultiplier = 100f + / val) .setNumbers(50, 200) .setTextColor(Color.WHITE.normal) .setTextAlignment(Alignment.Center) @@ -1523,9 +1511,7 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> mBioOffsets[0]) .setSetterInt( - val -> { - mBioOffsets[0] = val; - }) + val -> mBioOffsets[0] = val) .setNumbers( -16, 16) @@ -1544,9 +1530,7 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> mBioOffsets[1]) .setSetterInt( - val -> { - mBioOffsets[1] = val; - }) + val -> mBioOffsets[1] = val) .setNumbers( -16, 16) @@ -1574,9 +1558,7 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> mOCTier1Offsets[0]) .setSetterInt( - val -> { - mOCTier1Offsets[0] = val; - }) + val -> mOCTier1Offsets[0] = val) .setNumbers( -16, 16) @@ -1595,9 +1577,7 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> mOCTier1Offsets[1]) .setSetterInt( - val -> { - mOCTier1Offsets[1] = val; - }) + val -> mOCTier1Offsets[1] = val) .setNumbers( -16, 16) @@ -1625,9 +1605,7 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> mOCTier2Offsets[0]) .setSetterInt( - val -> { - mOCTier2Offsets[0] = val; - }) + val -> mOCTier2Offsets[0] = val) .setNumbers( -16, 16) @@ -1646,9 +1624,7 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> mOCTier2Offsets[1]) .setSetterInt( - val -> { - mOCTier2Offsets[1] = val; - }) + val -> mOCTier2Offsets[1] = val) .setNumbers( -16, 16) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java index 04811bb5d4..4c847e0fb7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java @@ -47,7 +47,7 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn implements IAlignment, ISurvivalConstructable, IAddUIWidgets, IGetTitleColor { public static final int INPUT_SLOTS = 3, OUTPUT_SLOTS = 3; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_PrimitiveBlastFurnace>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_PrimitiveBlastFurnace>>() { + private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_PrimitiveBlastFurnace>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_PrimitiveBlastFurnace> computeValue(Class<?> type) { diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java index cee78c3fa4..ce6a5509bb 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java @@ -59,30 +59,19 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti } protected static int commonSizeCompute(int tier) { - switch (tier) { - case 1: - return 4000000; - case 2: - return 8000000; - case 3: - return 16000000; - case 4: - return 32000000; - case 5: - return 64000000; - case 6: - return 128000000; - case 7: - return 256000000; - case 8: - return 512000000; - case 9: - return 1024000000; - case 10: - return 2147483640; - default: - return 0; - } + return switch (tier) { + case 1 -> 4000000; + case 2 -> 8000000; + case 3 -> 16000000; + case 4 -> 32000000; + case 5 -> 64000000; + case 6 -> 128000000; + case 7 -> 256000000; + case 8 -> 512000000; + case 9 -> 1024000000; + case 10 -> 2147483640; + default -> 0; + }; } public GT_MetaTileEntity_DigitalChestBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java index e374658871..93ee2b0c10 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java @@ -64,57 +64,35 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit } protected static int commonSizeCompute(int tier) { - switch (tier) { - case 1: - return 4000000; - case 2: - return 8000000; - case 3: - return 16000000; - case 4: - return 32000000; - case 5: - return 64000000; - case 6: - return 128000000; - case 7: - return 256000000; - case 8: - return 512000000; - case 9: - return 1024000000; - case 10: - return 2147483640; - default: - return 0; - } + return switch (tier) { + case 1 -> 4000000; + case 2 -> 8000000; + case 3 -> 16000000; + case 4 -> 32000000; + case 5 -> 64000000; + case 6 -> 128000000; + case 7 -> 256000000; + case 8 -> 512000000; + case 9 -> 1024000000; + case 10 -> 2147483640; + default -> 0; + }; } private static int tierPump(int tier) { - switch (tier) { - case 1: - return 2; - case 2: - return 3; - case 3: - return 3; - case 4: - return 4; - case 5: - return 4; - case 6: - return 5; - case 7: - return 5; - case 8: - return 6; - case 9: - return 7; - case 10: - return 8; - default: - return 0; - } + return switch (tier) { + case 1 -> 2; + case 2 -> 3; + case 3 -> 3; + case 4 -> 4; + case 5 -> 4; + case 6 -> 5; + case 7 -> 5; + case 8 -> 6; + case 9 -> 7; + case 10 -> 8; + default -> 0; + }; } public GT_MetaTileEntity_DigitalTankBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { |