CameronReed/cmods-haxxor
1
0
Fork 0
Code Issues Pull Requests Releases 4 Activity

Compare commits

base: CameronReed:main
Branches Tags
CameronReed:main
CameronReed:v2.0.0
CameronReed:v1.2.1
CameronReed:v1.1.0
CameronReed:v1.0.0
..
compare: CameronReed:v2.0.0
Branches Tags
CameronReed:main
CameronReed:v2.0.0
CameronReed:v1.2.1
CameronReed:v1.1.0
CameronReed:v1.0.0

No commits in common. "main" and "v2.0.0" have entirely different histories.
main ... v2.0.0

25 changed files with 157 additions and 544 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -117,3 +117,4 @@ run/
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar !gradle-wrapper.jar
/libs/

43
build.gradle
View File

@ -1,15 +1,11 @@
plugins { plugins {
id 'fabric-loom' version '1.7-SNAPSHOT' id 'fabric-loom' version '1.0-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }
version = project.mod_version version = project.mod_version
group = project.maven_group group = project.maven_group
base {
archivesName = project.archives_base_name
}
repositories { repositories {
// Add repositories to retrieve artifacts from in here. // Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because // You should only use this when depending on other mods because
@ -22,17 +18,6 @@ repositories {
} }
} }
loom {
splitEnvironmentSourceSets()
mods {
"haxxor" {
sourceSet sourceSets.client
sourceSet sourceSets.main
}
}
}
dependencies { dependencies {
// To change the versions see the gradle.properties file // To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}" minecraft "com.mojang:minecraft:${project.minecraft_version}"
@ -41,43 +26,53 @@ dependencies {
// Fabric API. This is technically optional, but you probably want it anyway. // Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modImplementation files("libs/cmods-1.2.2-dev.jar") modImplementation files("libs/cmods-1.0.0-dev.jar")
modCompileOnly "com.terraformersmc:modmenu:4.1.1" modCompileOnly "com.terraformersmc:modmenu:4.1.1"
} }
processResources { processResources {
inputs.property "version", project.version inputs.property "version", project.version
filteringCharset "UTF-8"
filesMatching("fabric.mod.json") { filesMatching("fabric.mod.json") {
expand "version": project.version expand "version": project.version
} }
} }
def targetJavaVersion = 17
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
it.options.release = 21 // ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
// If Javadoc is generated, this must be specified in that task too.
it.options.encoding = "UTF-8"
if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
it.options.release = targetJavaVersion
}
} }
java { java {
def javaVersion = JavaVersion.toVersion(targetJavaVersion)
if (JavaVersion.current() < javaVersion) {
toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
}
archivesBaseName = project.archives_base_name
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present. // if it is present.
// If you remove this line, sources will not be generated. // If you remove this line, sources will not be generated.
withSourcesJar() withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
} }
jar { jar {
from("LICENSE") { from("LICENSE") {
rename { "${it}_${project.base.archivesName.get()}"} rename { "${it}_${project.archivesBaseName}" }
} }
} }
// configure the maven publication // configure the maven publication
publishing { publishing {
publications { publications {
create("mavenJava", MavenPublication) { mavenJava(MavenPublication) {
artifactId = project.archives_base_name
from components.java from components.java
} }
} }

10
gradle.properties
View File

@ -2,13 +2,13 @@
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.21 minecraft_version=1.19.3
yarn_mappings=1.21+build.7 yarn_mappings=1.19.3+build.2
loader_version=0.15.11 loader_version=0.14.13
# Mod Properties # Mod Properties
mod_version=2.4.2 mod_version=2.0.0
maven_group=cmods maven_group=cmods
archives_base_name=haxxor archives_base_name=haxxor
# Dependencies # Dependencies
# check this on https://modmuss50.me/fabric.html # check this on https://modmuss50.me/fabric.html
fabric_version=0.100.4+1.21 fabric_version=0.68.1+1.19.3

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1 +1 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip

118
src/client/java/cmods/haxxor/hacks/Elevator.java
View File

@ -1,118 +0,0 @@
package cmods.haxxor.hacks;
import cmods.haxxor.options.HaxxorOptions;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import org.lwjgl.glfw.GLFW;
import java.util.Objects;
public class Elevator {
private static KeyBinding teleport_up_key;
private static KeyBinding teleport_down_key;
private static boolean up_was_pressed = false;
private static boolean down_was_pressed = false;
private static final HaxxorOptions.ElevatorOptions options = HaxxorOptions.getInstance().elevatorOptions;
public static void init() {
teleport_up_key = KeyBindingHelper.registerKeyBinding(new KeyBinding(
"key.haxxor.elevator.up",
GLFW.GLFW_KEY_UP,
"category.haxxor.options"
));
teleport_down_key = KeyBindingHelper.registerKeyBinding(new KeyBinding(
"key.haxxor.elevator.down",
GLFW.GLFW_KEY_DOWN,
"category.haxxor.options"
));
}
public static void tick(MinecraftClient client) {
if (teleport_up_key.isPressed() && !up_was_pressed)
tp_up(client);
if (teleport_down_key.isPressed() && !down_was_pressed)
tp_down(client);
up_was_pressed = teleport_up_key.isPressed();
down_was_pressed = teleport_down_key.isPressed();
}
private static void tp_up(MinecraftClient client) {
if (client == null || client.player == null || client.world == null)
return;
BlockPos blockPos = client.player.getBlockPos();
Vec3d pos = null;
for (int i = 1; i <= options.max_tp_up.get(); i++) {
if (can_tp_to_block(client, blockPos.up(i))) {
pos = blockPos.up(i).toCenterPos();
break;
}
}
if (pos == null) {
if (options.send_too_far_message.get())
client.player.sendMessage(Text.translatable("haxxor.message.elevator.too_far"));
return;
}
teleport(client, pos.getX(), Math.floor(pos.getY()), pos.getZ());
}
private static void tp_down(MinecraftClient client) {
if (client == null || client.player == null || client.world == null)
return;
BlockPos blockPos = client.player.getBlockPos();
Vec3d pos = null;
for (int i = 1; i <= options.max_tp_down.get(); i++) {
if (can_tp_to_block(client, blockPos.down(i))) {
pos = blockPos.down(i).toCenterPos();
break;
}
}
if (pos == null) {
if (options.send_too_far_message.get())
client.player.sendMessage(Text.translatable("haxxor.message.elevator.too_far"));
return;
}
teleport(client, pos.getX(), Math.floor(pos.getY()), pos.getZ());
}
private static boolean can_tp_to_block(MinecraftClient client, BlockPos pos) {
if (client.player == null || client.world == null)
return false;
return client.world.getBlockState(pos.down()).hasSolidTopSurface(client.world, pos, client.player) &&
client.world.getBlockState(pos).isAir() &&
client.world.getBlockState(pos.up()).isAir();
}
private static void teleport(MinecraftClient client, double x, double y, double z) {
if (client.player == null)
return;
Vec3d position = new Vec3d(x, y, z);
if (options.send_tp_message.get())
client.player.sendMessage(Text.translatable("haxxor.message.elevator", position.getX(), position.getY(), position.getZ()));
client.player.setPosition(position);
PlayerMoveC2SPacket packet = new PlayerMoveC2SPacket.PositionAndOnGround(position.getX(), position.getY(),
position.getZ(), client.player.isOnGround());
Objects.requireNonNull(client.getNetworkHandler()).sendPacket(packet);
}
}

18
src/client/java/cmods/haxxor/mixin/GlobalGlow.java
View File

@ -1,18 +0,0 @@
package cmods.haxxor.mixin;
import cmods.haxxor.options.HaxxorOptions;
import net.minecraft.entity.LivingEntity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(LivingEntity.class)
public class GlobalGlow {
@Inject(method = "isGlowing()Z", at = @At("RETURN"), cancellable = true)
private void isGlowingOverride(CallbackInfoReturnable<Boolean> cir) {
if (HaxxorOptions.getInstance().glow.enabled.get()) {
cir.setReturnValue(true);
}
}
}

20
src/client/java/cmods/haxxor/mixin/GlobalGlowAll.java
View File

@ -1,20 +0,0 @@
package cmods.haxxor.mixin;
import cmods.haxxor.options.HaxxorOptions;
import net.minecraft.entity.Entity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(Entity.class)
public class GlobalGlowAll {
@Inject(method = "isGlowing()Z", at = @At("RETURN"), cancellable = true)
private void isGlowingOverride(CallbackInfoReturnable<Boolean> cir) {
HaxxorOptions options = HaxxorOptions.getInstance();
if (options.glow.enabled.get() && options.glow.include_non_living.get()) {
cir.setReturnValue(true);
}
}
}

64
src/client/java/cmods/haxxor/ui/ElevatorOptionsScreen.java
View File

@ -1,64 +0,0 @@
package cmods.haxxor.ui;
import cmods.cmods.options.CmodsOptions;
import cmods.cmods.ui.IntegerAdjustWidget;
import cmods.cmods.ui.ToggleButton;
import cmods.haxxor.options.HaxxorOptions;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.GridWidget;
import net.minecraft.client.gui.widget.SimplePositioningWidget;
import net.minecraft.screen.ScreenTexts;
import net.minecraft.text.Text;
import static cmods.cmods.ui.Constants.*;
public class ElevatorOptionsScreen extends Screen {
private final Screen parent;
private final CmodsOptions global_options = CmodsOptions.getInstance();
private final HaxxorOptions.ElevatorOptions options = HaxxorOptions.getInstance().elevatorOptions;
public ElevatorOptionsScreen(Screen parent) {
super(Text.translatable("haxxor.options.elevator.title"));
this.parent = parent;
}
protected void init() {
if (client == null)
return;
final int startHeight = (int) Math.floor(this.height * startHeight_multiplier);
GridWidget grid = new GridWidget();
grid.getMainPositioner().marginX(5).marginBottom(4).alignHorizontalCenter();
GridWidget.Adder adder = grid.createAdder(2);
adder.add(new ToggleButton(0, 0, buttonWidth, buttonHeight,
Text.translatable("haxxor.options.elevator.too_far"), options.send_too_far_message));
adder.add(new ToggleButton(0, 0, buttonWidth, buttonHeight,
Text.translatable("haxxor.options.elevator.tp_message"), options.send_tp_message));
adder.add(new IntegerAdjustWidget(Text.translatable("haxxor.options.elevator.max_tp_up"), options.max_tp_up));
adder.add(new IntegerAdjustWidget(Text.translatable("haxxor.options.elevator.max_tp_down"), options.max_tp_down));
adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent))
.width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement));
grid.refreshPositions();
SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f);
grid.forEachChild(this::addDrawableChild);
}
public void render(DrawContext context, int mouseX, int mouseY, float delta) {
// this.renderBackground(context, mouseX, mouseY, delta);
super.render(context, mouseX, mouseY, delta);
context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff);
}
public void removed() {
global_options.save();
}
}

