Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.19.2 Update #8

Open
wants to merge 1,274 commits into
base: master
Choose a base branch
from
Open

Conversation

MarvionKirito
Copy link

Updated and fixed as possible.

leijurv and others added 30 commits October 6, 2023 01:40
I saw in setup.md "(if you have docker on Windows, I'd be grateful if
you could let me know if it works there too)".  So I went to build
it on Windows.

I use Windows Subsystem for Linux, which is (mostly) Ubuntu but not
really (there's no init).  But Docker Desktop has an integration for
WSL2.

For me, gradle wouldn't build the image without forcing git to install
in the container.  I'll attach screenshots to the pull request.  It just
looks like whatever ubuntu:focal my docker system grabbed doesn't have
git installed by default.

Anyway, this fixes it, and shouldn't screw anything even if git is
installed by default.  I tested it on my M1 Mac pro and it still works
fine.
…r/handleDuplicatePaletteEntries

Handle duplicate palette entries
…toreBuildIgnoreExisting

Restore `buildIgnoreExisting`
…ockerfile_apt

Adds git to the Dockerfile apt install (Windows build functionality)
…vedVersionDetection

Improve version detection
…r/fixSingleValuePalette

Fix scanning chunks using a SingleValuePalette
# Conflicts:
#	.github/workflows/gradle_build.yml
#	README.md
#	SETUP.md
#	build.gradle
#	buildSrc/build.gradle
#	buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
#	buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
#	fabric/build.gradle
#	fabric/src/main/resources/fabric.mod.json
#	forge/src/main/resources/META-INF/mods.toml
#	gradle.properties
#	src/api/java/baritone/api/IBaritoneProvider.java
#	src/api/java/baritone/api/Settings.java
#	src/api/java/baritone/api/command/exception/CommandUnhandledException.java
#	src/api/java/baritone/api/event/listener/AbstractGameEventListener.java
#	src/api/java/baritone/api/schematic/MaskSchematic.java
#	src/api/java/baritone/api/utils/BlockOptionalMeta.java
#	src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
#	src/api/java/baritone/api/utils/Helper.java
#	src/api/java/baritone/api/utils/IPlayerContext.java
#	src/api/java/baritone/api/utils/RotationUtils.java
#	src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java
#	src/launch/java/baritone/launch/mixins/MixinLivingEntity.java
#	src/launch/java/baritone/launch/mixins/MixinMinecraft.java
#	src/main/java/baritone/Baritone.java
#	src/main/java/baritone/behavior/LookBehavior.java
#	src/main/java/baritone/cache/WorldProvider.java
#	src/main/java/baritone/command/ExampleBaritoneControl.java
#	src/main/java/baritone/command/defaults/ComeCommand.java
#	src/main/java/baritone/command/defaults/SetCommand.java
#	src/main/java/baritone/event/GameEventHandler.java
#	src/main/java/baritone/pathing/movement/Movement.java
#	src/main/java/baritone/pathing/movement/MovementHelper.java
#	src/main/java/baritone/pathing/movement/movements/MovementDescend.java
#	src/main/java/baritone/pathing/movement/movements/MovementPillar.java
#	src/main/java/baritone/process/BuilderProcess.java
#	src/main/java/baritone/process/FarmProcess.java
#	src/main/java/baritone/process/MineProcess.java
#	src/main/java/baritone/utils/IRenderer.java
#	src/main/java/baritone/utils/PathRenderer.java
#	src/main/java/baritone/utils/player/BaritonePlayerController.java
# Conflicts:
#	build.gradle
#	buildSrc/build.gradle
#	buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
#	fabric/build.gradle
#	fabric/src/main/java/baritone/launch/FabricMixinPlugin.java
#	fabric/src/main/resources/fabric.mod.json
#	forge/build.gradle
#	forge/src/main/resources/META-INF/mods.toml
#	gradle.properties
#	scripts/proguard.pro
#	src/api/java/baritone/api/utils/RayTraceUtils.java
#	src/launch/java/baritone/launch/mixins/MixinClientPlayerEntity.java
#	src/launch/java/baritone/launch/mixins/MixinCommandSuggestionHelper.java
#	src/launch/java/baritone/launch/mixins/MixinMinecraft.java
#	src/launch/java/baritone/launch/mixins/MixinNetworkManager.java
#	src/main/java/baritone/behavior/InventoryBehavior.java
#	src/main/java/baritone/behavior/PathingBehavior.java
#	src/main/java/baritone/cache/CachedChunk.java
#	src/main/java/baritone/cache/CachedRegion.java
#	src/main/java/baritone/cache/CachedWorld.java
#	src/main/java/baritone/cache/ChunkPacker.java
#	src/main/java/baritone/cache/WorldScanner.java
#	src/main/java/baritone/command/defaults/SelCommand.java
#	src/main/java/baritone/pathing/movement/CalculationContext.java
#	src/main/java/baritone/pathing/movement/MovementHelper.java
#	src/main/java/baritone/pathing/movement/movements/MovementDescend.java
#	src/main/java/baritone/pathing/movement/movements/MovementFall.java
#	src/main/java/baritone/pathing/movement/movements/MovementTraverse.java
#	src/main/java/baritone/pathing/path/PathExecutor.java
#	src/main/java/baritone/process/BuilderProcess.java
#	src/main/java/baritone/process/MineProcess.java
#	src/main/java/baritone/selection/Selection.java
#	src/main/java/baritone/selection/SelectionRenderer.java
#	src/main/java/baritone/utils/InputOverrideHandler.java
#	src/main/java/baritone/utils/PathingControlManager.java
#	src/main/java/baritone/utils/ToolSet.java
#	src/main/java/baritone/utils/schematic/format/DefaultSchematicFormats.java
#	tweaker/build.gradle
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants