New icons for holograms module

Author: Nekiplay

build.gradle

@@ -57,7 +57,7 @@ dependencies {
 
 	// Meteor Client
 	modImplementation files("libs\\baritone-unoptimized-fabric-1.10.2.jar")
-	modImplementation files("libs\\meteor-client-1.21.5-12.jar")
+	modImplementation files("libs\\meteor-client-1.21.5-16.jar")
 
 	// Xaero's Mods
 	modCompileOnly "maven.modrinth:xaeros-world-map:${project.xwm_fabric_version}" // Xaero's World Map

libs/meteor-client-1.21.5-12.jar libs/meteor-client-1.21.5-16.jarlibs/meteor-client-1.21.5-12.jar renamed to libs/meteor-client-1.21.5-16.jar

@@ -17,8 +17,16 @@ public static Item register(String path, Function<Item.Settings, Item> factory,
 	public static Item METEOR_PLUS_LOGO_ITEM = null;
 	public static Item METEOR_PLUS_LOGO_MODS_ITEM = null;
 
+	public static Item METEOR_PLUS_STAR_ITEM = null;
+	public static Item METEOR_PLUS_DIAMOND_ITEM = null;
+	public static Item METEOR_PLUS_MONEY_ITEM = null;
+
 	public static void initialize() {
 		METEOR_PLUS_LOGO_ITEM = register("logo", Item::new, new Item.Settings());
 		METEOR_PLUS_LOGO_MODS_ITEM = register("logo_mods", Item::new, new Item.Settings());
+
+		METEOR_PLUS_STAR_ITEM = register("star", Item::new, new Item.Settings());
+		METEOR_PLUS_DIAMOND_ITEM = register("diamond", Item::new, new Item.Settings());
+		METEOR_PLUS_MONEY_ITEM = register("money", Item::new, new Item.Settings());
 	}
 }

src/main/java/nekiplay/main/items/ModItems.java

@@ -9,10 +9,11 @@
 import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(value = WBlockPosEdit.class, remap = false, priority = 1001)
 public class WBlockPosEditMixin extends WHorizontalList  {
@@ -36,9 +37,9 @@ public class WBlockPosEditMixin extends WHorizontalList  {
 	private boolean clicking;
 	@Inject(method = "addTextBox", at = @At("HEAD"), cancellable = true)
 	private void addTextBox(CallbackInfo ci) {
-		this.textBoxX = this.add(this.theme.textBox(Integer.toString(this.value.getX()), this::filter)).minWidth(75.0).widget();
-		this.textBoxY = this.add(this.theme.textBox(Integer.toString(this.value.getY()), this::filter)).minWidth(75.0).widget();
-		this.textBoxZ = this.add(this.theme.textBox(Integer.toString(this.value.getZ()), this::filter)).minWidth(75.0).widget();
+		this.textBoxX = this.add(this.theme.textBox(Integer.toString(this.value.getX()), this::filterFixed)).minWidth(75.0).widget();
+		this.textBoxY = this.add(this.theme.textBox(Integer.toString(this.value.getY()), this::filterFixed)).minWidth(75.0).widget();
+		this.textBoxZ = this.add(this.theme.textBox(Integer.toString(this.value.getZ()), this::filterFixed)).minWidth(75.0).widget();
 		this.textBoxX.actionOnUnfocused = () -> {
 			try {
 				this.lastValue = this.value;
@@ -84,20 +85,25 @@ private void addTextBox(CallbackInfo ci) {
 			catch (NumberFormatException ignore) { }
 		};
 
-
-
 		if (ConfigModifier.get().positionProtection.get()) {
 			textBoxX.set("***");
-			textBoxZ.set("***");
+			updateRender(textBoxX);
 			textBoxY.set("***");
+			updateRender(textBoxY);
+			textBoxZ.set("***");
+			updateRender(textBoxZ);
 		}
 		ci.cancel();
 	}
-	@Shadow
-	private boolean filter(String text, char c) {
+	private void updateRender(WTextBox textBox) {
+		textBoxX.setFocused(true);
+		textBoxX.setFocused(false);
+	}
+	@Unique
+	private boolean filterFixed(String text, char c) {
 		boolean validate = true;
 		boolean good;
-		if (c == '-' && text.isEmpty() || text.equals("***")) {
+		if ((c == '-' && text.isEmpty()) || text.equals("***")) {
 			good = true;
 			validate = false;
 		} else {
@@ -111,7 +117,6 @@ private boolean filter(String text, char c) {
 				good = false;
 			}
 		}
-
 		return good;
 	}
 	@Shadow

src/main/java/nekiplay/meteorplus/mixin/meteorclient/gui/WBlockPosEditMixin.java

@@ -0,0 +1,7 @@
+{
+	"model": {
+		"type": "model",
+		"model": "meteorplus:item/diamond"
+	}
+}
+

src/main/resources/assets/meteorplus/items/diamond.json

@@ -0,0 +1,7 @@
+{
+	"model": {
+		"type": "model",
+		"model": "meteorplus:item/money"
+	}
+}
+

src/main/resources/assets/meteorplus/items/money.json

@@ -0,0 +1,7 @@
+{
+	"model": {
+		"type": "model",
+		"model": "meteorplus:item/star"
+	}
+}
+

src/main/resources/assets/meteorplus/items/star.json

@@ -6,6 +6,9 @@
 
 	"item.meteorplus.logo": "Meteor+ logo",
 	"item.meteorplus.logo_mods": "Meteor+ Integrations logo",
+	"item.meteorplus.star": "Star",
+	"item.meteorplus.diamond": "Diamond",
+	"item.meteorplus.money": "Money",
 
 	"modules.meteor-client.better-tooltips.beehive.honey-level": "§7Honey level: §e%d§7.",
 	"modules.meteor-client.better-tooltips.beehive.bees": "§7Bees: §e%d§7.",

src/main/resources/assets/meteorplus/lang/en_us.json

@@ -6,6 +6,9 @@
 
 	"item.meteorplus.logo": "Meteor+ логотип",
 	"item.meteorplus.logo_mods": "Meteor+ Integrations логотип",
+	"item.meteorplus.star": "Звезда",
+	"item.meteorplus.diamond": "Алмаз",
+	"item.meteorplus.money": "Деньги",
 
 	"modules.meteor-client.better-tooltips.beehive.honey-level": "§7Уровень мёда: §e%d§7.",
 	"modules.meteor-client.better-tooltips.beehive.bees": "§7Пчел: §e%d§7.",

src/main/resources/assets/meteorplus/lang/ru_ru.json

@@ -6,6 +6,9 @@
 
 	"item.meteorplus.logo": "Meteor+ логотип",
 	"item.meteorplus.logo_mods": "Meteor+ Integrations логотип",
+	"item.meteorplus.star": "Зірка",
+	"item.meteorplus.diamond": "Діамант",
+	"item.meteorplus.money": "Гроші",
 
 	"modules.meteor-client.better-tooltips.beehive.honey-level": "§7Рівень меду: §e%d§7.",
 	"modules.meteor-client.better-tooltips.beehive.bees": "§7Бджіл: §e%d§7.",