aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/render/items
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2022-08-27 10:19:57 +0100
committerGitHub <noreply@github.com>2022-08-27 11:19:57 +0200
commit6f31720697bcc351421a4d86ba3bf749375dd12c (patch)
tree3adf8f318f22c892d74cd7c9d30b6dd3f11f11bd /src/main/java/gregtech/common/render/items
parentc3eac50decd33ee2be8703dfb2ecf9cdc31c2b67 (diff)
downloadGT5-Unofficial-6f31720697bcc351421a4d86ba3bf749375dd12c.tar.gz
GT5-Unofficial-6f31720697bcc351421a4d86ba3bf749375dd12c.tar.bz2
GT5-Unofficial-6f31720697bcc351421a4d86ba3bf749375dd12c.zip
Update buildscript & apply spotless (#1306)
* Update dependencies * Update buildscript, apply spotless
Diffstat (limited to 'src/main/java/gregtech/common/render/items')
-rw-r--r--src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java54
-rw-r--r--src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java38
-rw-r--r--src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java4
3 files changed, 71 insertions, 25 deletions
diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java
index bd508a49a5..26115592f3 100644
--- a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java
+++ b/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java
@@ -1,11 +1,15 @@
package gregtech.common.render.items;
+import static gregtech.api.enums.ItemList.*;
+import static gregtech.api.enums.ItemList.Large_Fluid_Cell_Chrome;
+
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Textures;
import gregtech.api.items.GT_MetaGenerated_Item;
import gregtech.api.util.GT_Utility;
import gregtech.common.render.GT_RenderUtil;
import gregtech.loaders.ExtraIcons;
+import javax.annotation.Nullable;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
@@ -16,19 +20,14 @@ import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.fluids.FluidStack;
import org.lwjgl.opengl.GL11;
-import javax.annotation.Nullable;
-
-import static gregtech.api.enums.ItemList.*;
-import static gregtech.api.enums.ItemList.Large_Fluid_Cell_Chrome;
-
public class GT_GeneratedItem_Renderer implements IItemRenderer {
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
return type == ItemRenderType.EQUIPPED
- || type == ItemRenderType.EQUIPPED_FIRST_PERSON
- || type == ItemRenderType.INVENTORY
- || type == ItemRenderType.ENTITY;
+ || type == ItemRenderType.EQUIPPED_FIRST_PERSON
+ || type == ItemRenderType.INVENTORY
+ || type == ItemRenderType.ENTITY;
}
@Override
@@ -57,7 +56,8 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
if (tCharge >= tStats[0]) {
tIcon = aItem.mIconList[(aMetaData - aItem.mOffset)][8];
} else {
- tIcon = aItem.mIconList[(aMetaData - aItem.mOffset)][(7 - (int) Math.max(0L, Math.min(5L, (tStats[0] - tCharge) * 6L / tStats[0])))];
+ tIcon = aItem.mIconList[(aMetaData - aItem.mOffset)][
+ (7 - (int) Math.max(0L, Math.min(5L, (tStats[0] - tCharge) * 6L / tStats[0])))];
}
}
} else {
@@ -67,8 +67,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
tIcon = aItem.mIconList[(aMetaData - aItem.mOffset)][0];
}
- if (tIcon == null)
- tIcon = Textures.ItemIcons.RENDERING_ERROR.getIcon();
+ if (tIcon == null) tIcon = Textures.ItemIcons.RENDERING_ERROR.getIcon();
ItemList largeFluidCell = getLargeFluidCell(aStack);
if (largeFluidCell != null) {
@@ -80,7 +79,15 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) {
GT_RenderUtil.renderItemIcon(tIcon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
} else {
- ItemRenderer.renderItemIn2D(Tessellator.instance, tIcon.getMaxU(), tIcon.getMinV(), tIcon.getMinU(), tIcon.getMaxV(), tIcon.getIconWidth(), tIcon.getIconHeight(), 0.0625F);
+ ItemRenderer.renderItemIn2D(
+ Tessellator.instance,
+ tIcon.getMaxU(),
+ tIcon.getMinV(),
+ tIcon.getMinU(),
+ tIcon.getMaxV(),
+ tIcon.getIconWidth(),
+ tIcon.getIconHeight(),
+ 0.0625F);
}
GL11.glDisable(GL11.GL_BLEND);
}
@@ -100,7 +107,8 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
return null;
}
- private static void renderLargeFluidCellExtraParts(IItemRenderer.ItemRenderType type, ItemList item, ItemStack stack) {
+ private static void renderLargeFluidCellExtraParts(
+ IItemRenderer.ItemRenderType type, ItemList item, ItemStack stack) {
IIcon inner;
if (item == Large_Fluid_Cell_Steel) inner = ExtraIcons.steelLargeCellInner;
@@ -118,7 +126,15 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
if (type.equals(ItemRenderType.INVENTORY)) {
GT_RenderUtil.renderItemIcon(inner, 16.0D, -0.001D, 0.0F, 0.0F, -1.0F);
} else {
- ItemRenderer.renderItemIn2D(Tessellator.instance, inner.getMaxU(), inner.getMinV(), inner.getMinU(), inner.getMaxV(), inner.getIconWidth(), inner.getIconHeight(), 0.0625F);
+ ItemRenderer.renderItemIn2D(
+ Tessellator.instance,
+ inner.getMaxU(),
+ inner.getMinV(),
+ inner.getMinU(),
+ inner.getMaxV(),
+ inner.getIconWidth(),
+ inner.getIconHeight(),
+ 0.0625F);
}
FluidStack fluidStack = GT_Utility.getFluidForFilledItem(stack, true);
@@ -134,7 +150,15 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
if (type.equals(ItemRenderType.INVENTORY)) {
GT_RenderUtil.renderItemIcon(fluidIcon, 16.0D, -0.001D, 0.0F, 0.0F, -1.0F);
} else {
- ItemRenderer.renderItemIn2D(Tessellator.instance, fluidIcon.getMaxU(), fluidIcon.getMinV(), fluidIcon.getMinU(), fluidIcon.getMaxV(), fluidIcon.getIconWidth(), fluidIcon.getIconHeight(), 0.0625F);
+ ItemRenderer.renderItemIn2D(
+ Tessellator.instance,
+ fluidIcon.getMaxU(),
+ fluidIcon.getMinV(),
+ fluidIcon.getMinU(),
+ fluidIcon.getMaxV(),
+ fluidIcon.getIconWidth(),
+ fluidIcon.getIconHeight(),
+ 0.0625F);
}
GL11.glColor3ub((byte) -1, (byte) -1, (byte) -1);
diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java
index 59eba76d03..6a2535559e 100644
--- a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java
+++ b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java
@@ -19,9 +19,9 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer {
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
return type == ItemRenderType.EQUIPPED
- || type == ItemRenderType.EQUIPPED_FIRST_PERSON
- || type == ItemRenderType.INVENTORY
- || type == ItemRenderType.ENTITY;
+ || type == ItemRenderType.EQUIPPED_FIRST_PERSON
+ || type == ItemRenderType.INVENTORY
+ || type == ItemRenderType.ENTITY;
}
@Override
@@ -65,7 +65,15 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer {
if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) {
GT_RenderUtil.renderItemIcon(tOverlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
} else {
- ItemRenderer.renderItemIn2D(Tessellator.instance, tOverlay.getMaxU(), tOverlay.getMinV(), tOverlay.getMinU(), tOverlay.getMaxV(), tOverlay.getIconWidth(), tOverlay.getIconHeight(), 0.0625F);
+ ItemRenderer.renderItemIn2D(
+ Tessellator.instance,
+ tOverlay.getMaxU(),
+ tOverlay.getMinV(),
+ tOverlay.getMinU(),
+ tOverlay.getMaxV(),
+ tOverlay.getIconWidth(),
+ tOverlay.getIconHeight(),
+ 0.0625F);
}
}
@@ -83,9 +91,16 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer {
if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) {
GT_RenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
} else {
- ItemRenderer.renderItemIn2D(Tessellator.instance, icon.getMaxU(), icon.getMinV(), icon.getMinU(), icon.getMaxV(), icon.getIconWidth(), icon.getIconHeight(), 0.0625F);
+ ItemRenderer.renderItemIn2D(
+ Tessellator.instance,
+ icon.getMaxU(),
+ icon.getMinV(),
+ icon.getMinU(),
+ icon.getMaxV(),
+ icon.getIconWidth(),
+ icon.getIconHeight(),
+ 0.0625F);
}
-
}
public void renderContainedFluid(ItemRenderType type, FluidStack aFluidStack, IIcon fluidIcon) {
@@ -98,9 +113,16 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer {
if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) {
GT_RenderUtil.renderItemIcon(fluidIcon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
} else {
- ItemRenderer.renderItemIn2D(Tessellator.instance, fluidIcon.getMaxU(), fluidIcon.getMinV(), fluidIcon.getMinU(), fluidIcon.getMaxV(), fluidIcon.getIconWidth(), fluidIcon.getIconHeight(), 0.0625F);
+ ItemRenderer.renderItemIn2D(
+ Tessellator.instance,
+ fluidIcon.getMaxU(),
+ fluidIcon.getMinV(),
+ fluidIcon.getMinU(),
+ fluidIcon.getMaxV(),
+ fluidIcon.getIconWidth(),
+ fluidIcon.getIconHeight(),
+ 0.0625F);
}
GL11.glDepthFunc(GL11.GL_LEQUAL);
}
-
}
diff --git a/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java b/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java
index ebabb2167a..8e23a0005d 100644
--- a/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java
+++ b/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java
@@ -10,7 +10,8 @@ import org.lwjgl.opengl.GL11;
public class GT_MetaGenerated_Item_Renderer implements IItemRenderer {
- private final IItemRenderer mItemRenderer = new GT_GeneratedItem_Renderer();;
+ private final IItemRenderer mItemRenderer = new GT_GeneratedItem_Renderer();
+ ;
private final IItemRenderer mMaterialRenderer = new GT_GeneratedMaterial_Renderer();
public GT_MetaGenerated_Item_Renderer() {
@@ -62,5 +63,4 @@ public class GT_MetaGenerated_Item_Renderer implements IItemRenderer {
return mItemRenderer;
}
-
}