dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Sonar issues

Browse Source
This commit is contained in:
raoulvdberge
2023-07-03 19:57:10 +02:00
committed by Raoul
parent 88a28b427e
commit 9d243e93e7
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/com/refinedmods/refinedstorage/render/model/baked/CableCoverBakedModel.java
View File

@@ -183,15 +183,15 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
toX = 16; toX = 16;
} }
fromX = 16 - size; fromX = 16F - size;
} else if (coverSide == Direction.EAST) { } else if (coverSide == Direction.EAST) {
fromZ = 0; fromZ = 0;
toZ = size; toZ = size;
} else if (coverSide == Direction.WEST) { } else if (coverSide == Direction.WEST) {
fromZ = 16 - size; fromZ = 16F - size;
toZ = 16; toZ = 16;
} else if (coverSide == Direction.DOWN || coverSide == Direction.UP) { } else if (coverSide == Direction.DOWN || coverSide == Direction.UP) {
fromZ = 16 - size; fromZ = 16F - size;
toZ = 16; toZ = 16;
} }
HashMap<Direction, TextureAtlasSprite> spriteCache = new HashMap<>(); //Changed from 1.12: to improve sprite getting for each side HashMap<Direction, TextureAtlasSprite> spriteCache = new HashMap<>(); //Changed from 1.12: to improve sprite getting for each side
@@ -210,7 +210,7 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
toX = 16; toX = 16;
} }
fromX = 16 - size; fromX = 16F - size;
} else if (coverSide == Direction.SOUTH) { } else if (coverSide == Direction.SOUTH) {
if (hasWest) { if (hasWest) {
fromX = 2; fromX = 2;
@@ -220,7 +220,7 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
toX = size; toX = size;
} else if (coverSide == Direction.EAST) { } else if (coverSide == Direction.EAST) {
fromZ = 16 - size; fromZ = 16F - size;
toZ = 16; toZ = 16;
} else if (coverSide == Direction.WEST) { } else if (coverSide == Direction.WEST) {
fromZ = 0; fromZ = 0;
@@ -240,7 +240,7 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
// Bottom // Bottom
if (coverSide == Direction.NORTH) { if (coverSide == Direction.NORTH) {
fromX = size; fromX = size;
toX = 16 - size; toX = 16F - size;
if (hasDown) { if (hasDown) {
fromY = 2; fromY = 2;
@@ -251,7 +251,7 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
toY = size; toY = size;
} else if (coverSide == Direction.SOUTH) { } else if (coverSide == Direction.SOUTH) {
fromX = size; fromX = size;
toX = 16 - size; toX = 16F - size;
if (hasDown) { if (hasDown) {
fromY = 2; fromY = 2;
@@ -262,7 +262,7 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
toY = size; toY = size;
} else if (coverSide == Direction.EAST) { } else if (coverSide == Direction.EAST) {
fromZ = size; fromZ = size;
toZ = 16 - size; toZ = 16F - size;
if (hasDown) { if (hasDown) {
fromY = 2; fromY = 2;
@@ -273,7 +273,7 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
toY = size; toY = size;
} else if (coverSide == Direction.WEST) { } else if (coverSide == Direction.WEST) {
fromZ = size; fromZ = size;
toZ = 16 - size; toZ = 16F - size;
if (hasDown) { if (hasDown) {
fromY = 2; fromY = 2;
@@ -284,7 +284,7 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
toY = size; toY = size;
} else if (coverSide == Direction.DOWN || coverSide == Direction.UP) { } else if (coverSide == Direction.DOWN || coverSide == Direction.UP) {
fromZ = size; fromZ = size;
toZ = 16 - size; toZ = 16F - size;
fromX = 0; fromX = 0;
toX = size; toX = size;
@@ -300,7 +300,7 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
// Up // Up
if (coverSide == Direction.NORTH) { if (coverSide == Direction.NORTH) {
fromX = size; fromX = size;
toX = 16 - size; toX = 16F - size;
if (hasUp) { if (hasUp) {
toY = 14; toY = 14;
@@ -308,10 +308,10 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
toY = 16; toY = 16;
} }
fromY = 16 - size; fromY = 16F - size;
} else if (coverSide == Direction.SOUTH) { } else if (coverSide == Direction.SOUTH) {
fromX = size; fromX = size;
toX = 16 - size; toX = 16F - size;
if (hasUp) { if (hasUp) {
toY = 14; toY = 14;
@@ -319,10 +319,10 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
toY = 16; toY = 16;
} }
fromY = 16 - size; fromY = 16F - size;
} else if (coverSide == Direction.EAST) { } else if (coverSide == Direction.EAST) {
fromZ = size; fromZ = size;
toZ = 16 - size; toZ = 16F - size;
if (hasUp) { if (hasUp) {
toY = 14; toY = 14;
@@ -330,10 +330,10 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
toY = 16; toY = 16;
} }
fromY = 16 - size; fromY = 16F - size;
} else if (coverSide == Direction.WEST) { } else if (coverSide == Direction.WEST) {
fromZ = size; fromZ = size;
toZ = 16 - size; toZ = 16F - size;
if (hasUp) { if (hasUp) {
toY = 14; toY = 14;
@@ -341,12 +341,12 @@ public class CableCoverBakedModel extends BakedModelWrapper<BakedModel> {
toY = 16; toY = 16;
} }
fromY = 16 - size; fromY = 16F - size;
} else if (coverSide == Direction.DOWN || coverSide == Direction.UP) { } else if (coverSide == Direction.DOWN || coverSide == Direction.UP) {
fromZ = size; fromZ = size;
toZ = 16 - size; toZ = 16F - size;
fromX = 16 - size; fromX = 16F - size;
toX = 16; toX = 16;
} }

6
src/main/java/com/refinedmods/refinedstorage/screen/widget/ScrollbarWidget.java
View File

@@ -12,7 +12,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
public class ScrollbarWidget implements GuiEventListener { 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 x;
private final int y; private final int y;
@@ -63,9 +63,9 @@ public class ScrollbarWidget implements GuiEventListener {
public void render(GuiGraphics graphics) { public void render(GuiGraphics graphics) {
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
if (small) { 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 { } 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);
} }
} }