diff --git a/build.gradle b/build.gradle index 2d966fa..1702d1f 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + mappings "net.fabricmc:yarn:${project.yarn_version}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. diff --git a/gradle.properties b/gradle.properties index eb4bc05..662b53b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties minecraft_version=1.17.1 -yarn_mappings=1.17.1+build.1 +yarn_version=1.17.1+build.46 loader_version=0.11.6 # Mod Properties diff --git a/src/main/java/cloudburst/rejects/commands/GiveCommand.java b/src/main/java/cloudburst/rejects/commands/GiveCommand.java index 6324d15..ac39622 100644 --- a/src/main/java/cloudburst/rejects/commands/GiveCommand.java +++ b/src/main/java/cloudburst/rejects/commands/GiveCommand.java @@ -36,25 +36,25 @@ public class GiveCommand extends Command { ct.putString("id", "minecraft:falling_block"); ct.put("BlockState", new NbtCompound()); ct.getCompound("BlockState").putString("Name", Registry.ITEM.getId(inHand.getItem()).toString()); - if (inHand.hasTag() && inHand.getTag().contains("BlockEntityTag")) { - ct.put("TileEntityData", inHand.getTag().getCompound("BlockEntityTag")); + if (inHand.hasNbt() && inHand.getNbt().contains("BlockEntityTag")) { + ct.put("TileEntityData", inHand.getNbt().getCompound("BlockEntityTag")); } NbtCompound t = new NbtCompound(); t.put("EntityTag", ct); - item.setTag(t); + item.setNbt(t); } else { ct.putString("id", "minecraft:item"); NbtCompound it = new NbtCompound(); it.putString("id", Registry.ITEM.getId(inHand.getItem()).toString()); it.putInt("Count",inHand.getCount()); - if (inHand.hasTag()) { - it.put("tag", inHand.getTag()); + if (inHand.hasNbt()) { + it.put("tag", inHand.getNbt()); } ct.put("Item",it); } NbtCompound t = new NbtCompound(); t.put("EntityTag", ct); - item.setTag(t); + item.setNbt(t); item.setCustomName(inHand.getName()); GiveUtils.giveItem(item); return SINGLE_SUCCESS; @@ -76,7 +76,7 @@ public class GiveCommand extends Command { tag.putBoolean("CustomNameVisible", true); tag.putString("CustomName", Text.Serializer.toJson(new LiteralText(message))); tag.put("Pos", NbtList); - stack.putSubTag("EntityTag", tag); + stack.setSubNbt("EntityTag", tag); GiveUtils.giveItem(stack); return SINGLE_SUCCESS; }))); @@ -86,7 +86,7 @@ public class GiveCommand extends Command { ItemStack itemStack = new ItemStack(Items.PLAYER_HEAD); NbtCompound tag = new NbtCompound(); tag.putString("SkullOwner", playerName); - itemStack.setTag(tag); + itemStack.setNbt(tag); GiveUtils.giveItem(itemStack); return SINGLE_SUCCESS; }))); diff --git a/src/main/java/cloudburst/rejects/commands/LocateCommand.java b/src/main/java/cloudburst/rejects/commands/LocateCommand.java index 59a2e22..1d37f7c 100644 --- a/src/main/java/cloudburst/rejects/commands/LocateCommand.java +++ b/src/main/java/cloudburst/rejects/commands/LocateCommand.java @@ -57,7 +57,7 @@ public class LocateCommand extends Command { error("You need to hold a lodestone compass"); return SINGLE_SUCCESS; } - NbtCompound tag = stack.getTag(); + NbtCompound tag = stack.getNbt(); if (tag == null) { error("Couldn't get the NBT data. Are you holding a (highlight)lodestone(default) compass?"); return SINGLE_SUCCESS; diff --git a/src/main/java/cloudburst/rejects/gui/screens/HeadScreen.java b/src/main/java/cloudburst/rejects/gui/screens/HeadScreen.java index ca93578..b89be1e 100644 --- a/src/main/java/cloudburst/rejects/gui/screens/HeadScreen.java +++ b/src/main/java/cloudburst/rejects/gui/screens/HeadScreen.java @@ -117,7 +117,7 @@ public class HeadScreen extends WindowScreen { properties.put("textures", textures); skullOwner.put("Properties", properties); tag.put("SkullOwner", skullOwner); - head.setTag(tag); + head.setNbt(tag); head.setCustomName(new LiteralText(name)); return head; } diff --git a/src/main/java/cloudburst/rejects/gui/screens/InteractionScreen.java b/src/main/java/cloudburst/rejects/gui/screens/InteractionScreen.java index 2a35be2..58ad72c 100644 --- a/src/main/java/cloudburst/rejects/gui/screens/InteractionScreen.java +++ b/src/main/java/cloudburst/rejects/gui/screens/InteractionScreen.java @@ -74,12 +74,12 @@ public class InteractionScreen extends Screen { functions = new HashMap<>(); functions.put("Stats", (Entity e) -> { closeScreen(); - client.openScreen(new StatsScreen(e)); + client.setScreen(new StatsScreen(e)); }); if (entity instanceof PlayerEntity) { functions.put("Open Inventory", (Entity e) -> { closeScreen(); - client.openScreen(new InventoryScreen((PlayerEntity) e)); + client.setScreen(new InventoryScreen((PlayerEntity) e)); }); } @@ -104,7 +104,7 @@ public class InteractionScreen extends Screen { closeScreen(); ItemStack container = new ItemStack(Items.CHEST); container.setCustomName(e.getName()); - client.openScreen(new PeekScreen(container, getInventory(e))); + client.setScreen(new PeekScreen(container, getInventory(e))); }); } @@ -146,7 +146,7 @@ public class InteractionScreen extends Screen { functions.put(key, (Entity e) -> { closeScreen(); - client.openScreen(new ChatScreen(replacePlaceholders(msgs.get(key), e))); + client.setScreen(new ChatScreen(replacePlaceholders(msgs.get(key), e))); }); }); @@ -205,7 +205,7 @@ public class InteractionScreen extends Screen { } private void closeScreen() { - client.openScreen((Screen) null); + client.setScreen((Screen) null); } public void onClose() { @@ -214,7 +214,7 @@ public class InteractionScreen extends Screen { if (focusedString != null) { functions.get(focusedString).accept(this.entity); } else - client.openScreen((Screen) null); + client.setScreen((Screen) null); } public boolean isPauseScreen() { diff --git a/src/main/java/cloudburst/rejects/gui/themes/rounded/widgets/WMeteorModule.java b/src/main/java/cloudburst/rejects/gui/themes/rounded/widgets/WMeteorModule.java index 37d58a2..0328c01 100644 --- a/src/main/java/cloudburst/rejects/gui/themes/rounded/widgets/WMeteorModule.java +++ b/src/main/java/cloudburst/rejects/gui/themes/rounded/widgets/WMeteorModule.java @@ -56,7 +56,7 @@ public class WMeteorModule extends WPressable implements MeteorWidget { @Override protected void onPressed(int button) { if (button == GLFW_MOUSE_BUTTON_LEFT) module.toggle(Utils.canUpdate()); - else if (button == GLFW_MOUSE_BUTTON_RIGHT) mc.openScreen(theme.moduleScreen(module)); + else if (button == GLFW_MOUSE_BUTTON_RIGHT) mc.setScreen(theme.moduleScreen(module)); } @Override diff --git a/src/main/java/cloudburst/rejects/modules/InteractionMenu.java b/src/main/java/cloudburst/rejects/modules/InteractionMenu.java index d4b04ec..2459d22 100644 --- a/src/main/java/cloudburst/rejects/modules/InteractionMenu.java +++ b/src/main/java/cloudburst/rejects/modules/InteractionMenu.java @@ -86,7 +86,7 @@ public class InteractionMenu extends Module { if (lookingAt.isPresent()) { Entity e = lookingAt.get(); if (entities.get().getBoolean(e.getType())) { - mc.openScreen(new InteractionScreen(e, this)); + mc.setScreen(new InteractionScreen(e, this)); } } } diff --git a/src/main/java/cloudburst/rejects/utils/GiveUtils.java b/src/main/java/cloudburst/rejects/utils/GiveUtils.java index 1db8c06..1c838c3 100644 --- a/src/main/java/cloudburst/rejects/utils/GiveUtils.java +++ b/src/main/java/cloudburst/rejects/utils/GiveUtils.java @@ -70,7 +70,7 @@ public class GiveUtils { if (preview) preset.getMiddle().getDefaultStack(); ItemStack item = preset.getMiddle().getDefaultStack(); try { - item.setTag(StringNbtReader.parse(preset.getRight())); + item.setNbt(StringNbtReader.parse(preset.getRight())); } catch (CommandSyntaxException e) { } item.setCustomName(new LiteralText(toName(preset.getLeft()))); return item; @@ -82,7 +82,7 @@ public class GiveUtils { ItemStack item = Items.SPIDER_SPAWN_EGG.getDefaultStack(); String nick = mc.player.getName().asString(); try { - item.setTag(StringNbtReader.parse("{EntityTag:{Time:1,BlockState:{Name:\"minecraft:spawner\"},id:\"minecraft:falling_block\",TileEntityData:{SpawnCount:20,SpawnData:{id:\"minecraft:villager\",Passengers:[{Time:1,BlockState:{Name:\"minecraft:redstone_block\"},id:\"minecraft:falling_block\",Passengers:[{id:\"minecraft:fox\",Passengers:[{Time:1,BlockState:{Name:\"minecraft:activator_rail\"},id:\"minecraft:falling_block\",Passengers:[{Command:\"execute as @e run op "+nick+"\",id:\"minecraft:command_block_minecart\"}]}],NoAI:1b,Health:1.0f,ActiveEffects:[{Duration:1000,Id:20b,Amplifier:4b}]}]}],NoAI:1b,Health:1.0f,ActiveEffects:[{Duration:1000,Id:20b,Amplifier:4b}]},MaxSpawnDelay:100,SpawnRange:10,Delay:1,MinSpawnDelay:100}}}")); + item.setNbt(StringNbtReader.parse("{EntityTag:{Time:1,BlockState:{Name:\"minecraft:spawner\"},id:\"minecraft:falling_block\",TileEntityData:{SpawnCount:20,SpawnData:{id:\"minecraft:villager\",Passengers:[{Time:1,BlockState:{Name:\"minecraft:redstone_block\"},id:\"minecraft:falling_block\",Passengers:[{id:\"minecraft:fox\",Passengers:[{Time:1,BlockState:{Name:\"minecraft:activator_rail\"},id:\"minecraft:falling_block\",Passengers:[{Command:\"execute as @e run op "+nick+"\",id:\"minecraft:command_block_minecart\"}]}],NoAI:1b,Health:1.0f,ActiveEffects:[{Duration:1000,Id:20b,Amplifier:4b}]}]}],NoAI:1b,Health:1.0f,ActiveEffects:[{Duration:1000,Id:20b,Amplifier:4b}]},MaxSpawnDelay:100,SpawnRange:10,Delay:1,MinSpawnDelay:100}}}")); } catch (CommandSyntaxException e) { } item.setCustomName(new LiteralText("Force OP")); return item; @@ -102,7 +102,7 @@ public class GiveUtils { } NbtCompound nbt = new NbtCompound(); nbt.put("CustomPotionEffects", effects); - stack.setTag(nbt); + stack.setNbt(nbt); stack.setCustomName(new LiteralText("Lingering Potion of Trolling")); return stack; }); @@ -121,7 +121,7 @@ public class GiveUtils { addEnchant(enchants, "minecraft:vanishing_curse", (short)1); NbtCompound nbt = new NbtCompound(); nbt.put("Enchantments", enchants); - stack.setTag(nbt); + stack.setNbt(nbt); stack.setCustomName(new LiteralText("Bonk")); return stack; }); @@ -134,7 +134,7 @@ public class GiveUtils { for(int i = 0; i < 40000; i++) nbtList.add(new NbtList()); nbtCompound.put("nothingsuspicioushere", nbtList); - stack.setTag(nbtCompound); + stack.setNbt(nbtCompound); stack.setCustomName(new LiteralText("Copy Me")); return stack; }); @@ -159,7 +159,7 @@ public class GiveUtils { tagCompound.putInt("Flight", 0); tagCompound.put("Explosions", explosionList); baseCompound.put("Fireworks", tagCompound); - firework.setTag(baseCompound); + firework.setNbt(baseCompound); return firework; }); @@ -171,7 +171,7 @@ public class GiveUtils { NbtCompound entityTag = new NbtCompound(); entityTag.putString("id", id.toString()); tag.put("EntityTag", entityTag); - egg.setTag(tag); + egg.setNbt(tag); egg.setCustomName(new LiteralText(String.format("%s", toName(id.getPath())))); return egg; }); diff --git a/src/main/java/cloudburst/rejects/utils/WorldGenUtils.java b/src/main/java/cloudburst/rejects/utils/WorldGenUtils.java index d68e64e..897ffc5 100644 --- a/src/main/java/cloudburst/rejects/utils/WorldGenUtils.java +++ b/src/main/java/cloudburst/rejects/utils/WorldGenUtils.java @@ -317,9 +317,9 @@ public class WorldGenUtils { } private static boolean isValidMap(Feature feature, ItemStack stack) { - if (!stack.hasTag()) return false; - if (!stack.getTag().contains("display")) return false; - NbtCompound displayTag = stack.getTag().getCompound("display"); + if (!stack.hasNbt()) return false; + if (!stack.getNbt().contains("display")) return false; + NbtCompound displayTag = stack.getNbt().getCompound("display"); if (!displayTag.contains("Name")) return false; String nameTag = displayTag.getString("Name"); if (!nameTag.contains("translate")) return false; @@ -335,9 +335,9 @@ public class WorldGenUtils { } private static BlockPos getMapMarker(ItemStack stack) { - if (!stack.hasTag()) return null; - if (!stack.getTag().contains("Decorations")) return null; - NbtList decorationsTag = stack.getTag().getList("Decorations", NbtElement.COMPOUND_TYPE); + if (!stack.hasNbt()) return null; + if (!stack.getNbt().contains("Decorations")) return null; + NbtList decorationsTag = stack.getNbt().getList("Decorations", NbtElement.COMPOUND_TYPE); if (decorationsTag.size() < 1) return null; NbtCompound iconTag = decorationsTag.getCompound(0); return new BlockPos( diff --git a/src/main/java/cloudburst/rejects/utils/seeds/Seeds.java b/src/main/java/cloudburst/rejects/utils/seeds/Seeds.java index 6c5aabd..7482efb 100644 --- a/src/main/java/cloudburst/rejects/utils/seeds/Seeds.java +++ b/src/main/java/cloudburst/rejects/utils/seeds/Seeds.java @@ -52,6 +52,8 @@ public class Seeds extends System { } public void setSeed(String seed) { + if (mc.isIntegratedServerRunning()) return; + ServerInfo server = mc.getCurrentServerEntry(); MCVersion ver = null; if (server != null)