67
src/client/java/cmods/haxxor/ui/GlowOptionsScreen.java
View File

@ -1,67 +0,0 @@
package cmods.haxxor.ui;
import cmods.cmods.options.CmodsOptions;
import cmods.cmods.ui.ToggleButton;
import cmods.haxxor.HaxxorClient;
import cmods.haxxor.options.HaxxorOptions;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.GridWidget;
import net.minecraft.client.gui.widget.SimplePositioningWidget;
import net.minecraft.screen.ScreenTexts;
import net.minecraft.text.Text;
import static cmods.cmods.ui.Constants.*;
public class GlowOptionsScreen extends Screen {
private final Screen parent;
private final CmodsOptions global_options = CmodsOptions.getInstance();
private final HaxxorOptions.GlowOptions options = HaxxorOptions.getInstance().glow;
public GlowOptionsScreen(Screen parent) {
super(Text.translatable("haxxor.options.glow.title"));
this.parent = parent;
}
protected void init() {
if (client == null)
return;
final int startHeight = (int) Math.floor(this.height * startHeight_multiplier);
GridWidget grid = new GridWidget();
grid.getMainPositioner().marginX(5).marginBottom(4).alignHorizontalCenter();
GridWidget.Adder adder = grid.createAdder(2);
adder.add(ButtonWidget.builder(
Text.translatable("haxxor.options.glow.enabled", options.enabled.get() ?
Text.translatable("haxxor.state.enabled") :
Text.translatable("haxxor.state.disabled")),
button -> button.setMessage(
Text.translatable("haxxor.options.glow.enabled", HaxxorClient.toggleGlow() ?
Text.translatable("haxxor.state.enabled") :
Text.translatable("haxxor.state.disabled"))
)).build());
adder.add(new ToggleButton(0, 0, buttonWidth, buttonHeight,
Text.translatable("haxxor.options.glow.include_non_living"), options.include_non_living));
adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent))
.width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement));
grid.refreshPositions();
SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f);
grid.forEachChild(this::addDrawableChild);
}
public void render(DrawContext context, int mouseX, int mouseY, float delta) {
// this.renderBackground(context, mouseX, mouseY, delta);
super.render(context, mouseX, mouseY, delta);
context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff);
}
public void removed() {
global_options.save();
}
}

