22
33import java .util .LinkedList ;
44import java .util .Objects ;
5+ import java .util .Optional ;
56
67import ninja .genuine .tooltips .client .Tooltip ;
78import ninja .genuine .tooltips .client .config .Config ;
@@ -24,34 +25,28 @@ public TooltipEvent() {}
2425 public void tick (ClientTickEvent event ) {
2526 if (event .phase != Phase .START )
2627 return ;
27- EntityItem entity = null ;
28- try {
29- entity = ModUtils .getMouseOver (Minecraft .getMinecraft ().world , Minecraft .getMinecraft ().player , 0 ).get ();
30- } catch (Exception e ) {}
31- synchronized (tooltips ) {
32- tooltips .removeIf (Objects ::isNull );
33- tooltips .removeIf (Tooltip ::isDead );
34- tooltips .forEach (Tooltip ::tick );
28+ tooltips .removeIf (Objects ::isNull );
29+ tooltips .removeIf (Tooltip ::isDead );
30+ tooltips .forEach (Tooltip ::tick );
31+ Optional <EntityItem > mouseOver = ModUtils .getMouseOver ();
32+ if (mouseOver .isPresent ()) {
3533 boolean createTooltip = true ;
34+ EntityItem entity = mouseOver .get ();
3635 for (Tooltip tooltip : tooltips )
37- if (tooltip .getEntity () == entity ) {
38- createTooltip = false ;
39- tooltip .reset ();
40- }
41- if (createTooltip && entity != null )
36+ if (tooltip .getEntity () == entity )
37+ createTooltip = !tooltip .reset ();
38+ if (createTooltip )
4239 tooltips .addFirst (new Tooltip (Minecraft .getMinecraft ().player , entity ));
43- for (int i = Config .getInstance ().getMaxTooltips (); i < tooltips .size (); i ++)
44- tooltips .get (i ).forceFade ();
4540 }
41+ for (int i = Config .getInstance ().getMaxTooltips (); i < tooltips .size (); i ++)
42+ tooltips .get (i ).forceFade ();
4643 }
4744
4845 @ SubscribeEvent
4946 public void render (RenderWorldLastEvent event ) {
5047 if (!Config .getInstance ().isEnabled () || Minecraft .getMinecraft ().world == null )
5148 return ;
52- synchronized (tooltips ) {
53- for (Tooltip tooltip : tooltips )
54- RenderHelper .renderTooltip (tooltip , event .getPartialTicks ());
55- }
49+ for (Tooltip tooltip : tooltips )
50+ RenderHelper .renderTooltip (tooltip , event .getPartialTicks ());
5651 }
5752}
0 commit comments