diff --git a/src/main/java/electrodynamics/api/gas/GasStack.java b/src/main/java/electrodynamics/api/gas/GasStack.java index 057384e9d..618ef4adf 100644 --- a/src/main/java/electrodynamics/api/gas/GasStack.java +++ b/src/main/java/electrodynamics/api/gas/GasStack.java @@ -167,7 +167,7 @@ public int getVolumeChangeFromHeating(int deltaTemp) { throw new UnsupportedOperationException("The temperature cannot drop below absolute zero"); } - double change = (deltaTemp + (double) temperature) / (double) temperature; + double change = (deltaTemp + (double) temperature) / temperature; return (int) Math.ceil(amount * change); diff --git a/src/main/java/electrodynamics/client/misc/SWBFClientExtensions.java b/src/main/java/electrodynamics/client/misc/SWBFClientExtensions.java index d3390314d..0ff4ff3a9 100644 --- a/src/main/java/electrodynamics/client/misc/SWBFClientExtensions.java +++ b/src/main/java/electrodynamics/client/misc/SWBFClientExtensions.java @@ -15,6 +15,7 @@ public SWBFClientExtensions(SimpleWaterBasedFluidType fluidType) { this.fluidType = fluidType; } + @Override public ResourceLocation getStillTexture() { return fluidType.texture; } diff --git a/src/main/java/electrodynamics/client/particle/fluiddrop/ParticleFluidDrop.java b/src/main/java/electrodynamics/client/particle/fluiddrop/ParticleFluidDrop.java index 277ca3d4e..551c068a6 100644 --- a/src/main/java/electrodynamics/client/particle/fluiddrop/ParticleFluidDrop.java +++ b/src/main/java/electrodynamics/client/particle/fluiddrop/ParticleFluidDrop.java @@ -25,7 +25,7 @@ public ParticleFluidDrop(ClientLevel level, double x, double y, double z, double setSpriteFromAge(sprites); setColor(options.r, options.g, options.b); int i = (int)(8.0 / (this.random.nextDouble() * 0.8 + 0.2)); - this.lifetime = (int)Math.max((float)i * options.scale, 1.0F); + this.lifetime = (int)Math.max(i * options.scale, 1.0F); } @Override @@ -35,7 +35,7 @@ public ParticleRenderType getRenderType() { @Override public float getQuadSize(float scaleFactor) { - return this.quadSize * Mth.clamp(((float)this.age + scaleFactor) / (float)this.lifetime * 32.0F, 0.0F, 1.0F); + return this.quadSize * Mth.clamp((this.age + scaleFactor) / this.lifetime * 32.0F, 0.0F, 1.0F); } @Override diff --git a/src/main/java/electrodynamics/client/particle/lavawithphysics/ParticleLavaWithPhysics.java b/src/main/java/electrodynamics/client/particle/lavawithphysics/ParticleLavaWithPhysics.java index 93dafbe7e..9388aa211 100644 --- a/src/main/java/electrodynamics/client/particle/lavawithphysics/ParticleLavaWithPhysics.java +++ b/src/main/java/electrodynamics/client/particle/lavawithphysics/ParticleLavaWithPhysics.java @@ -44,7 +44,7 @@ public int getLightColor(float partialTick) { @Override public float getQuadSize(float scaleFactor) { - float f = ((float) this.age + scaleFactor) / (float) this.lifetime; + float f = (this.age + scaleFactor) / this.lifetime; return this.quadSize * (1.0F - f * f); } diff --git a/src/main/java/electrodynamics/client/screen/item/ScreenSeismicScanner.java b/src/main/java/electrodynamics/client/screen/item/ScreenSeismicScanner.java index 63b3c58be..49743c88b 100644 --- a/src/main/java/electrodynamics/client/screen/item/ScreenSeismicScanner.java +++ b/src/main/java/electrodynamics/client/screen/item/ScreenSeismicScanner.java @@ -60,7 +60,7 @@ public ScreenSeismicScanner(ContainerSeismicScanner container, Inventory inv, Co graphics.renderComponentTooltip(getFontRenderer(), tooltips, xAxis, yAxis); }).setOnPress(but -> { - ScreenComponentButton button = (ScreenComponentButton) but; + ScreenComponentButton button = but; componentsToHide.forEach(component -> { component.setActive(button.isPressed); diff --git a/src/main/java/electrodynamics/client/screen/tile/ScreenElectrolosisChamber.java b/src/main/java/electrodynamics/client/screen/tile/ScreenElectrolosisChamber.java index 3a485f0c2..875b0515f 100644 --- a/src/main/java/electrodynamics/client/screen/tile/ScreenElectrolosisChamber.java +++ b/src/main/java/electrodynamics/client/screen/tile/ScreenElectrolosisChamber.java @@ -51,12 +51,12 @@ public ScreenElectrolosisChamber(ContainerElectrolosisChamber container, Invento int width = getFontRenderer().width(text); float scale = 1; if(width > 70) { - scale = 70.0F / (float) width; + scale = 70.0F / width; width = 70; } int diff = 70 - width; int half = diff / 2; - int x = (int) Math.ceil((float) (52 + half) / scale) + 1; + int x = (int) Math.ceil((52 + half) / scale) + 1; int y = (int) Math.ceil(52.0F / scale); graphics.pose().pushPose(); graphics.pose().scale(scale, scale, scale); diff --git a/src/main/java/electrodynamics/common/block/subtype/SubtypeMachine.java b/src/main/java/electrodynamics/common/block/subtype/SubtypeMachine.java index e35e3c1e3..194c6d432 100644 --- a/src/main/java/electrodynamics/common/block/subtype/SubtypeMachine.java +++ b/src/main/java/electrodynamics/common/block/subtype/SubtypeMachine.java @@ -216,6 +216,7 @@ public boolean isItem() { return false; } + @Override public boolean isPlayerStorable() { return this == quarry; } diff --git a/src/main/java/electrodynamics/common/item/gear/tools/electric/utils/ItemRailgun.java b/src/main/java/electrodynamics/common/item/gear/tools/electric/utils/ItemRailgun.java index 47839b728..a6cf8b811 100644 --- a/src/main/java/electrodynamics/common/item/gear/tools/electric/utils/ItemRailgun.java +++ b/src/main/java/electrodynamics/common/item/gear/tools/electric/utils/ItemRailgun.java @@ -123,7 +123,7 @@ public static void registerColoredBlocks(RegisterColorHandlersEvent.Item event) double maxHeat = item.getMaxTemp(); - double amtPerTier = maxHeat / (double) HEAT_COLORS.length; + double amtPerTier = maxHeat / HEAT_COLORS.length; int threshhold = (int) (currHeat / amtPerTier); diff --git a/src/main/java/electrodynamics/common/tile/TileMultiSubnode.java b/src/main/java/electrodynamics/common/tile/TileMultiSubnode.java index 065767dda..021637391 100644 --- a/src/main/java/electrodynamics/common/tile/TileMultiSubnode.java +++ b/src/main/java/electrodynamics/common/tile/TileMultiSubnode.java @@ -37,6 +37,7 @@ public TileMultiSubnode(BlockPos worldPosition, BlockState blockState) { addComponent(new ComponentPacketHandler(this)); } + @Override @Nullable public ICapabilityElectrodynamic getElectrodynamicCapability(@Nullable Direction side) { if (level.getBlockEntity(parentPos.get()) instanceof IMultiblockParentTile node) { @@ -45,6 +46,7 @@ public ICapabilityElectrodynamic getElectrodynamicCapability(@Nullable Direction return null; } + @Override @Nullable public IFluidHandler getFluidHandlerCapability(@Nullable Direction side) { if (level.getBlockEntity(parentPos.get()) instanceof IMultiblockParentTile node) { @@ -53,6 +55,7 @@ public IFluidHandler getFluidHandlerCapability(@Nullable Direction side) { return null; } + @Override @Nullable public IGasHandler getGasHandlerCapability(@Nullable Direction side) { if (level.getBlockEntity(parentPos.get()) instanceof IMultiblockParentTile node) { @@ -61,6 +64,7 @@ public IGasHandler getGasHandlerCapability(@Nullable Direction side) { return null; } + @Override @Nullable public IItemHandler getItemHandlerCapability(@Nullable Direction side) { if (level.getBlockEntity(parentPos.get()) instanceof IMultiblockParentTile node) { diff --git a/src/main/java/electrodynamics/common/tile/machines/quarry/TileLogisticalManager.java b/src/main/java/electrodynamics/common/tile/machines/quarry/TileLogisticalManager.java index 1b57d53b7..02163982b 100644 --- a/src/main/java/electrodynamics/common/tile/machines/quarry/TileLogisticalManager.java +++ b/src/main/java/electrodynamics/common/tile/machines/quarry/TileLogisticalManager.java @@ -251,6 +251,7 @@ public void writeConnection(Direction dir, EnumConnectType connection) { connections.set(masked | (connection.ordinal() << (dir.ordinal() * 4))); } + @Override public EnumConnectType[] readConnections() { EnumConnectType[] connections = new EnumConnectType[6]; for (Direction dir : Direction.values()) { diff --git a/src/main/java/electrodynamics/common/tile/pipelines/gas/gastransformer/thermoelectricmanipulator/GenericTileThermoelectricManipulator.java b/src/main/java/electrodynamics/common/tile/pipelines/gas/gastransformer/thermoelectricmanipulator/GenericTileThermoelectricManipulator.java index 96a491d8b..d9919a68c 100644 --- a/src/main/java/electrodynamics/common/tile/pipelines/gas/gastransformer/thermoelectricmanipulator/GenericTileThermoelectricManipulator.java +++ b/src/main/java/electrodynamics/common/tile/pipelines/gas/gastransformer/thermoelectricmanipulator/GenericTileThermoelectricManipulator.java @@ -360,7 +360,7 @@ public BiConsumer getCondensedHandler() { tankGas.bringPressureTo(Gas.PRESSURE_AT_SEA_LEVEL); - FluidStack fluidStack = new FluidStack(fluid, (int) tankGas.getAmount()); + FluidStack fluidStack = new FluidStack(fluid, tankGas.getAmount()); outputTank.fill(fluidStack, IFluidHandler.FluidAction.EXECUTE); diff --git a/src/main/java/electrodynamics/common/tile/pipelines/gas/gastransformer/thermoelectricmanipulator/TileAdvancedThermoelectricManipulator.java b/src/main/java/electrodynamics/common/tile/pipelines/gas/gastransformer/thermoelectricmanipulator/TileAdvancedThermoelectricManipulator.java index b5b09ee48..bd21419d6 100644 --- a/src/main/java/electrodynamics/common/tile/pipelines/gas/gastransformer/thermoelectricmanipulator/TileAdvancedThermoelectricManipulator.java +++ b/src/main/java/electrodynamics/common/tile/pipelines/gas/gastransformer/thermoelectricmanipulator/TileAdvancedThermoelectricManipulator.java @@ -89,10 +89,10 @@ public void updateAddonTanks(int count, boolean isLeft) { ComponentGasHandlerMulti handler = getComponent(IComponentType.GasHandler); ComponentFluidHandlerMulti multi = getComponent(IComponentType.FluidHandler); if (isLeft) { - multi.getInputTanks()[0].setCapacity((int) (Constants.GAS_TRANSFORMER_BASE_INPUT_CAPCITY + Constants.GAS_TRANSFORMER_ADDON_TANK_CAPCITY * count)); + multi.getInputTanks()[0].setCapacity(Constants.GAS_TRANSFORMER_BASE_INPUT_CAPCITY + Constants.GAS_TRANSFORMER_ADDON_TANK_CAPCITY * count); handler.getInputTanks()[0].setCapacity(Constants.GAS_TRANSFORMER_BASE_INPUT_CAPCITY + Constants.GAS_TRANSFORMER_ADDON_TANK_CAPCITY * count); } else { - multi.getOutputTanks()[0].setCapacity((int) (Constants.GAS_TRANSFORMER_BASE_OUTPUT_CAPCITY + Constants.GAS_TRANSFORMER_ADDON_TANK_CAPCITY * count)); + multi.getOutputTanks()[0].setCapacity(Constants.GAS_TRANSFORMER_BASE_OUTPUT_CAPCITY + Constants.GAS_TRANSFORMER_ADDON_TANK_CAPCITY * count); handler.getOutputTanks()[0].setCapacity(Constants.GAS_TRANSFORMER_BASE_OUTPUT_CAPCITY + Constants.GAS_TRANSFORMER_ADDON_TANK_CAPCITY * count); } } @@ -193,7 +193,7 @@ public void updateLit(boolean isHeating, Direction facing) { @Override public IComponentFluidHandler getFluidHandler() { - return new ComponentFluidHandlerMulti.ComponentFluidHandlerMultiBiDirec(this).setInputDirections(BlockEntityUtils.MachineDirection.BOTTOM).setInputTanks(1, arr((int) Constants.GAS_TRANSFORMER_BASE_INPUT_CAPCITY)).setOutputDirections(BlockEntityUtils.MachineDirection.BOTTOM).setOutputTanks(1, arr((int) Constants.GAS_TRANSFORMER_BASE_OUTPUT_CAPCITY)); + return new ComponentFluidHandlerMulti.ComponentFluidHandlerMultiBiDirec(this).setInputDirections(BlockEntityUtils.MachineDirection.BOTTOM).setInputTanks(1, arr(Constants.GAS_TRANSFORMER_BASE_INPUT_CAPCITY)).setOutputDirections(BlockEntityUtils.MachineDirection.BOTTOM).setOutputTanks(1, arr(Constants.GAS_TRANSFORMER_BASE_OUTPUT_CAPCITY)); } @Override diff --git a/src/main/java/electrodynamics/common/tile/pipelines/gas/gastransformer/thermoelectricmanipulator/TileBasicThermoelectricManipulator.java b/src/main/java/electrodynamics/common/tile/pipelines/gas/gastransformer/thermoelectricmanipulator/TileBasicThermoelectricManipulator.java index 7de603a4e..8911817c8 100644 --- a/src/main/java/electrodynamics/common/tile/pipelines/gas/gastransformer/thermoelectricmanipulator/TileBasicThermoelectricManipulator.java +++ b/src/main/java/electrodynamics/common/tile/pipelines/gas/gastransformer/thermoelectricmanipulator/TileBasicThermoelectricManipulator.java @@ -40,7 +40,7 @@ public void updateLit(boolean isHeating, Direction facing) { @Override public IComponentFluidHandler getFluidHandler() { - return new ComponentFluidHandlerMulti(this).setInputTanks(1, (int) Constants.GAS_TRANSFORMER_BASE_INPUT_CAPCITY).setInputDirections(BlockEntityUtils.MachineDirection.BACK).setOutputTanks(1, (int) Constants.GAS_TRANSFORMER_BASE_OUTPUT_CAPCITY).setOutputDirections(BlockEntityUtils.MachineDirection.FRONT); + return new ComponentFluidHandlerMulti(this).setInputTanks(1, Constants.GAS_TRANSFORMER_BASE_INPUT_CAPCITY).setInputDirections(BlockEntityUtils.MachineDirection.BACK).setOutputTanks(1, Constants.GAS_TRANSFORMER_BASE_OUTPUT_CAPCITY).setOutputDirections(BlockEntityUtils.MachineDirection.FRONT); } @Override @@ -97,9 +97,9 @@ public void updateTankCount() { } ComponentGasHandlerMulti handler = getComponent(IComponentType.GasHandler); ComponentFluidHandlerMulti multi = getComponent(IComponentType.FluidHandler); - multi.getInputTanks()[0].setCapacity((int) (Constants.GAS_TRANSFORMER_BASE_INPUT_CAPCITY + Constants.GAS_TRANSFORMER_ADDON_TANK_CAPCITY * tankCount)); + multi.getInputTanks()[0].setCapacity(Constants.GAS_TRANSFORMER_BASE_INPUT_CAPCITY + Constants.GAS_TRANSFORMER_ADDON_TANK_CAPCITY * tankCount); handler.getInputTanks()[0].setCapacity(Constants.GAS_TRANSFORMER_BASE_INPUT_CAPCITY + Constants.GAS_TRANSFORMER_ADDON_TANK_CAPCITY * tankCount); - multi.getOutputTanks()[0].setCapacity((int) (Constants.GAS_TRANSFORMER_BASE_OUTPUT_CAPCITY + Constants.GAS_TRANSFORMER_ADDON_TANK_CAPCITY * tankCount)); + multi.getOutputTanks()[0].setCapacity(Constants.GAS_TRANSFORMER_BASE_OUTPUT_CAPCITY + Constants.GAS_TRANSFORMER_ADDON_TANK_CAPCITY * tankCount); handler.getOutputTanks()[0].setCapacity(Constants.GAS_TRANSFORMER_BASE_OUTPUT_CAPCITY + Constants.GAS_TRANSFORMER_ADDON_TANK_CAPCITY * tankCount); } diff --git a/src/main/java/electrodynamics/compatibility/jei/recipecategories/misc/ChemicalReactorRecipeCategory.java b/src/main/java/electrodynamics/compatibility/jei/recipecategories/misc/ChemicalReactorRecipeCategory.java index c17c269ec..b49803674 100644 --- a/src/main/java/electrodynamics/compatibility/jei/recipecategories/misc/ChemicalReactorRecipeCategory.java +++ b/src/main/java/electrodynamics/compatibility/jei/recipecategories/misc/ChemicalReactorRecipeCategory.java @@ -202,6 +202,7 @@ public List getGasOutputs(ChemicalReactorRecipe recipe) { return outputs; } + @Override public void setItemInputs(List> inputs, IRecipeLayoutBuilder builder) { SlotDataWrapper wrapper; for (int i = 0; i < inputSlotWrappers.length; i++) { @@ -214,6 +215,7 @@ public void setItemInputs(List> inputs, IRecipeLayoutBuilder bui } } + @Override public void setItemOutputs(List outputs, IRecipeLayoutBuilder builder) { SlotDataWrapper wrapper; for (int i = 0; i < outputSlotWrappers.length; i++) { @@ -228,6 +230,7 @@ public void setItemOutputs(List outputs, IRecipeLayoutBuilder builder } } + @Override public void setFluidInputs(List> inputs, IRecipeLayoutBuilder builder) { AbstractFluidGaugeObject wrapper; RecipeIngredientRole role = RecipeIngredientRole.INPUT; @@ -270,6 +273,7 @@ public void setFluidInputs(List> inputs, IRecipeLayoutBuilder b } } + @Override public void setFluidOutputs(List outputs, IRecipeLayoutBuilder builder) { AbstractFluidGaugeObject wrapper; RecipeIngredientRole role = RecipeIngredientRole.OUTPUT; @@ -301,6 +305,7 @@ public void setFluidOutputs(List outputs, IRecipeLayoutBuilder build } } + @Override public void setGasInputs(List> inputs, IRecipeLayoutBuilder builder) { AbstractGasGaugeObject wrapper; @@ -339,11 +344,12 @@ public void setGasInputs(List> inputs, IRecipeLayoutBuilder build int oneMinusHeight = wrapper.getHeight() - height; - builder.addSlot(role, wrapper.getX() + 1, wrapper.getY() + wrapper.getHeight() - height).addIngredients(ElectrodynamicsJeiTypes.GAS_STACK, stacks).setCustomRenderer(ElectrodynamicsJeiTypes.GAS_STACK, new IngredientRendererGasStack((int) maxGaugeCap, -oneMinusHeight + 1, height, wrapper.getBarsTexture())); + builder.addSlot(role, wrapper.getX() + 1, wrapper.getY() + wrapper.getHeight() - height).addIngredients(ElectrodynamicsJeiTypes.GAS_STACK, stacks).setCustomRenderer(ElectrodynamicsJeiTypes.GAS_STACK, new IngredientRendererGasStack(maxGaugeCap, -oneMinusHeight + 1, height, wrapper.getBarsTexture())); } } + @Override public void setGasOutputs(List outputs, IRecipeLayoutBuilder builder) { AbstractGasGaugeObject wrapper; @@ -376,7 +382,7 @@ public void setGasOutputs(List outputs, IRecipeLayoutBuilder builder) int oneMinusHeight = wrapper.getHeight() - height; - builder.addSlot(role, wrapper.getX() + 1, wrapper.getY() + wrapper.getHeight() - height).addIngredient(ElectrodynamicsJeiTypes.GAS_STACK, stack).setCustomRenderer(ElectrodynamicsJeiTypes.GAS_STACK, new IngredientRendererGasStack((int) maxGaugeCap, -oneMinusHeight + 1, height, wrapper.getBarsTexture())); + builder.addSlot(role, wrapper.getX() + 1, wrapper.getY() + wrapper.getHeight() - height).addIngredient(ElectrodynamicsJeiTypes.GAS_STACK, stack).setCustomRenderer(ElectrodynamicsJeiTypes.GAS_STACK, new IngredientRendererGasStack(maxGaugeCap, -oneMinusHeight + 1, height, wrapper.getBarsTexture())); } } } diff --git a/src/main/java/electrodynamics/compatibility/jei/recipecategories/utils/AbstractRecipeCategory.java b/src/main/java/electrodynamics/compatibility/jei/recipecategories/utils/AbstractRecipeCategory.java index 306162670..2134d8e71 100644 --- a/src/main/java/electrodynamics/compatibility/jei/recipecategories/utils/AbstractRecipeCategory.java +++ b/src/main/java/electrodynamics/compatibility/jei/recipecategories/utils/AbstractRecipeCategory.java @@ -329,7 +329,7 @@ public void setGasInputs(List> inputs, IRecipeLayoutBuilder build int oneMinusHeight = wrapper.getHeight() - height; - builder.addSlot(role, wrapper.getX() + 1, wrapper.getY() + wrapper.getHeight() - height).addIngredients(ElectrodynamicsJeiTypes.GAS_STACK, stacks).setCustomRenderer(ElectrodynamicsJeiTypes.GAS_STACK, new IngredientRendererGasStack((int) maxGaugeCap, -oneMinusHeight + 1, height, wrapper.getBarsTexture())); + builder.addSlot(role, wrapper.getX() + 1, wrapper.getY() + wrapper.getHeight() - height).addIngredients(ElectrodynamicsJeiTypes.GAS_STACK, stacks).setCustomRenderer(ElectrodynamicsJeiTypes.GAS_STACK, new IngredientRendererGasStack(maxGaugeCap, -oneMinusHeight + 1, height, wrapper.getBarsTexture())); } } @@ -362,7 +362,7 @@ public void setGasOutputs(List outputs, IRecipeLayoutBuilder builder) int oneMinusHeight = wrapper.getHeight() - height; - builder.addSlot(role, wrapper.getX() + 1, wrapper.getY() + wrapper.getHeight() - height).addIngredient(ElectrodynamicsJeiTypes.GAS_STACK, stack).setCustomRenderer(ElectrodynamicsJeiTypes.GAS_STACK, new IngredientRendererGasStack((int) maxGaugeCap, -oneMinusHeight + 1, height, wrapper.getBarsTexture())); + builder.addSlot(role, wrapper.getX() + 1, wrapper.getY() + wrapper.getHeight() - height).addIngredient(ElectrodynamicsJeiTypes.GAS_STACK, stack).setCustomRenderer(ElectrodynamicsJeiTypes.GAS_STACK, new IngredientRendererGasStack(maxGaugeCap, -oneMinusHeight + 1, height, wrapper.getBarsTexture())); } } diff --git a/src/main/java/electrodynamics/compatibility/jei/utils/ingredients/IngredientRendererGasStack.java b/src/main/java/electrodynamics/compatibility/jei/utils/ingredients/IngredientRendererGasStack.java index 31941bff6..d18f961ae 100644 --- a/src/main/java/electrodynamics/compatibility/jei/utils/ingredients/IngredientRendererGasStack.java +++ b/src/main/java/electrodynamics/compatibility/jei/utils/ingredients/IngredientRendererGasStack.java @@ -54,7 +54,7 @@ public void render(GuiGraphics graphics, GasStack ingredient) { stack.pushPose(); - float amt = (float) ingredient.getAmount(); + float amt = ingredient.getAmount(); if (amt < tankAmount / 50) { double amtPowTen = Math.pow(10, Math.round(Math.log10(amt) - Math.log10(5.5) + 0.5)); diff --git a/src/main/java/electrodynamics/prefab/screen/component/types/ScreenComponentVerticalSlider.java b/src/main/java/electrodynamics/prefab/screen/component/types/ScreenComponentVerticalSlider.java index 7e58ad7cb..2a0cd6c78 100644 --- a/src/main/java/electrodynamics/prefab/screen/component/types/ScreenComponentVerticalSlider.java +++ b/src/main/java/electrodynamics/prefab/screen/component/types/ScreenComponentVerticalSlider.java @@ -31,6 +31,7 @@ public ScreenComponentVerticalSlider setClickConsumer(Consumer responde return this; } + @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double dragX, double dragY) { if (isValidClick(button)) { this.onMouseDrag(mouseX, mouseY, dragX, dragY); @@ -75,7 +76,7 @@ public void renderBackground(GuiGraphics graphics, int xAxis, int yAxis, int gui graphics.blit(bg.getLocation(), guiWidth + xLocation - 1, guiHeight + yLocation, width, 1, bg.textureU(), bg.textureV(), bg.textureWidth(), 1, bg.imageWidth(), bg.imageHeight()); - int permutations = (int) ((double) (height - 2) / 28.0D); + int permutations = (int) ((height - 2) / 28.0D); int remainder = height - permutations * 28 - 2; @@ -148,31 +149,38 @@ private VerticalSliderTextures(int textureWidth, int textureHeight, int textureU this.loc = loc; } - public ResourceLocation getLocation() { + @Override + public ResourceLocation getLocation() { return this.loc; } - public int imageHeight() { + @Override + public int imageHeight() { return this.imageHeight; } - public int imageWidth() { + @Override + public int imageWidth() { return this.imageWidth; } - public int textureHeight() { + @Override + public int textureHeight() { return this.textureHeight; } - public int textureU() { + @Override + public int textureU() { return this.textureU; } - public int textureV() { + @Override + public int textureV() { return this.textureV; } - public int textureWidth() { + @Override + public int textureWidth() { return this.textureWidth; } diff --git a/src/main/java/electrodynamics/prefab/tile/components/type/ComponentFluidHandlerMulti.java b/src/main/java/electrodynamics/prefab/tile/components/type/ComponentFluidHandlerMulti.java index 1cfaaeb8f..75bd08ab5 100644 --- a/src/main/java/electrodynamics/prefab/tile/components/type/ComponentFluidHandlerMulti.java +++ b/src/main/java/electrodynamics/prefab/tile/components/type/ComponentFluidHandlerMulti.java @@ -230,6 +230,7 @@ public IComponentType getType() { return IComponentType.FluidHandler; } + @Override public IFluidHandler getCapability(@Nullable Direction side, CapabilityInputType inputType) { if (side == null || !isSided) { return null; diff --git a/src/main/java/electrodynamics/prefab/tile/types/GenericConnectTile.java b/src/main/java/electrodynamics/prefab/tile/types/GenericConnectTile.java index f8f883d93..cb276e621 100644 --- a/src/main/java/electrodynamics/prefab/tile/types/GenericConnectTile.java +++ b/src/main/java/electrodynamics/prefab/tile/types/GenericConnectTile.java @@ -207,6 +207,7 @@ public boolean writeConnection(Direction dir, EnumConnectType connection) { return this.connections.isDirty(); } + @Override public EnumConnectType[] readConnections() { return connectionsArr; } diff --git a/src/main/java/electrodynamics/prefab/tile/types/GenericGasTile.java b/src/main/java/electrodynamics/prefab/tile/types/GenericGasTile.java index d5ef77093..c0f1611a6 100644 --- a/src/main/java/electrodynamics/prefab/tile/types/GenericGasTile.java +++ b/src/main/java/electrodynamics/prefab/tile/types/GenericGasTile.java @@ -50,7 +50,7 @@ public BiConsumer getCondensedHandler() { int room = Math.max(0, MAX_CONDENSED_AMOUNT - currentCondensate.getAmount()); - int taken = Math.min(room, (int) tankGas.getAmount()); + int taken = Math.min(room, tankGas.getAmount()); currentCondensate.setAmount(currentCondensate.getAmount() + taken); @@ -58,7 +58,7 @@ public BiConsumer getCondensedHandler() { } else { - FluidStack newFluid = new FluidStack(condensedFluid, Math.min((int) tankGas.getAmount(), MAX_CONDENSED_AMOUNT)); + FluidStack newFluid = new FluidStack(condensedFluid, Math.min(tankGas.getAmount(), MAX_CONDENSED_AMOUNT)); condensedFluidFromGas.set(newFluid); diff --git a/src/main/java/electrodynamics/prefab/tile/types/GenericRefreshingConnectTile.java b/src/main/java/electrodynamics/prefab/tile/types/GenericRefreshingConnectTile.java index 4b21d8cdc..601a204ab 100644 --- a/src/main/java/electrodynamics/prefab/tile/types/GenericRefreshingConnectTile.java +++ b/src/main/java/electrodynamics/prefab/tile/types/GenericRefreshingConnectTile.java @@ -157,7 +157,7 @@ public void updateNetwork(Direction[] dirs) { continue; } - adjacentNetworks.add((NETWORK) wire.conductor().getNetwork()); + adjacentNetworks.add(wire.conductor().getNetwork()); }