26
src/client/java/cmods/haxxor/HaxxorModule.java → src/main/java/cmods/haxxor/HaxxorModule.java
View File

@ -3,13 +3,11 @@ package cmods.haxxor;
import cmods.cmods.api.ButtonBuilder; import cmods.cmods.api.ButtonBuilder;
import cmods.cmods.api.Module; import cmods.cmods.api.Module;
import cmods.cmods.api.ModuleOptions; import cmods.cmods.api.ModuleOptions;
import cmods.cmods.ui.Line; import cmods.cmods.client.ui.Line;
import cmods.cmods.ui.ToggleButton; import cmods.cmods.client.ui.ToggleButton;
import cmods.haxxor.hacks.AutoFarmer; import cmods.haxxor.client.AutoFarmer;
import cmods.haxxor.options.HaxxorOptions; import cmods.haxxor.client.options.HaxxorOptions;
import cmods.haxxor.ui.ElevatorOptionsScreen; import cmods.haxxor.client.ui.FarmerOptionsScreen;
import cmods.haxxor.ui.FarmerOptionsScreen;
import cmods.haxxor.ui.GlowOptionsScreen;
import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -17,8 +15,8 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.function.Consumer; import java.util.function.Consumer;
import static cmods.cmods.ui.Constants.buttonHeight; import static cmods.cmods.client.ui.Constants.buttonHeight;
import static cmods.cmods.ui.Constants.buttonWidth; import static cmods.cmods.client.ui.Constants.buttonWidth;
public class HaxxorModule extends Module { public class HaxxorModule extends Module {
private static final int precedence = 0; private static final int precedence = 0;
@ -29,20 +27,14 @@ public class HaxxorModule extends Module {
} }
public static void init() { public static void init() {
final HaxxorOptions options = HaxxorOptions.getInstance(); HaxxorOptions options = HaxxorOptions.getInstance();
ArrayList<ButtonBuilder> optionButtons = new ArrayList<>(4); ArrayList<ButtonBuilder> optionButtons = new ArrayList<>(2);
ArrayList<ButtonBuilder> uiOptions = new ArrayList<>(2); ArrayList<ButtonBuilder> uiOptions = new ArrayList<>(2);
optionButtons.add((screen, client) -> ButtonWidget.builder(Text.translatable("haxxor.options.farmer"), optionButtons.add((screen, client) -> ButtonWidget.builder(Text.translatable("haxxor.options.farmer"),
button -> client.setScreen(new FarmerOptionsScreen(screen))).build()); button -> client.setScreen(new FarmerOptionsScreen(screen))).build());
optionButtons.add(((screen, client) -> ButtonWidget.builder(Text.translatable("haxxor.options.elevator"),
button -> client.setScreen(new ElevatorOptionsScreen(screen))).build()));
optionButtons.add(((screen, client) -> ButtonWidget.builder(Text.translatable("haxxor.options.glow"),
button -> client.setScreen(new GlowOptionsScreen(screen))).build()));
optionButtons.add((screen, client) -> new ToggleButton(0, 0, buttonWidth, buttonHeight, optionButtons.add((screen, client) -> new ToggleButton(0, 0, buttonWidth, buttonHeight,
Text.translatable("haxxor.options.fall_damage"), options.cancelFallDamage)); Text.translatable("haxxor.options.fall_damage"), options.cancelFallDamage));

22
src/client/java/cmods/haxxor/hacks/AutoFarmer.java → src/main/java/cmods/haxxor/client/AutoFarmer.java
View File

@ -1,6 +1,6 @@
package cmods.haxxor.hacks; package cmods.haxxor.client;
import cmods.haxxor.options.HaxxorOptions; import cmods.haxxor.client.options.HaxxorOptions;
import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import net.minecraft.block.*; import net.minecraft.block.*;
@ -31,7 +31,7 @@ public class AutoFarmer { // Really just a namespace and needed to separate thin
new AutoFarmerCropType(Blocks.POTATOES, Items.POTATO, GROWTH_PATTERN.BASIC, Blocks.FARMLAND), new AutoFarmerCropType(Blocks.POTATOES, Items.POTATO, GROWTH_PATTERN.BASIC, Blocks.FARMLAND),
new AutoFarmerCropType(Blocks.CARROTS, Items.CARROT, GROWTH_PATTERN.BASIC, Blocks.FARMLAND), new AutoFarmerCropType(Blocks.CARROTS, Items.CARROT, GROWTH_PATTERN.BASIC, Blocks.FARMLAND),
new AutoFarmerCropType(Blocks.NETHER_WART, Items.NETHER_WART, GROWTH_PATTERN.BASIC, Blocks.SOUL_SAND), new AutoFarmerCropType(Blocks.NETHER_WART, Items.NETHER_WART, GROWTH_PATTERN.BASIC, Blocks.SOUL_SAND),
new AutoFarmerCropType(Blocks.SUGAR_CANE, Items.SUGAR_CANE, GROWTH_PATTERN.LEAVE_BASE, null) new AutoFarmerCropType(Blocks.SUGAR_CANE, null, GROWTH_PATTERN.LEAVE_BASE, null)
}; };
@ -43,7 +43,7 @@ public class AutoFarmer { // Really just a namespace and needed to separate thin
PLACE_OFF_HAND PLACE_OFF_HAND
} }
public enum GROWTH_PATTERN { private enum GROWTH_PATTERN {
BASIC, BASIC,
LEAVE_BASE LEAVE_BASE
} }
@ -61,14 +61,14 @@ public class AutoFarmer { // Really just a namespace and needed to separate thin
} }
public static boolean canFarm() { public static boolean canFarm() {
return !queuedActions.isEmpty(); return queuedActions.size() > 0;
} }
public static void tick(MinecraftClient client) { public static void tick(MinecraftClient client) {
if (client.player == null) if (client.player == null)
return; return;
if (!queuedStopPackets.isEmpty()) if (queuedStopPackets.size() > 0)
sendStopPackets(client); sendStopPackets(client);
scanBlocks(client); scanBlocks(client);
@ -199,11 +199,7 @@ public class AutoFarmer { // Really just a namespace and needed to separate thin
if (cropType.growth_pattern == GROWTH_PATTERN.LEAVE_BASE && block.isOf(cropType.crop_type) && if (cropType.growth_pattern == GROWTH_PATTERN.LEAVE_BASE && block.isOf(cropType.crop_type) &&
options.crops_enabled[i].get()) { options.crops_enabled[i].get()) {
if (options.seeds_enabled[i].get()) {
return isSecondBlock(client.world, pos, cropType.crop_type) ? ACTION_TYPE.BREAK : ACTION_TYPE.NONE; return isSecondBlock(client.world, pos, cropType.crop_type) ? ACTION_TYPE.BREAK : ACTION_TYPE.NONE;
} else {
return isBottomBlock(client.world, pos, cropType.crop_type) ? ACTION_TYPE.BREAK : ACTION_TYPE.NONE;
}
} }
if (cropType.seed_type != null && cropType.planted_on != null && block.isOf(cropType.planted_on) && if (cropType.seed_type != null && cropType.planted_on != null && block.isOf(cropType.planted_on) &&
@ -265,7 +261,7 @@ public class AutoFarmer { // Really just a namespace and needed to separate thin
if (block.getBlock() instanceof CropBlock) if (block.getBlock() instanceof CropBlock)
return ((CropBlock) block.getBlock()).isMature(block); return ((CropBlock) block.getBlock()).isMature(block);
if (blockType == NetherWartBlock.class) if (blockType == NetherWartBlock.class)
return block.get(NetherWartBlock.AGE) >= NetherWartBlock.MAX_AGE; return block.get(NetherWartBlock.AGE) >= NetherWartBlock.field_31199;
return false; return false;
} }
@ -275,10 +271,6 @@ public class AutoFarmer { // Really just a namespace and needed to separate thin
!world.getBlockState(pos.down().down()).isOf(crop_type); !world.getBlockState(pos.down().down()).isOf(crop_type);
} }
private static boolean isBottomBlock(ClientWorld world, BlockPos pos, Block crop_type) {
return world.getBlockState(pos).isOf(crop_type) && !world.getBlockState(pos.down()).isOf(crop_type);
}
private static void sendStopPackets(MinecraftClient client) { private static void sendStopPackets(MinecraftClient client) {
if (client.world == null || client.player == null) if (client.world == null || client.player == null)
return; return;

4
src/client/java/cmods/haxxor/hacks/FallDamageCancel.java → src/main/java/cmods/haxxor/client/FallDamageCancel.java
View File

@ -1,6 +1,6 @@
package cmods.haxxor.hacks; package cmods.haxxor.client;
import cmods.haxxor.options.HaxxorOptions; import cmods.haxxor.client.options.HaxxorOptions;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

6
src/client/java/cmods/haxxor/hacks/FlyHack.java → src/main/java/cmods/haxxor/client/FlyHack.java
View File

@ -1,6 +1,6 @@
package cmods.haxxor.hacks; package cmods.haxxor.client;
import cmods.haxxor.options.HaxxorOptions; import cmods.haxxor.client.options.HaxxorOptions;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
@ -16,7 +16,7 @@ public class FlyHack {
private static int tickCounter = ticksToFirst; private static int tickCounter = ticksToFirst;
public static void tick(MinecraftClient client) { public static void tick(MinecraftClient client) {
if (client.player == null || client.world == null || client.player.isCreative() || client.player.isSpectator()) if (client.player == null || client.world == null || client.player.isCreative())
return; return;
client.player.getAbilities().allowFlying = options.flyHackEnabled.get(); client.player.getAbilities().allowFlying = options.flyHackEnabled.get();

27
src/client/java/cmods/haxxor/HaxxorClient.java → src/main/java/cmods/haxxor/client/HaxxorClient.java
View File

@ -1,10 +1,7 @@
package cmods.haxxor; package cmods.haxxor.client;
import cmods.haxxor.hacks.AutoFarmer; import cmods.haxxor.HaxxorModule;
import cmods.haxxor.hacks.Elevator; import cmods.haxxor.client.options.HaxxorOptions;
import cmods.haxxor.hacks.FallDamageCancel;
import cmods.haxxor.hacks.FlyHack;
import cmods.haxxor.options.HaxxorOptions;
import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
@ -25,7 +22,6 @@ public class HaxxorClient implements ClientModInitializer {
private static StickyKeyBinding auto_farm_key; private static StickyKeyBinding auto_farm_key;
private static StickyKeyBinding fly_hack_key; private static StickyKeyBinding fly_hack_key;
private static StickyKeyBinding glow_key;
private static final HaxxorOptions options = HaxxorOptions.getInstance(); private static final HaxxorOptions options = HaxxorOptions.getInstance();
@Override @Override
@ -50,15 +46,7 @@ public class HaxxorClient implements ClientModInitializer {
() -> true () -> true
)); ));
glow_key = (StickyKeyBinding) KeyBindingHelper.registerKeyBinding(new StickyKeyBinding(
"key.haxxor.glow",
-1,
"category.haxxor.options",
() -> true
));
AutoFarmer.init(); AutoFarmer.init();
Elevator.init();
ClientTickEvents.END_CLIENT_TICK.register(this::tick); ClientTickEvents.END_CLIENT_TICK.register(this::tick);
} }
@ -70,20 +58,11 @@ public class HaxxorClient implements ClientModInitializer {
return options.autoFarmer.enabled.get(); return options.autoFarmer.enabled.get();
} }
public static boolean toggleGlow() {
glow_key.setPressed(true);
options.glow.enabled.set(glow_key.isPressed());
return options.glow.enabled.get();
}
private void tick(MinecraftClient client) { private void tick(MinecraftClient client) {
options.autoFarmer.enabled.set(auto_farm_key.isPressed()); options.autoFarmer.enabled.set(auto_farm_key.isPressed());
options.flyHackEnabled.set(fly_hack_key.isPressed()); options.flyHackEnabled.set(fly_hack_key.isPressed());
options.glow.enabled.set(glow_key.isPressed());
AutoFarmer.tick(client); AutoFarmer.tick(client);
Elevator.tick(client);
FlyHack.tick(client); FlyHack.tick(client);
FallDamageCancel.tick(client); FallDamageCancel.tick(client);
} }

4
src/client/java/cmods/haxxor/ModMenuConfig.java → src/main/java/cmods/haxxor/client/ModMenuConfig.java
View File

@ -1,6 +1,6 @@
package cmods.haxxor; package cmods.haxxor.client;
import cmods.haxxor.ui.HaxxorOptionsScreen; import cmods.haxxor.client.ui.HaxxorOptionsScreen;
import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import com.terraformersmc.modmenu.api.ModMenuApi; import com.terraformersmc.modmenu.api.ModMenuApi;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;

95
src/client/java/cmods/haxxor/options/HaxxorOptions.java → src/main/java/cmods/haxxor/client/options/HaxxorOptions.java
View File

@ -1,25 +1,27 @@
package cmods.haxxor.options; package cmods.haxxor.client.options;
import cmods.cmods.api.ModuleOptions; import cmods.cmods.api.ModuleOptions;
import cmods.cmods.options.BooleanOption; import cmods.cmods.client.options.BooleanOption;
import cmods.cmods.options.IntegerOption; import cmods.cmods.client.options.CmodsOptions;
import cmods.haxxor.hacks.AutoFarmer; import cmods.cmods.client.options.IntegerOption;
import cmods.haxxor.client.AutoFarmer;
import net.fabricmc.loader.api.FabricLoader;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.io.FileWriter;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Properties; import java.util.Properties;
import static cmods.cmods.api.PropertyUtils.getBooleanProperty;
import static cmods.cmods.api.PropertyUtils.getIntegerProperty;
public final class HaxxorOptions extends ModuleOptions { public final class HaxxorOptions extends ModuleOptions {
private static HaxxorOptions instance = null; private static HaxxorOptions instance = null;
private static final String MODULE_PREFIX = "haxxor."; private static final String MODULE_PREFIX = "haxxor.";
private final Path properties_file = FabricLoader.getInstance().getConfigDir().resolve("Haxxor.properties");
public final AutoFarmerOptions autoFarmer; public final AutoFarmerOptions autoFarmer;
public final UIOptions uiOptions; public final UIOptions uiOptions;
public final ElevatorOptions elevatorOptions;
public final GlowOptions glow;
public final BooleanOption flyHackEnabled = new BooleanOption(false); public final BooleanOption flyHackEnabled = new BooleanOption(false);
public final BooleanOption cancelFallDamage = new BooleanOption(true); public final BooleanOption cancelFallDamage = new BooleanOption(true);
@ -28,6 +30,7 @@ public final class HaxxorOptions extends ModuleOptions {
public static HaxxorOptions getInstance() { public static HaxxorOptions getInstance() {
if (instance == null) { if (instance == null) {
instance = new HaxxorOptions(); instance = new HaxxorOptions();
CmodsOptions.addOptions(instance);
} }
return instance; return instance;
@ -36,16 +39,12 @@ public final class HaxxorOptions extends ModuleOptions {
private HaxxorOptions() { private HaxxorOptions() {
autoFarmer = new AutoFarmerOptions(); autoFarmer = new AutoFarmerOptions();
uiOptions = new UIOptions(); uiOptions = new UIOptions();
elevatorOptions = new ElevatorOptions();
glow = new GlowOptions();
} }
public void load(@Nullable Properties properties) { public void load(@Nullable Properties properties) {
// Sub category properties // Sub category properties
autoFarmer.load(properties); autoFarmer.load(properties);
uiOptions.load(properties); uiOptions.load(properties);
elevatorOptions.load(properties);
glow.load(properties);
// Top level properties // Top level properties
cancelFallDamage.value = getBooleanProperty(properties, "cancel_fall_damage", cancelFallDamage.value); cancelFallDamage.value = getBooleanProperty(properties, "cancel_fall_damage", cancelFallDamage.value);
@ -55,12 +54,29 @@ public final class HaxxorOptions extends ModuleOptions {
// Sub category properties // Sub category properties
autoFarmer.save(properties); autoFarmer.save(properties);
uiOptions.save(properties); uiOptions.save(properties);
elevatorOptions.save(properties);
glow.save(properties);
// Top level properties // Top level properties
properties.setProperty("cancel_fall_damage", cancelFallDamage.value.toString()); properties.setProperty("cancel_fall_damage", cancelFallDamage.value.toString());
try {
properties.store(new FileWriter(properties_file.toFile()), "Haxxor Properties");
} catch (IOException e) {
System.out.println("[Haxxor]: Failed to save properties");
} }
}
private static boolean getBooleanProperty(@Nullable Properties properties, String key, Boolean default_value) {
if (properties == null)
return default_value;
return Boolean.parseBoolean(properties.getProperty(key, default_value.toString()));
}
private static int getIntegerProperty(@Nullable Properties properties, String key, Integer default_value) {
if (properties == null)
return default_value;
return Integer.parseInt(properties.getProperty(key, default_value.toString()));
}
public static class AutoFarmerOptions { public static class AutoFarmerOptions {
@ -139,8 +155,8 @@ public final class HaxxorOptions extends ModuleOptions {
private void load(@Nullable Properties properties) { private void load(@Nullable Properties properties) {
show_auto_farmer.value = getBooleanProperty(properties, PREFIX + "show_auto_farmer", show_auto_farmer.value); show_auto_farmer.value = getBooleanProperty(properties, PREFIX + "show_auto_farmer", true);
show_fly_hack.value = getBooleanProperty(properties, PREFIX + "show_fly_hack", show_fly_hack.value); show_fly_hack.value = getBooleanProperty(properties, PREFIX + "show_fly_hack", true);
} }
private void save(Properties properties) { private void save(Properties properties) {
@ -148,49 +164,4 @@ public final class HaxxorOptions extends ModuleOptions {
properties.setProperty(PREFIX + "show_fly_hack", show_fly_hack.value.toString()); properties.setProperty(PREFIX + "show_fly_hack", show_fly_hack.value.toString());
} }
} }
public static class ElevatorOptions {
private final String PREFIX = MODULE_PREFIX + "elevator.";
public final BooleanOption send_too_far_message = new BooleanOption(true);
public final BooleanOption send_tp_message = new BooleanOption(true);
public final IntegerOption max_tp_up = new IntegerOption(10);
public final IntegerOption max_tp_down = new IntegerOption(10);
ElevatorOptions() { }
private void load(@Nullable Properties properties) {
send_too_far_message.value = getBooleanProperty(properties, PREFIX + "send_too_far_message", send_too_far_message.value);
send_tp_message.value = getBooleanProperty(properties, PREFIX + "send_tp_message", send_tp_message.value);
max_tp_up.value = getIntegerProperty(properties, PREFIX + "max_tp_up", max_tp_up.value);
max_tp_down.value = getIntegerProperty(properties, PREFIX + "max_tp_down", max_tp_down.value);
}
private void save(Properties properties) {
properties.setProperty(PREFIX + "send_too_far_message", send_too_far_message.value.toString());
properties.setProperty(PREFIX + "send_tp_message", send_tp_message.value.toString());
properties.setProperty(PREFIX + "max_tp_up", max_tp_up.value.toString());
properties.setProperty(PREFIX + "max_tp_down", max_tp_down.value.toString());
}
}
public static class GlowOptions {
private final String PREFIX = MODULE_PREFIX + "glow.";
public final BooleanOption enabled = new BooleanOption(false);
public final BooleanOption include_non_living = new BooleanOption(false);
GlowOptions() { }
private void load(@Nullable Properties properties) {
include_non_living.value = getBooleanProperty(properties, PREFIX + "include_non_living", include_non_living.value);
}
private void save(Properties properties) {
properties.setProperty(PREFIX + "include_non_living", include_non_living.value.toString());
}
}
} }

38
src/client/java/cmods/haxxor/ui/CropSelectScreen.java → src/main/java/cmods/haxxor/client/ui/CropSelectScreen.java
View File

@ -1,19 +1,19 @@
package cmods.haxxor.ui; package cmods.haxxor.client.ui;
import cmods.cmods.options.CmodsOptions; import cmods.cmods.client.options.CmodsOptions;
import cmods.cmods.ui.ToggleButton; import cmods.cmods.client.ui.ToggleButton;
import cmods.haxxor.hacks.AutoFarmer; import cmods.haxxor.client.AutoFarmer;
import cmods.haxxor.options.HaxxorOptions; import cmods.haxxor.client.options.HaxxorOptions;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.EmptyWidget; import net.minecraft.client.gui.widget.EmptyWidget;
import net.minecraft.client.gui.widget.GridWidget; import net.minecraft.client.gui.widget.GridWidget;
import net.minecraft.client.gui.widget.SimplePositioningWidget; import net.minecraft.client.gui.widget.SimplePositioningWidget;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.screen.ScreenTexts; import net.minecraft.screen.ScreenTexts;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import static cmods.cmods.ui.Constants.*; import static cmods.cmods.client.ui.Constants.*;
public class CropSelectScreen extends Screen { public class CropSelectScreen extends Screen {
private final CmodsOptions global_options = CmodsOptions.getInstance(); private final CmodsOptions global_options = CmodsOptions.getInstance();
@ -56,25 +56,25 @@ public class CropSelectScreen extends Screen {
adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent)) adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent))
.width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement)); .width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement));
grid.refreshPositions(); grid.recalculateDimensions();
SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f); SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f);
grid.forEachChild(this::addDrawableChild); addDrawableChild(grid);
} }
public void render(DrawContext context, int mouseX, int mouseY, float delta) { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
super.render(context, mouseX, mouseY, delta); final int column1 = this.width / 2 + column1_offset;
final int column2 = this.width / 2 + column2_offset;
final int startHeight = (int) Math.floor(this.height * startHeight_multiplier) + heightOffset;
final int column1 = width / 2 + column1_offset; this.renderBackground(matrices);
final int column2 = width / 2 + column2_offset;
final int startHeight = (int) Math.floor(height * startHeight_multiplier) + heightOffset;
// this.renderBackground(context, mouseX, mouseY, delta); drawCenteredText(matrices, this.textRenderer, Text.translatable("haxxor.options.farmer.crop_select.seeds"),
context.drawCenteredTextWithShadow(textRenderer, Text.translatable("haxxor.options.farmer.crop_select.seeds"),
column1 + buttonWidth / 2, startHeight - rowIncrement, 0xffffff); column1 + buttonWidth / 2, startHeight - rowIncrement, 0xffffff);
context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff);
context.drawCenteredTextWithShadow(textRenderer, Text.translatable("haxxor.options.farmer.crop_select.blocks"), drawCenteredText(matrices, this.textRenderer, Text.translatable("haxxor.options.farmer.crop_select.blocks"),
column2 + buttonWidth / 2, startHeight - rowIncrement, 0xffffff); column2 + buttonWidth / 2, startHeight - rowIncrement, 0xffffff);
super.render(matrices, mouseX, mouseY, delta);
} }
public void removed() { public void removed() {

4
src/client/java/cmods/haxxor/ui/CycleButtonWidget.java → src/main/java/cmods/haxxor/client/ui/CycleButtonWidget.java
View File

@ -1,4 +1,4 @@
package cmods.haxxor.ui; package cmods.haxxor.client.ui;
import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.text.Text; import net.minecraft.text.Text;
@ -10,7 +10,7 @@ public class CycleButtonWidget extends ButtonWidget {
public CycleButtonWidget(int x, int y, int width, int height, Text[] options, int startIndex, CycleAction onCycle) { public CycleButtonWidget(int x, int y, int width, int height, Text[] options, int startIndex, CycleAction onCycle) {
this(x, y, width, height, options, startIndex, onCycle, DEFAULT_NARRATION_SUPPLIER); this(x, y, width, height, options, startIndex, onCycle, ButtonWidget.DEFAULT_NARRATION_SUPPLIER);
} }
public CycleButtonWidget(int x, int y, int width, int height, Text[] options, int startIndex, CycleAction onCycle, public CycleButtonWidget(int x, int y, int width, int height, Text[] options, int startIndex, CycleAction onCycle,

28
src/client/java/cmods/haxxor/ui/FarmerOptionsScreen.java → src/main/java/cmods/haxxor/client/ui/FarmerOptionsScreen.java
View File

@ -1,19 +1,19 @@
package cmods.haxxor.ui; package cmods.haxxor.client.ui;
import cmods.cmods.options.CmodsOptions; import cmods.cmods.client.options.CmodsOptions;
import cmods.cmods.ui.IntegerAdjustWidget; import cmods.cmods.client.ui.IntegerAdjustWidget;
import cmods.cmods.ui.ToggleButton; import cmods.cmods.client.ui.ToggleButton;
import cmods.haxxor.HaxxorClient; import cmods.haxxor.client.HaxxorClient;
import cmods.haxxor.options.HaxxorOptions; import cmods.haxxor.client.options.HaxxorOptions;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.GridWidget; import net.minecraft.client.gui.widget.GridWidget;
import net.minecraft.client.gui.widget.SimplePositioningWidget; import net.minecraft.client.gui.widget.SimplePositioningWidget;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.screen.ScreenTexts; import net.minecraft.screen.ScreenTexts;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import static cmods.cmods.ui.Constants.*; import static cmods.cmods.client.ui.Constants.*;
public class FarmerOptionsScreen extends Screen { public class FarmerOptionsScreen extends Screen {
private final Screen parent; private final Screen parent;
@ -71,15 +71,15 @@ public class FarmerOptionsScreen extends Screen {
adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent)) adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent))
.width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement)); .width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement));
grid.refreshPositions(); grid.recalculateDimensions();
SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f); SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f);
grid.forEachChild(this::addDrawableChild); addDrawableChild(grid);
} }
public void render(DrawContext context, int mouseX, int mouseY, float delta) { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
// this.renderBackground(context, mouseX, mouseY, delta); this.renderBackground(matrices);
super.render(context, mouseX, mouseY, delta); drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff);
context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); super.render(matrices, mouseX, mouseY, delta);
} }
public void removed() { public void removed() {

36
src/client/java/cmods/haxxor/ui/HaxxorOptionsScreen.java → src/main/java/cmods/haxxor/client/ui/HaxxorOptionsScreen.java
View File

@ -1,18 +1,18 @@
package cmods.haxxor.ui; package cmods.haxxor.client.ui;
import cmods.cmods.options.CmodsOptions; import cmods.cmods.client.options.CmodsOptions;
import cmods.cmods.ui.ToggleButton; import cmods.cmods.client.ui.ToggleButton;
import cmods.haxxor.HaxxorClient; import cmods.haxxor.client.HaxxorClient;
import cmods.haxxor.options.HaxxorOptions; import cmods.haxxor.client.options.HaxxorOptions;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.GridWidget; import net.minecraft.client.gui.widget.GridWidget;
import net.minecraft.client.gui.widget.SimplePositioningWidget; import net.minecraft.client.gui.widget.SimplePositioningWidget;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.screen.ScreenTexts; import net.minecraft.screen.ScreenTexts;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import static cmods.cmods.ui.Constants.*; import static cmods.cmods.client.ui.Constants.*;
public class HaxxorOptionsScreen extends Screen { public class HaxxorOptionsScreen extends Screen {
private final Screen parent; private final Screen parent;
@ -40,32 +40,26 @@ public class HaxxorOptionsScreen extends Screen {
adder.add(ButtonWidget.builder(Text.translatable("haxxor.options.farmer"), adder.add(ButtonWidget.builder(Text.translatable("haxxor.options.farmer"),
button -> this.client.setScreen(new FarmerOptionsScreen(this))).build()); button -> this.client.setScreen(new FarmerOptionsScreen(this))).build());
adder.add(ButtonWidget.builder(Text.translatable("haxxor.options.elevator"),
button -> this.client.setScreen(new ElevatorOptionsScreen(this))).build());
adder.add((ButtonWidget.builder(Text.translatable("haxxor.options.glow"),
button -> client.setScreen(new GlowOptionsScreen(this))).build()));
adder.add(new ToggleButton(0, 0, buttonWidth, buttonHeight, adder.add(new ToggleButton(0, 0, buttonWidth, buttonHeight,
Text.translatable("haxxor.options.fall_damage"), options.cancelFallDamage)); Text.translatable("haxxor.options.fall_damage"), options.cancelFallDamage));
adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent)) adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent))
.width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement)); .width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement));
grid.refreshPositions(); grid.recalculateDimensions();
SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f); SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f);
grid.forEachChild(this::addDrawableChild); addDrawableChild(grid);
} }
public void render(DrawContext context, int mouseX, int mouseY, float delta) { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
// renderBackground(context, mouseX, mouseY, delta); renderBackground(matrices);
super.render(context, mouseX, mouseY, delta);
Text versionText = Text.literal("v" + HaxxorClient.version); Text versionText = Text.literal("v" + HaxxorClient.version);
context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff);
context.drawTextWithShadow(textRenderer, versionText, width - textRenderer.getWidth(versionText) - 2, drawCenteredText(matrices, textRenderer, title, this.width / 2, 15, 0xffffff);
drawTextWithShadow(matrices, textRenderer, versionText, this.width - textRenderer.getWidth(versionText) - 2,
this.height - textRenderer.fontHeight - 2, 0xffffff); this.height - textRenderer.fontHeight - 2, 0xffffff);
super.render(matrices, mouseX, mouseY, delta);
} }
public void removed() { public void removed() {

4
src/client/java/cmods/haxxor/ui/OptionsSlideWidget.java → src/main/java/cmods/haxxor/client/ui/OptionsSlideWidget.java
View File

@ -1,6 +1,6 @@
package cmods.haxxor.ui; package cmods.haxxor.client.ui;
import cmods.cmods.options.IntegerOption; import cmods.cmods.client.options.IntegerOption;
import net.minecraft.client.gui.widget.SliderWidget; import net.minecraft.client.gui.widget.SliderWidget;
import net.minecraft.text.Text; import net.minecraft.text.Text;

24
src/client/java/cmods/haxxor/ui/UIOptionsScreen.java → src/main/java/cmods/haxxor/client/ui/UIOptionsScreen.java
View File

@ -1,17 +1,17 @@
package cmods.haxxor.ui; package cmods.haxxor.client.ui;
import cmods.cmods.options.CmodsOptions; import cmods.cmods.client.options.CmodsOptions;
import cmods.cmods.ui.ToggleButton; import cmods.cmods.client.ui.ToggleButton;
import cmods.haxxor.options.HaxxorOptions; import cmods.haxxor.client.options.HaxxorOptions;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.GridWidget; import net.minecraft.client.gui.widget.GridWidget;
import net.minecraft.client.gui.widget.SimplePositioningWidget; import net.minecraft.client.gui.widget.SimplePositioningWidget;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.screen.ScreenTexts; import net.minecraft.screen.ScreenTexts;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import static cmods.cmods.ui.Constants.*; import static cmods.cmods.client.ui.Constants.*;
public class UIOptionsScreen extends Screen { public class UIOptionsScreen extends Screen {
private final Screen parent; private final Screen parent;
@ -45,15 +45,15 @@ public class UIOptionsScreen extends Screen {
adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent)) adder.add(ButtonWidget.builder(ScreenTexts.DONE, button -> client.setScreen(parent))
.width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement)); .width(doneButtonWidth).build(), 2, adder.copyPositioner().marginTop(doneButtonRowIncrement));
grid.refreshPositions(); grid.recalculateDimensions();
SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f); SimplePositioningWidget.setPos(grid, 0, startHeight, this.width, this.height, 0.5f, 0.0f);
grid.forEachChild(this::addDrawableChild); addDrawableChild(grid);
} }
public void render(DrawContext context, int mouseX, int mouseY, float delta) { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
// this.renderBackground(context, mouseX, mouseY, delta); this.renderBackground(matrices);
super.render(context, mouseX, mouseY, delta); drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xffffff);
context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); super.render(matrices, mouseX, mouseY, delta);
} }
public void removed() { public void removed() {

22
src/main/resources/assets/haxxor/lang/en_us.json
View File

@ -10,9 +10,6 @@
"haxxor.actions.available": "Actions available", "haxxor.actions.available": "Actions available",
"haxxor.actions.unavailable": "Actions unavailable", "haxxor.actions.unavailable": "Actions unavailable",
"haxxor.message.elevator": "Teleporting to: [%.2f, %.2f, %.2f]",
"haxxor.message.elevator.too_far": "Too far!",
"haxxor.options": "Haxxor", "haxxor.options": "Haxxor",
"haxxor.options.title": "Haxxor Options", "haxxor.options.title": "Haxxor Options",
@ -37,22 +34,7 @@
"haxxor.options.farmer.crop_select.seeds": "Seeds to Plant", "haxxor.options.farmer.crop_select.seeds": "Seeds to Plant",
"haxxor.options.farmer.crop_select.blocks": "Crops to Break", "haxxor.options.farmer.crop_select.blocks": "Crops to Break",
"haxxor.options.elevator": "Elevator",
"haxxor.options.elevator.title": "Elevator Options",
"haxxor.options.elevator.too_far": "Too Far Message",
"haxxor.options.elevator.tp_message": "Teleport Message",
"haxxor.options.elevator.max_tp_up": "Max Tp Up",
"haxxor.options.elevator.max_tp_down": "Max Tp Down",
"haxxor.options.glow": "Glow",
"haxxor.options.glow.title": "Glow Options",
"haxxor.options.glow.enabled": "Glow: %s",
"haxxor.options.glow.include_non_living": "Include Non-Living",
"category.haxxor.options": "Haxxor", "category.haxxor.options": "Haxxor",
"key.haxxor.auto_farm": "Auto Farm", "key.haxxor.auto_farm": "Auto Farm Toggle",
"key.haxxor.fly": "Fly Hack", "key.haxxor.fly": "Fly Hack Toggle"
"key.haxxor.glow": "Global Glow",
"key.haxxor.elevator.up": "Teleport Up",
"key.haxxor.elevator.down": "Teleport Down"
} }

