From 9d243e93e79cc1b9d68f6f1d414fcb5aea61c18c Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 3 Jul 2023 19:57:10 +0200 Subject: [PATCH] Fix Sonar issues --- .../model/baked/CableCoverBakedModel.java | 40 +++++++++---------- .../screen/widget/ScrollbarWidget.java | 6 +-- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/baked/CableCoverBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/baked/CableCoverBakedModel.java index 01e4b979b..57c3e63e4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/baked/CableCoverBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/baked/CableCoverBakedModel.java @@ -183,15 +183,15 @@ public class CableCoverBakedModel extends BakedModelWrapper { toX = 16; } - fromX = 16 - size; + fromX = 16F - size; } else if (coverSide == Direction.EAST) { fromZ = 0; toZ = size; } else if (coverSide == Direction.WEST) { - fromZ = 16 - size; + fromZ = 16F - size; toZ = 16; } else if (coverSide == Direction.DOWN || coverSide == Direction.UP) { - fromZ = 16 - size; + fromZ = 16F - size; toZ = 16; } HashMap spriteCache = new HashMap<>(); //Changed from 1.12: to improve sprite getting for each side @@ -210,7 +210,7 @@ public class CableCoverBakedModel extends BakedModelWrapper { toX = 16; } - fromX = 16 - size; + fromX = 16F - size; } else if (coverSide == Direction.SOUTH) { if (hasWest) { fromX = 2; @@ -220,7 +220,7 @@ public class CableCoverBakedModel extends BakedModelWrapper { toX = size; } else if (coverSide == Direction.EAST) { - fromZ = 16 - size; + fromZ = 16F - size; toZ = 16; } else if (coverSide == Direction.WEST) { fromZ = 0; @@ -240,7 +240,7 @@ public class CableCoverBakedModel extends BakedModelWrapper { // Bottom if (coverSide == Direction.NORTH) { fromX = size; - toX = 16 - size; + toX = 16F - size; if (hasDown) { fromY = 2; @@ -251,7 +251,7 @@ public class CableCoverBakedModel extends BakedModelWrapper { toY = size; } else if (coverSide == Direction.SOUTH) { fromX = size; - toX = 16 - size; + toX = 16F - size; if (hasDown) { fromY = 2; @@ -262,7 +262,7 @@ public class CableCoverBakedModel extends BakedModelWrapper { toY = size; } else if (coverSide == Direction.EAST) { fromZ = size; - toZ = 16 - size; + toZ = 16F - size; if (hasDown) { fromY = 2; @@ -273,7 +273,7 @@ public class CableCoverBakedModel extends BakedModelWrapper { toY = size; } else if (coverSide == Direction.WEST) { fromZ = size; - toZ = 16 - size; + toZ = 16F - size; if (hasDown) { fromY = 2; @@ -284,7 +284,7 @@ public class CableCoverBakedModel extends BakedModelWrapper { toY = size; } else if (coverSide == Direction.DOWN || coverSide == Direction.UP) { fromZ = size; - toZ = 16 - size; + toZ = 16F - size; fromX = 0; toX = size; @@ -300,7 +300,7 @@ public class CableCoverBakedModel extends BakedModelWrapper { // Up if (coverSide == Direction.NORTH) { fromX = size; - toX = 16 - size; + toX = 16F - size; if (hasUp) { toY = 14; @@ -308,10 +308,10 @@ public class CableCoverBakedModel extends BakedModelWrapper { toY = 16; } - fromY = 16 - size; + fromY = 16F - size; } else if (coverSide == Direction.SOUTH) { fromX = size; - toX = 16 - size; + toX = 16F - size; if (hasUp) { toY = 14; @@ -319,10 +319,10 @@ public class CableCoverBakedModel extends BakedModelWrapper { toY = 16; } - fromY = 16 - size; + fromY = 16F - size; } else if (coverSide == Direction.EAST) { fromZ = size; - toZ = 16 - size; + toZ = 16F - size; if (hasUp) { toY = 14; @@ -330,10 +330,10 @@ public class CableCoverBakedModel extends BakedModelWrapper { toY = 16; } - fromY = 16 - size; + fromY = 16F - size; } else if (coverSide == Direction.WEST) { fromZ = size; - toZ = 16 - size; + toZ = 16F - size; if (hasUp) { toY = 14; @@ -341,12 +341,12 @@ public class CableCoverBakedModel extends BakedModelWrapper { toY = 16; } - fromY = 16 - size; + fromY = 16F - size; } else if (coverSide == Direction.DOWN || coverSide == Direction.UP) { fromZ = size; - toZ = 16 - size; + toZ = 16F - size; - fromX = 16 - size; + fromX = 16F - size; toX = 16; } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java index 39fd95ef1..d52c3b3d2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java @@ -12,7 +12,7 @@ import java.util.LinkedList; import java.util.List; public class ScrollbarWidget implements GuiEventListener { - private static final int SCROLLER_HEIGHT = 15; + private static final float SCROLLER_HEIGHT = 15; private final int x; private final int y; @@ -63,9 +63,9 @@ public class ScrollbarWidget implements GuiEventListener { public void render(GuiGraphics graphics) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); if (small) { - graphics.blit(BaseScreen.ICONS_TEXTURE, screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 218 : 225, 0, 7, SCROLLER_HEIGHT); + graphics.blit(BaseScreen.ICONS_TEXTURE, screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (height - SCROLLER_HEIGHT)), isEnabled() ? 218 : 225, 0, 7, (int) SCROLLER_HEIGHT); } else { - graphics.blit(BaseScreen.ICONS_TEXTURE, screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 232 : 244, 0, 12, SCROLLER_HEIGHT); + graphics.blit(BaseScreen.ICONS_TEXTURE, screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (height - SCROLLER_HEIGHT)), isEnabled() ? 232 : 244, 0, 12, (int) SCROLLER_HEIGHT); } }