Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.9-SNAPSHOT'
id 'fabric-loom' version '1.10.1'
}

sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
Expand Down Expand Up @@ -40,16 +40,17 @@ dependencies {
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

modImplementation("meteordevelopment:meteor-client:${project.minecraft_version}-SNAPSHOT")
modCompileOnly "meteordevelopment:baritone:${project.baritone_version}-SNAPSHOT"
modCompileOnly "meteordevelopment:baritone:${project.baritone_version}-SNAPSHOT"

// seed .locate and ore sim
extraLibs('com.seedfinding:mc_math:ffd2edcfcc0d18147549c88cc7d8ec6cf21b5b91') { transitive = false }
extraLibs('com.seedfinding:mc_seed:1ead6fcefe7e8de4b3d60cd6c4e993f1e8f33409') { transitive = false }
extraLibs('com.seedfinding:mc_core:1.210.0') { transitive = false }
extraLibs('com.seedfinding:mc_noise:7e3ba65e181796c4a2a1c8881d840b2254b92962') { transitive = false }
extraLibs('com.seedfinding:mc_biome:41a42cb9019a552598f12089059538853e18ec78') { transitive = false }
extraLibs('com.seedfinding:mc_terrain:b4246cbd5880c4f8745ccb90e1b102bde3448126') { transitive = false }
extraLibs('com.seedfinding:mc_feature:919b7e513cc1e87e029a9cd703fc4e2dc8686229') { transitive = false }
extraLibs('com.seedfinding:mc_math:851e9d0577dfdca50154e98f1d334bd31c641326') { transitive = false }
extraLibs('com.seedfinding:mc_seed:55f6242001f7eb4226df4ed0d023f1838a54a99d') { transitive = false }
extraLibs('com.seedfinding:mc_core:b84ff1c38be399eda096dbde2819258c62f81275') { transitive = false }
extraLibs('com.seedfinding:mc_noise:dbab3996ea3abff5dd420db53c31d5498afd2fe5') { transitive = false }
extraLibs('com.seedfinding:mc_biome:17af8cb1110fdc983b7cb2b887d1fb2060e23ee3') { transitive = false }
extraLibs('com.seedfinding:mc_terrain:a03e440ec5b282e399382f2cc5ad0db91b438d2e') { transitive = false }
extraLibs('com.seedfinding:mc_feature:755d3611ac1c499c28289ccca5b738af6a5859b7') { transitive = false }
extraLibs('com.seedfinding:mc_reversal:75aa6ce47a9f53a1aa212765e9830e08f6c86299') { transitive = false }

// seedcracker api
implementation (include('com.github.19MisterX98.SeedcrackerX:seedcrackerx-api:2.10.1')) {transitive = false}
Expand Down Expand Up @@ -93,6 +94,6 @@ tasks.withType(JavaCompile).configureEach {
// We'll use that if it's available, but otherwise we'll use the older option.
def targetVersion = 21
if (JavaVersion.current().isJava9Compatible()) {
it.options.release = targetVersion
it.options.release = targetVersion
}
}
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
org.gradle.jvmargs=-Xmx2G

# Fabric Properties
minecraft_version=1.21.4
yarn_version=1.21.4+build.8
loader_version=0.16.9
minecraft_version=1.21.5
yarn_version=1.21.5+build.1
loader_version=0.16.14

# Mod Properties
mod_version = 0.3
maven_group = anticope.rejects
archives_base_name = meteor-rejects-addon

baritone_version=1.21.4
baritone_version=1.21.5
2 changes: 1 addition & 1 deletion src/main/java/anticope/rejects/MeteorRejectsAddon.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void onInitialize() {
modules.add(new RoboWalk());
modules.add(new ShieldBypass());
modules.add(new SilentDisconnect());
modules.add(new SkeletonESP());
// modules.add(new SkeletonESP());
modules.add(new SoundLocator());
modules.add(new TreeAura());
modules.add(new VehicleOneHit());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/anticope/rejects/commands/GiveCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
ct.putInt("Time", 1);
ct.putString("id", "minecraft:falling_block");
ct.put("BlockState", new NbtCompound());
ct.getCompound("BlockState").putString("Name", Registries.ITEM.getId(inHand.getItem()).toString());
ct.getCompound("BlockState");

} else {
ct.putString("id", "minecraft:item");
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/anticope/rejects/commands/HeadsCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,5 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
Utils.screenToOpen = new HeadScreen(GuiThemes.get());
return SINGLE_SUCCESS;
});

}


}
45 changes: 9 additions & 36 deletions src/main/java/anticope/rejects/commands/ServerCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,51 +116,24 @@ private MutableText formatPort(int port, InetAddress address) {
text.append(ports.get(port));
if (ports.get(port).startsWith("HTTP") || ports.get(port).startsWith("FTP")) {
text.setStyle(text.getStyle()
.withClickEvent(new ClickEvent(
Action.OPEN_URL,
String.format("%s://%s:%d", ports.get(port).toLowerCase(), address.getHostAddress(), port)
))
.withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT,
Text.literal("Open in browser")
))
);
.withClickEvent(new ClickEvent.OpenUrl(java.net.URI.create(String.format("%s://%s:%d", ports.get(port).toLowerCase(), address.getHostAddress(), port))))
.withHoverEvent(new HoverEvent.ShowText(Text.literal("Open in browser"))));
} else if (Objects.equals(ports.get(port), "DynMap")) {
text.setStyle(text.getStyle()
.withClickEvent(new ClickEvent(
ClickEvent.Action.OPEN_URL,
String.format("http://%s:%d", address.getHostAddress(), port)
))
.withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT,
Text.literal("Open in browser")
))
);
.withClickEvent(new ClickEvent.OpenUrl(java.net.URI.create(String.format("http://%s:%d", address.getHostAddress(), port))))
.withHoverEvent(new HoverEvent.ShowText(Text.literal("Open in browser"))));
} else {
text.setStyle(text.getStyle()
.withClickEvent(new ClickEvent(
ClickEvent.Action.COPY_TO_CLIPBOARD,
String.format("%s:%d", address.getHostAddress(), port)
))
.withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT,
Text.literal("Copy")
))
);
.withClickEvent(new ClickEvent.CopyToClipboard(String.format("%s:%d", address.getHostAddress(), port)))
.withHoverEvent(new HoverEvent.ShowText(Text.literal("Copy"))));
}
} else {
text.setStyle(text.getStyle()
.withClickEvent(new ClickEvent(
ClickEvent.Action.COPY_TO_CLIPBOARD,
String.format("%s:%d", address.getHostAddress(), port)
))
.withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT,
Text.literal("Copy")
))
);
.withClickEvent(new ClickEvent.CopyToClipboard(String.format("%s:%d", address.getHostAddress(), port)))
.withHoverEvent(new HoverEvent.ShowText(Text.literal("Copy"))));
}

