@@ -254,98 +254,98 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
254254 if (y1 > y2 )
255255 {
256256 //Draw right
257- RenderUtil .drawRect (x1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y2 , 1 , 0x00FF00 );
257+ RenderUtil .drawRect (guiGraphics , x1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y2 , 1 , 0x00FF00 );
258258 //Draw bottom for bottom
259- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
259+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
260260 //Draw top for bottom
261- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x2 , y1 , 1 , 0x00FF00 );
261+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x2 , y1 , 1 , 0x00FF00 );
262262 //Draw bottom for top
263- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
263+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
264264 //Draw top for top
265- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , x2 , y2 , 1 , 0x00FF00 );
265+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , x2 , y2 , 1 , 0x00FF00 );
266266 //Draw left
267- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , 1 , 0x00FF00 );
267+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , 1 , 0x00FF00 );
268268 }
269269 else
270270 {
271271 //Draw right
272- RenderUtil .drawRect (x1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y1 , 1 , 0x00FF00 );
272+ RenderUtil .drawRect (guiGraphics , x1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y1 , 1 , 0x00FF00 );
273273 //Draw bottom for bottom
274- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
274+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
275275 //Draw top for bottom
276- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , x2 , y2 , 1 , 0x00FF00 );
276+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , x2 , y2 , 1 , 0x00FF00 );
277277 //Draw bottom for top
278- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
278+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
279279 //Draw top for top
280- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x2 , y1 , 1 , 0x00FF00 );
280+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x2 , y1 , 1 , 0x00FF00 );
281281 //Draw left
282- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , 1 , 0x00FF00 );
282+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , 1 , 0x00FF00 );
283283 }
284284 }
285285 if (betterAdvancementEntryScreen .y == this .advConnectedToMouse .y )
286286 {
287287 if (x1 > x2 )
288288 {
289289 //Draw top
290- RenderUtil .drawRect (x2 , y1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , 1 , 0x00FF00 );
290+ RenderUtil .drawRect (guiGraphics , x2 , y1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , 1 , 0x00FF00 );
291291 //Draw left for right
292- RenderUtil .drawRect (x1 , y1 , x1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
292+ RenderUtil .drawRect (guiGraphics , x1 , y1 , x1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
293293 //Draw right for right
294- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
294+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
295295 //Draw left for left
296- RenderUtil .drawRect (x2 , y1 , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
296+ RenderUtil .drawRect (guiGraphics , x2 , y1 , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
297297 //Draw right for left
298- RenderUtil .drawRect (x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
298+ RenderUtil .drawRect (guiGraphics , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
299299 //Draw bottom
300- RenderUtil .drawRect (x2 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
300+ RenderUtil .drawRect (guiGraphics , x2 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
301301 }
302302 else
303303 {
304304 //Draw left
305- RenderUtil .drawRect (x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x1 , y2 , 1 , 0x00FF00 );
305+ RenderUtil .drawRect (guiGraphics , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x1 , y2 , 1 , 0x00FF00 );
306306 //Draw left for right
307- RenderUtil .drawRect (x2 , y1 , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
307+ RenderUtil .drawRect (guiGraphics , x2 , y1 , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
308308 //Draw right for right
309- RenderUtil .drawRect (x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
309+ RenderUtil .drawRect (guiGraphics , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
310310 //Draw left for left
311- RenderUtil .drawRect (x1 , y1 , x1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
311+ RenderUtil .drawRect (guiGraphics , x1 , y1 , x1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
312312 //Draw right for left
313- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
313+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
314314 //Draw right
315- RenderUtil .drawRect (x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
315+ RenderUtil .drawRect (guiGraphics , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
316316 }
317317 }
318318 if (degrees == 45 || degrees == 135 || degrees == 225 || degrees == 315 )
319319 {
320320 //Draw lines around each advancement
321321 //First
322322 //Top
323- RenderUtil .drawRect (x1 , y1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , 1 , 0x00FF00 );
323+ RenderUtil .drawRect (guiGraphics , x1 , y1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , 1 , 0x00FF00 );
324324 //Bottom
325- RenderUtil .drawRect (x1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
325+ RenderUtil .drawRect (guiGraphics , x1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
326326 //Left
327- RenderUtil .drawRect (x1 , y1 , x1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
327+ RenderUtil .drawRect (guiGraphics , x1 , y1 , x1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
328328 //Right
329- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
329+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
330330 //Second
331331 //Top
332- RenderUtil .drawRect (x2 , y2 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , 1 , 0x00FF00 );
332+ RenderUtil .drawRect (guiGraphics , x2 , y2 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , 1 , 0x00FF00 );
333333 //Bottom
334- RenderUtil .drawRect (x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
334+ RenderUtil .drawRect (guiGraphics , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
335335 //Left
336- RenderUtil .drawRect (x2 , y2 , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
336+ RenderUtil .drawRect (guiGraphics , x2 , y2 , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
337337 //Right
338- RenderUtil .drawRect (x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
338+ RenderUtil .drawRect (guiGraphics , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
339339
340340 if (degrees == 45 || degrees == 225 )
341341 {
342- RenderUtil .drawRect (x1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
343- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , 1 , 0x00FF00 );
342+ RenderUtil .drawRect (guiGraphics , x1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
343+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 , 1 , 0x00FF00 );
344344 }
345345 else if (degrees == 135 || degrees == 315 )
346346 {
347- RenderUtil .drawRect (x1 , y1 , x2 , y2 , 1 , 0x00FF00 );
348- RenderUtil .drawRect (x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
347+ RenderUtil .drawRect (guiGraphics , x1 , y1 , x2 , y2 , 1 , 0x00FF00 );
348+ RenderUtil .drawRect (guiGraphics , x1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y1 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , x2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , y2 + BetterAdvancementWidget .ADVANCEMENT_SIZE - 1 , 1 , 0x00FF00 );
349349 }
350350 }
351351 }
@@ -393,7 +393,6 @@ private void renderInside(GuiGraphics guiGraphics, int mouseX, int mouseY, int l
393393 }
394394
395395 public void renderWindow (GuiGraphics guiGraphics , int left , int top , int right , int bottom , int maxTabs , int skip ) {
396- RenderSystem .enableBlend ();
397396 // Top left corner
398397 guiGraphics .blit (RenderType ::guiTextured , Resources .Gui .WINDOW , left , top , 0 , 0 , CORNER_SIZE , CORNER_SIZE , 256 , 256 );
399398 // Top side
@@ -419,13 +418,9 @@ public void renderWindow(GuiGraphics guiGraphics, int left, int top, int right,
419418 tab .drawTab (guiGraphics , left , top , width , height , tab == this .selectedTab );
420419 }
421420
422- RenderSystem .defaultBlendFunc ();
423-
424421 for (BetterAdvancementTab tab : this .tabs .values ().stream ().skip (skip ).limit (maxTabs ).toList ()) {
425422 tab .drawIcon (guiGraphics , left , top , width , height );
426423 }
427-
428- RenderSystem .disableBlend ();
429424 }
430425
431426 FormattedCharSequence windowTitle = TITLE .getVisualOrderText ();
@@ -445,9 +440,7 @@ private void renderToolTips(GuiGraphics guiGraphics, int mouseX, int mouseY, int
445440 if (this .selectedTab != null ) {
446441 guiGraphics .pose ().pushPose ();
447442 guiGraphics .pose ().translate (left + PADDING , top + 2 *PADDING , 400.0D );
448- RenderSystem .enableDepthTest ();
449443 this .selectedTab .drawToolTips (guiGraphics ,mouseX - left - PADDING , mouseY - top - 2 *PADDING , left , top , right - left - 2 *PADDING , bottom - top - 3 *PADDING , zoom );
450- RenderSystem .disableDepthTest ();
451444 guiGraphics .pose ().popPose ();
452445 }
453446
0 commit comments