diff --git a/build.gradle b/build.gradle index 1495b62..24d13aa 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' + id 'fabric-loom' version '0.12-SNAPSHOT' } sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 @@ -10,6 +10,7 @@ group = project.maven_group repositories { mavenCentral() + mavenLocal() maven { url "https://maven.meteordev.org/releases"} maven { url "https://maven.meteordev.org/snapshots" } maven { url "https://maven.seedfinding.com/" } @@ -31,16 +32,17 @@ dependencies { modImplementation("meteordevelopment:meteor-client:SNAPSHOT") // seed .locate and ore sim - extraLibs('com.seedfinding:mc_math:d73ac7cc644c67628ade0effd7136e11eb00bb76') {transitive = false} - extraLibs('com.seedfinding:mc_seed:5518e3ba3ee567fb0b51c15958967f70a6a19e02') {transitive = false} - extraLibs('com.seedfinding:mc_core:706e4f1b7aa6b42b3627f682a311d06280d80b5c') {transitive = false} - extraLibs('com.seedfinding:mc_noise:a6ab8e6c688491829f8d2adf845392da22ef8e9c') {transitive = false} - extraLibs('com.seedfinding:mc_biome:533cdb5ed955ff1c3106f9901aea6aa5b08fd781') {transitive = false} - extraLibs('com.seedfinding:mc_terrain:9e937ddb838e28e79423c287fa18b1ce66f061d7') {transitive = false} - extraLibs('com.seedfinding:mc_feature:ef939c0dd7d66ab1bd290d6aab1e42a12cb3dbf1') {transitive = false} + implementation('com.seedfinding:mc_math:0eb505174da8a92550f8ec6efe254e0fa936cc0d') { transitive = false } + implementation('com.seedfinding:mc_seed:5518e3ba3ee567fb0b51c15958967f70a6a19e02') { transitive = false } + implementation('com.seedfinding:mc_core:706e4f1b7aa6b42b3627f682a311d06280d80b5c') { transitive = false } + implementation('com.seedfinding:mc_noise:a6ab8e6c688491829f8d2adf845392da22ef8e9c') { transitive = false } + implementation('com.seedfinding:mc_biome:b2271807a047bb43ac60c8c20ad47e315f19b9a6') { transitive = false } + implementation('com.seedfinding:mc_terrain:9e937ddb838e28e79423c287fa18b1ce66f061d7') { transitive = false } + implementation('com.seedfinding:mc_feature:ef939c0dd7d66ab1bd290d6aab1e42a12cb3dbf1') { transitive = false } // seedcracker api - implementation (include('com.github.19MisterX98.SeedcrackerX:seedcrackerx-api:master-SNAPSHOT')) {transitive = false} + implementation (include('com.github.19MisterX98.SeedcrackerX:seedcrackerx-api:2.10.1')) {transitive = false} +// implementation (include('com.github.19MisterX98.SeedcrackerX:seedcrackerx-api:master-SNAPSHOT')) {transitive = false} configurations.implementation.extendsFrom(configurations.extraLibs) } diff --git a/gradle.properties b/gradle.properties index e9e87f9..818ebda 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties -minecraft_version=1.18.2 -yarn_version=1.18.2+build.1 -loader_version=0.13.3 +minecraft_version=1.19 +yarn_version=1.19+build.1 +loader_version=0.14.7 # Mod Properties mod_version = 0.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a33384a..4605298 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/java/anticope/rejects/arguments/EnumArgumentType.java b/src/main/java/anticope/rejects/arguments/EnumArgumentType.java index 97c2491..4d8c141 100644 --- a/src/main/java/anticope/rejects/arguments/EnumArgumentType.java +++ b/src/main/java/anticope/rejects/arguments/EnumArgumentType.java @@ -13,11 +13,11 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder; import java.lang.reflect.InvocationTargetException; import net.minecraft.command.CommandSource; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; public class EnumArgumentType> implements ArgumentType { private static final DynamicCommandExceptionType NO_SUCH_TYPE = new DynamicCommandExceptionType(o -> - new LiteralText(o + " is not a valid argument.")); + Text.literal(o + " is not a valid argument.")); private T[] values; diff --git a/src/main/java/anticope/rejects/arguments/EnumStringArgumentType.java b/src/main/java/anticope/rejects/arguments/EnumStringArgumentType.java index 0c23ff3..1117d97 100644 --- a/src/main/java/anticope/rejects/arguments/EnumStringArgumentType.java +++ b/src/main/java/anticope/rejects/arguments/EnumStringArgumentType.java @@ -12,13 +12,13 @@ import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.command.CommandSource; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; public class EnumStringArgumentType implements ArgumentType { private Collection EXAMPLES; private static final DynamicCommandExceptionType INVALID_OPTION = new DynamicCommandExceptionType(name -> - new LiteralText(name+" is not a valid option.")); + Text.literal(name + " is not a valid option.")); public EnumStringArgumentType(Collection examples) { this.EXAMPLES = examples; } diff --git a/src/main/java/anticope/rejects/commands/GiveCommand.java b/src/main/java/anticope/rejects/commands/GiveCommand.java index ca3761a..46259e0 100644 --- a/src/main/java/anticope/rejects/commands/GiveCommand.java +++ b/src/main/java/anticope/rejects/commands/GiveCommand.java @@ -10,7 +10,6 @@ import net.minecraft.nbt.*; import anticope.rejects.utils.GiveUtils; import meteordevelopment.meteorclient.systems.commands.Command; -import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import net.minecraft.util.registry.Registry; @@ -73,7 +72,7 @@ public class GiveCommand extends Command { tag.putBoolean("Interpret", true); tag.putBoolean("NoGravity", true); tag.putBoolean("CustomNameVisible", true); - tag.putString("CustomName", Text.Serializer.toJson(new LiteralText(message))); + tag.putString("CustomName", Text.Serializer.toJson(Text.literal(message))); tag.put("Pos", NbtList); stack.setSubNbt("EntityTag", tag); GiveUtils.giveItem(stack); @@ -84,7 +83,7 @@ public class GiveCommand extends Command { String message = ctx.getArgument("message", String.class).replace("&", "\247"); ItemStack stack = new ItemStack(Items.BAT_SPAWN_EGG); NbtCompound tag = new NbtCompound(); - tag.putString("CustomName", Text.Serializer.toJson(new LiteralText(message))); + tag.putString("CustomName", Text.Serializer.toJson(Text.literal(message))); tag.putBoolean("NoAI", true); tag.putBoolean("Silent", true); tag.putBoolean("PersistenceRequired", true); diff --git a/src/main/java/anticope/rejects/commands/KickCommand.java b/src/main/java/anticope/rejects/commands/KickCommand.java index bf69377..cc723ac 100644 --- a/src/main/java/anticope/rejects/commands/KickCommand.java +++ b/src/main/java/anticope/rejects/commands/KickCommand.java @@ -7,7 +7,7 @@ import net.minecraft.command.CommandSource; import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import org.apache.commons.lang3.SystemUtils; import meteordevelopment.meteorclient.systems.commands.Command; @@ -23,7 +23,7 @@ public class KickCommand extends Command { @Override public void build(LiteralArgumentBuilder builder) { builder.then(literal("disconnect").executes(ctx -> { - mc.player.networkHandler.onDisconnect(new DisconnectS2CPacket(new LiteralText("Disconnected via .kick command"))); + mc.player.networkHandler.onDisconnect(new DisconnectS2CPacket(Text.literal("Disconnected via .kick command"))); return SINGLE_SUCCESS; })); builder.then(literal("pos").executes(ctx -> { diff --git a/src/main/java/anticope/rejects/commands/LocateCommand.java b/src/main/java/anticope/rejects/commands/LocateCommand.java index 5322a67..b17613e 100644 --- a/src/main/java/anticope/rejects/commands/LocateCommand.java +++ b/src/main/java/anticope/rejects/commands/LocateCommand.java @@ -21,8 +21,8 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket; import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket; import net.minecraft.sound.SoundEvents; -import net.minecraft.text.BaseText; -import net.minecraft.text.LiteralText; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -32,12 +32,12 @@ public class LocateCommand extends Command { private final static DynamicCommandExceptionType NOT_FOUND = new DynamicCommandExceptionType(o -> { if (o instanceof WorldGenUtils.Feature) { - return new LiteralText(String.format( + return Text.literal(String.format( "%s not found.", Utils.nameToTitle(o.toString().replaceAll("_", "-"))) ); } - return new LiteralText("Not found."); + return Text.literal("Not found."); }); private Vec3d firstStart; @@ -69,7 +69,7 @@ public class LocateCommand extends Command { } Vec3d coords = new Vec3d(nbt1.getDouble("X"),nbt1.getDouble("Y"),nbt1.getDouble("Z")); - BaseText text = new LiteralText("Lodestone located at "); + MutableText text = Text.literal("Lodestone located at "); text.append(ChatUtils.formatCoords(coords)); text.append("."); info(text); @@ -80,7 +80,7 @@ public class LocateCommand extends Command { WorldGenUtils.Feature feature = EnumArgumentType.getEnum(ctx, "feature", WorldGenUtils.Feature.stronghold); BlockPos pos = WorldGenUtils.locateFeature(feature, mc.player.getBlockPos()); if (pos != null) { - BaseText text = new LiteralText(String.format( + MutableText text = Text.literal(String.format( "%s located at ", Utils.nameToTitle(feature.toString().replaceAll("_", "-")) )); @@ -172,7 +172,7 @@ public class LocateCommand extends Command { BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("stop"); MeteorClient.EVENT_BUS.unsubscribe(this); Vec3d coords = new Vec3d(intersection[0],0,intersection[1]); - BaseText text = new LiteralText("Stronghold roughly located at "); + MutableText text = Text.literal("Stronghold roughly located at "); text.append(ChatUtils.formatCoords(coords)); text.append("."); info(text); diff --git a/src/main/java/anticope/rejects/commands/SaveSkinCommand.java b/src/main/java/anticope/rejects/commands/SaveSkinCommand.java index bb22eac..b8ad97b 100644 --- a/src/main/java/anticope/rejects/commands/SaveSkinCommand.java +++ b/src/main/java/anticope/rejects/commands/SaveSkinCommand.java @@ -9,7 +9,7 @@ import meteordevelopment.meteorclient.systems.commands.arguments.PlayerArgumentT import meteordevelopment.meteorclient.utils.network.Http; import net.minecraft.command.CommandSource; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import org.apache.commons.codec.binary.Base64; import org.lwjgl.BufferUtils; import org.lwjgl.PointerBuffer; @@ -25,7 +25,7 @@ import static com.mojang.brigadier.Command.SINGLE_SUCCESS; public class SaveSkinCommand extends Command { - private final static SimpleCommandExceptionType IO_EXCEPTION = new SimpleCommandExceptionType(new LiteralText("An IOException occurred")); + private final static SimpleCommandExceptionType IO_EXCEPTION = new SimpleCommandExceptionType(Text.literal("An IOException occurred")); private final PointerBuffer filters; private final Gson GSON = new Gson(); diff --git a/src/main/java/anticope/rejects/commands/SeedCommand.java b/src/main/java/anticope/rejects/commands/SeedCommand.java index d7e7e52..f5789f8 100644 --- a/src/main/java/anticope/rejects/commands/SeedCommand.java +++ b/src/main/java/anticope/rejects/commands/SeedCommand.java @@ -6,19 +6,19 @@ import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import net.minecraft.command.CommandSource; -import net.minecraft.text.BaseText; -import net.minecraft.text.LiteralText; import com.seedfinding.mccore.version.MCVersion; import meteordevelopment.meteorclient.systems.commands.Command; import anticope.rejects.utils.seeds.Seed; import anticope.rejects.utils.seeds.Seeds; import meteordevelopment.meteorclient.utils.Utils; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; import static com.mojang.brigadier.Command.SINGLE_SUCCESS; public class SeedCommand extends Command { - private final static SimpleCommandExceptionType NO_SEED = new SimpleCommandExceptionType(new LiteralText("No seed for current world saved.")); + private final static SimpleCommandExceptionType NO_SEED = new SimpleCommandExceptionType(Text.literal("No seed for current world saved.")); public SeedCommand() { super("seed", "Get or set seed for the current world."); @@ -35,7 +35,7 @@ public class SeedCommand extends Command { builder.then(literal("list").executes(ctx -> { Seeds.get().seeds.forEach((name, seed) -> { - BaseText text = new LiteralText(name + " "); + MutableText text = Text.literal(name + " "); text.append(seed.toText()); info(text); }); @@ -45,7 +45,7 @@ public class SeedCommand extends Command { builder.then(literal("delete").executes(ctx -> { Seed seed = Seeds.get().getSeed(); if (seed != null) { - BaseText text = new LiteralText("Deleted "); + MutableText text = Text.literal("Deleted "); text.append(seed.toText()); info(text); } diff --git a/src/main/java/anticope/rejects/commands/ServerCommand.java b/src/main/java/anticope/rejects/commands/ServerCommand.java index 0057eb0..7b5aa8c 100644 --- a/src/main/java/anticope/rejects/commands/ServerCommand.java +++ b/src/main/java/anticope/rejects/commands/ServerCommand.java @@ -6,11 +6,11 @@ import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import net.minecraft.client.network.ServerInfo; import net.minecraft.command.CommandSource; -import net.minecraft.text.BaseText; import net.minecraft.text.ClickEvent; import net.minecraft.text.HoverEvent; -import net.minecraft.text.LiteralText; import net.minecraft.text.ClickEvent.Action; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; import net.minecraft.util.Formatting; import anticope.rejects.utils.portscanner.PScanRunner; @@ -34,8 +34,8 @@ import com.mojang.brigadier.arguments.IntegerArgumentType; */ public class ServerCommand extends Command { - private final static SimpleCommandExceptionType ADDRESS_ERROR = new SimpleCommandExceptionType(new LiteralText("Couldn't obtain server address")); - private final static SimpleCommandExceptionType INVALID_RANGE = new SimpleCommandExceptionType(new LiteralText("Invalid range")); + private final static SimpleCommandExceptionType ADDRESS_ERROR = new SimpleCommandExceptionType(Text.literal("Couldn't obtain server address")); + private final static SimpleCommandExceptionType INVALID_RANGE = new SimpleCommandExceptionType(Text.literal("Invalid range")); private final static HashMap ports = new HashMap(); @@ -119,8 +119,8 @@ public class ServerCommand extends Command { scanPorts(address, port_list); } - private BaseText formatPort(int port, InetAddress address) { - BaseText text = new LiteralText(String.format("- %s%d%s ", Formatting.GREEN, port, Formatting.GRAY)); + private MutableText formatPort(int port, InetAddress address) { + MutableText text = Text.literal(String.format("- %s%d%s ", Formatting.GREEN, port, Formatting.GRAY)); if (ports.containsKey(port)) { text.append(ports.get(port)); if (ports.get(port).startsWith("HTTP") || ports.get(port).startsWith("FTP")) { @@ -131,7 +131,7 @@ public class ServerCommand extends Command { )) .withHoverEvent(new HoverEvent( HoverEvent.Action.SHOW_TEXT, - new LiteralText("Open in browser") + Text.literal("Open in browser") )) ); } else if (ports.get(port) == "DynMap") { @@ -142,7 +142,7 @@ public class ServerCommand extends Command { )) .withHoverEvent(new HoverEvent( HoverEvent.Action.SHOW_TEXT, - new LiteralText("Open in browser") + Text.literal("Open in browser") )) ); } else { @@ -153,7 +153,7 @@ public class ServerCommand extends Command { )) .withHoverEvent(new HoverEvent( HoverEvent.Action.SHOW_TEXT, - new LiteralText("Copy") + Text.literal("Copy") )) ); } @@ -165,7 +165,7 @@ public class ServerCommand extends Command { )) .withHoverEvent(new HoverEvent( HoverEvent.Action.SHOW_TEXT, - new LiteralText("Copy") + Text.literal("Copy") )) ); } diff --git a/src/main/java/anticope/rejects/commands/SetBlockCommand.java b/src/main/java/anticope/rejects/commands/SetBlockCommand.java index 5e8e25e..b13f84a 100644 --- a/src/main/java/anticope/rejects/commands/SetBlockCommand.java +++ b/src/main/java/anticope/rejects/commands/SetBlockCommand.java @@ -3,6 +3,7 @@ package anticope.rejects.commands; import anticope.rejects.arguments.ClientPosArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import meteordevelopment.meteorclient.systems.commands.Command; +import meteordevelopment.meteorclient.systems.commands.Commands; import net.minecraft.block.BlockState; import net.minecraft.command.CommandSource; import net.minecraft.command.argument.BlockStateArgument; @@ -19,7 +20,7 @@ public class SetBlockCommand extends Command { @Override public void build(LiteralArgumentBuilder builder) { - builder.then(argument("pos", ClientPosArgumentType.pos()).then(argument("block", BlockStateArgumentType.blockState()).executes(ctx -> { + builder.then(argument("pos", ClientPosArgumentType.pos()).then(argument("block", BlockStateArgumentType.blockState(Commands.REGISTRY_ACCESS)).executes(ctx -> { Vec3d pos = ClientPosArgumentType.getPos(ctx, "pos"); BlockState blockState = ctx.getArgument("block", BlockStateArgument.class).getBlockState(); mc.world.setBlockState(new BlockPos((int)pos.getX(), (int)pos.getY(), (int)pos.getZ()), blockState); diff --git a/src/main/java/anticope/rejects/commands/TerrainExport.java b/src/main/java/anticope/rejects/commands/TerrainExport.java index 36e2865..563fca2 100644 --- a/src/main/java/anticope/rejects/commands/TerrainExport.java +++ b/src/main/java/anticope/rejects/commands/TerrainExport.java @@ -6,7 +6,7 @@ import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import meteordevelopment.meteorclient.systems.commands.Command; import net.minecraft.command.CommandSource; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; import org.lwjgl.BufferUtils; @@ -24,7 +24,7 @@ public class TerrainExport extends Command { private final PointerBuffer filters; - private final static SimpleCommandExceptionType IO_EXCEPTION = new SimpleCommandExceptionType(new LiteralText("An IOException occurred")); + private final static SimpleCommandExceptionType IO_EXCEPTION = new SimpleCommandExceptionType(Text.literal("An IOException occurred")); public TerrainExport() { super("terrain-export", "Export an area to the c++ terrain finder format (very popbob command)."); diff --git a/src/main/java/anticope/rejects/gui/screens/HeadScreen.java b/src/main/java/anticope/rejects/gui/screens/HeadScreen.java index 88081e8..808e2c1 100644 --- a/src/main/java/anticope/rejects/gui/screens/HeadScreen.java +++ b/src/main/java/anticope/rejects/gui/screens/HeadScreen.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtList; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import java.lang.reflect.Type; import java.util.ArrayList; @@ -84,7 +84,7 @@ public class HeadScreen extends WindowScreen { WTable t = theme.table(); for (ItemStack head : heads) { t.add(theme.item(head)); - t.add(theme.label(head.getName().asString())); + t.add(theme.label(head.getName().getString())); WButton give = t.add(theme.button("Give")).widget(); give.action = () -> { try { @@ -119,7 +119,7 @@ public class HeadScreen extends WindowScreen { skullOwner.put("Properties", properties); tag.put("SkullOwner", skullOwner); head.setNbt(tag); - head.setCustomName(new LiteralText(name)); + head.setCustomName(Text.literal(name)); return head; } diff --git a/src/main/java/anticope/rejects/gui/screens/InteractionScreen.java b/src/main/java/anticope/rejects/gui/screens/InteractionScreen.java index 624b758..f2167b0 100644 --- a/src/main/java/anticope/rejects/gui/screens/InteractionScreen.java +++ b/src/main/java/anticope/rejects/gui/screens/InteractionScreen.java @@ -27,14 +27,14 @@ import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.*; import net.minecraft.entity.mob.EndermanEntity; -import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.AbstractHorseEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.vehicle.StorageMinecartEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.network.packet.c2s.play.PlayerInputC2SPacket; import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.minecraft.util.Hand; import net.minecraft.util.math.MathHelper; import org.lwjgl.glfw.GLFW; @@ -72,7 +72,7 @@ public class InteractionScreen extends Screen { } public InteractionScreen(Entity entity, InteractionMenu module) { - super(new LiteralText("Menu Screen")); + super(Text.literal("Menu Screen")); selectedDotColor = module.selectedDotColor.get().getPacked(); dotColor = module.dotColor.get().getPacked(); @@ -93,7 +93,7 @@ public class InteractionScreen extends Screen { }); } - else if (entity instanceof HorseBaseEntity) { + else if (entity instanceof AbstractHorseEntity) { functions.put("Open Inventory", (Entity e) -> { closeScreen(); if (client.player.isRiding()) { @@ -120,7 +120,7 @@ public class InteractionScreen extends Screen { functions.put("Spectate", (Entity e) -> { MinecraftClient.getInstance().setCameraEntity(e); - client.player.sendMessage(new LiteralText("Sneak to un-spectate."), true); + client.player.sendMessage(Text.literal("Sneak to un-spectate."), true); MeteorClient.EVENT_BUS.subscribe(shiftListener); closeScreen(); }); @@ -256,7 +256,7 @@ public class InteractionScreen extends Screen { matrix.scale (2f, 2f, 1f); drawCenteredText(matrix, textRenderer, entity.getName(), width / 4, 6, 0xFFFFFFFF); - int scale = client.options.guiScale; + int scale = client.options.getGuiScale().getValue(); Vector2 mouse = new Vector2(mouseX, mouseY); Vector2 center = new Vector2(width / 2, height / 2); mouse.subtract(center); diff --git a/src/main/java/anticope/rejects/modules/AntiSpawnpoint.java b/src/main/java/anticope/rejects/modules/AntiSpawnpoint.java index f46c83e..83fb333 100644 --- a/src/main/java/anticope/rejects/modules/AntiSpawnpoint.java +++ b/src/main/java/anticope/rejects/modules/AntiSpawnpoint.java @@ -35,8 +35,8 @@ public class AntiSpawnpoint extends Module { BlockPos blockPos = ((PlayerInteractBlockC2SPacket) event.packet).getBlockHitResult().getBlockPos(); - boolean IsOverWorld = mc.world.getDimension().isBedWorking(); - boolean IsNetherWorld = mc.world.getDimension().isRespawnAnchorWorking(); + boolean IsOverWorld = mc.world.getDimension().bedWorks(); + boolean IsNetherWorld = mc.world.getDimension().respawnAnchorWorks(); boolean BlockIsBed = mc.world.getBlockState(blockPos).getBlock() instanceof BedBlock; boolean BlockIsAnchor = mc.world.getBlockState(blockPos).getBlock().equals(Blocks.RESPAWN_ANCHOR); diff --git a/src/main/java/anticope/rejects/modules/AntiVanish.java b/src/main/java/anticope/rejects/modules/AntiVanish.java index ad555c4..826ea1e 100644 --- a/src/main/java/anticope/rejects/modules/AntiVanish.java +++ b/src/main/java/anticope/rejects/modules/AntiVanish.java @@ -116,7 +116,7 @@ public class AntiVanish extends Module { return uuidstr; } } - return player.getName().asString(); + return player.getName().getString(); } public String getName() { diff --git a/src/main/java/anticope/rejects/modules/Auto32K.java b/src/main/java/anticope/rejects/modules/Auto32K.java index a13702d..43be236 100644 --- a/src/main/java/anticope/rejects/modules/Auto32K.java +++ b/src/main/java/anticope/rejects/modules/Auto32K.java @@ -119,7 +119,7 @@ public class Auto32K extends Module { return; } mc.player.setSneaking(false); - mc.interactionManager.interactBlock(mc.player, mc.world, Hand.MAIN_HAND, new BlockHitResult(mc.player.getPos(), mc.player.getHorizontalFacing(), bestBlock.up(), false)); + mc.interactionManager.interactBlock(mc.player, Hand.MAIN_HAND, new BlockHitResult(mc.player.getPos(), mc.player.getHorizontalFacing(), bestBlock.up(), false)); phase = 8; } } else if (mode.get() == Mode.Dispenser) { @@ -151,10 +151,10 @@ public class Auto32K extends Module { } phase += 1; } else if (phase == 2) { - mc.interactionManager.interactBlock(mc.player, mc.world, Hand.MAIN_HAND, new BlockHitResult(mc.player.getPos(), Direction.UP, bestBlock, false)); + mc.interactionManager.interactBlock(mc.player, Hand.MAIN_HAND, new BlockHitResult(mc.player.getPos(), Direction.UP, bestBlock, false)); phase += 1; } else if (phase == 3) { - mc.interactionManager.interactBlock(mc.player, mc.world, Hand.MAIN_HAND, new BlockHitResult(mc.player.getPos(), mc.player.getHorizontalFacing().getOpposite(), bestBlock.up(), false)); + mc.interactionManager.interactBlock(mc.player, Hand.MAIN_HAND, new BlockHitResult(mc.player.getPos(), mc.player.getHorizontalFacing().getOpposite(), bestBlock.up(), false)); phase += 1; }else if (phase == 4 && mc.currentScreen instanceof Generic3x3ContainerScreen) { InvUtils.move().from(shulkerSlot.slot()).toId(4); @@ -165,11 +165,11 @@ public class Auto32K extends Module { }else if (phase == 6) { mc.player.getInventory().selectedSlot = redstoneSlot.slot(); mc.player.setSneaking(true); - mc.interactionManager.interactBlock(mc.player, mc.world, Hand.MAIN_HAND, new BlockHitResult(mc.player.getPos(), mc.player.getHorizontalFacing().getOpposite(), bestBlock.up(2), false)); + mc.interactionManager.interactBlock(mc.player, Hand.MAIN_HAND, new BlockHitResult(mc.player.getPos(), mc.player.getHorizontalFacing().getOpposite(), bestBlock.up(2), false)); mc.player.setSneaking(false); phase += 1; }else if (phase == 7){ - mc.interactionManager.interactBlock(mc.player, mc.world, Hand.MAIN_HAND, new BlockHitResult(mc.player.getPos(), mc.player.getHorizontalFacing().getOpposite(), bestBlock.add(x, 0, z), false)); + mc.interactionManager.interactBlock(mc.player, Hand.MAIN_HAND, new BlockHitResult(mc.player.getPos(), mc.player.getHorizontalFacing().getOpposite(), bestBlock.add(x, 0, z), false)); phase += 1; } } diff --git a/src/main/java/anticope/rejects/modules/AutoExtinguish.java b/src/main/java/anticope/rejects/modules/AutoExtinguish.java index a83bfb3..803c5c7 100644 --- a/src/main/java/anticope/rejects/modules/AutoExtinguish.java +++ b/src/main/java/anticope/rejects/modules/AutoExtinguish.java @@ -91,7 +91,7 @@ public class AutoExtinguish extends Module { @EventHandler private void onTick(TickEvent.Pre event) { - if (mc.world.getDimension().isRespawnAnchorWorking()) { + if (mc.world.getDimension().respawnAnchorWorks()) { if (doesWaterBucketWork) { warning("Water Buckets don't work in this dimension!"); doesWaterBucketWork = false; @@ -159,7 +159,7 @@ public class AutoExtinguish extends Module { float pitch = mc.gameRenderer.getCamera().getPitch() % 360; Rotations.rotate(yaw, 90); - mc.interactionManager.interactItem(mc.player, mc.player.world, Hand.MAIN_HAND); + mc.interactionManager.interactItem(mc.player, Hand.MAIN_HAND); mc.player.getInventory().selectedSlot = preSlot; Rotations.rotate(yaw, pitch); diff --git a/src/main/java/anticope/rejects/modules/AutoTNT.java b/src/main/java/anticope/rejects/modules/AutoTNT.java index 22c0859..ce27a55 100644 --- a/src/main/java/anticope/rejects/modules/AutoTNT.java +++ b/src/main/java/anticope/rejects/modules/AutoTNT.java @@ -197,7 +197,7 @@ public class AutoTNT extends Module { private void ignite(BlockPos pos, FindItemResult item) { InvUtils.swap(item.slot(), true); - mc.interactionManager.interactBlock(mc.player, mc.world, Hand.MAIN_HAND, new BlockHitResult(new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5), Direction.UP, pos, true)); + mc.interactionManager.interactBlock(mc.player, Hand.MAIN_HAND, new BlockHitResult(new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5), Direction.UP, pos, true)); InvUtils.swapBack(); } diff --git a/src/main/java/anticope/rejects/modules/BonemealAura.java b/src/main/java/anticope/rejects/modules/BonemealAura.java index 904e587..d2f25af 100644 --- a/src/main/java/anticope/rejects/modules/BonemealAura.java +++ b/src/main/java/anticope/rejects/modules/BonemealAura.java @@ -47,7 +47,7 @@ public class BonemealAura extends Module { isBonemealing = true; Rotations.rotate(Rotations.getYaw(crop), Rotations.getPitch(crop), () -> { InvUtils.swap(bonemeal.slot(), false); - mc.interactionManager.interactBlock(mc.player, mc.world, Hand.MAIN_HAND, new BlockHitResult( + mc.interactionManager.interactBlock(mc.player, Hand.MAIN_HAND, new BlockHitResult( mc.player.getPos(), rayTraceCheck(crop), crop, true)); mc.player.swingHand(Hand.MAIN_HAND); }); diff --git a/src/main/java/anticope/rejects/modules/ChatBot.java b/src/main/java/anticope/rejects/modules/ChatBot.java index 361c80f..792ef83 100644 --- a/src/main/java/anticope/rejects/modules/ChatBot.java +++ b/src/main/java/anticope/rejects/modules/ChatBot.java @@ -25,6 +25,7 @@ import meteordevelopment.starscript.Script; import meteordevelopment.starscript.compiler.Compiler; import meteordevelopment.starscript.compiler.Parser; import meteordevelopment.starscript.utils.StarscriptError; +import net.minecraft.text.Text; public class ChatBot extends Module { @@ -61,7 +62,8 @@ public class ChatBot extends Module { private void onMessageRecieve(ReceiveMessageEvent event) { String msg = event.getMessage().getString(); if (help.get() && msg.endsWith(prefix.get()+"help")) { - mc.getNetworkHandler().sendPacket(new ChatMessageC2SPacket("Avaliable commands: " + String.join(", ", commands.keySet()))); + mc.player.sendMessage(Text.of("Avaliable commands: " + String.join(", ", commands.keySet())), false); +// mc.getNetworkHandler().sendPacket(new ChatMessageC2SPacket("Avaliable commands: " + String.join(", ", commands.keySet())), ); return; } for (String cmd : commands.keySet()) { diff --git a/src/main/java/anticope/rejects/modules/CoordLogger.java b/src/main/java/anticope/rejects/modules/CoordLogger.java index 9ae4410..399f81a 100644 --- a/src/main/java/anticope/rejects/modules/CoordLogger.java +++ b/src/main/java/anticope/rejects/modules/CoordLogger.java @@ -15,8 +15,8 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket; import net.minecraft.network.packet.s2c.play.WorldEventS2CPacket; -import net.minecraft.text.BaseText; -import net.minecraft.text.LiteralText; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -149,14 +149,14 @@ public class CoordLogger extends Module { } } - public BaseText formatMessage(String message, Vec3d coords) { - BaseText text = new LiteralText(message); + public MutableText formatMessage(String message, Vec3d coords) { + MutableText text = Text.literal(message); text.append(ChatUtils.formatCoords(coords)); text.append(Formatting.GRAY.toString()+"."); return text; } - public BaseText formatMessage(String message, BlockPos coords) { + public MutableText formatMessage(String message, BlockPos coords) { return formatMessage(message, new Vec3d(coords.getX(), coords.getY(), coords.getZ())); } } diff --git a/src/main/java/anticope/rejects/modules/CustomPackets.java b/src/main/java/anticope/rejects/modules/CustomPackets.java index fb94267..ab09eea 100644 --- a/src/main/java/anticope/rejects/modules/CustomPackets.java +++ b/src/main/java/anticope/rejects/modules/CustomPackets.java @@ -52,11 +52,11 @@ public class CustomPackets extends Module { private void onUnknownPacket(CustomPayloadEvent event) { if (!unknownPackets.get()) return; - BaseText text = new LiteralText(event.packet.getChannel().toString()); + MutableText text = Text.literal(event.packet.getChannel().toString()); text.setStyle(text.getStyle() .withHoverEvent(new HoverEvent( HoverEvent.Action.SHOW_TEXT, - new LiteralText(readString(event.packet.getData())) + Text.literal(readString(event.packet.getData())) ))); info(text); } @@ -69,8 +69,8 @@ public class CustomPackets extends Module { event.cancel(); } - private BaseText format(String type, BaseText message) { - BaseText text = new LiteralText(String.format("[%s%s%s]", + private MutableText format(String type, MutableText message) { + MutableText text = Text.literal(String.format("[%s%s%s]", Formatting.AQUA, type, Formatting.GRAY @@ -87,18 +87,18 @@ public class CustomPackets extends Module { ).toString(); } - private BaseText formatMods(Map mods) { - BaseText text = new LiteralText("Disallowed mods: \n"); + private MutableText formatMods(Map mods) { + MutableText text = Text.literal("Disallowed mods: \n"); mods.forEach((name, data) -> { - BaseText modLine = new LiteralText(String.format("- %s%s%s ", Formatting.YELLOW, name, Formatting.GRAY)); + MutableText modLine = Text.literal(String.format("- %s%s%s ", Formatting.YELLOW, name, Formatting.GRAY)); modLine.append(data.disabled ? "disabled" : "enabled"); modLine.append("\n"); if (data.extra_data != null) { modLine.setStyle(modLine.getStyle() .withHoverEvent(new HoverEvent( HoverEvent.Action.SHOW_TEXT, - new LiteralText(data.extra_data.toString()) + Text.literal(data.extra_data.toString()) ))); } text.append(modLine); diff --git a/src/main/java/anticope/rejects/modules/Lavacast.java b/src/main/java/anticope/rejects/modules/Lavacast.java index 4754f93..b878bf1 100644 --- a/src/main/java/anticope/rejects/modules/Lavacast.java +++ b/src/main/java/anticope/rejects/modules/Lavacast.java @@ -207,7 +207,7 @@ public class Lavacast extends Module { } int prevSlot = mc.player.getInventory().selectedSlot; mc.player.getInventory().selectedSlot = findItemResult.slot(); - mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND); + mc.interactionManager.interactItem(mc.player,Hand.MAIN_HAND); mc.player.getInventory().selectedSlot = prevSlot; } @@ -220,7 +220,7 @@ public class Lavacast extends Module { } int prevSlot = mc.player.getInventory().selectedSlot; mc.player.getInventory().selectedSlot = findItemResult.slot(); - mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND); + mc.interactionManager.interactItem(mc.player,Hand.MAIN_HAND); mc.player.getInventory().selectedSlot = prevSlot; } @@ -233,7 +233,7 @@ public class Lavacast extends Module { } int prevSlot = mc.player.getInventory().selectedSlot; mc.player.getInventory().selectedSlot = findItemResult.slot(); - mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND); + mc.interactionManager.interactItem(mc.player,Hand.MAIN_HAND); mc.player.getInventory().selectedSlot = prevSlot; } diff --git a/src/main/java/anticope/rejects/modules/ObsidianFarm.java b/src/main/java/anticope/rejects/modules/ObsidianFarm.java index 5efccd1..87f406c 100644 --- a/src/main/java/anticope/rejects/modules/ObsidianFarm.java +++ b/src/main/java/anticope/rejects/modules/ObsidianFarm.java @@ -34,7 +34,7 @@ public class ObsidianFarm extends Module { if (mc.player == null) return; if (mc.world == null) return; if (mc.interactionManager == null) return; - if (mc.world.getDimension().isRespawnAnchorWorking()) { + if (mc.world.getDimension().respawnAnchorWorks()) { allowBreakAgain = true; return; } diff --git a/src/main/java/anticope/rejects/modules/OreSim.java b/src/main/java/anticope/rejects/modules/OreSim.java index 4a9a294..39a185d 100755 --- a/src/main/java/anticope/rejects/modules/OreSim.java +++ b/src/main/java/anticope/rejects/modules/OreSim.java @@ -24,10 +24,12 @@ import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.random.ChunkRandom; import net.minecraft.util.registry.Registry; import net.minecraft.world.Heightmap; +import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkStatus; -import net.minecraft.world.gen.random.ChunkRandom; +//import net.minecraft.world.chunk.world.random.ChunkRandom; import com.seedfinding.mccore.version.MCVersion; import java.util.ArrayList; @@ -134,7 +136,7 @@ public class OreSim extends Module { long chunkX = mc.player.getChunkPos().x; long chunkZ = mc.player.getChunkPos().z; ClientWorld world = mc.world; - int renderdistance = mc.options.viewDistance; + int renderdistance = mc.options.getViewDistance().getValue(); //maybe another config option? But its already crowded int chunkCounter = 5; @@ -215,7 +217,7 @@ public class OreSim extends Module { } private void loadVisibleChunks() { - int renderdistance = mc.options.viewDistance; + int renderdistance = mc.options.getViewDistance().getValue(); if (mc.player == null) { return; @@ -287,7 +289,7 @@ public class OreSim extends Module { return; } String biomeName = id.getPath(); - Identifier dimensionName = world.getDimension().getEffects(); + Identifier dimensionName = world.getDimension().effects(); for (Ore ore : oreConfig) { @@ -351,7 +353,7 @@ public class OreSim extends Module { // Mojang code // ==================================== - private ArrayList generateNormal(ClientWorld world, Random random, BlockPos blockPos, int veinSize, float discardOnAir) { + private ArrayList generateNormal(ClientWorld world, ChunkRandom random, BlockPos blockPos, int veinSize, float discardOnAir) { float f = random.nextFloat() * 3.1415927F; float g = (float) veinSize / 8.0F; int i = MathHelper.ceil(((float) veinSize / 16.0F * 2.0F + 1.0F) / 2.0F); @@ -378,7 +380,7 @@ public class OreSim extends Module { return new ArrayList<>(); } - private ArrayList generateVeinPart(ClientWorld world, Random random, int veinSize, double startX, double endX, double startZ, double endZ, double startY, double endY, int x, int y, int z, int size, int i, float discardOnAir) { + private ArrayList generateVeinPart(ClientWorld world, ChunkRandom random, int veinSize, double startX, double endX, double startZ, double endZ, double startY, double endY, int x, int y, int z, int size, int i, float discardOnAir) { BitSet bitSet = new BitSet(size * i * size); BlockPos.Mutable mutable = new BlockPos.Mutable(); @@ -468,7 +470,7 @@ public class OreSim extends Module { return poses; } - private boolean shouldPlace(ClientWorld world, BlockPos orePos, float discardOnAir, Random random) { + private boolean shouldPlace(ClientWorld world, BlockPos orePos, float discardOnAir, ChunkRandom random) { if (discardOnAir == 0F || (discardOnAir != 1F && random.nextFloat() >= discardOnAir)) { return true; } @@ -481,7 +483,7 @@ public class OreSim extends Module { return true; } - private ArrayList generateHidden(ClientWorld world, Random random, BlockPos blockPos, int size) { + private ArrayList generateHidden(ClientWorld world, ChunkRandom random, BlockPos blockPos, int size) { ArrayList poses = new ArrayList<>(); @@ -502,7 +504,7 @@ public class OreSim extends Module { return poses; } - private int randomCoord(Random random, int size) { + private int randomCoord(ChunkRandom random, int size) { return Math.round((random.nextFloat() - random.nextFloat()) * (float) size); } } diff --git a/src/main/java/anticope/rejects/modules/Prone.java b/src/main/java/anticope/rejects/modules/Prone.java index dd035bd..05c9afc 100644 --- a/src/main/java/anticope/rejects/modules/Prone.java +++ b/src/main/java/anticope/rejects/modules/Prone.java @@ -121,10 +121,10 @@ public class Prone extends Module { Rotations.rotate(Rotations.getYaw(target), Rotations.getPitch(target), 10, true, () -> { if (bucket.isOffhand()) { - mc.interactionManager.interactItem(mc.player, mc.world, Hand.OFF_HAND); + mc.interactionManager.interactItem(mc.player, Hand.OFF_HAND); } else { InvUtils.swap(bucket.slot(), true); - mc.interactionManager.interactItem(mc.player, mc.world, Hand.MAIN_HAND); + mc.interactionManager.interactItem(mc.player, Hand.MAIN_HAND); InvUtils.swapBack(); } diff --git a/src/main/java/anticope/rejects/modules/SkeletonESP.java b/src/main/java/anticope/rejects/modules/SkeletonESP.java index a27450d..0f9b12b 100644 --- a/src/main/java/anticope/rejects/modules/SkeletonESP.java +++ b/src/main/java/anticope/rejects/modules/SkeletonESP.java @@ -168,8 +168,8 @@ public class SkeletonESP extends Module { bufferBuilder.vertex(matrix4f, 0, -0.55f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); matrixStack.pop(); - bufferBuilder.end(); - BufferRenderer.draw(bufferBuilder); +// bufferBuilder.end(); +// BufferRenderer.draw(bufferBuilder); //TODO Skeleton ESP if (swimming) matrixStack.translate(0, 0.95f, 0); if (swimming || flying) matrixStack.multiply(new Quaternion(new Vec3f(1, 0, 0), 90 + m, true)); diff --git a/src/main/java/anticope/rejects/modules/TreeAura.java b/src/main/java/anticope/rejects/modules/TreeAura.java index 07f3983..45a12e8 100644 --- a/src/main/java/anticope/rejects/modules/TreeAura.java +++ b/src/main/java/anticope/rejects/modules/TreeAura.java @@ -96,9 +96,9 @@ public class TreeAura extends Module { } InvUtils.swap(sapling.slot(), false); if (rotation.get()) - Rotations.rotate(Rotations.getYaw(plantPos), Rotations.getPitch(plantPos), () -> mc.player.networkHandler.sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, new BlockHitResult(Utils.vec3d(plantPos), Direction.UP, plantPos, false)))); + Rotations.rotate(Rotations.getYaw(plantPos), Rotations.getPitch(plantPos), () -> mc.player.networkHandler.sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, new BlockHitResult(Utils.vec3d(plantPos), Direction.UP, plantPos, false), 0))); else - mc.player.networkHandler.sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, new BlockHitResult(Utils.vec3d(plantPos), Direction.UP, plantPos, false))); + mc.player.networkHandler.sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, new BlockHitResult(Utils.vec3d(plantPos), Direction.UP, plantPos, false), 0)); } private void doBonemeal(BlockPos sapling) { @@ -110,9 +110,9 @@ public class TreeAura extends Module { } InvUtils.swap(bonemeal.slot(), false); if (rotation.get()) - Rotations.rotate(Rotations.getYaw(sapling), Rotations.getPitch(sapling), () -> mc.player.networkHandler.sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, new BlockHitResult(Utils.vec3d(sapling), Direction.UP, sapling, false)))); + Rotations.rotate(Rotations.getYaw(sapling), Rotations.getPitch(sapling), () -> mc.player.networkHandler.sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, new BlockHitResult(Utils.vec3d(sapling), Direction.UP, sapling, false), 0))); else - mc.player.networkHandler.sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, new BlockHitResult(Utils.vec3d(sapling), Direction.UP, sapling, false))); + mc.player.networkHandler.sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, new BlockHitResult(Utils.vec3d(sapling), Direction.UP, sapling, false), 0)); } private boolean canPlant(BlockPos pos) { diff --git a/src/main/java/anticope/rejects/utils/GiveUtils.java b/src/main/java/anticope/rejects/utils/GiveUtils.java index 35b1897..e3e3a5a 100644 --- a/src/main/java/anticope/rejects/utils/GiveUtils.java +++ b/src/main/java/anticope/rejects/utils/GiveUtils.java @@ -6,7 +6,7 @@ import net.minecraft.item.Items; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtList; import net.minecraft.nbt.StringNbtReader; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.minecraft.util.Identifier; import java.util.Arrays; @@ -28,8 +28,8 @@ public class GiveUtils { public static final Map> PRESETS = new HashMap<>(); - private final static SimpleCommandExceptionType NOT_IN_CREATIVE = new SimpleCommandExceptionType(new LiteralText("You must be in creative mode to use this.")); - private final static SimpleCommandExceptionType NO_SPACE = new SimpleCommandExceptionType(new LiteralText("No space in hotbar.")); + private final static SimpleCommandExceptionType NOT_IN_CREATIVE = new SimpleCommandExceptionType(Text.literal("You must be in creative mode to use this.")); + private final static SimpleCommandExceptionType NO_SPACE = new SimpleCommandExceptionType(Text.literal("No space in hotbar.")); private static final List HIDDEN_ENTITIES = Arrays.asList( new Identifier("giant"), @@ -73,7 +73,7 @@ public class GiveUtils { try { item.setNbt(StringNbtReader.parse(preset.getRight())); } catch (CommandSyntaxException e) { } - item.setCustomName(new LiteralText(toName(preset.getLeft()))); + item.setCustomName(Text.literal(toName(preset.getLeft()))); return item; }); }); @@ -81,11 +81,11 @@ public class GiveUtils { PRESETS.put("force_op", (preview) -> { if (preview) Items.SPIDER_SPAWN_EGG.getDefaultStack(); ItemStack item = Items.SPIDER_SPAWN_EGG.getDefaultStack(); - String nick = mc.player.getName().asString(); + String nick = mc.player.getName().getString(); try { 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")); + item.setCustomName(Text.literal("Force OP")); return item; }); @@ -104,7 +104,7 @@ public class GiveUtils { NbtCompound nbt = new NbtCompound(); nbt.put("CustomPotionEffects", effects); stack.setNbt(nbt); - stack.setCustomName(new LiteralText("Lingering Potion of Trolling")); + stack.setCustomName(Text.literal("Lingering Potion of Trolling")); return stack; }); @@ -123,7 +123,7 @@ public class GiveUtils { NbtCompound nbt = new NbtCompound(); nbt.put("Enchantments", enchants); stack.setNbt(nbt); - stack.setCustomName(new LiteralText("Bonk")); + stack.setCustomName(Text.literal("Bonk")); return stack; }); @@ -136,7 +136,7 @@ public class GiveUtils { nbtList.add(new NbtList()); nbtCompound.put("nothingsuspicioushere", nbtList); stack.setNbt(nbtCompound); - stack.setCustomName(new LiteralText("Copy Me")); + stack.setCustomName(Text.literal("Copy Me")); return stack; }); @@ -173,7 +173,7 @@ public class GiveUtils { entityTag.putString("id", id.toString()); tag.put("EntityTag", entityTag); egg.setNbt(tag); - egg.setCustomName(new LiteralText(String.format("%s", toName(id.getPath())))); + egg.setCustomName(Text.literal(String.format("%s", toName(id.getPath())))); return egg; }); }); diff --git a/src/main/java/anticope/rejects/utils/Ore.java b/src/main/java/anticope/rejects/utils/Ore.java index 0ff85fb..4326781 100755 --- a/src/main/java/anticope/rejects/utils/Ore.java +++ b/src/main/java/anticope/rejects/utils/Ore.java @@ -8,7 +8,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.intprovider.ConstantIntProvider; import net.minecraft.util.math.intprovider.IntProvider; import net.minecraft.util.math.intprovider.UniformIntProvider; -import net.minecraft.world.dimension.DimensionType; +import net.minecraft.world.dimension.DimensionTypes; import java.util.*; public class Ore { @@ -93,31 +93,31 @@ public class Ore { emeraldIndex.put(emeraldBiome, 27); } - ores.add(new Ore(Type.COAL, DimensionType.OVERWORLD_ID, 9, 6, ConstantIntProvider.create(30), false, 136, 320, Generator.DEFAULT, 17, coal, new Color(47, 44, 54))); - ores.add(new Ore(Type.COAL, DimensionType.OVERWORLD_ID, 10, 6, ConstantIntProvider.create(20), 1F, true, 97, 97, Generator.DEFAULT, 17, 0.5F, coal, new Color(47, 44, 54))); - ores.add(new Ore(Type.IRON, DimensionType.OVERWORLD_ID, 11, 6, ConstantIntProvider.create(90), true, 233, 153, Generator.DEFAULT, 9, iron, new Color(236, 173, 119))); - ores.add(new Ore(Type.IRON, DimensionType.OVERWORLD_ID, 12, 6, ConstantIntProvider.create(10), true, 17, 41, Generator.DEFAULT, 9, iron, new Color(236, 173, 119))); - ores.add(new Ore(Type.IRON, DimensionType.OVERWORLD_ID, 13, 6, ConstantIntProvider.create(10), false, -64, 73, Generator.DEFAULT, 4, iron, new Color(236, 173, 119))); - ores.add(new Ore(Type.GOLD_EXTRA, DimensionType.OVERWORLD_ID, extraGoldIndex, 6, ConstantIntProvider.create(50), false, 32, 257, Generator.DEFAULT, 9, gold, new Color(247, 229, 30))); - ores.add(new Ore(Type.GOLD, DimensionType.OVERWORLD_ID, 14, 6, ConstantIntProvider.create(4), 1F, true, -15, 49, Generator.DEFAULT, 9, 0.5F, gold, new Color(247, 229, 30))); - ores.add(new Ore(Type.GOLD, DimensionType.OVERWORLD_ID, 15, 6, UniformIntProvider.create(0, 1), 1F, false, -64, -47, Generator.DEFAULT, 9, 0.5F, gold, new Color(247, 229, 30))); - ores.add(new Ore(Type.REDSTONE, DimensionType.OVERWORLD_ID, 16, 6, ConstantIntProvider.create(4), false, -64, 16, Generator.DEFAULT, 8, redstone, new Color(245, 7, 23))); - ores.add(new Ore(Type.REDSTONE, DimensionType.OVERWORLD_ID, 17, 6, ConstantIntProvider.create(8), true, -63, 33, Generator.DEFAULT, 8, redstone, new Color(245, 7, 23))); - ores.add(new Ore(Type.DIAMOND, DimensionType.OVERWORLD_ID, 18, 6, ConstantIntProvider.create(7), 1F, true, -63, 81, Generator.DEFAULT, 4, 0.5F, diamond, new Color(33, 244, 255))); - ores.add(new Ore(Type.DIAMOND, DimensionType.OVERWORLD_ID, 19, 6, ConstantIntProvider.create(1), (1F / 9F), true, -63, 81, Generator.DEFAULT, 12, 0.7F, diamond, new Color(33, 244, 255))); - ores.add(new Ore(Type.DIAMOND, DimensionType.OVERWORLD_ID, 20, 6, ConstantIntProvider.create(4), 1F, true, -63, 81, Generator.DEFAULT, 8, 1F, diamond, new Color(33, 244, 255))); - ores.add(new Ore(Type.LAPIS, DimensionType.OVERWORLD_ID, 21, 6, ConstantIntProvider.create(2), true, 1, 33, Generator.DEFAULT, 7, lapis, new Color(8, 26, 189))); - ores.add(new Ore(Type.LAPIS, DimensionType.OVERWORLD_ID, 22, 6, ConstantIntProvider.create(4), 1F, false, -64, 65, Generator.DEFAULT, 7, 1F, lapis, new Color(8, 26, 189))); - ores.add(new Ore(Type.EMERALD, DimensionType.OVERWORLD_ID, emeraldIndex, 6, ConstantIntProvider.create(100), true, 233, 249, Generator.DEFAULT, 3, emerald, new Color(27, 209, 45))); + ores.add(new Ore(Type.COAL, DimensionTypes.OVERWORLD_ID, 9, 6, ConstantIntProvider.create(30), false, 136, 320, Generator.DEFAULT, 17, coal, new Color(47, 44, 54))); + ores.add(new Ore(Type.COAL, DimensionTypes.OVERWORLD_ID, 10, 6, ConstantIntProvider.create(20), 1F, true, 97, 97, Generator.DEFAULT, 17, 0.5F, coal, new Color(47, 44, 54))); + ores.add(new Ore(Type.IRON, DimensionTypes.OVERWORLD_ID, 11, 6, ConstantIntProvider.create(90), true, 233, 153, Generator.DEFAULT, 9, iron, new Color(236, 173, 119))); + ores.add(new Ore(Type.IRON, DimensionTypes.OVERWORLD_ID, 12, 6, ConstantIntProvider.create(10), true, 17, 41, Generator.DEFAULT, 9, iron, new Color(236, 173, 119))); + ores.add(new Ore(Type.IRON, DimensionTypes.OVERWORLD_ID, 13, 6, ConstantIntProvider.create(10), false, -64, 73, Generator.DEFAULT, 4, iron, new Color(236, 173, 119))); + ores.add(new Ore(Type.GOLD_EXTRA, DimensionTypes.OVERWORLD_ID, extraGoldIndex, 6, ConstantIntProvider.create(50), false, 32, 257, Generator.DEFAULT, 9, gold, new Color(247, 229, 30))); + ores.add(new Ore(Type.GOLD, DimensionTypes.OVERWORLD_ID, 14, 6, ConstantIntProvider.create(4), 1F, true, -15, 49, Generator.DEFAULT, 9, 0.5F, gold, new Color(247, 229, 30))); + ores.add(new Ore(Type.GOLD, DimensionTypes.OVERWORLD_ID, 15, 6, UniformIntProvider.create(0, 1), 1F, false, -64, -47, Generator.DEFAULT, 9, 0.5F, gold, new Color(247, 229, 30))); + ores.add(new Ore(Type.REDSTONE, DimensionTypes.OVERWORLD_ID, 16, 6, ConstantIntProvider.create(4), false, -64, 16, Generator.DEFAULT, 8, redstone, new Color(245, 7, 23))); + ores.add(new Ore(Type.REDSTONE, DimensionTypes.OVERWORLD_ID, 17, 6, ConstantIntProvider.create(8), true, -63, 33, Generator.DEFAULT, 8, redstone, new Color(245, 7, 23))); + ores.add(new Ore(Type.DIAMOND, DimensionTypes.OVERWORLD_ID, 18, 6, ConstantIntProvider.create(7), 1F, true, -63, 81, Generator.DEFAULT, 4, 0.5F, diamond, new Color(33, 244, 255))); + ores.add(new Ore(Type.DIAMOND, DimensionTypes.OVERWORLD_ID, 19, 6, ConstantIntProvider.create(1), (1F / 9F), true, -63, 81, Generator.DEFAULT, 12, 0.7F, diamond, new Color(33, 244, 255))); + ores.add(new Ore(Type.DIAMOND, DimensionTypes.OVERWORLD_ID, 20, 6, ConstantIntProvider.create(4), 1F, true, -63, 81, Generator.DEFAULT, 8, 1F, diamond, new Color(33, 244, 255))); + ores.add(new Ore(Type.LAPIS, DimensionTypes.OVERWORLD_ID, 21, 6, ConstantIntProvider.create(2), true, 1, 33, Generator.DEFAULT, 7, lapis, new Color(8, 26, 189))); + ores.add(new Ore(Type.LAPIS, DimensionTypes.OVERWORLD_ID, 22, 6, ConstantIntProvider.create(4), 1F, false, -64, 65, Generator.DEFAULT, 7, 1F, lapis, new Color(8, 26, 189))); + ores.add(new Ore(Type.EMERALD, DimensionTypes.OVERWORLD_ID, emeraldIndex, 6, ConstantIntProvider.create(100), true, 233, 249, Generator.DEFAULT, 3, emerald, new Color(27, 209, 45))); //This only generates near dripstone caves. I'll need propper biome detection to get this right //ores.add(new Ore(Type.COPPER, "overworld", 23, 6, ConstantIntProvider.create(16), true, 49, 65, Generator.DEFAULT, 20, copper, new Color(239, 151, 0))); - ores.add(new Ore(Type.COPPER, DimensionType.OVERWORLD_ID, 24, 6, ConstantIntProvider.create(16), true, 49, 65, Generator.DEFAULT, 10, copper, new Color(239, 151, 0))); - ores.add(new Ore(Type.GOLD_NETHER, DimensionType.THE_NETHER_ID, Map.of("default", 19, "basalt_deltas", -1), 7, ConstantIntProvider.create(10), false, 10, 118, Generator.DEFAULT, 10, gold, new Color(247, 229, 30))); - ores.add(new Ore(Type.QUARTZ, DimensionType.THE_NETHER_ID, Map.of("default", 20, "basalt_deltas", -1), 7, ConstantIntProvider.create(16), false, 10, 118, Generator.DEFAULT, 14, quartz, new Color(205, 205, 205))); - ores.add(new Ore(Type.GOLD_NETHER, DimensionType.THE_NETHER_ID, Map.of("default", -1, "basalt_deltas", 13), 7, ConstantIntProvider.create(20), false, 10, 118, Generator.DEFAULT, 10, gold, new Color(247, 229, 30))); - ores.add(new Ore(Type.QUARTZ, DimensionType.THE_NETHER_ID, Map.of("default", -1, "basalt_deltas", 14), 7, ConstantIntProvider.create(32), false, 10, 118, Generator.DEFAULT, 14, quartz, new Color(205, 205, 205))); - ores.add(new Ore(Type.LDEBRIS, DimensionType.THE_NETHER_ID, 21, 7, ConstantIntProvider.create(1), true, 17, 9, Generator.NO_SURFACE, 3, debris, new Color(209, 27, 245))); - ores.add(new Ore(Type.SDEBRIS, DimensionType.THE_NETHER_ID, 22, 7, ConstantIntProvider.create(1), false, 8, 120, Generator.NO_SURFACE, 2, debris, new Color(209, 27, 245))); + ores.add(new Ore(Type.COPPER, DimensionTypes.OVERWORLD_ID, 24, 6, ConstantIntProvider.create(16), true, 49, 65, Generator.DEFAULT, 10, copper, new Color(239, 151, 0))); + ores.add(new Ore(Type.GOLD_NETHER, DimensionTypes.THE_NETHER_ID, Map.of("default", 19, "basalt_deltas", -1), 7, ConstantIntProvider.create(10), false, 10, 118, Generator.DEFAULT, 10, gold, new Color(247, 229, 30))); + ores.add(new Ore(Type.QUARTZ, DimensionTypes.THE_NETHER_ID, Map.of("default", 20, "basalt_deltas", -1), 7, ConstantIntProvider.create(16), false, 10, 118, Generator.DEFAULT, 14, quartz, new Color(205, 205, 205))); + ores.add(new Ore(Type.GOLD_NETHER, DimensionTypes.THE_NETHER_ID, Map.of("default", -1, "basalt_deltas", 13), 7, ConstantIntProvider.create(20), false, 10, 118, Generator.DEFAULT, 10, gold, new Color(247, 229, 30))); + ores.add(new Ore(Type.QUARTZ, DimensionTypes.THE_NETHER_ID, Map.of("default", -1, "basalt_deltas", 14), 7, ConstantIntProvider.create(32), false, 10, 118, Generator.DEFAULT, 14, quartz, new Color(205, 205, 205))); + ores.add(new Ore(Type.LDEBRIS, DimensionTypes.THE_NETHER_ID, 21, 7, ConstantIntProvider.create(1), true, 17, 9, Generator.NO_SURFACE, 3, debris, new Color(209, 27, 245))); + ores.add(new Ore(Type.SDEBRIS, DimensionTypes.THE_NETHER_ID, 22, 7, ConstantIntProvider.create(1), false, 8, 120, Generator.NO_SURFACE, 2, debris, new Color(209, 27, 245))); return ores; } @@ -141,21 +141,21 @@ public class Ore { for (String extraGoldBiome : extraGoldBiomes) { extraGoldIndexes.put(extraGoldBiome, 14); } - ores.add(new Ore(Type.COAL, DimensionType.OVERWORLD_ID, 7, 6, ConstantIntProvider.create(20), false, 0, 128, Generator.DEFAULT, 20, coal, new Color(47, 44, 54))); - ores.add(new Ore(Type.IRON,DimensionType.OVERWORLD_ID, 8, 6, ConstantIntProvider.create(20), false, 0, 64, Generator.DEFAULT, 9, iron, new Color(236, 173, 119))); - ores.add(new Ore(Type.GOLD, DimensionType.OVERWORLD_ID, 9, 6, ConstantIntProvider.create(2), false, 0, 32, Generator.DEFAULT, 9, gold, new Color(247, 229, 30))); - ores.add(new Ore(Type.REDSTONE, DimensionType.OVERWORLD_ID, 10, 6, ConstantIntProvider.create(8), false, 0, 16, Generator.DEFAULT, 8, redstone, new Color(245, 7, 23))); - ores.add(new Ore(Type.DIAMOND, DimensionType.OVERWORLD_ID, 11, 6, ConstantIntProvider.create(1), false, 0, 16, Generator.DEFAULT, 8, diamond, new Color(33, 244, 255))); - ores.add(new Ore(Type.LAPIS, DimensionType.OVERWORLD_ID, 12, 6, ConstantIntProvider.create(1), true, 16, 16, Generator.DEFAULT, 7, lapis, new Color(8, 26, 189))); - ores.add(new Ore(Type.COPPER, DimensionType.OVERWORLD_ID, 13, 6, ConstantIntProvider.create(6), true, 49, 49, Generator.DEFAULT, 10, copper, new Color(239, 151, 0))); - ores.add(new Ore(Type.GOLD_EXTRA, DimensionType.OVERWORLD_ID, extraGoldIndexes, 6, ConstantIntProvider.create(20), false, 32, 80, Generator.DEFAULT, 9, gold, new Color(247, 229, 30))); - ores.add(new Ore(Type.EMERALD, DimensionType.OVERWORLD_ID, emeraldIndexes, 6, UniformIntProvider.create(6, 8), false, 4, 32, Generator.EMERALD, 1, emerald, new Color(27, 209, 45))); - ores.add(new Ore(Type.GOLD_NETHER, DimensionType.THE_NETHER_ID, Map.of("default", 13, "basalt_deltas", -1), 7, ConstantIntProvider.create(10), false, 10, 118, Generator.DEFAULT, 10, gold, new Color(247, 229, 30))); - ores.add(new Ore(Type.QUARTZ, DimensionType.THE_NETHER_ID, Map.of("default", 14, "basalt_deltas", -1), 7, ConstantIntProvider.create(16), false, 10, 118, Generator.DEFAULT, 14, quartz, new Color(205, 205, 205))); - ores.add(new Ore(Type.GOLD_NETHER, DimensionType.THE_NETHER_ID, Map.of("default", -1, "basalt_deltas", 13), 7, ConstantIntProvider.create(20), false, 10, 118, Generator.DEFAULT, 10, gold, new Color(247, 229, 30))); - ores.add(new Ore(Type.QUARTZ, DimensionType.THE_NETHER_ID, Map.of("default", -1, "basalt_deltas", 14), 7, ConstantIntProvider.create(32), false, 10, 118, Generator.DEFAULT, 14, quartz, new Color(205, 205, 205))); - ores.add(new Ore(Type.LDEBRIS, DimensionType.THE_NETHER_ID, LDebrisIndexes, 7, ConstantIntProvider.create(1), true, 17, 9, Generator.NO_SURFACE, 3, debris, new Color(209, 27, 245))); - ores.add(new Ore(Type.SDEBRIS, DimensionType.THE_NETHER_ID, SDebrisIndexes, 7, ConstantIntProvider.create(1), false, 8, 120, Generator.NO_SURFACE, 2, debris, new Color(209, 27, 245))); + ores.add(new Ore(Type.COAL, DimensionTypes.OVERWORLD_ID, 7, 6, ConstantIntProvider.create(20), false, 0, 128, Generator.DEFAULT, 20, coal, new Color(47, 44, 54))); + ores.add(new Ore(Type.IRON,DimensionTypes.OVERWORLD_ID, 8, 6, ConstantIntProvider.create(20), false, 0, 64, Generator.DEFAULT, 9, iron, new Color(236, 173, 119))); + ores.add(new Ore(Type.GOLD, DimensionTypes.OVERWORLD_ID, 9, 6, ConstantIntProvider.create(2), false, 0, 32, Generator.DEFAULT, 9, gold, new Color(247, 229, 30))); + ores.add(new Ore(Type.REDSTONE, DimensionTypes.OVERWORLD_ID, 10, 6, ConstantIntProvider.create(8), false, 0, 16, Generator.DEFAULT, 8, redstone, new Color(245, 7, 23))); + ores.add(new Ore(Type.DIAMOND, DimensionTypes.OVERWORLD_ID, 11, 6, ConstantIntProvider.create(1), false, 0, 16, Generator.DEFAULT, 8, diamond, new Color(33, 244, 255))); + ores.add(new Ore(Type.LAPIS, DimensionTypes.OVERWORLD_ID, 12, 6, ConstantIntProvider.create(1), true, 16, 16, Generator.DEFAULT, 7, lapis, new Color(8, 26, 189))); + ores.add(new Ore(Type.COPPER, DimensionTypes.OVERWORLD_ID, 13, 6, ConstantIntProvider.create(6), true, 49, 49, Generator.DEFAULT, 10, copper, new Color(239, 151, 0))); + ores.add(new Ore(Type.GOLD_EXTRA, DimensionTypes.OVERWORLD_ID, extraGoldIndexes, 6, ConstantIntProvider.create(20), false, 32, 80, Generator.DEFAULT, 9, gold, new Color(247, 229, 30))); + ores.add(new Ore(Type.EMERALD, DimensionTypes.OVERWORLD_ID, emeraldIndexes, 6, UniformIntProvider.create(6, 8), false, 4, 32, Generator.EMERALD, 1, emerald, new Color(27, 209, 45))); + ores.add(new Ore(Type.GOLD_NETHER, DimensionTypes.THE_NETHER_ID, Map.of("default", 13, "basalt_deltas", -1), 7, ConstantIntProvider.create(10), false, 10, 118, Generator.DEFAULT, 10, gold, new Color(247, 229, 30))); + ores.add(new Ore(Type.QUARTZ, DimensionTypes.THE_NETHER_ID, Map.of("default", 14, "basalt_deltas", -1), 7, ConstantIntProvider.create(16), false, 10, 118, Generator.DEFAULT, 14, quartz, new Color(205, 205, 205))); + ores.add(new Ore(Type.GOLD_NETHER, DimensionTypes.THE_NETHER_ID, Map.of("default", -1, "basalt_deltas", 13), 7, ConstantIntProvider.create(20), false, 10, 118, Generator.DEFAULT, 10, gold, new Color(247, 229, 30))); + ores.add(new Ore(Type.QUARTZ, DimensionTypes.THE_NETHER_ID, Map.of("default", -1, "basalt_deltas", 14), 7, ConstantIntProvider.create(32), false, 10, 118, Generator.DEFAULT, 14, quartz, new Color(205, 205, 205))); + ores.add(new Ore(Type.LDEBRIS, DimensionTypes.THE_NETHER_ID, LDebrisIndexes, 7, ConstantIntProvider.create(1), true, 17, 9, Generator.NO_SURFACE, 3, debris, new Color(209, 27, 245))); + ores.add(new Ore(Type.SDEBRIS, DimensionTypes.THE_NETHER_ID, SDebrisIndexes, 7, ConstantIntProvider.create(1), false, 8, 120, Generator.NO_SURFACE, 2, debris, new Color(209, 27, 245))); return ores; } @@ -182,7 +182,7 @@ public class Ore { for (Ore ore : ores) { if (ore.type == Type.EMERALD || ore.type == Type.GOLD_EXTRA) { ore.index.keySet().forEach(key -> ore.index.put(key, ore.index.get(key) - 3)); - } else if (ore.dimension == DimensionType.OVERWORLD_ID) { + } else if (ore.dimension == DimensionTypes.OVERWORLD_ID) { ore.index.keySet().forEach(key -> ore.index.put(key, ore.index.get(key) - 2)); } else if (ore.type == Type.LDEBRIS) { ore.minY = 16; diff --git a/src/main/java/anticope/rejects/utils/seeds/Seed.java b/src/main/java/anticope/rejects/utils/seeds/Seed.java index ccac092..d842143 100644 --- a/src/main/java/anticope/rejects/utils/seeds/Seed.java +++ b/src/main/java/anticope/rejects/utils/seeds/Seed.java @@ -34,7 +34,7 @@ public class Seed { } public Text toText() { - BaseText text = new LiteralText(String.format("[%s%s%s] (%s)", + MutableText text = Text.literal(String.format("[%s%s%s] (%s)", Formatting.GREEN, seed.toString(), Formatting.WHITE, @@ -47,7 +47,7 @@ public class Seed { )) .withHoverEvent(new HoverEvent( HoverEvent.Action.SHOW_TEXT, - new LiteralText("Copy to clipboard") + Text.literal("Copy to clipboard") )) ); return text; diff --git a/src/main/java/anticope/rejects/utils/seeds/Seeds.java b/src/main/java/anticope/rejects/utils/seeds/Seeds.java index 172108d..6e6ca61 100644 --- a/src/main/java/anticope/rejects/utils/seeds/Seeds.java +++ b/src/main/java/anticope/rejects/utils/seeds/Seeds.java @@ -5,10 +5,10 @@ import java.util.HashMap; import anticope.rejects.events.SeedChangedEvent; import net.minecraft.client.network.ServerInfo; import net.minecraft.nbt.NbtCompound; -import net.minecraft.text.BaseText; import net.minecraft.text.ClickEvent; import net.minecraft.text.HoverEvent; -import net.minecraft.text.LiteralText; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; import net.minecraft.util.Formatting; import com.seedfinding.mccore.version.MCVersion; @@ -60,10 +60,10 @@ public class Seeds extends System { ServerInfo server = mc.getCurrentServerEntry(); MCVersion ver = null; if (server != null) - ver = MCVersion.fromString(server.version.asString()); + ver = MCVersion.fromString(server.version.getString()); if (ver == null) { String targetVer = "unknown"; - if (server != null) targetVer = server.version.asString(); + if (server != null) targetVer = server.version.getString(); sendInvalidVersionWarning(seed, targetVer); ver = MCVersion.latest(); } @@ -98,13 +98,13 @@ public class Seeds extends System { } private static void sendInvalidVersionWarning(String seed, String targetVer) { - BaseText msg = new LiteralText(String.format("Couldn't resolve minecraft version \"%s\". Using %s instead. If you wish to change the version run: ", targetVer, MCVersion.latest().name)); + MutableText msg = Text.literal(String.format("Couldn't resolve minecraft version \"%s\". Using %s instead. If you wish to change the version run: ", targetVer, MCVersion.latest().name)); String cmd = String.format("%sseed %s ", Config.get().prefix, seed); - BaseText cmdText = new LiteralText(cmd+""); + MutableText cmdText = Text.literal(cmd+""); cmdText.setStyle(cmdText.getStyle() .withUnderline(true) .withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, cmd)) - .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new LiteralText("run command"))) + .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal("run command"))) ); msg.append(cmdText); msg.setStyle(msg.getStyle()