return text;
}

}
24 changes: 12 additions & 12 deletions src/main/java/anticope/rejects/gui/hud/RadarHud.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ public class RadarHud extends HudElement {
.min(1)
.sliderRange(0.01, 5)
.onChanged(aDouble -> calculateSize())
.build()
.build()
);

private final Setting<Double> zoom = sgGeneral.add(new DoubleSetting.Builder()
.name("zoom")
.description("Radar zoom.")
.defaultValue(1)
.min(0.01)
.sliderRange(0.01, 3)
.build()
.name("zoom")
.description("Radar zoom.")
.defaultValue(1)
.min(0.01)
.sliderRange(0.01, 3)
.build()
);

public RadarHud() {
Expand All @@ -93,15 +93,15 @@ public void render(HudRenderer renderer) {
double height = getHeight();
Renderer2D.COLOR.begin();
Renderer2D.COLOR.quad(x, y, width, height, backgroundColor.get());
Renderer2D.COLOR.render(null);
Renderer2D.COLOR.render();
if (mc.world != null) {
for (Entity entity : mc.world.getEntities()) {
if (!entities.get().contains(entity.getType())) return;
double xPos = ((entity.getX() - mc.player.getX()) * scale.get() * zoom.get() + width/2);
double yPos = ((entity.getZ() - mc.player.getZ()) * scale.get() * zoom.get() + height/2);
if (xPos < 0 || yPos < 0 || xPos > width - scale.get() || yPos > height - scale.get()) continue;
String icon = "*";
if (letters.get())
if (letters.get())
icon = entity.getType().getUntranslatedName().substring(0,1).toUpperCase();
Color c = esp.getColor(entity);
if (c == null) c = Color.WHITE;
Expand All @@ -121,9 +121,9 @@ public void render(HudRenderer renderer) {
renderer.text(icon, xPos + x, yPos + y, waypoint.color.get(), false);
}
}
Renderer2D.COLOR.render(null);
Renderer2D.COLOR.render();
});

}

}
Loading