Skip to content

Commit b14c758

Browse files
leijurvleijurv
authored
Merge pull request #4536 from rfresh2/1.21.3
1.21.3
2 parents 9eefcbc + fd4fbf5 commit b14c758

File tree

25 files changed

+125
-152
lines changed

25 files changed

+125
-152
lines changed

‎fabric/src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525

2626
"depends": {
2727
"fabricloader": ">=0.14.22",
28-
"minecraft": ["1.21","1.21.1"]
28+
"minecraft": ["1.21.2","1.21.3"]
2929
}
3030
}

‎forge/src/main/resources/META-INF/mods.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ A Minecraft pathfinder bot.
3535
modId="minecraft"
3636
mandatory=true
3737
# This version range declares a minimum of the current minecraft version up to but not including the next major version
38-
versionRange="[1.21, 1.21.1]"
38+
versionRange="[1.21.2, 1.21.3]"
3939
ordering="NONE"
4040
side="BOTH"

‎gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ org.gradle.jvmargs=-Xmx4G
22

33
available_loaders=fabric,forge,neoforge,tweaker
44

5-
mod_version=1.11.0
5+
mod_version=1.12.0
66
maven_group=baritone
77
archives_base_name=baritone
88

99
java_version=21
1010

11-
minecraft_version=1.21
11+
minecraft_version=1.21.3
1212

13-
forge_version=51.0.16
13+
forge_version=53.0.7
1414

15-
neoforge_version=20-beta
15+
neoforge_version=6-beta
1616

17-
fabric_version=0.15.11
17+
fabric_version=0.16.7
1818

1919
nether_pathfinder_version=1.4.1
2020

‎neoforge/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ archivesBaseName = archivesBaseName + "-neoforge"
2626

