In holograms no more need server ip

Author: Nekiplay

src/main/java/nekiplay/meteorplus/features/modules/render/holograms/HologramData.java

@@ -18,7 +18,7 @@ public class HologramData {
 	public HologramData() {
 
 	}
-	public HologramData(double x, double y, double z, String text, String world, String dimension, Color color, double max_render_distance) {
+	public HologramData(double x, double y, double z, String text, String dimension, Color color, double max_render_distance) {
 		this.x = x;
 		this.y = y;
 		this.z = z;
@@ -27,7 +27,7 @@ public HologramData(double x, double y, double z, String text, String world, Str
 		this.text = text;
 	}
 
-	public HologramData(BlockPos pos, String text, String world, Dimension dimension, Color color, double max_render_distance) {
+	public HologramData(BlockPos pos, String text, Dimension dimension, Color color, double max_render_distance) {
 		this.x = pos.getX();
 		this.y = pos.getY();
 		this.z = pos.getZ();

src/main/java/nekiplay/meteorplus/features/modules/render/holograms/HologramDataListed.java

@@ -13,7 +13,6 @@ public class HologramDataListed {
 	public double y;
 	public double z;
 	public String text;
-	public String world;
 	public String dimension;
 	public Color color;
 	public double max_render_distance = 16;
@@ -27,26 +26,24 @@ public class HologramDataListed {
 	public HologramDataListed() {
 
 	}
-	public HologramDataListed(double x, double y, double z, String text, String world, String dimension, Color color, double max_render_distance) {
+	public HologramDataListed(double x, double y, double z, String text, String dimension, Color color, double max_render_distance) {
 		this.x = x;
 		this.y = y;
 		this.z = z;
 		this.color = color;
 
 		this.text = text;
-		this.world = world;
 		this.dimension = dimension;
 		this.max_render_distance = max_render_distance;
 	}
 
-	public HologramDataListed(BlockPos pos, String text, String world, Dimension dimension, Color color, double max_render_distance) {
+	public HologramDataListed(BlockPos pos, String text, Dimension dimension, Color color, double max_render_distance) {
 		this.x = pos.getX();
 		this.y = pos.getY();
 		this.z = pos.getZ();
 		this.color = color;
 
 		this.text = text;
-		this.world = world;
 		this.dimension = dimension.name();
 		this.max_render_distance = max_render_distance;
 	}

src/main/java/nekiplay/meteorplus/features/modules/render/holograms/HologramModule.java

@@ -4,6 +4,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import meteordevelopment.meteorclient.MeteorClient;
+import meteordevelopment.meteorclient.events.game.GameJoinedEvent;
 import meteordevelopment.meteorclient.events.render.Render2DEvent;
 import meteordevelopment.meteorclient.events.world.TickEvent;
 import meteordevelopment.meteorclient.renderer.text.TextRenderer;
@@ -57,7 +58,7 @@ private void onTick(TickEvent.Post event) {
 		inWorldHolograms.clear();
 		Dimension dim = PlayerUtils.getDimension();
 		for (HologramDataListed hologramData : allHolograms) {
-			if (hologramData.world.equals(Utils.getWorldName()) && hologramData.dimension.equals(dim.name())) {
+			if (hologramData.dimension.equals(dim.name())) {
 				inWorldHolograms.add(hologramData);
 			}
 		}
@@ -84,20 +85,23 @@ private void on2DRender(Render2DEvent event) {
 					double hX = -widthHalf;
 					double hY = -heightDown;
 
-					text.render(MeteorStarscript.run(scripts.get(hologram_text)), hX, hY, hologramData.color, true);
-					for (HologramData hologramData1 : hologramData.other_holograms) {
-						text.render(MeteorStarscript.run(scripts.get(hologramData1.text)), hX - hologramData1.x, hY - hologramData1.y, hologramData1.color, true);
-						if (hologramData1.item_id != 0) {
-							Item item = Item.byRawId(hologramData1.item_id);
-							RenderUtils.drawItem(event.drawContext, item.getDefaultStack(), (int) ((int) hX - hologramData1.x), (int) ((int) 0 - hologramData1.y), hologramData1.item_scale, true);
+					var script = scripts.get(hologram_text);
+					if (script != null) {
+						text.render(MeteorStarscript.run(script), hX, hY, hologramData.color, true);
+						for (HologramData hologramData1 : hologramData.other_holograms) {
+							text.render(MeteorStarscript.run(scripts.get(hologramData1.text)), hX - hologramData1.x, hY - hologramData1.y, hologramData1.color, true);
+							if (hologramData1.item_id != 0) {
+								Item item = Item.byRawId(hologramData1.item_id);
+								RenderUtils.drawItem(event.drawContext, item.getDefaultStack(), (int) ((int) hX - hologramData1.x), (int) ((int) 0 - hologramData1.y), hologramData1.item_scale, true);
+							}
 						}
-					}
 
-					text.end();
-					if (hologramData.item_id != 0) {
-						Item item = Item.byRawId(hologramData.item_id);
-						RenderUtils.drawItem(event.drawContext, item.getDefaultStack(), (int) hX, (int) 0, hologramData.item_scale, true);
+						if (hologramData.item_id != 0) {
+							Item item = Item.byRawId(hologramData.item_id);
+							RenderUtils.drawItem(event.drawContext, item.getDefaultStack(), (int) hX, (int) 0, hologramData.item_scale, true);
+						}
 					}
+					text.end();
 					NametagUtils.end(event.drawContext);
 				}
 			}
@@ -162,8 +166,8 @@ private void createDefault() {
 		if (!dir2.exists()) {
 			dir2.mkdir();
 
-			HologramDataListed hologramData = new HologramDataListed(new BlockPos(0, 64, 0), "Spawn", world_name, PlayerUtils.getDimension(), Color.RED, 16);
-			HologramData hologramData2 = new HologramData(new BlockPos(0, 15, 0), PlayerUtils.getDimension().name(), world_name, PlayerUtils.getDimension(), Color.RED, 16);
+			HologramDataListed hologramData = new HologramDataListed(new BlockPos(0, 64, 0), "Spawn", PlayerUtils.getDimension(), Color.RED, 16);
+			HologramData hologramData2 = new HologramData(new BlockPos(0, 15, 0), PlayerUtils.getDimension().name(), PlayerUtils.getDimension(), Color.RED, 16);
 			hologramData.other_holograms.add(hologramData2);
 			String json = gson.toJson(hologramData);
 
@@ -185,4 +189,8 @@ private void createDefault() {
 			}
 		}
 	}
+	@EventHandler
+	public void onJoinGame(GameJoinedEvent event) {
+		load();
+	}
 }