From e4d725d9aae4683b439d44edd1d404dc5e034407 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Sun, 2 Apr 2023 15:24:50 -0700 Subject: [PATCH] Revert "loottables broke & #click not working" This reverts commit 3e082b21d584e6c05544ee0505cd40c79d4eb6fd. --- fabric/src/main/resources/fabric.mod.json | 2 +- forge/src/main/resources/META-INF/mods.toml | 2 +- gradle.properties | 4 ++-- settings.gradle | 1 - .../api/command/datatypes/BlockById.java | 9 ++++--- .../command/datatypes/EntityClassById.java | 9 ++++--- .../api/event/events/RenderEvent.java | 2 +- .../baritone/api/utils/BlockOptionalMeta.java | 23 +++++++----------- .../java/baritone/api/utils/BlockUtils.java | 5 ++-- .../java/baritone/api/utils/SettingsUtil.java | 5 ++-- .../mixins/MixinClientPlayNetHandler.java | 24 ------------------- .../mixins/MixinClientPlayerEntity.java | 17 +++++++++++++ .../launch/mixins/MixinWorldRenderer.java | 2 +- .../command/defaults/FindCommand.java | 9 ++++--- .../command/defaults/FollowCommand.java | 3 +-- .../pathing/movement/MovementHelper.java | 2 +- src/main/java/baritone/utils/GuiClick.java | 15 +++++++----- src/main/java/baritone/utils/IRenderer.java | 2 +- .../java/baritone/utils/PathRenderer.java | 2 +- .../format/defaults/LitematicaSchematic.java | 3 +-- .../format/defaults/MCEditSchematic.java | 3 +-- .../format/defaults/SpongeSchematic.java | 3 +-- tweaker/build.gradle | 2 +- 23 files changed, 65 insertions(+), 84 deletions(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 62a815d0f..539fed3a8 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -26,6 +26,6 @@ "depends": { "fabricloader": ">=0.11.0", - "minecraft": "1.19.3" + "minecraft": "1.19.2" } } \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 2a25bf8ed..9297ed74b 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -35,6 +35,6 @@ A Minecraft pathfinder bot. modId="minecraft" mandatory=true # This version range declares a minimum of the current minecraft version up to but not including the next major version -versionRange="[1.19.3]" +versionRange="[1.19.2]" ordering="NONE" side="BOTH" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 208dbb3e7..4c3f5b494 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,5 +5,5 @@ maven_group=baritone archives_base_name=baritone minecraft_version=1.19.2 -forge_version=1.19.2-43.0.0 -fabric_version=0.14.11 +forge_version=1.19.2-43.1.65 +fabric_version=0.14.9 diff --git a/settings.gradle b/settings.gradle index 7809c35c6..2475b0845 100755 --- a/settings.gradle +++ b/settings.gradle @@ -44,7 +44,6 @@ rootProject.name = 'baritone' include("tweaker") if (System.getProperty("Baritone.enabled_platforms") == null) { System.setProperty("Baritone.enabled_platforms", "fabric,forge") -// System.setProperty("Baritone.enabled_platforms", "fabric") } for (platform in System.getProperty("Baritone.enabled_platforms").split(",")) { include(platform) diff --git a/src/api/java/baritone/api/command/datatypes/BlockById.java b/src/api/java/baritone/api/command/datatypes/BlockById.java index 21562e188..5e63fcf25 100644 --- a/src/api/java/baritone/api/command/datatypes/BlockById.java +++ b/src/api/java/baritone/api/command/datatypes/BlockById.java @@ -19,12 +19,11 @@ package baritone.api.command.datatypes; import baritone.api.command.exception.CommandException; import baritone.api.command.helpers.TabCompleteHelper; -import net.minecraft.core.registries.BuiltInRegistries; +import java.util.stream.Stream; +import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; -import java.util.stream.Stream; - public enum BlockById implements IDatatypeFor { INSTANCE; @@ -32,7 +31,7 @@ public enum BlockById implements IDatatypeFor { public Block get(IDatatypeContext ctx) throws CommandException { ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString()); Block block; - if ((block = BuiltInRegistries.BLOCK.getOptional(id).orElse(null)) == null) { + if ((block = Registry.BLOCK.getOptional(id).orElse(null)) == null) { throw new IllegalArgumentException("no block found by that id"); } return block; @@ -42,7 +41,7 @@ public enum BlockById implements IDatatypeFor { public Stream tabComplete(IDatatypeContext ctx) throws CommandException { return new TabCompleteHelper() .append( - BuiltInRegistries.BLOCK.keySet() + Registry.BLOCK.keySet() .stream() .map(Object::toString) ) diff --git a/src/api/java/baritone/api/command/datatypes/EntityClassById.java b/src/api/java/baritone/api/command/datatypes/EntityClassById.java index d7cb75734..aff7a2d94 100644 --- a/src/api/java/baritone/api/command/datatypes/EntityClassById.java +++ b/src/api/java/baritone/api/command/datatypes/EntityClassById.java @@ -19,12 +19,11 @@ package baritone.api.command.datatypes; import baritone.api.command.exception.CommandException; import baritone.api.command.helpers.TabCompleteHelper; -import net.minecraft.core.registries.BuiltInRegistries; +import java.util.stream.Stream; +import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityType; -import java.util.stream.Stream; - public enum EntityClassById implements IDatatypeFor { INSTANCE; @@ -32,7 +31,7 @@ public enum EntityClassById implements IDatatypeFor { public EntityType get(IDatatypeContext ctx) throws CommandException { ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString()); EntityType entity; - if ((entity = BuiltInRegistries.ENTITY_TYPE.getOptional(id).orElse(null)) == null) { + if ((entity = Registry.ENTITY_TYPE.getOptional(id).orElse(null)) == null) { throw new IllegalArgumentException("no entity found by that id"); } return entity; @@ -41,7 +40,7 @@ public enum EntityClassById implements IDatatypeFor { @Override public Stream tabComplete(IDatatypeContext ctx) throws CommandException { return new TabCompleteHelper() - .append(BuiltInRegistries.ENTITY_TYPE.stream().map(Object::toString)) + .append(Registry.ENTITY_TYPE.stream().map(Object::toString)) .filterPrefixNamespaced(ctx.getConsumer().getString()) .sortAlphabetically() .stream(); diff --git a/src/api/java/baritone/api/event/events/RenderEvent.java b/src/api/java/baritone/api/event/events/RenderEvent.java index a12a4dd5c..cb7a0414c 100644 --- a/src/api/java/baritone/api/event/events/RenderEvent.java +++ b/src/api/java/baritone/api/event/events/RenderEvent.java @@ -18,7 +18,7 @@ package baritone.api.event.events; import com.mojang.blaze3d.vertex.PoseStack; -import org.joml.Matrix4f; +import com.mojang.math.Matrix4f; /** * @author Brady diff --git a/src/api/java/baritone/api/utils/BlockOptionalMeta.java b/src/api/java/baritone/api/utils/BlockOptionalMeta.java index 2ba6f3ed1..aaeed981f 100644 --- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java +++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java @@ -19,22 +19,18 @@ package baritone.api.utils; import baritone.api.utils.accessor.IItemStack; import com.google.common.collect.ImmutableSet; -import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.netty.util.concurrent.ThreadPerTaskExecutor; -import net.minecraft.SharedConstants; import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.*; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.packs.*; -import net.minecraft.server.packs.metadata.pack.PackMetadataSection; +import net.minecraft.server.packs.PackResources; +import net.minecraft.server.packs.PackType; +import net.minecraft.server.packs.repository.Pack; import net.minecraft.server.packs.repository.PackRepository; import net.minecraft.server.packs.repository.ServerPacksSource; -import net.minecraft.server.packs.resources.MultiPackResourceManager; import net.minecraft.server.packs.resources.ReloadableResourceManager; import net.minecraft.util.RandomSource; import net.minecraft.util.Unit; -import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; @@ -46,8 +42,6 @@ import net.minecraft.world.level.storage.loot.PredicateManager; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.Vec3; -import org.apache.logging.log4j.core.jmx.Server; - import javax.annotation.Nonnull; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -169,16 +163,17 @@ public final class BlockOptionalMeta { public static LootTables getManager() { if (manager == null) { - MultiPackResourceManager resources = new MultiPackResourceManager(PackType.SERVER_DATA, List.of(getVanillaServerPack())); + PackRepository rpl = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource()); + rpl.reload(); + PackResources thePack = rpl.getAvailablePacks().iterator().next().open(); ReloadableResourceManager resourceManager = new ReloadableResourceManager(PackType.SERVER_DATA); manager = new LootTables(predicate); resourceManager.registerReloadListener(manager); try { - resourceManager.createReload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), CompletableFuture.completedFuture(Unit.INSTANCE), resources.listPacks().toList()).done().get(); + resourceManager.createReload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), CompletableFuture.completedFuture(Unit.INSTANCE), Collections.singletonList(thePack)).done().get(); } catch (Exception exception) { throw new RuntimeException(exception); } - } return manager; } @@ -197,7 +192,7 @@ public final class BlockOptionalMeta { // the other overload for generate doesnt work in forge because forge adds code that requires a non null world getManager().get(lootTableLocation).getRandomItems( - new LootContext.Builder((ServerLevel null) + new LootContext.Builder((ServerLevel) null) .withRandom(RandomSource.create()) .withParameter(LootContextParams.ORIGIN, Vec3.atLowerCornerOf(BlockPos.ZERO)) .withParameter(LootContextParams.TOOL, ItemStack.EMPTY) diff --git a/src/api/java/baritone/api/utils/BlockUtils.java b/src/api/java/baritone/api/utils/BlockUtils.java index a43d78e87..cc4204f8e 100644 --- a/src/api/java/baritone/api/utils/BlockUtils.java +++ b/src/api/java/baritone/api/utils/BlockUtils.java @@ -20,7 +20,6 @@ package baritone.api.utils; import java.util.HashMap; import java.util.Map; import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; @@ -29,7 +28,7 @@ public class BlockUtils { private static transient Map resourceCache = new HashMap<>(); public static String blockToString(Block block) { - ResourceLocation loc = BuiltInRegistries.BLOCK.getKey(block); + ResourceLocation loc = Registry.BLOCK.getKey(block); String name = loc.getPath(); // normally, only write the part after the minecraft: if (!loc.getNamespace().equals("minecraft")) { // Baritone is running on top of forge with mods installed, perhaps? @@ -57,7 +56,7 @@ public class BlockUtils { if (resourceCache.containsKey(name)) { return null; // cached as null } - block = BuiltInRegistries.BLOCK.getOptional(ResourceLocation.tryParse(name.contains(":") ? name : "minecraft:" + name)).orElse(null); + block = Registry.BLOCK.getOptional(ResourceLocation.tryParse(name.contains(":") ? name : "minecraft:" + name)).orElse(null); Map copy = new HashMap<>(resourceCache); // read only copy is safe, wont throw concurrentmodification copy.put(name, block); resourceCache = copy; diff --git a/src/api/java/baritone/api/utils/SettingsUtil.java b/src/api/java/baritone/api/utils/SettingsUtil.java index 9e82c05de..5b9358a21 100644 --- a/src/api/java/baritone/api/utils/SettingsUtil.java +++ b/src/api/java/baritone/api/utils/SettingsUtil.java @@ -23,7 +23,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.core.Direction; import net.minecraft.core.Registry; import net.minecraft.core.Vec3i; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; @@ -253,8 +252,8 @@ public class SettingsUtil { ), ITEM( Item.class, - str -> BuiltInRegistries.ITEM.get(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue? - item -> BuiltInRegistries.ITEM.getKey(item).toString() + str -> Registry.ITEM.get(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue? + item -> Registry.ITEM.getKey(item).toString() ), LIST() { @Override diff --git a/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java b/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java index e718685c9..df3fbf09f 100644 --- a/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java +++ b/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java @@ -20,19 +20,14 @@ package baritone.launch.mixins; import baritone.Baritone; import baritone.api.BaritoneAPI; import baritone.api.IBaritone; -import baritone.api.event.events.ChatEvent; import baritone.api.event.events.ChunkEvent; import baritone.api.event.events.type.EventState; import baritone.cache.CachedChunk; -import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.player.LocalPlayer; -import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.*; import net.minecraft.world.level.ChunkPos; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -68,25 +63,6 @@ public class MixinClientPlayNetHandler { } }*/ - @Shadow @Final private Minecraft minecraft; - - @Inject( - method = "sendChat(Ljava/lang/String;)V", - at = @At("HEAD"), - cancellable = true - ) - private void sendChatMessage(String string, CallbackInfo ci) { - ChatEvent event = new ChatEvent(string); - IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(this.minecraft.player); - if (baritone == null) { - return; - } - baritone.getGameEventHandler().onSendChatMessage(event); - if (event.isCancelled()) { - ci.cancel(); - } - } - @Inject( method = "handleLevelChunkWithLight", at = @At("RETURN") diff --git a/src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java b/src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java index 22ca083e0..e5f3e0375 100644 --- a/src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java +++ b/src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java @@ -41,6 +41,23 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(LocalPlayer.class) public class MixinClientPlayerEntity { + @Inject( + method = "sendChat(Ljava/lang/String;Lnet/minecraft/network/chat/Component;)V", + at = @At("HEAD"), + cancellable = true + ) + private void sendChatMessage(String string, Component component, CallbackInfo ci) { + ChatEvent event = new ChatEvent(string); + IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((LocalPlayer) (Object) this); + if (baritone == null) { + return; + } + baritone.getGameEventHandler().onSendChatMessage(event); + if (event.isCancelled()) { + ci.cancel(); + } + } + @Inject( method = "tick", at = @At( diff --git a/src/launch/java/baritone/launch/mixins/MixinWorldRenderer.java b/src/launch/java/baritone/launch/mixins/MixinWorldRenderer.java index a6cf48899..622721281 100644 --- a/src/launch/java/baritone/launch/mixins/MixinWorldRenderer.java +++ b/src/launch/java/baritone/launch/mixins/MixinWorldRenderer.java @@ -21,11 +21,11 @@ import baritone.api.BaritoneAPI; import baritone.api.IBaritone; import baritone.api.event.events.RenderEvent; import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.math.Matrix4f; import net.minecraft.client.Camera; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.LightTexture; -import org.joml.Matrix4f; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/baritone/command/defaults/FindCommand.java b/src/main/java/baritone/command/defaults/FindCommand.java index 500981873..913156400 100644 --- a/src/main/java/baritone/command/defaults/FindCommand.java +++ b/src/main/java/baritone/command/defaults/FindCommand.java @@ -27,7 +27,6 @@ import baritone.api.utils.BetterBlockPos; import baritone.cache.CachedChunk; import net.minecraft.core.Registry; import net.minecraft.ChatFormatting; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.HoverEvent; @@ -58,7 +57,7 @@ public class FindCommand extends Command { Component[] components = toFind.stream() .flatMap(block -> ctx.worldData().getCachedWorld().getLocationsOf( - BuiltInRegistries.BLOCK.getKey(block).getPath(), + Registry.BLOCK.getKey(block).getPath(), Integer.MAX_VALUE, origin.x, origin.y, @@ -92,9 +91,9 @@ public class FindCommand extends Command { public Stream tabComplete(String label, IArgConsumer args) throws CommandException { return new TabCompleteHelper() .append( - CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.stream() - .map(BuiltInRegistries.BLOCK::getKey) - .map(Object::toString) + CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.stream() + .map(Registry.BLOCK::getKey) + .map(Object::toString) ) .filterPrefixNamespaced(args.getString()) .sortAlphabetically() diff --git a/src/main/java/baritone/command/defaults/FollowCommand.java b/src/main/java/baritone/command/defaults/FollowCommand.java index b7e708377..46c6a1c60 100644 --- a/src/main/java/baritone/command/defaults/FollowCommand.java +++ b/src/main/java/baritone/command/defaults/FollowCommand.java @@ -31,7 +31,6 @@ import java.util.*; import java.util.function.Predicate; import java.util.stream.Stream; import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; @@ -85,7 +84,7 @@ public class FollowCommand extends Command { } else { logDirect("Following these types of entities:"); classes.stream() - .map(BuiltInRegistries.ENTITY_TYPE::getKey) + .map(Registry.ENTITY_TYPE::getKey) .map(Objects::requireNonNull) .map(ResourceLocation::toString) .forEach(this::logDirect); diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java index b636ef9c2..128fa5e16 100644 --- a/src/main/java/baritone/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -724,7 +724,7 @@ public interface MovementHelper extends ActionCosts, Helper { static boolean isBlockNormalCube(BlockState state) { Block block = state.getBlock(); - if (block instanceof BambooStalkBlock + if (block instanceof BambooBlock || block instanceof MovingPistonBlock || block instanceof ScaffoldingBlock || block instanceof ShulkerBoxBlock diff --git a/src/main/java/baritone/utils/GuiClick.java b/src/main/java/baritone/utils/GuiClick.java index 876d5fb42..d0a435e1f 100644 --- a/src/main/java/baritone/utils/GuiClick.java +++ b/src/main/java/baritone/utils/GuiClick.java @@ -24,6 +24,8 @@ import baritone.api.utils.BetterBlockPos; import baritone.api.utils.Helper; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.math.Matrix4f; +import com.mojang.math.Vector4f; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.player.LocalPlayer; @@ -37,8 +39,6 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; -import org.joml.Matrix4f; -import org.joml.Vector4f; import java.awt.*; import java.util.Collections; @@ -118,8 +118,8 @@ public class GuiClick extends Screen implements Helper { } public void onRender(PoseStack modelViewStack, Matrix4f projectionMatrix) { - this.projectionViewMatrix = new Matrix4f(projectionMatrix); - this.projectionViewMatrix.mul(modelViewStack.last().pose()); + this.projectionViewMatrix = projectionMatrix.copy(); + this.projectionViewMatrix.multiply(modelViewStack.last().pose()); this.projectionViewMatrix.invert(); if (currentMouseOver != null) { @@ -158,9 +158,12 @@ public class GuiClick extends Screen implements Helper { y = y * 2 - 1; Vector4f pos = new Vector4f((float) x, (float) y, (float) z, 1.0F); - projectionViewMatrix.transformProject(pos); + pos.transform(this.projectionViewMatrix); + if (pos.w() == 0) { + return null; + } - pos.normalize(); + pos.perspectiveDivide(); return new Vec3(pos.x(), pos.y(), pos.z()); } } diff --git a/src/main/java/baritone/utils/IRenderer.java b/src/main/java/baritone/utils/IRenderer.java index 380fbd9e0..d07bf44fa 100644 --- a/src/main/java/baritone/utils/IRenderer.java +++ b/src/main/java/baritone/utils/IRenderer.java @@ -23,9 +23,9 @@ import baritone.api.utils.Helper; import baritone.utils.accessor.IEntityRenderManager; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; +import com.mojang.math.Matrix4f; import java.awt.*; import net.minecraft.world.phys.AABB; -import org.joml.Matrix4f; import static org.lwjgl.opengl.GL11.*; diff --git a/src/main/java/baritone/utils/PathRenderer.java b/src/main/java/baritone/utils/PathRenderer.java index f18db52b2..5f50962e7 100644 --- a/src/main/java/baritone/utils/PathRenderer.java +++ b/src/main/java/baritone/utils/PathRenderer.java @@ -30,6 +30,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexFormat; +import com.mojang.math.Matrix4f; import java.awt.*; import java.util.Collection; import java.util.Collections; @@ -44,7 +45,6 @@ import net.minecraft.world.level.dimension.DimensionType; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import org.joml.Matrix4f; import static org.lwjgl.opengl.GL11.*; diff --git a/src/main/java/baritone/utils/schematic/format/defaults/LitematicaSchematic.java b/src/main/java/baritone/utils/schematic/format/defaults/LitematicaSchematic.java index 65cdec058..9fd672d62 100644 --- a/src/main/java/baritone/utils/schematic/format/defaults/LitematicaSchematic.java +++ b/src/main/java/baritone/utils/schematic/format/defaults/LitematicaSchematic.java @@ -20,7 +20,6 @@ package baritone.utils.schematic.format.defaults; import baritone.utils.schematic.StaticSchematic; import net.minecraft.core.Registry; import net.minecraft.core.Vec3i; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.resources.ResourceLocation; @@ -94,7 +93,7 @@ public final class LitematicaSchematic extends StaticSchematic { BlockState[] blockList = new BlockState[blockStatePalette.size()]; for (int i = 0; i < blockStatePalette.size(); i++) { - Block block = BuiltInRegistries.BLOCK.get(new ResourceLocation((((CompoundTag) blockStatePalette.get(i)).getString("Name")))); + Block block = Registry.BLOCK.get(new ResourceLocation((((CompoundTag) blockStatePalette.get(i)).getString("Name")))); CompoundTag properties = ((CompoundTag) blockStatePalette.get(i)).getCompound("Properties"); blockList[i] = getBlockState(block, properties); diff --git a/src/main/java/baritone/utils/schematic/format/defaults/MCEditSchematic.java b/src/main/java/baritone/utils/schematic/format/defaults/MCEditSchematic.java index 3018021a5..4693ea387 100644 --- a/src/main/java/baritone/utils/schematic/format/defaults/MCEditSchematic.java +++ b/src/main/java/baritone/utils/schematic/format/defaults/MCEditSchematic.java @@ -19,7 +19,6 @@ package baritone.utils.schematic.format.defaults; import baritone.utils.schematic.StaticSchematic; import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.datafix.fixes.ItemIdFix; @@ -63,7 +62,7 @@ public final class MCEditSchematic extends StaticSchematic { // additional is 0 through 15 inclusive since it's & 0xF above blockID |= additional[blockInd] << 8; } - Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.tryParse(ItemIdFix.getItem(blockID))); + Block block = Registry.BLOCK.get(ResourceLocation.tryParse(ItemIdFix.getItem(blockID))); // int meta = metadata[blockInd] & 0xFF; // this.states[x][z][y] = block.getStateFromMeta(meta); this.states[x][z][y] = block.defaultBlockState(); diff --git a/src/main/java/baritone/utils/schematic/format/defaults/SpongeSchematic.java b/src/main/java/baritone/utils/schematic/format/defaults/SpongeSchematic.java index 12163cbff..3c00b08c6 100644 --- a/src/main/java/baritone/utils/schematic/format/defaults/SpongeSchematic.java +++ b/src/main/java/baritone/utils/schematic/format/defaults/SpongeSchematic.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; @@ -107,7 +106,7 @@ public final class SpongeSchematic extends StaticSchematic { private BlockState deserialize() { if (this.blockState == null) { - Block block = BuiltInRegistries.BLOCK.get(this.resourceLocation); + Block block = Registry.BLOCK.get(this.resourceLocation); this.blockState = block.defaultBlockState(); this.properties.keySet().stream().sorted(String::compareTo).forEachOrdered(key -> { diff --git a/tweaker/build.gradle b/tweaker/build.gradle index 1b6304189..ce623af6c 100644 --- a/tweaker/build.gradle +++ b/tweaker/build.gradle @@ -17,7 +17,7 @@ import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask -import baritone.gradle.task.TweakerJsonAssembler +//import baritone.gradle.task.TweakerJsonAssembler plugins { id "com.github.johnrengelman.shadow" version "7.0.0"