Skip to content

Commit 8848c65

Browse files
RedCarlos26RedCarlos26
committed
1.21.5 update
1 parent fda963b commit 8848c65

3 files changed

Lines changed: 29 additions & 28 deletions

File tree

‎gradle.properties‎

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

33
# Fabric Properties (https://fabricmc.net/develop/)
4-
minecraft_version=1.21.4
5-
yarn_mappings=1.21.4+build.8
6-
loader_version=0.16.10
4+
minecraft_version=1.21.5
5+
yarn_mappings=1.21.5+build.1
6+
loader_version=0.16.12
77

88
# Mod Properties
99
mod_version=2.11.0

‎src/main/java/me/redcarlos/higtools/modules/main/HighwayBuilderHIG.java‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import net.minecraft.item.*;
5454
import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
5555
import net.minecraft.network.packet.s2c.play.InventoryS2CPacket;
56+
import net.minecraft.registry.tag.ItemTags;
5657
import net.minecraft.text.MutableText;
5758
import net.minecraft.text.Text;
5859
import net.minecraft.util.Formatting;
@@ -611,10 +612,10 @@ private void onTick(TickEvent.Pre event) {
611612
@EventHandler
612613
private void onPacket(PacketEvent.Receive event) {
613614
if (event.packet instanceof InventoryS2CPacket p) {
614-
if (p.getSyncId() == 0 && suspended)
615+
if (p.syncId() == 0 && suspended)
615616
inventory = true;
616617
else
617-
this.syncId = p.getSyncId();
618+
this.syncId = p.syncId();
618619
}
619620
}
620621

@@ -1121,7 +1122,7 @@ protected void tick(HighwayBuilderHIG b) {
11211122
protected void start(HighwayBuilderHIG b) {
11221123
int biggestCount = 0;
11231124

1124-
for (int i = 0; i < b.mc.player.getInventory().main.size(); i++) {
1125+
for (int i = 0; i < b.mc.player.getInventory().getMainStacks().size(); i++) {
11251126
ItemStack itemStack = b.mc.player.getInventory().getStack(i);
11261127

11271128
if (itemStack.getItem() instanceof BlockItem && b.trashItems.get().contains(itemStack.getItem()) && itemStack.getCount() > biggestCount) {
@@ -1160,7 +1161,7 @@ protected void tick(HighwayBuilderHIG b) {
11601161
return;
11611162
}
11621163

1163-
for (int i = 0; i < b.mc.player.getInventory().main.size(); i++) {
1164+
for (int i = 0; i < b.mc.player.getInventory().getMainStacks().size(); i++) {
11641165
if (i == skipSlot) continue;
11651166

11661167
ItemStack itemStack = b.mc.player.getInventory().getStack(i);
@@ -1179,7 +1180,7 @@ protected void tick(HighwayBuilderHIG b) {
11791180
eject = false;
11801181
break;
11811182
}
1182-
if (stack.getItem() instanceof PickaxeItem) {
1183+
if (stack.isIn(ItemTags.PICKAXES)) {
11831184
eject = false;
11841185
break;
11851186
}
@@ -1242,7 +1243,7 @@ else if (b.lastState == ThrowOutTrash) {
12421243
}
12431244

12441245
int emptySlots = 0;
1245-
for (int i = 0; i < b.mc.player.getInventory().main.size(); i++) {
1246+
for (int i = 0; i < b.mc.player.getInventory().getMainStacks().size(); i++) {
12461247
if (b.mc.player.getInventory().getStack(i).isEmpty()) emptySlots++;
12471248
}
12481249

@@ -1290,7 +1291,7 @@ protected void tick(HighwayBuilderHIG b) {
12901291
}
12911292
}
12921293

1293-
for (int i = 0; i < b.mc.player.getInventory().main.size(); i++) {
1294+
for (int i = 0; i < b.mc.player.getInventory().getMainStacks().size(); i++) {
12941295
ItemStack itemStack = b.mc.player.getInventory().getStack(i);
12951296
if (itemStack.getItem() == Items.OBSIDIAN) obsidianCount += itemStack.getCount();
12961297
}
@@ -1371,7 +1372,7 @@ protected void tick(HighwayBuilderHIG b) {
13711372
return;
13721373
}
13731374

1374-
if (countItem(b, stack -> stack.getItem() instanceof PickaxeItem) <= b.savePickaxes.get()) {
1375+
if (countItem(b, stack -> stack.isIn(ItemTags.PICKAXES)) <= b.savePickaxes.get()) {
13751376
if (b.searchEnderChest.get() || b.searchShulkers.get()) {
13761377
b.restockTask.setPickaxes();
13771378
}
@@ -1438,7 +1439,7 @@ else if (b.lastState == Center) {
14381439
break;
14391440
}
14401441
}
1441-
if (b.restockTask.pickaxes && stack.getItem() instanceof PickaxeItem) {
1442+
if (b.restockTask.pickaxes && stack.isIn(ItemTags.PICKAXES)) {
14421443
stop = false;
14431444
break;
14441445
}
@@ -1461,7 +1462,7 @@ else if (b.lastState == Center) {
14611462
if (slot == -1) {
14621463
boolean restockOccurred = (
14631464
(b.restockTask.materials && (hasItem(b, stack -> stack.getItem() instanceof BlockItem bi && b.blocksToPlace.get().contains(bi.getBlock())) || b.blocksToPlace.get().contains(Blocks.OBSIDIAN) && countItem(b, itemStack -> itemStack.getItem() == Items.ENDER_CHEST) > b.saveEchests.get())) ||
1464-
(b.restockTask.pickaxes && countItem(b, itemStack -> itemStack.getItem() instanceof PickaxeItem) > b.savePickaxes.get()) ||
1465+
(b.restockTask.pickaxes && countItem(b, itemStack -> itemStack.isIn(ItemTags.PICKAXES)) > b.savePickaxes.get()) ||
14651466
(b.restockTask.food && hasItem(b, itemStack -> itemStack.contains(DataComponentTypes.FOOD) && !Modules.get().get(AutoEat.class).blacklist.get().contains(itemStack.getItem())))
14661467
);
14671468

@@ -1473,7 +1474,7 @@ else if (b.lastState == Center) {
14731474
}
14741475

14751476
int restockSlots = -b.minEmpty.get();
1476-
for (int i = 0; i < b.mc.player.getInventory().main.size(); i++) {
1477+
for (int i = 0; i < b.mc.player.getInventory().getMainStacks().size(); i++) {
14771478
if (b.mc.player.getInventory().getStack(i).isEmpty()) restockSlots++;
14781479
}
14791480

@@ -1535,7 +1536,7 @@ protected void tick(HighwayBuilderHIG b) {
15351536
slotsPulled += countSlots(b, itemStack -> itemStack.getItem() instanceof BlockItem bi && b.blocksToPlace.get().contains(bi.getBlock()));
15361537
if (b.blocksToPlace.get().contains(Blocks.OBSIDIAN)) slotsPulled += ((countItem(b, itemStack -> itemStack.getItem() == Items.ENDER_CHEST) - b.saveEchests.get()) * 8) / 64;
15371538
}
1538-
if (b.restockTask.pickaxes) slotsPulled += countSlots(b, itemStack -> itemStack.getItem() instanceof PickaxeItem) - b.savePickaxes.get();
1539+
if (b.restockTask.pickaxes) slotsPulled += countSlots(b, itemStack -> itemStack.isIn(ItemTags.PICKAXES)) - b.savePickaxes.get();
15391540
if (b.restockTask.food) slotsPulled += countSlots(b, itemStack -> itemStack.contains(DataComponentTypes.FOOD) && !Modules.get().get(AutoEat.class).blacklist.get().contains(itemStack.getItem()));
15401541

15411542

@@ -1649,7 +1650,7 @@ private boolean restockItems(HighwayBuilderHIG b, Inventory inv) {
16491650
}
16501651
}
16511652
if (b.restockTask.pickaxes) {
1652-
if (grabFromInventory(inv, itemStack -> itemStack.getItem() instanceof PickaxeItem)) return true;
1653+
if (grabFromInventory(inv, itemStack -> itemStack.isIn(ItemTags.PICKAXES))) return true;
16531654
}
16541655
if (b.restockTask.food) {
16551656
return grabFromInventory(inv, itemStack -> itemStack.contains(DataComponentTypes.FOOD) && !Modules.get().get(AutoEat.class).blacklist.get().contains(itemStack.getItem()));
@@ -1679,7 +1680,7 @@ private void setShulkerPredicate(HighwayBuilderHIG b) {
16791680
if (b.restockTask.materials && stack.getItem() instanceof BlockItem bi) {
16801681
if (b.blocksToPlace.get().contains(bi.getBlock()) || (b.blocksToPlace.get().contains(Blocks.OBSIDIAN) && bi == Items.ENDER_CHEST)) return true;
16811682
}
1682-
if (b.restockTask.pickaxes && stack.getItem() instanceof PickaxeItem) return true;
1683+
if (b.restockTask.pickaxes && stack.isIn(ItemTags.PICKAXES)) return true;
16831684
if (b.restockTask.food && stack.contains(DataComponentTypes.FOOD) && !Modules.get().get(AutoEat.class).blacklist.get().contains(stack.getItem())) return true;
16841685
}
16851686

@@ -1710,7 +1711,7 @@ private void handleContainerBlock(HighwayBuilderHIG b, BlockPos bp) {
17101711

17111712
private int countSlots(HighwayBuilderHIG b, Predicate<ItemStack> predicate) {
17121713
int count = 0;
1713-
for (int i = 0; i < b.mc.player.getInventory().main.size(); i++) {
1714+
for (int i = 0; i < b.mc.player.getInventory().getMainStacks().size(); i++) {
17141715
ItemStack stack = b.mc.player.getInventory().getStack(i);
17151716
if (predicate.test(stack)) count++;
17161717
}
@@ -2023,7 +2024,7 @@ protected void place(HighwayBuilderHIG b, MBPIterator it, int slot, State nextSt
20232024
}
20242025

20252026
private int findSlot(HighwayBuilderHIG b, Predicate<ItemStack> predicate, boolean hotbar) {
2026-
for (int i = hotbar ? 0 : 9; i < (hotbar ? 9 : b.mc.player.getInventory().main.size()); i++) {
2027+
for (int i = hotbar ? 0 : 9; i < (hotbar ? 9 : b.mc.player.getInventory().getMainStacks().size()); i++) {
20272028
if (predicate.test(b.mc.player.getInventory().getStack(i))) return i;
20282029
}
20292030

@@ -2072,7 +2073,7 @@ protected int findHotbarSlot(HighwayBuilderHIG b, boolean replaceTools) {
20722073
}
20732074

20742075
protected boolean hasItem(HighwayBuilderHIG b, Predicate<ItemStack> predicate) {
2075-
for (int i = 0; i < b.mc.player.getInventory().main.size(); i++) {
2076+
for (int i = 0; i < b.mc.player.getInventory().getMainStacks().size(); i++) {
20762077
if (predicate.test(b.mc.player.getInventory().getStack(i))) return true;
20772078
}
20782079

@@ -2081,7 +2082,7 @@ protected boolean hasItem(HighwayBuilderHIG b, Predicate<ItemStack> predicate) {
20812082

20822083
protected int countItem(HighwayBuilderHIG b, Predicate<ItemStack> predicate) {
20832084
int count = 0;
2084-
for (int i = 0; i < b.mc.player.getInventory().main.size(); i++) {
2085+
for (int i = 0; i < b.mc.player.getInventory().getMainStacks().size(); i++) {
20852086
ItemStack stack = b.mc.player.getInventory().getStack(i);
20862087
if (predicate.test(stack)) count += stack.getCount();
20872088
}
@@ -2113,13 +2114,13 @@ protected int findAndMoveToHotbar(HighwayBuilderHIG b, Predicate<ItemStack> pred
21132114

21142115
protected int findAndMoveBestToolToHotbar(HighwayBuilderHIG b, BlockState blockState, boolean noSilkTouch) {
21152116
// Check for creative
2116-
if (b.mc.player.isCreative()) return b.mc.player.getInventory().selectedSlot;
2117+
if (b.mc.player.isCreative()) return b.mc.player.getInventory().getSelectedSlot();
21172118

21182119
// Find best tool
21192120
double bestScore = -1;
21202121
int bestSlot = -1;
21212122

2122-
for (int i = 0; i < b.mc.player.getInventory().main.size(); i++) {
2123+
for (int i = 0; i < b.mc.player.getInventory().getMainStacks().size(); i++) {
21232124
double score = AutoTool.getScore(b.mc.player.getInventory().getStack(i), blockState, false, false, AutoTool.EnchantPreference.None, itemStack -> {
21242125
if (noSilkTouch && Utils.hasEnchantment(itemStack, Enchantments.SILK_TOUCH)) return false;
21252126
return !b.dontBreakTools.get() || itemStack.getMaxDamage() - itemStack.getDamage() > (itemStack.getMaxDamage() * (b.breakDurability.get() / 100));
@@ -2131,11 +2132,11 @@ protected int findAndMoveBestToolToHotbar(HighwayBuilderHIG b, BlockState blockS
21312132
}
21322133
}
21332134

2134-
if (bestSlot == -1) return b.mc.player.getInventory().selectedSlot;
2135+
if (bestSlot == -1) return b.mc.player.getInventory().getSelectedSlot();
21352136

21362137
ItemStack bestStack = b.mc.player.getInventory().getStack(bestSlot);
2137-
if (bestStack.getItem() instanceof PickaxeItem) {
2138-
int count = countItem(b, stack -> stack.getItem() instanceof PickaxeItem);
2138+
if (bestStack.isIn(ItemTags.PICKAXES)) {
2139+
int count = countItem(b, stack -> stack.isIn(ItemTags.PICKAXES));
21392140

21402141
// If we are in the process of restocking pickaxes and happen to need one, we should allow using it
21412142
// as long as it has enough durability, since we will obtain more shortly thereafter
@@ -2863,7 +2864,7 @@ public boolean shouldRemove() {
28632864
}
28642865

28652866
public double progress() {
2866-
int slot = b.mc.player.getInventory().selectedSlot;
2867+
int slot = b.mc.player.getInventory().getSelectedSlot();
28672868
return BlockUtils.getBreakDelta(slot , blockState) * ((b.mc.player.age - (packet ? packetStartTime : normalStartTime)) + 1);
28682869
}
28692870

‎src/main/java/me/redcarlos/higtools/system/HIGSystem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public NbtCompound toTag() {
104104

105105
@Override
106106
public HIGSystem fromTag(NbtCompound tag) {
107-
if (tag.contains("settings")) settings.fromTag(tag.getCompound("settings"));
107+
if (tag.contains("settings")) tag.getCompound("settings");
108108
return this;
109109
}
110110

0 commit comments

Comments
 (0)