Skip to content
This repository was archived by the owner on Mar 10, 2025. It is now read-only.

Commit 299c7ce

Browse files
RedCarlos26RedCarlos26
committed
Update to 1.19.4
1 parent b216e1d commit 299c7ce

17 files changed

Lines changed: 94 additions & 84 deletions

‎.github/workflows/dev_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
repo_token: '${{ secrets.GITHUB_TOKEN }}'
1919
automatic_release_tag: latest
2020
prerelease: false
21-
title: 1.19.3 Build
21+
title: 1.19.4 Build
2222
files: |
2323
./build/libs/*.jar

‎build.gradle‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '1.0-SNAPSHOT'
2+
id 'fabric-loom' version '1.1-SNAPSHOT'
33
}
44

55
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
@@ -9,20 +9,23 @@ version = project.mod_version
99
group = project.maven_group
1010

1111
repositories {
12-
maven { url "https://maven.meteordev.org/releases"}
13-
maven { url "https://maven.meteordev.org/snapshots" }
1412
mavenCentral()
1513
mavenLocal()
14+
maven { url "https://maven.meteordev.org/releases"}
15+
maven { url "https://maven.meteordev.org/snapshots" }
16+
}
17+
18+
loom {
19+
accessWidenerPath = file("src/main/resources/fartenware.accesswidener")
1620
}
1721

1822
dependencies {
19-
// Fabric
2023
minecraft "com.mojang:minecraft:${project.minecraft_version}"
2124
mappings "net.fabricmc:yarn:${project.yarn_version}:v2"
2225
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
2326

24-
// Meteor
25-
modImplementation "meteordevelopment:meteor-client:${project.meteor_version}"
27+
modImplementation "meteordevelopment:meteor-client:${project.meteor_version}-SNAPSHOT"
28+
modImplementation "baritone:fabric:${project.minecraft_version}-SNAPSHOT"
2629
}
2730

2831
processResources {

‎gradle.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
org.gradle.jvmargs=-Xmx2G
22

3-
# Fabric (https://fabricmc.net/versions.html)
4-
minecraft_version=1.19.3
5-
yarn_version=1.19.3+build.5
6-
loader_version=0.14.12
3+
# Fabric Properties (https://fabricmc.net/develop/)
4+
minecraft_version=1.19.4
5+
yarn_version=1.19.4+build.1
6+
loader_version=0.14.19
77

88
# Mod Properties
9-
mod_version=1.0
9+
mod_version=1.1
1010
maven_group=fartenware.package
1111
archives_base_name=fartenware
1212

1313
# Meteor (https://maven.meteordev.org/)
14-
meteor_version=0.5.2-SNAPSHOT
14+
meteor_version=0.5.3

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/java/fartenware/systems/FartenWare.java renamed to src/main/java/fartenware/FartenWare.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package fartenware.systems;
1+
package fartenware;
22

3-
import fartenware.systems.hud.*;
4-
import fartenware.systems.modules.main.BedrockBreaker;
5-
import fartenware.systems.modules.main.EchestFarmerPlus;
6-
import fartenware.systems.modules.main.ItemFrameInserter;
7-
import fartenware.systems.modules.main.ItemFramePlacer;
3+
import fartenware.modules.hud.TextPresets;
4+
import fartenware.modules.main.BedrockBreaker;
5+
import fartenware.modules.main.EchestFarmerPlus;
6+
import fartenware.modules.main.ItemFrameInserter;
7+
import fartenware.modules.main.ItemFramePlacer;
88
import meteordevelopment.meteorclient.MeteorClient;
99
import meteordevelopment.meteorclient.addons.MeteorAddon;
1010
import meteordevelopment.meteorclient.systems.Systems;
@@ -15,13 +15,12 @@
1515
import meteordevelopment.meteorclient.systems.modules.Modules;
1616
import meteordevelopment.meteorclient.utils.misc.MeteorStarscript;
1717
import meteordevelopment.starscript.value.ValueMap;
18-
1918
import net.fabricmc.loader.api.FabricLoader;
2019
import net.fabricmc.loader.api.metadata.ModMetadata;
2120
import net.minecraft.item.Items;
22-
2321
import org.slf4j.Logger;
2422
import org.slf4j.LoggerFactory;
23+
2524
import java.lang.invoke.MethodHandles;
2625

2726
public class FartenWare extends MeteorAddon {

‎src/main/java/fartenware/mixins/McClientMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fartenware.mixins;
22

3-
import fartenware.systems.modules.main.BedrockBreaker;
3+
import fartenware.modules.main.BedrockBreaker;
44
import meteordevelopment.meteorclient.systems.modules.Modules;
55
import net.minecraft.block.Blocks;
66
import net.minecraft.client.MinecraftClient;

src/main/java/fartenware/systems/hud/TextPresets.java renamed to src/main/java/fartenware/modules/hud/TextPresets.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package fartenware.systems.hud;
1+
package fartenware.modules.hud;
22

3-
import fartenware.systems.FartenWare;
3+
import fartenware.FartenWare;
44
import meteordevelopment.meteorclient.systems.hud.HudElementInfo;
55
import meteordevelopment.meteorclient.systems.hud.elements.TextHud;
66

src/main/java/fartenware/systems/modules/main/BedrockBreaker.java renamed to src/main/java/fartenware/modules/main/BedrockBreaker.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
package fartenware.systems.modules.main;
1+
package fartenware.modules.main;
22

3-
import fartenware.systems.FartenWare;
3+
import fartenware.FartenWare;
44
import fartenware.utils.bedrock.InventoryManager;
55
import fartenware.utils.bedrock.Messager;
66
import fartenware.utils.bedrock.TargetBlock;
77
import meteordevelopment.meteorclient.events.world.TickEvent;
8-
import meteordevelopment.meteorclient.settings.*;
8+
import meteordevelopment.meteorclient.settings.BoolSetting;
9+
import meteordevelopment.meteorclient.settings.ModuleListSetting;
10+
import meteordevelopment.meteorclient.settings.Setting;
11+
import meteordevelopment.meteorclient.settings.SettingGroup;
912
import meteordevelopment.meteorclient.systems.modules.Module;
1013
import meteordevelopment.meteorclient.systems.modules.Modules;
1114
import meteordevelopment.meteorclient.systems.modules.misc.AntiPacketKick;
@@ -146,7 +149,7 @@ private static boolean blockInPlayerRange(BlockPos blockPos, PlayerEntity player
146149
return blockPos.isWithinDistance(player.getPos(), range);
147150
}
148151

149-
private static boolean shouldAddNewTargetBlock(BlockPos pos){
152+
private static boolean shouldAddNewTargetBlock(BlockPos pos) {
150153
for (TargetBlock breaker : cachedTargetBlockList) {
151154
if (breaker.getBlockPos().getManhattanDistance(pos) == 0) {
152155
return false;

src/main/java/fartenware/systems/modules/main/EchestFarmerPlus.java renamed to src/main/java/fartenware/modules/main/EchestFarmerPlus.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package fartenware.systems.modules.main;
1+
package fartenware.modules.main;
22

3-
import fartenware.systems.FartenWare;
4-
import fartenware.utils.FWorldUtils;
53
import baritone.api.BaritoneAPI;
64
import baritone.api.IBaritone;
75
import baritone.api.pathing.goals.GoalBlock;
6+
import fartenware.FartenWare;
7+
import fartenware.utils.FartenUtils;
88
import meteordevelopment.meteorclient.events.render.Render3DEvent;
99
import meteordevelopment.meteorclient.events.world.TickEvent;
1010
import meteordevelopment.meteorclient.renderer.ShapeMode;
@@ -121,7 +121,7 @@ public void onDeactivate() {
121121

122122
@EventHandler
123123
private void onTick(TickEvent.Pre event) {
124-
if (!InvUtils.find(Items.OBSIDIAN).found()){
124+
if (!InvUtils.find(Items.OBSIDIAN).found()) {
125125
if (baritone.getPathingBehavior().isPathing()) baritone.getCommandManager().execute("pause");
126126
needsTo = true;
127127
target = null;
@@ -146,16 +146,14 @@ private void onTick(TickEvent.Pre event) {
146146
return;
147147
}
148148

149-
if (mc.player.getBlockPos().equals(target) && pickingUp){
149+
if (mc.player.getBlockPos().equals(target) && pickingUp) {
150150
needsTo = false;
151151
target = null;
152152
pickingUp = false;
153153
ChatUtils.sendPlayerMsg(baritoneCommand.get());
154154
return;
155155
}
156156

157-
158-
159157
// Break existing echest at target pos
160158
if (mc.world.getBlockState(target).getBlock() == Blocks.ENDER_CHEST && needsTo && !pickingUp) {
161159
double bestScore = -1;
@@ -193,10 +191,9 @@ private void onTick(TickEvent.Pre event) {
193191
}
194192
}
195193

196-
197-
private BlockPos findSpot(){
198-
for(BlockPos pos : FWorldUtils.getSphere(mc.player.getBlockPos(),1,1)){
199-
if (mc.world.getBlockState(pos).isReplaceable() || pos != mc.player.getBlockPos()){
194+
private BlockPos findSpot() {
195+
for (BlockPos pos : FartenUtils.getSphere(mc.player.getBlockPos(), 1, 1)) {
196+
if (mc.world.getBlockState(pos).isReplaceable() || pos != mc.player.getBlockPos()) {
200197
return pos;
201198
}
202199
}

src/main/java/fartenware/systems/modules/main/ItemFrameInserter.java renamed to src/main/java/fartenware/modules/main/ItemFrameInserter.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package fartenware.systems.modules.main;
1+
package fartenware.modules.main;
22

3-
import fartenware.systems.FartenWare;
3+
import fartenware.FartenWare;
44
import meteordevelopment.meteorclient.events.world.TickEvent;
55
import meteordevelopment.meteorclient.settings.BoolSetting;
66
import meteordevelopment.meteorclient.settings.IntSetting;
77
import meteordevelopment.meteorclient.settings.Setting;
88
import meteordevelopment.meteorclient.settings.SettingGroup;
9-
import meteordevelopment.meteorclient.systems.modules.Categories;
109
import meteordevelopment.meteorclient.systems.modules.Module;
1110
import meteordevelopment.meteorclient.utils.player.Rotations;
1211
import meteordevelopment.orbit.EventHandler;
@@ -16,7 +15,7 @@
1615
import net.minecraft.util.math.BlockPos;
1716
import net.minecraft.util.math.MathHelper;
1817

19-
public class ItemFrameInserter extends Module{
18+
public class ItemFrameInserter extends Module {
2019
private final SettingGroup sgGeneral = settings.getDefaultGroup();
2120

2221
private final Setting<Integer> distance = sgGeneral.add(new IntSetting.Builder()
@@ -34,9 +33,10 @@ public class ItemFrameInserter extends Module{
3433
.name("delay")
3534
.description("delay between places")
3635
.defaultValue(2)
37-
.range(0,20)
36+
.range(0, 20)
3837
.build()
3938
);
39+
4040
private final Setting<Boolean> rotate = sgGeneral.add(new BoolSetting.Builder()
4141
.name("rotate")
4242
.description("Whether or not to rotate when placing.")
@@ -45,39 +45,39 @@ public class ItemFrameInserter extends Module{
4545
);
4646

4747
public ItemFrameInserter() {
48-
super(FartenWare.MAIN,"item-frame-inserter", "Places currently held item into item frame.");
48+
super(FartenWare.MAIN, "item-frame-inserter", "Places currently held item into item frame.");
4949
}
5050

5151
int timer = 0;
5252

5353
@Override
54-
public void onActivate(){
54+
public void onActivate() {
5555
timer = 0;
5656
}
5757

5858
@Override
59-
public void onDeactivate(){
59+
public void onDeactivate() {
6060
timer = 0;
6161
}
6262

6363
@EventHandler
64-
public void onTick(TickEvent.Pre event){
64+
public void onTick(TickEvent.Pre event) {
6565

66-
if (timer < delay.get()){
66+
if (timer < delay.get()) {
6767
timer++;
6868
return;
6969
}
7070

7171
for (Entity entity : mc.world.getEntities()) {
7272
if (!(entity instanceof ItemFrameEntity)) continue;
73-
BlockPos entityPos = new BlockPos(Math.floor(entity.getPos().x), Math.floor(entity.getPos().y), Math.floor(entity.getPos().z));
74-
if (distanceBetween(entityPos,mc.player.getBlockPos()) > distance.get()) continue;
73+
BlockPos entityPos = new BlockPos(MathHelper.floor(entity.getPos().x), MathHelper.floor(entity.getPos().y), MathHelper.floor(entity.getPos().z));
74+
if (distanceBetween(entityPos, mc.player.getBlockPos()) > distance.get()) continue;
7575
if (!((ItemFrameEntity) entity).getHeldItemStack().isEmpty()) continue;
7676

77-
if (rotate.get()){
78-
Rotations.rotate(Rotations.getYaw(entity),Rotations.getPitch(entity),() -> mc.interactionManager.interactEntity(mc.player,entity,Hand.MAIN_HAND));
79-
}else{
80-
mc.interactionManager.interactEntity(mc.player,entity,Hand.MAIN_HAND);
77+
if (rotate.get()) {
78+
Rotations.rotate(Rotations.getYaw(entity), Rotations.getPitch(entity), () -> mc.interactionManager.interactEntity(mc.player, entity, Hand.MAIN_HAND));
79+
} else {
80+
mc.interactionManager.interactEntity(mc.player, entity, Hand.MAIN_HAND);
8181
}
8282
timer = 0;
8383
return;

0 commit comments

Comments
 (0)