14
src/main/resources/fabric.mod.json
View File

@ -14,20 +14,16 @@
"icon": "assets/haxxor/icon.png", "icon": "assets/haxxor/icon.png",
"environment": "client", "environment": "client",
"entrypoints": { "entrypoints": {
"client": [ "client": ["cmods.haxxor.client.HaxxorClient"],
"cmods.haxxor.HaxxorClient" "modmenu": ["cmods.haxxor.client.ModMenuConfig"]
],
"modmenu": [
"cmods.haxxor.ModMenuConfig"
]
}, },
"mixins": [ "mixins": [
"haxxor.mixins.json" "haxxor.mixins.json"
], ],
"depends": { "depends": {
"fabricloader": ">=0.14.10", "fabricloader": ">=0.14.11",
"fabric": "*", "fabric": "*",
"minecraft": "1.21.0", "minecraft": "1.19.3",
"cmods": "1.2.2" "cmods": "1.0.0"
} }
} }

2
src/client/resources/haxxor.mixins.json → src/main/resources/haxxor.mixins.json
View File

@ -4,8 +4,6 @@
"package": "cmods.haxxor.mixin", "package": "cmods.haxxor.mixin",
"compatibilityLevel": "JAVA_17", "compatibilityLevel": "JAVA_17",
"mixins": [ "mixins": [
"GlobalGlow",
"GlobalGlowAll"
], ],
"client": [], "client": [],
"injectors": { "injectors": {