Skip to content

Commit 1b455b9

Browse files
lukfluglukflug
committed
Switched to official mappings
1 parent a4f8300 commit 1b455b9

File tree

4 files changed

+50
-50
lines changed

4 files changed

+50
-50
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ loomVersion = 0.6.37
99
minecraft16fabric = 1.16.5
1010
mappings16fabric = 1.16.5+build.4
1111

12-
mappings16forge = 20201028-1.16.3
12+
mappings16forge = 1.16.5
1313
minecraft16forge = 1.16.5-36.0.46
1414

1515
minecraft8fabric = 1.8.9

‎panelstudio-mc16-forge/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ buildscript {
1515
apply plugin: "net.minecraftforge.gradle"
1616

1717
minecraft {
18-
mappings("snapshot",project.mappings16forge)
18+
mappings("official",project.mappings16forge)
1919
}
2020

2121
dependencies {

‎panelstudio-mc16-forge/src/main/java/com/lukflug/panelstudio/mc16forge/GLInterface.java‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -58,72 +58,72 @@ public Dimension getWindowSize() {
5858
public void drawString(Point pos, int height, String s, Color c) {
5959
GL11.glPushMatrix();
6060
GL11.glTranslatef(pos.x,pos.y,0);
61-
double scale=height/(double)Minecraft.getInstance().fontRenderer.FONT_HEIGHT;
61+
double scale=height/(double)Minecraft.getInstance().font.lineHeight;
6262
GL11.glScaled(scale,scale,1);
6363
end(false);
64-
Minecraft.getInstance().fontRenderer.drawStringWithShadow(getMatrixStack(),s,0,0,c.getRGB());
64+
Minecraft.getInstance().font.drawShadow(getMatrixStack(),s,0,0,c.getRGB());
6565
begin(false);
6666
GL11.glPopMatrix();
6767
}
6868

6969
@SuppressWarnings("resource")
7070
@Override
7171
public int getFontWidth(int height, String s) {
72-
double scale=height/(double)Minecraft.getInstance().fontRenderer.FONT_HEIGHT;
73-
return (int)Math.round(Minecraft.getInstance().fontRenderer.getStringWidth(s)*scale);
72+
double scale=height/(double)Minecraft.getInstance().font.lineHeight;
73+
return (int)Math.round(Minecraft.getInstance().font.width(s)*scale);
7474
}
7575

7676
@Override
7777
public void fillTriangle(Point pos1, Point pos2, Point pos3, Color c1, Color c2, Color c3) {
7878
Tessellator tessellator = Tessellator.getInstance();
79-
BufferBuilder bufferbuilder = tessellator.getBuffer();
79+
BufferBuilder bufferbuilder = tessellator.getBuilder();
8080
bufferbuilder.begin(GL11.GL_TRIANGLES,DefaultVertexFormats.POSITION_COLOR);
81-
bufferbuilder.pos(pos1.x,pos1.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).endVertex();
82-
bufferbuilder.pos(pos2.x,pos2.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).endVertex();
83-
bufferbuilder.pos(pos3.x,pos3.y,getZLevel()).color(c3.getRed()/255.0f,c3.getGreen()/255.0f,c3.getBlue()/255.0f,c3.getAlpha()/255.0f).endVertex();
84-
tessellator.draw();
81+
bufferbuilder.vertex(pos1.x,pos1.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).endVertex();
82+
bufferbuilder.vertex(pos2.x,pos2.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).endVertex();
83+
bufferbuilder.vertex(pos3.x,pos3.y,getZLevel()).color(c3.getRed()/255.0f,c3.getGreen()/255.0f,c3.getBlue()/255.0f,c3.getAlpha()/255.0f).endVertex();
84+
tessellator.end();
8585
}
8686

8787
@Override
8888
public void drawLine(Point a, Point b, Color c1, Color c2) {
8989
Tessellator tessellator = Tessellator.getInstance();
90-
BufferBuilder bufferbuilder = tessellator.getBuffer();
90+
BufferBuilder bufferbuilder = tessellator.getBuilder();
9191
bufferbuilder.begin(GL11.GL_LINES,DefaultVertexFormats.POSITION_COLOR);
92-
bufferbuilder.pos(a.x,a.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).endVertex();
93-
bufferbuilder.pos(b.x,b.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).endVertex();
94-
tessellator.draw();
92+
bufferbuilder.vertex(a.x,a.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).endVertex();
93+
bufferbuilder.vertex(b.x,b.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).endVertex();
94+
tessellator.end();
9595
}
9696

9797
@Override
9898
public void fillRect(Rectangle r, Color c1, Color c2, Color c3, Color c4) {
9999
Tessellator tessellator = Tessellator.getInstance();
100-
BufferBuilder bufferbuilder = tessellator.getBuffer();
100+
BufferBuilder bufferbuilder = tessellator.getBuilder();
101101
bufferbuilder.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR);
102-
bufferbuilder.pos(r.x,r.y+r.height,getZLevel()).color(c4.getRed()/255.0f,c4.getGreen()/255.0f,c4.getBlue()/255.0f,c4.getAlpha()/255.0f).endVertex();
103-
bufferbuilder.pos(r.x+r.width,r.y+r.height,getZLevel()).color(c3.getRed()/255.0f,c3.getGreen()/255.0f,c3.getBlue()/255.0f,c3.getAlpha()/255.0f).endVertex();
104-
bufferbuilder.pos(r.x+r.width,r.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).endVertex();
105-
bufferbuilder.pos(r.x,r.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).endVertex();
106-
tessellator.draw();
102+
bufferbuilder.vertex(r.x,r.y+r.height,getZLevel()).color(c4.getRed()/255.0f,c4.getGreen()/255.0f,c4.getBlue()/255.0f,c4.getAlpha()/255.0f).endVertex();
103+
bufferbuilder.vertex(r.x+r.width,r.y+r.height,getZLevel()).color(c3.getRed()/255.0f,c3.getGreen()/255.0f,c3.getBlue()/255.0f,c3.getAlpha()/255.0f).endVertex();
104+
bufferbuilder.vertex(r.x+r.width,r.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).endVertex();
105+
bufferbuilder.vertex(r.x,r.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).endVertex();
106+
tessellator.end();
107107
}
108108

109109
@Override
110110
public void drawRect(Rectangle r, Color c1, Color c2, Color c3, Color c4) {
111111
Tessellator tessellator = Tessellator.getInstance();
112-
BufferBuilder bufferbuilder = tessellator.getBuffer();
112+
BufferBuilder bufferbuilder = tessellator.getBuilder();
113113
bufferbuilder.begin(GL11.GL_LINE_LOOP, DefaultVertexFormats.POSITION_COLOR);
114-
bufferbuilder.pos(r.x,r.y+r.height,getZLevel()).color(c4.getRed()/255.0f,c4.getGreen()/255.0f,c4.getBlue()/255.0f,c4.getAlpha()/255.0f).endVertex();
115-
bufferbuilder.pos(r.x+r.width,r.y+r.height,getZLevel()).color(c3.getRed()/255.0f,c3.getGreen()/255.0f,c3.getBlue()/255.0f,c3.getAlpha()/255.0f).endVertex();
116-
bufferbuilder.pos(r.x+r.width,r.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).endVertex();
117-
bufferbuilder.pos(r.x,r.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).endVertex();
118-
tessellator.draw();
114+
bufferbuilder.vertex(r.x,r.y+r.height,getZLevel()).color(c4.getRed()/255.0f,c4.getGreen()/255.0f,c4.getBlue()/255.0f,c4.getAlpha()/255.0f).endVertex();
115+
bufferbuilder.vertex(r.x+r.width,r.y+r.height,getZLevel()).color(c3.getRed()/255.0f,c3.getGreen()/255.0f,c3.getBlue()/255.0f,c3.getAlpha()/255.0f).endVertex();
116+
bufferbuilder.vertex(r.x+r.width,r.y,getZLevel()).color(c2.getRed()/255.0f,c2.getGreen()/255.0f,c2.getBlue()/255.0f,c2.getAlpha()/255.0f).endVertex();
117+
bufferbuilder.vertex(r.x,r.y,getZLevel()).color(c1.getRed()/255.0f,c1.getGreen()/255.0f,c1.getBlue()/255.0f,c1.getAlpha()/255.0f).endVertex();
118+
tessellator.end();
119119
}
120120

121121
@Override
122122
public synchronized int loadImage(String name) {
123123
try {
124124
ResourceLocation rl=new ResourceLocation(getResourcePrefix()+name);
125125
if (!textures.contains(rl)) {
126-
Minecraft.getInstance().getTextureManager().loadAsync(rl,null).get();
126+
Minecraft.getInstance().getTextureManager().preload(rl,null).get();
127127
textures.add(rl);
128128
}
129129
return textures.indexOf(rl);
@@ -165,18 +165,18 @@ public void drawImage(Rectangle r, int rotation, boolean parity, int image, Colo
165165
texCoords[1][1]=temp2;
166166
}
167167
Tessellator tessellator = Tessellator.getInstance();
168-
BufferBuilder bufferbuilder = tessellator.getBuffer();
168+
BufferBuilder bufferbuilder = tessellator.getBuilder();
169169
float[] colorBuffer={color.getRed()/255.0f,color.getGreen()/255.0f,color.getBlue()/255.0f,color.getAlpha()/255.0f};
170-
Minecraft.getInstance().getTextureManager().bindTexture(textures.get(image));
170+
Minecraft.getInstance().getTextureManager().bind(textures.get(image));
171171
GL11.glTexEnvfv(GL11.GL_TEXTURE_ENV,GL11.GL_TEXTURE_ENV_COLOR,colorBuffer);
172-
GlStateManager.enableTexture();
172+
GlStateManager._enableTexture();
173173
bufferbuilder.begin(GL11.GL_QUADS,DefaultVertexFormats.POSITION_TEX);
174-
bufferbuilder.pos(r.x,r.y+r.height,getZLevel()).tex(texCoords[0][0],texCoords[0][1]).endVertex();
175-
bufferbuilder.pos(r.x+r.width,r.y+r.height,getZLevel()).tex(texCoords[1][0],texCoords[1][1]).endVertex();
176-
bufferbuilder.pos(r.x+r.width,r.y,getZLevel()).tex(texCoords[2][0],texCoords[2][1]).endVertex();
177-
bufferbuilder.pos(r.x,r.y,getZLevel()).tex(texCoords[3][0],texCoords[3][1]).endVertex();
178-
tessellator.draw();
179-
GlStateManager.disableTexture();
174+
bufferbuilder.vertex(r.x,r.y+r.height,getZLevel()).uv(texCoords[0][0],texCoords[0][1]).endVertex();
175+
bufferbuilder.vertex(r.x+r.width,r.y+r.height,getZLevel()).uv(texCoords[1][0],texCoords[1][1]).endVertex();
176+
bufferbuilder.vertex(r.x+r.width,r.y,getZLevel()).uv(texCoords[2][0],texCoords[2][1]).endVertex();
177+
bufferbuilder.vertex(r.x,r.y,getZLevel()).uv(texCoords[3][0],texCoords[3][1]).endVertex();
178+
tessellator.end();
179+
GlStateManager._disableTexture();
180180
}
181181

182182
/**
@@ -192,7 +192,7 @@ protected void scissor (Rectangle r) {
192192
Point a=guiToScreen(r.getLocation()),b=guiToScreen(new Point(r.x+r.width,r.y+r.height));
193193
if (!clipX) {
194194
a.x=0;
195-
b.x=Minecraft.getInstance().getMainWindow().getWidth();
195+
b.x=Minecraft.getInstance().getWindow().getWidth();
196196
}
197197
GL11.glScissor(Math.min(a.x,b.x),Math.min(a.y,b.y),Math.abs(b.x-a.x),Math.abs(b.y-a.y));
198198
GL11.glEnable(GL11.GL_SCISSOR_TEST);
@@ -243,7 +243,7 @@ public void restore() {
243243
public Point screenToGui (Point p) {
244244
int resX=getWindowSize().width;
245245
int resY=getWindowSize().height;
246-
return new Point(p.x*resX/Minecraft.getInstance().getMainWindow().getWidth(),resY-p.y*resY/Minecraft.getInstance().getMainWindow().getHeight()-1);
246+
return new Point(p.x*resX/Minecraft.getInstance().getWindow().getWidth(),resY-p.y*resY/Minecraft.getInstance().getWindow().getHeight()-1);
247247
}
248248

249249
/**
@@ -254,23 +254,23 @@ public Point screenToGui (Point p) {
254254
public Point guiToScreen (Point p) {
255255
double resX=getScreenWidth();
256256
double resY=getScreenHeight();
257-
return new Point((int)Math.round(p.x*Minecraft.getInstance().getMainWindow().getWidth()/resX),(int)Math.round((resY-p.y)*Minecraft.getInstance().getMainWindow().getHeight()/resY));
257+
return new Point((int)Math.round(p.x*Minecraft.getInstance().getWindow().getWidth()/resX),(int)Math.round((resY-p.y)*Minecraft.getInstance().getWindow().getHeight()/resY));
258258
}
259259

260260
/**
261261
* Get the current screen width.
262262
* @return the screen width
263263
*/
264264
protected double getScreenWidth() {
265-
return Minecraft.getInstance().getMainWindow().getScaledWidth();
265+
return Minecraft.getInstance().getWindow().getGuiScaledWidth();
266266
}
267267

268268
/**
269269
* Get the current screen height.
270270
* @return the screen height
271271
*/
272272
protected double getScreenHeight() {
273-
return Minecraft.getInstance().getMainWindow().getScaledHeight();
273+
return Minecraft.getInstance().getWindow().getGuiScaledHeight();
274274
}
275275

276276
/**
@@ -288,11 +288,11 @@ public void begin (boolean matrix) {
288288
GL11.glPushMatrix();
289289
GL11.glLoadIdentity();
290290
}
291-
GlStateManager.enableBlend();
292-
GlStateManager.disableTexture();
293-
GlStateManager.blendFuncSeparate(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA,GL11.GL_ONE,GL11.GL_ZERO);
291+
GlStateManager._enableBlend();
292+
GlStateManager._disableTexture();
293+
GlStateManager._blendFuncSeparate(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA,GL11.GL_ONE,GL11.GL_ZERO);
294294
GL11.glShadeModel(GL11.GL_SMOOTH);
295-
GlStateManager.lineWidth(2);
295+
GlStateManager._lineWidth(2);
296296
// Set texture env mode to combine
297297
GL11.glPushAttrib(GL11.GL_TEXTURE_BIT);
298298
GL11.glTexEnvi(GL11.GL_TEXTURE_ENV,GL11.GL_TEXTURE_ENV_MODE,GL13.GL_COMBINE);
@@ -319,8 +319,8 @@ public void begin (boolean matrix) {
319319
public void end (boolean matrix) {
320320
GL11.glPopAttrib();
321321
GL11.glShadeModel(GL11.GL_FLAT);
322-
GlStateManager.enableTexture();
323-
GlStateManager.disableBlend();
322+
GlStateManager._enableTexture();
323+
GlStateManager._disableBlend();
324324
if (matrix) {
325325
GL11.glMatrixMode(GL11.GL_PROJECTION);
326326
GL11.glPopMatrix();

‎panelstudio-mc16-forge/src/main/java/com/lukflug/panelstudio/mc16forge/MinecraftGUI.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ public MinecraftGUI() {
4747
* Displays the GUI.
4848
*/
4949
public void enterGUI() {
50-
Minecraft.getInstance().displayGuiScreen(this);
50+
Minecraft.getInstance().setScreen(this);
5151
}
5252

5353
/**
5454
* Closes the GUI.
5555
*/
5656
public void exitGUI() {
57-
Minecraft.getInstance().displayGuiScreen(null);
57+
Minecraft.getInstance().setScreen(null);
5858
}
5959

6060
/**

0 commit comments

Comments
 (0)