Skip to content

Commit

Permalink
Update to 1.21.4 + New Meteor version format
Browse files Browse the repository at this point in the history
  • Loading branch information
RedCarlos26 committed Jan 13, 2025
1 parent 2a811f3 commit 56ac8f8
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 33 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
modImplementation("net.fabricmc:fabric-loader:${project.property("loader_version")}")

// Meteor
modImplementation("meteordevelopment:meteor-client:${project.property("meteor_version")}")
modImplementation("meteordevelopment:meteor-client:${project.property("minecraft_version")}-SNAPSHOT")
}

tasks {
Expand Down
9 changes: 3 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
org.gradle.jvmargs=-Xmx2G

# Fabric Properties (https://fabricmc.net/develop/)
minecraft_version=1.21.3
yarn_mappings=1.21.3+build.2
loader_version=0.16.9
minecraft_version=1.21.4
yarn_mappings=1.21.4+build.8
loader_version=0.16.10

# Mod Properties
mod_version=2.9.2
maven_group=higtools.package
archives_base_name=HIGTools

# Meteor (https://maven.meteordev.org/)
meteor_version=0.5.9-SNAPSHOT
7 changes: 4 additions & 3 deletions src/main/java/me/redcarlos/higtools/mixins/RotationMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@

@Mixin(value = Rotation.class, remap = false)
public abstract class RotationMixin extends Module {
@Unique private Setting<Boolean> toggleOnLeave;
@Unique
private Setting<Boolean> toggleOnLeave;

@Inject(method = "<init>", at=@At("TAIL"))
@Inject(method = "<init>", at = @At("TAIL"))
private void onInit(CallbackInfo ci) {
SettingGroup sgGeneral = settings.getDefaultGroup();

toggleOnLeave = sgGeneral.add(new BoolSetting.Builder()
toggleOnLeave = sgGeneral.add(new BoolSetting.Builder()
.name("toggle-on-leave")
.description("Toggle the module off when you leave a world.")
.defaultValue(false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1203,6 +1203,7 @@ protected int findBlocksToPlacePrioritizeTrash(HighwayBuilderHIG b) {

private interface MBPIterator extends Iterator<MBlockPos>, Iterable<MBlockPos> {
void save();

void restore();

@NotNull
Expand Down Expand Up @@ -1265,9 +1266,13 @@ public MBlockPos next() {

private interface IBlockPosProvider {
MBPIterator getFront();

MBPIterator getFloor();

MBPIterator getRailings(boolean mine);

MBPIterator getLiquids();

MBPIterator getEChestBlockade(boolean mine);
}

Expand Down
42 changes: 21 additions & 21 deletions src/main/java/me/redcarlos/higtools/modules/main/HighwayTools.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,27 @@ public class HighwayTools extends Module {
);

/**
private final Setting<Boolean> toggleModules = sgGeneral.add(new BoolSetting.Builder()
.name("toggle-modules")
.description("Turn on these modules when HighwayTools is activated.")
.defaultValue(true)
.build()
);
private final Setting<Boolean> toggleBack = sgGeneral.add(new BoolSetting.Builder()
.name("toggle-back-off")
.description("Turn the other modules back on when HighwayTools is deactivated.")
.defaultValue(true)
.visible(toggleModules::get)
.build()
);
private final Setting<List<Module>> moduleList = sgGeneral.add(new ModuleListSetting.Builder()
.name("modules")
.description("Which modules to enable.")
.visible(toggleModules::get)
.build()
);
* private final Setting<Boolean> toggleModules = sgGeneral.add(new BoolSetting.Builder()
* .name("toggle-modules")
* .description("Turn on these modules when HighwayTools is activated.")
* .defaultValue(true)
* .build()
* );
* <p>
* private final Setting<Boolean> toggleBack = sgGeneral.add(new BoolSetting.Builder()
* .name("toggle-back-off")
* .description("Turn the other modules back on when HighwayTools is deactivated.")
* .defaultValue(true)
* .visible(toggleModules::get)
* .build()
* );
* <p>
* private final Setting<List<Module>> moduleList = sgGeneral.add(new ModuleListSetting.Builder()
* .name("modules")
* .description("Which modules to enable.")
* .visible(toggleModules::get)
* .build()
* );
*/

private final Setting<Boolean> axisToggle = sgGeneral.add(new BoolSetting.Builder()
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/redcarlos/higtools/system/HIGSystem.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class HIGSystem extends System<HIGSystem> {
public final Setting<SettingColor> prefixColor = sgPrefix.add(new ColorSetting.Builder()
.name("prefix-color")
.description("Color display for the prefix.")
.defaultValue(new SettingColor(145,61,226, 255))
.defaultValue(new SettingColor(145, 61, 226, 255))
.onChanged(p -> ChatUtils.registerCustomPrefix("me.redcarlos.higtools", this::getPrefix))
.build()
);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"depends": {
"java": ">=21",
"minecraft": ["1.21.2", "${minecraft_version}"],
"minecraft": "${minecraft_version}",
"fabricloader": ">=${loader_version}",
"meteor-client": ">0.5.8"
}
Expand Down

0 comments on commit 56ac8f8

Please sign in to comment.