Skip to content
This repository was archived by the owner on Jan 18, 2024. It is now read-only.

Commit 48680ad

Browse files
author
sjcl
committed
SuppressWarnings
1 parent 34789a5 commit 48680ad

File tree

2 files changed

+30
-29
lines changed

2 files changed

+30
-29
lines changed

build.gradle

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ext.modversion = "${project.version_major}.${project.version_minor}.${project.ve
2929
group = project.group
3030
version = "${project.version_minecraft}-${modversion}"
3131
compileJava.options.encoding = 'UTF-8'
32-
compileApiJava.options.encoding = 'UTF-8'
32+
compileApiJava.options.encoding = 'UTF-8'
3333

3434
idea {
3535
module {
@@ -57,17 +57,17 @@ minecraft {
5757
replace '${forgeversion}', project.version_forge
5858
}
5959

60-
sourceSets {
61-
api {
62-
java {
63-
srcDir "BnnWidget/src/api/java"
64-
}
65-
resources {
66-
srcDir "BnnWidget/src/api/resources"
67-
}
68-
}
69-
}
70-
60+
sourceSets {
61+
api {
62+
java {
63+
srcDir "BnnWidget/src/api/java"
64+
}
65+
resources {
66+
srcDir "BnnWidget/src/api/resources"
67+
}
68+
}
69+
}
70+
7171
processResources {
7272
// this will ensure that this task is redone when the versions change.
7373
inputs.property 'version', project.version
@@ -114,14 +114,14 @@ jar {
114114
shadowJar {
115115
from sourceSets.main.output
116116
from sourceSets.api.output
117-
relocate 'org.apache.http.entity.mime', 'com.kamesuta.mc.signpic.lib.org.apache.http.entity.mime'
118-
relocate 'org.apache.http.entity.mime.content', 'com.kamesuta.mc.signpic.lib.org.apache.http.entity.mime.content'
117+
relocate 'org.apache.http.entity.mime', 'com.kamesuta.mc.signpic.lib.org.apache.http.entity.mime'
118+
relocate 'org.apache.http.entity.mime.content', 'com.kamesuta.mc.signpic.lib.org.apache.http.entity.mime.content'
119119
classifier = project.hasProperty('extra_classifier') ? project.extra_classifier : 'universal'
120120
manifest commonManifest
121121
}
122122

123123
reobf {
124-
shadowJar { mappingType = "SEARGE" }
124+
shadowJar { mappingType = "SEARGE" }
125125
}
126126
tasks.reobfShadowJar.mustRunAfter shadowJar
127127

@@ -212,6 +212,6 @@ if (project.hasProperty('api_key_curseforge') && project.hasProperty('extra_curs
212212
changelog = ''
213213

214214
additionalArtifact devJar, sourceJar, apiJar
215-
relatedProject 'bnnwidget'
215+
relatedProject 'bnnwidget'
216216
}
217-
}
217+
}

src/main/java/com/kamesuta/mc/signpic/render/CustomItemSignRenderer.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import com.kamesuta.mc.signpic.entry.content.Content;
2424

2525
import net.minecraft.client.renderer.block.model.BakedQuad;
26-
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
27-
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
2826
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
2927
import net.minecraft.client.renderer.vertex.VertexFormat;
3028
import net.minecraft.client.resources.model.IBakedModel;
@@ -58,7 +56,8 @@ public CustomItemSignRenderer(final @Nonnull IBakedModel model) {
5856
}
5957

6058
@Override
61-
public @Nullable Pair<? extends IFlexibleBakedModel, Matrix4f> handlePerspective(final @Nullable TransformType cameraTransformType) {
59+
@SuppressWarnings("deprecation")
60+
public @Nullable Pair<? extends IFlexibleBakedModel, Matrix4f> handlePerspective(final @Nullable net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType cameraTransformType) {
6261
final ItemStack itemStack = this.itemStack;
6362
if (itemStack!=null&&cameraTransformType!=null) {
6463
OpenGL.glPushMatrix();
@@ -78,7 +77,8 @@ public CustomItemSignRenderer(final @Nonnull IBakedModel model) {
7877
return Pair.of(this, null);
7978
}
8079

81-
public void renderItem(final @Nonnull TransformType type, final @Nullable ItemStack item) {
80+
@SuppressWarnings("deprecation")
81+
public void renderItem(final @Nonnull net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType type, final @Nullable ItemStack item) {
8282
OpenGL.glPushMatrix();
8383
OpenGL.glPushAttrib();
8484
OpenGL.glDisable(GL_CULL_FACE);
@@ -88,7 +88,7 @@ public void renderItem(final @Nonnull TransformType type, final @Nullable ItemSt
8888
// Size
8989
final SizeData size01 = content!=null ? content.image.getSize() : SizeData.DefaultSize;
9090
final SizeData size = attr.sizes.getMovie().get().aspectSize(size01);
91-
if (type==TransformType.GUI) {
91+
if (type==net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType.GUI) {
9292
OpenGL.glScalef(1f, -1f, 1f);
9393
final float slot = 1f;
9494
final SizeData size2 = ImageSizes.INNER.defineSize(size, slot, slot);
@@ -99,17 +99,17 @@ public void renderItem(final @Nonnull TransformType type, final @Nullable ItemSt
9999
entry.gui.drawScreen(0, 0, 0f, 1f, size2.getWidth()/slot, size2.getHeight()/slot);
100100
} else {
101101
OpenGL.glScalef(1f, -1f, 1f);
102-
if (type==TransformType.GROUND)
102+
if (type==net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType.GROUND)
103103
OpenGL.glTranslatef(-size.getWidth()/2f, .25f, 0f);
104-
else if (type==TransformType.FIXED) {
104+
else if (type==net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType.FIXED) {
105105
final float f = 0.0078125F; // vanilla map offset
106106
OpenGL.glTranslatef(-size.getWidth()/2f, .5f, f);
107-
} else if (type==TransformType.FIRST_PERSON)
107+
} else if (type==net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType.FIRST_PERSON)
108108
OpenGL.glTranslatef(-.25f, .25f, 0f);
109-
else if (type==TransformType.THIRD_PERSON) {
109+
else if (type==net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType.THIRD_PERSON) {
110110
OpenGL.glTranslatef(.25f, .25f, 0f);
111111
OpenGL.glTranslatef(-size.getWidth(), 0f, 0f);
112-
} else if (type==TransformType.HEAD)
112+
} else if (type==net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType.HEAD)
113113
;// Minecraft 1.8.x doesn't support Item Head.
114114
OpenGL.glTranslatef(0f, -size.getHeight(), 0f);
115115
final OffsetData offset = attr.offsets.getMovie().get();
@@ -147,8 +147,9 @@ public boolean isBuiltInRenderer() {
147147
}
148148

149149
@Override
150-
public @Nullable ItemCameraTransforms getItemCameraTransforms() {
151-
return ItemCameraTransforms.DEFAULT;
150+
@Deprecated
151+
public @Nullable net.minecraft.client.renderer.block.model.ItemCameraTransforms getItemCameraTransforms() {
152+
return net.minecraft.client.renderer.block.model.ItemCameraTransforms.DEFAULT;
152153
}
153154

154155
@Override

0 commit comments

Comments
 (0)