Skip to content

Commit 63f481a

Browse files
CrytoPalC10udburst
CrytoPal
and
C10udburst
authored
Update to 1.19.4 (Fixed) (#35)
* Add files via upload * Add files via upload * Update devbuild.yml --------- Co-authored-by: Cloudburst <[email protected]>
1 parent d3918fd commit 63f481a

File tree

14 files changed

+88
-84
lines changed

14 files changed

+88
-84
lines changed

‎.github/workflows/devbuild.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: devbuild
22

33
concurrency:
4-
group: "build-1.19.2"
4+
group: "build-1.19.4"
55
cancel-in-progress: true
66

77
on:
@@ -30,8 +30,8 @@ jobs:
3030
- uses: "marvinpinto/action-automatic-releases@latest"
3131
with:
3232
repo_token: "${{ secrets.GITHUB_TOKEN }}"
33-
automatic_release_tag: "latest-1.19.2"
33+
automatic_release_tag: "latest-1.19.4"
3434
prerelease: false
35-
title: "1.19.2 Build"
35+
title: "1.19.4 Build"
3636
files: |
3737
./build/libs/*.jar

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# How to use
2323
Download the [latest release](https://github.com/AntiCope/orion/releases/latest) and put it in your mods folder with Latest version of [Meteor Client](https://meteorclient.com)
2424

25-
Launch fabric loader for 1.18.x.
25+
Launch fabric loader for 1.19.x.
2626

2727
# Discord
2828
GhostTypes has retired from both Orion and Ion. Ion went to new ownership, and Orion has been left unmaintained.

‎build.gradle‎

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

55
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
@@ -26,7 +26,7 @@ dependencies {
2626
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
2727

2828
// Meteor
29-
modImplementation "meteordevelopment:meteor-client:${project.meteor_version}"
29+
modImplementation "meteordevelopment:meteor-client:${project.meteor_version}-SNAPSHOT"
3030

3131
// Required for loading logo hud element images
3232
modImplementation "net.fabricmc.fabric-api:fabric-resource-loader-v0:+"

‎gradle.properties‎

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

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

88
# Mod Properties
99
mod_version=0.1
1010
maven_group=meteordevelopment.addons
1111
archives_base_name=orion
1212

13-
meteor_version=0.5.2-SNAPSHOT
13+
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/me/ghosttypes/orion/modules/main/AnchorAura.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,12 +257,12 @@ private BlockPos findBreakPos(BlockPos targetPos) {
257257
return null;
258258
}
259259

260-
private boolean getDamagePlace(BlockPos pos) {
261-
return placeMode.get() == Safety.Suicide || DamageUtils.bedDamage(mc.player, Utils.vec3d(pos.add(0.5, 0.5, 0.5))) <= maxDamage.get();
260+
private boolean getDamagePlace(BlockPos pos) { // Thanks Crosby :)
261+
return placeMode.get() == Safety.Suicide || DamageUtils.bedDamage(mc.player, Utils.vec3d(pos).add(0.5, 0.5, 0.5)) <= maxDamage.get();
262262
}
263263

264-
private boolean getDamageBreak(BlockPos pos) {
265-
return breakMode.get() == Safety.Suicide || DamageUtils.anchorDamage(mc.player, Utils.vec3d(pos.add(0.5, 0.5, 0.5))) <= maxDamage.get();
264+
private boolean getDamageBreak(BlockPos pos) { // Thanks Crosby :)
265+
return breakMode.get() == Safety.Suicide || DamageUtils.anchorDamage(mc.player, Utils.vec3d(pos).add(0.5, 0.5, 0.5)) <= maxDamage.get();
266266
}
267267

268268
private boolean isValidPlace(BlockPos pos) {

‎src/main/java/me/ghosttypes/orion/modules/main/AutoBedCraft.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
import net.minecraft.client.gui.screen.recipebook.RecipeResultCollection;
1818
import net.minecraft.client.recipebook.RecipeBookGroup;
1919
import net.minecraft.item.BedItem;
20+
import net.minecraft.item.Item;
21+
import net.minecraft.item.Items;
2022
import net.minecraft.recipe.Recipe;
23+
import net.minecraft.registry.DynamicRegistryManager;
2124
import net.minecraft.screen.CraftingScreenHandler;
2225
import net.minecraft.screen.ScreenHandler;
2326
import net.minecraft.screen.slot.SlotActionType;
@@ -123,7 +126,7 @@ private void onTick(TickEvent.Post event) {
123126
List<RecipeResultCollection> recipeResultCollectionList = mc.player.getRecipeBook().getResultsForGroup(RecipeBookGroup.CRAFTING_MISC);
124127
for (RecipeResultCollection recipeResultCollection : recipeResultCollectionList) {
125128
for (Recipe<?> recipe : recipeResultCollection.getRecipes(true)) {
126-
if (recipe.getOutput().getItem() instanceof BedItem) {
129+
if (recipe.getOutput((DynamicRegistryManager) BedItem.BLOCK_ITEMS).getItem() instanceof BedItem) {
127130
assert mc.interactionManager != null;
128131
mc.interactionManager.clickRecipe(currentScreenHandler.syncId, recipe, false);
129132
windowClick(currentScreenHandler, 0, SlotActionType.QUICK_MOVE, 1);

‎src/main/java/me/ghosttypes/orion/modules/main/BedDisabler.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import net.minecraft.item.Items;
1717
import net.minecraft.util.math.BlockPos;
1818
import net.minecraft.util.math.Vec3d;
19+
import net.minecraft.util.math.Vec3i;
1920

2021
import java.util.ArrayList;
2122

@@ -36,9 +37,9 @@ public class BedDisabler extends Module {
3637
private int wpt, delayTimer;
3738

3839

39-
private final ArrayList<Vec3d> places = new ArrayList<Vec3d>() {{
40-
add(new Vec3d(0, 1, 0));
41-
add(new Vec3d(0, 2, 0));
40+
private final ArrayList<Vec3i> places = new ArrayList<Vec3i>() {{
41+
add(new Vec3i(0, 1, 0));
42+
add(new Vec3i(0, 2, 0));
4243
}};
4344

4445

@@ -79,12 +80,12 @@ private void onTick(TickEvent.Pre event) {
7980

8081
private void doPlace(FindItemResult string) {
8182
wpt = 0;
82-
ArrayList<Vec3d> p = new ArrayList<Vec3d>(places);
83-
if (!ignoreFeet.get()) p.add(new Vec3d(0, 0, 0));
83+
ArrayList<Vec3i> p = new ArrayList<>(places);
84+
if (!ignoreFeet.get()) p.add(new Vec3i(0, 0, 0));
8485
BlockPos ppos = mc.player.getBlockPos();
85-
for (Vec3d b: p) {
86+
for (Vec3i b: p) {
8687
if (wpt >= webPerTick.get()) break;
87-
BlockPos bb = ppos.add(b.x, b.y, b.z);
88+
BlockPos bb = ppos.add(b.getX(), b.getY(), b.getZ());
8889
BlockUtils.place(bb, string, 50, false);
8990
wpt++;
9091
}

‎src/main/java/me/ghosttypes/orion/modules/main/SelfTrapPlus.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import net.minecraft.block.Blocks;
1818
import net.minecraft.item.Items;
1919
import net.minecraft.util.math.BlockPos;
20-
import net.minecraft.util.math.Vec3d;
20+
import net.minecraft.util.math.Vec3i;
2121

2222
import java.util.ArrayList;
2323
import java.util.List;
@@ -56,19 +56,19 @@ public enum modes {
5656
private BlockPos startPos;
5757
private int bpt;
5858

59-
private final ArrayList<Vec3d> full = new ArrayList<Vec3d>() {{
60-
add(new Vec3d(0, 2, 0));
61-
add(new Vec3d(1, 1, 0));
62-
add(new Vec3d(-1, 1, 0));
63-
add(new Vec3d(0, 1, 1));
64-
add(new Vec3d(0, 1, -1));
59+
private final ArrayList<Vec3i> full = new ArrayList<Vec3i>() {{
60+
add(new Vec3i(0, 2, 0));
61+
add(new Vec3i(1, 1, 0));
62+
add(new Vec3i(-1, 1, 0));
63+
add(new Vec3i(0, 1, 1));
64+
add(new Vec3i(0, 1, -1));
6565
}};
6666

67-
private final ArrayList<Vec3d> antiFacePlace = new ArrayList<Vec3d>() {{
68-
add(new Vec3d(1, 1, 0));
69-
add(new Vec3d(-1, 1, 0));
70-
add(new Vec3d(0, 1, 1));
71-
add(new Vec3d(0, 1, -1));
67+
private final ArrayList<Vec3i> antiFacePlace = new ArrayList<Vec3i>() {{
68+
add(new Vec3i(1, 1, 0));
69+
add(new Vec3i(-1, 1, 0));
70+
add(new Vec3i(0, 1, 1));
71+
add(new Vec3i(0, 1, -1));
7272
}};
7373

7474

@@ -92,10 +92,10 @@ private void onTick(TickEvent.Pre event) {
9292
if (BlockHelper.isVecComplete(getTrapDesign()) && turnOff.get()) { info("Finished self trap."); toggle(); return;}
9393
if (toggleOnMove.get() && startPos != mc.player.getBlockPos()) { toggle(); return; }
9494
if (onlyInHole.get() && !Wrapper.isInHole(mc.player)) { toggle(); return; }
95-
for (Vec3d b : getTrapDesign()) {
95+
for (Vec3i b : getTrapDesign()) {
9696
if (bpt >= blockPerTick.get()) return;
9797
BlockPos ppos = mc.player.getBlockPos();
98-
BlockPos bb = ppos.add(b.x, b.y, b.z);
98+
BlockPos bb = ppos.add(b.getX(), b.getY(), b.getZ());
9999
if (BlockHelper.getBlock(bb) == Blocks.AIR) {
100100
BlockUtils.place(bb, obsidian, rotate.get(), 100, true);
101101
bpt++;
@@ -106,21 +106,21 @@ private void onTick(TickEvent.Pre event) {
106106
@EventHandler
107107
private void onRender(Render3DEvent event) {
108108
if (!render.get() || BlockHelper.isVecComplete(getTrapDesign())) return;
109-
for (Vec3d b: getTrapDesign()) {
109+
for (Vec3i b: getTrapDesign()) {
110110
BlockPos ppos = mc.player.getBlockPos();
111-
BlockPos bb = ppos.add(b.x, b.y, b.z);
111+
BlockPos bb = ppos.add(b.getX(), b.getY(), b.getZ());
112112
if (BlockHelper.getBlock(bb) == Blocks.AIR) event.renderer.box(bb, sideColor.get(), lineColor.get(), shapeMode.get(), 0);
113113
}
114114
}
115115

116-
private ArrayList<Vec3d> getTrapDesign() {
117-
ArrayList<Vec3d> trapDesign = new ArrayList<Vec3d>();
116+
private ArrayList<Vec3i> getTrapDesign() {
117+
ArrayList<Vec3i> trapDesign = new ArrayList<Vec3i>();
118118
switch (mode.get()) {
119119
case Full -> { trapDesign.addAll(full); }
120-
case Top -> { trapDesign.add(new Vec3d(0, 2, 0)); }
120+
case Top -> { trapDesign.add(new Vec3i(0, 2, 0)); }
121121
case AntiFacePlace -> { trapDesign.addAll(antiFacePlace); }
122122
}
123-
if (antiCev.get()) { trapDesign.add(new Vec3d(0, 3, 0));}
123+
if (antiCev.get()) { trapDesign.add(new Vec3i(0, 3, 0));}
124124
return trapDesign;
125125
}
126126
}

‎src/main/java/me/ghosttypes/orion/modules/main/SurroundPlus.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket;
2121
import net.minecraft.util.Hand;
2222
import net.minecraft.util.math.BlockPos;
23-
import net.minecraft.util.math.Vec3d;
23+
import net.minecraft.util.math.Vec3i;
2424

2525
import java.util.ArrayList;
2626
import java.util.Collections;
@@ -51,18 +51,18 @@ public class SurroundPlus extends Module {
5151
private final Setting<SettingColor> sideColor = sgRender.add(new ColorSetting.Builder().name("side-color").description("The side color.").defaultValue(new SettingColor(15, 255, 211,75)).build());
5252
private final Setting<SettingColor> lineColor = sgRender.add(new ColorSetting.Builder().name("line-color").description("The line color.").defaultValue(new SettingColor(15, 255, 211)).build());
5353

54-
private final ArrayList<Vec3d> surr = new ArrayList<Vec3d>() {{
55-
add(new Vec3d(1, 0, 0));
56-
add(new Vec3d(-1, 0, 0));
57-
add(new Vec3d(0, 0, 1));
58-
add(new Vec3d(0, 0, -1));
54+
private final ArrayList<Vec3i> surr = new ArrayList<Vec3i>() {{
55+
add(new Vec3i(1, 0, 0));
56+
add(new Vec3i(-1, 0, 0));
57+
add(new Vec3i(0, 0, 1));
58+
add(new Vec3i(0, 0, -1));
5959
}};
6060

61-
private final ArrayList<Vec3d> surrDouble = new ArrayList<Vec3d>() {{
62-
add(new Vec3d(1, 1, 0));
63-
add(new Vec3d(-1, 1, 0));
64-
add(new Vec3d(0, 1, 1));
65-
add(new Vec3d(0, 1, -1));
61+
private final ArrayList<Vec3i> surrDouble = new ArrayList<Vec3i>() {{
62+
add(new Vec3i(1, 1, 0));
63+
add(new Vec3i(-1, 1, 0));
64+
add(new Vec3i(0, 1, 1));
65+
add(new Vec3i(0, 1, -1));
6666
}};
6767

6868

@@ -88,9 +88,9 @@ private void onTick(TickEvent.Pre event) {
8888
}
8989
} else {
9090
BlockPos ppos = mc.player.getBlockPos();
91-
for (Vec3d b : getSurrDesign()) {
91+
for (Vec3i b : getSurrDesign()) {
9292
if (bpt >= blockPerTick.get()) return;
93-
BlockPos bb = ppos.add(b.x, b.y, b.z);
93+
BlockPos bb = ppos.add(b.getX(), b.getY(), b.getZ());
9494
if (BlockHelper.getBlock(bb) == Blocks.AIR) {
9595
if (placeInside.get()) {
9696
BlockUtils.place(bb, InvUtils.findInHotbar(itemStack -> blocks.get().contains(Block.getBlockFromItem(itemStack.getItem()))), rotation.get(), 100, false);
@@ -115,16 +115,16 @@ private void onTick(TickEvent.Pre event) {
115115
}
116116
}
117117

118-
private ArrayList<Vec3d> getSurrDesign() {
119-
ArrayList<Vec3d> surrDesign = new ArrayList<Vec3d>(surr);
118+
private ArrayList<Vec3i> getSurrDesign() {
119+
ArrayList<Vec3i> surrDesign = new ArrayList<Vec3i>(surr);
120120
if (useDouble.get()) surrDesign.addAll(surrDouble);
121121
return surrDesign;
122122
}
123123

124124
private boolean isDangerousCrystal(BlockPos bp) {
125125
BlockPos ppos = mc.player.getBlockPos();
126-
for (Vec3d b : getSurrDesign()) {
127-
BlockPos bb = ppos.add(b.x, b.y, b.z);
126+
for (Vec3i b : getSurrDesign()) {
127+
BlockPos bb = ppos.add(b.getX(), b.getY(), b.getZ());
128128
if (!bp.equals(bb) && BlockHelper.distanceBetween(bb, bp) <= 2) return true;
129129
}
130130
return false;
@@ -143,8 +143,8 @@ private boolean blockFilter(Block block) {
143143
private void onRender(Render3DEvent event) {
144144
if (render.get()) {
145145
BlockPos ppos = mc.player.getBlockPos();
146-
for (Vec3d b: getSurrDesign()) {
147-
BlockPos bb = ppos.add(b.x, b.y, b.z);
146+
for (Vec3i b: getSurrDesign()) {
147+
BlockPos bb = ppos.add( b.getX(), b.getY(), b.getZ());
148148
if (BlockHelper.getBlock(bb) == Blocks.AIR) event.renderer.box(bb, sideColor.get(), lineColor.get(), shapeMode.get(), 0);
149149
if (alwaysRender.get()) event.renderer.box(bb, sideColor.get(), lineColor.get(), shapeMode.get(), 0);
150150
}

0 commit comments

Comments
 (0)