2727
unimined.minecraft {
2828

29-
neoForged {
29+
neoForge {
3030
loader project.neoforge_version
3131
mixinConfig ["mixins.baritone.json"]
3232
}

‎neoforge/src/main/resources/META-INF/neoforge.mods.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ A Minecraft pathfinder bot.
3535
modId="minecraft"
3636
type="required"
3737
# This version range declares a minimum of the current minecraft version up to but not including the next major version
38-
versionRange="[1.21,1.21.1]"
38+
versionRange="[1.21.2,1.21.3]"
3939
ordering="NONE"
4040
side="BOTH"

‎src/api/java/baritone/api/Settings.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -656,13 +656,6 @@ public final class Settings {
656656
*/
657657
public final Setting<Boolean> logAsToast = new Setting<>(false);
658658

659-
/**
660-
* The time of how long the message in the pop-up will display
661-
* <p>
662-
* If below 1000L (1sec), it's better to disable this
663-
*/
664-
public final Setting<Long> toastTimer = new Setting<>(5000L);
665-
666659
/**
667660
* Print all the debug messages to chat
668661
*/

‎src/api/java/baritone/api/utils/BetterBlockPos.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public BetterBlockPos below(int amt) {
157157

158158
@Override
159159
public BetterBlockPos relative(Direction dir) {
160-
Vec3i vec = dir.getNormal();
160+
Vec3i vec = dir.getUnitVec3i();
161161
return new BetterBlockPos(x + vec.getX(), y + vec.getY(), z + vec.getZ());
162162
}
163163

@@ -166,7 +166,7 @@ public BetterBlockPos relative(Direction dir, int dist) {
166166
if (dist == 0) {
167167
return this;
168168
}
169-
Vec3i vec = dir.getNormal();
169+
Vec3i vec = dir.getUnitVec3i();
170170
return new BetterBlockPos(x + vec.getX() * dist, y + vec.getY() * dist, z + vec.getZ() * dist);
171171
}
172172

‎src/api/java/baritone/api/utils/BlockOptionalMeta.java

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import net.minecraft.client.Minecraft;
2626
import net.minecraft.commands.Commands;
2727
import net.minecraft.core.LayeredRegistryAccess;
28+
import net.minecraft.core.Registry;
2829
import net.minecraft.core.RegistryAccess;
2930
import net.minecraft.resources.RegistryDataLoader;
3031
import net.minecraft.resources.ResourceKey;
@@ -42,6 +43,7 @@
4243
import net.minecraft.server.packs.resources.CloseableResourceManager;
4344
import net.minecraft.server.packs.resources.MultiPackResourceManager;
4445
import net.minecraft.server.packs.resources.ResourceManager;
46+
import net.minecraft.tags.TagLoader;
4547
import net.minecraft.world.RandomSequences;
4648
import net.minecraft.world.flag.FeatureFlagSet;
4749
import net.minecraft.world.item.Item;
@@ -229,8 +231,8 @@ private static VanillaPackResources getVanillaServerPack() {
229231

230232
private static synchronized List<Item> drops(Block b) {
231233
return drops.computeIfAbsent(b, block -> {
232-
ResourceLocation lootTableLocation = block.getLootTable().location();
233-
if (lootTableLocation.equals(BuiltInLootTables.EMPTY.location())) {
234+
Optional<ResourceKey<LootTable>> optionalLootTableKey = block.getLootTable();
235+
if (optionalLootTableKey.isEmpty()) {
234236
return Collections.emptyList();
235237
} else {
236238
List<Item> items = new ArrayList<>();
@@ -251,13 +253,13 @@ private static synchronized List<Item> drops(Block b) {
251253
}
252254

253255
private static List<ItemStack> getDrops(Block state, LootParams.Builder params) {
254-
ResourceKey<LootTable> lv = state.getLootTable();
255-
if (lv == BuiltInLootTables.EMPTY) {
256+
Optional<ResourceKey<LootTable>> lv = state.getLootTable();
257+
if (lv.isEmpty()) {
256258
return Collections.emptyList();
257259
} else {
258260
LootParams lv2 = params.withParameter(LootContextParams.BLOCK_STATE, state.defaultBlockState()).create(LootContextParamSets.BLOCK);
259261
ServerLevelStub lv3 = (ServerLevelStub) lv2.getLevel();
260-
LootTable lv4 = lv3.holder().getLootTable(lv);
262+
LootTable lv4 = lv3.holder().getLootTable(lv.get());
261263
return((ILootTable) lv4).invokeGetRandomItems(new LootContext.Builder(lv2).withOptionalRandomSeed(1).create(null));
262264
}
263265
}
@@ -307,39 +309,16 @@ public static Unsafe getUnsafe() {
307309
public static CompletableFuture<RegistryAccess> load() {
308310
PackRepository packRepository = Minecraft.getInstance().getResourcePackRepository();
309311
CloseableResourceManager closeableResourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, packRepository.openAllSelected());
310-
LayeredRegistryAccess<RegistryLayer> layeredRegistryAccess = loadAndReplaceLayer(
311-
closeableResourceManager, RegistryLayer.createRegistryAccess(), RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES
312+
LayeredRegistryAccess<RegistryLayer> layeredRegistryAccess = RegistryLayer.createRegistryAccess();
313+
List<Registry.PendingTags<?>> pendingTags = TagLoader.loadTagsForExistingRegistries(
314+
closeableResourceManager, layeredRegistryAccess.getLayer(RegistryLayer.STATIC)
312315
);
313-
return ReloadableServerResources.loadResources(
314-
closeableResourceManager,
316+
return ReloadableServerRegistries.reload(
315317
layeredRegistryAccess,
316-
WorldDataConfiguration.DEFAULT.enabledFeatures(),
317-
Commands.CommandSelection.INTEGRATED,
318-
2,
319-
Runnable::run,
318+
pendingTags,
319+
closeableResourceManager,
320320
Minecraft.getInstance()
321-
).thenApply(reloadableServerResources -> reloadableServerResources.fullRegistries().get());
322-
}
323-
324-
private static LayeredRegistryAccess<RegistryLayer> loadAndReplaceLayer(
325-
ResourceManager resourceManager,
326-
LayeredRegistryAccess<RegistryLayer> registryAccess,
327-
RegistryLayer registryLayer,
328-
List<RegistryDataLoader.RegistryData<?>> registryData
329-
) {
330-
RegistryAccess.Frozen frozen = loadLayer(resourceManager, registryAccess, registryLayer, registryData);
331-
return registryAccess.replaceFrom(registryLayer, frozen);
321+
).thenApply(r -> r.layers().compositeAccess());
332322
}
333-
334-
private static RegistryAccess.Frozen loadLayer(
335-
ResourceManager resourceManager,
336-
LayeredRegistryAccess<RegistryLayer> registryAccess,
337-
RegistryLayer registryLayer,
338-
List<RegistryDataLoader.RegistryData<?>> registryData
339-
) {
340-
RegistryAccess.Frozen frozen = registryAccess.getAccessForLoading(registryLayer);
341-
return RegistryDataLoader.load(resourceManager, frozen, registryData);
342-
}
343-
344323
}
345324
}

‎src/api/java/baritone/api/utils/SettingsUtil.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import baritone.api.Settings;
2222
import net.minecraft.client.Minecraft;
2323
import net.minecraft.core.Direction;
24+
import net.minecraft.core.Holder;
2425
import net.minecraft.core.Registry;
2526
import net.minecraft.core.Vec3i;
2627
import net.minecraft.core.registries.BuiltInRegistries;
@@ -241,8 +242,8 @@ private enum Parser implements ISettingParser {
241242
BlockUtils::blockToString
242243
),
243244
ITEM(
244-
Item.class,
245-
str -> BuiltInRegistries.ITEM.get(ResourceLocation.parse(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
245+
Item.class,
246+
str -> BuiltInRegistries.ITEM.get(ResourceLocation.parse(str.trim())).map(Holder.Reference::value).orElse(null),
246247
item -> BuiltInRegistries.ITEM.getKey(item).toString()
247248
),
248249
LIST() {

‎src/api/java/baritone/api/utils/gui/BaritoneToast.java

Lines changed: 4 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -17,65 +17,13 @@
1717

1818
package baritone.api.utils.gui;
1919

20-
import com.mojang.blaze3d.platform.GlStateManager;
21-
import com.mojang.blaze3d.vertex.PoseStack;
2220
import net.minecraft.client.Minecraft;
23-
import net.minecraft.client.gui.GuiGraphics;
24-
import net.minecraft.client.gui.components.toasts.Toast;
25-
import net.minecraft.client.gui.components.toasts.ToastComponent;
21+
import net.minecraft.client.gui.components.toasts.SystemToast;
2622
import net.minecraft.network.chat.Component;
27-
import net.minecraft.resources.ResourceLocation;
28-
29-
public class BaritoneToast implements Toast {
30-
private String title;
31-
private String subtitle;
32-
private long firstDrawTime;
33-
private boolean newDisplay;
34-
private long totalShowTime;
35-
36-
public BaritoneToast(Component titleComponent, Component subtitleComponent, long totalShowTime) {
37-
this.title = titleComponent.getString();
38-
this.subtitle = subtitleComponent == null ? null : subtitleComponent.getString();
39-
this.totalShowTime = totalShowTime;
40-
}
41-
42-
public Visibility render(GuiGraphics gui, ToastComponent toastGui, long delta) {
43-
if (this.newDisplay) {
44-
this.firstDrawTime = delta;
45-
this.newDisplay = false;
46-
}
47-
48-
49-
//TODO: check
50-
gui.blit(ResourceLocation.parse("textures/gui/toasts.png"), 0, 0, 0, 32, 160, 32);
51-
52-
if (this.subtitle == null) {
53-
gui.drawString(toastGui.getMinecraft().font, this.title, 18, 12, -11534256);
54-
} else {
55-
gui.drawString(toastGui.getMinecraft().font, this.title, 18, 7, -11534256);
56-
gui.drawString(toastGui.getMinecraft().font, this.subtitle, 18, 18, -16777216);
57-
}
58-
59-
return delta - this.firstDrawTime < totalShowTime ? Visibility.SHOW : Visibility.HIDE;
60-
}
61-
62-
public void setDisplayedText(Component titleComponent, Component subtitleComponent) {
63-
this.title = titleComponent.getString();
64-
this.subtitle = subtitleComponent == null ? null : subtitleComponent.getString();
65-
this.newDisplay = true;
66-
}
67-
68-
public static void addOrUpdate(ToastComponent toast, Component title, Component subtitle, long totalShowTime) {
69-
BaritoneToast baritonetoast = toast.getToast(BaritoneToast.class, new Object());
70-
71-
if (baritonetoast == null) {
72-
toast.addToast(new BaritoneToast(title, subtitle, totalShowTime));
73-
} else {
74-
baritonetoast.setDisplayedText(title, subtitle);
75-
}
76-
}
7723

24+
public class BaritoneToast {
25+
private static final SystemToast.SystemToastId BARITONE_TOAST_ID = new SystemToast.SystemToastId(5000L);
7826
public static void addOrUpdate(Component title, Component subtitle) {
79-
addOrUpdate(Minecraft.getInstance().getToasts(), title, subtitle, baritone.api.BaritoneAPI.getSettings().toastTimer.value);
27+
SystemToast.addOrUpdate(Minecraft.getInstance().getToastManager(), BARITONE_TOAST_ID, title, subtitle);
8028
}
8129
}

0 commit comments

Comments
 (0)