I think it works again
This commit is contained in:
@@ -24,6 +24,7 @@ import baritone.api.event.events.PlayerUpdateEvent;
|
||||
import baritone.api.event.events.TickEvent;
|
||||
import baritone.api.event.events.WorldEvent;
|
||||
import baritone.api.event.events.type.EventState;
|
||||
import baritone.utils.accessor.IMinecraft;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.EntityPlayerSP;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
@@ -33,7 +34,9 @@ import net.minecraft.util.EnumActionResult;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import org.spongepowered.asm.lib.Opcodes;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Mutable;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
@@ -41,6 +44,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.function.BiFunction;
|
||||
|
||||
/**
|
||||
@@ -48,13 +52,19 @@ import java.util.function.BiFunction;
|
||||
* @since 7/31/2018
|
||||
*/
|
||||
@Mixin(Minecraft.class)
|
||||
public class MixinMinecraft {
|
||||
public class MixinMinecraft implements IMinecraft {
|
||||
|
||||
@Shadow
|
||||
public EntityPlayerSP player;
|
||||
|
||||
@Shadow
|
||||
public WorldClient world;
|
||||
|
||||
@Shadow
|
||||
@Final
|
||||
@Mutable
|
||||
public File gameDir;
|
||||
|
||||
@Inject(
|
||||
method = "init",
|
||||
at = @At("RETURN")
|
||||
@@ -176,4 +186,9 @@ public class MixinMinecraft {
|
||||
// rightClickMouse is only for the main player
|
||||
BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(blockpos, BlockInteractEvent.Type.USE));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setGameDir(File gameDir) {
|
||||
this.gameDir = gameDir;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,8 +125,6 @@ public class Baritone implements IBaritone {
|
||||
this.worldProvider = new WorldProvider(this);
|
||||
this.selectionManager = new SelectionManager(this);
|
||||
this.commandManager = new CommandManager(this);
|
||||
|
||||
new ExampleBaritoneControl(this);
|
||||
}
|
||||
|
||||
public void registerBehavior(IBehavior behavior) {
|
||||
|
||||
@@ -24,14 +24,13 @@ import baritone.api.bot.IBaritoneUser;
|
||||
import baritone.api.event.events.WorldEvent;
|
||||
import baritone.api.event.events.type.EventState;
|
||||
import baritone.api.utils.IPlayerContext;
|
||||
import baritone.api.utils.IPlayerController;
|
||||
import baritone.bot.impl.BotMinecraft;
|
||||
import baritone.bot.impl.BotWorld;
|
||||
import baritone.bot.impl.BotEntity;
|
||||
import baritone.command.ExampleBaritoneControl;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import net.minecraft.client.multiplayer.PlayerControllerMP;
|
||||
import net.minecraft.client.multiplayer.ServerData;
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
import net.minecraft.client.network.NetHandlerPlayClient;
|
||||
import net.minecraft.network.NetworkManager;
|
||||
import net.minecraft.util.Session;
|
||||
@@ -63,6 +62,7 @@ public final class BaritoneUser implements IBaritoneUser {
|
||||
this.session = session;
|
||||
this.profile = session.getProfile();
|
||||
this.baritone = (Baritone) BaritoneAPI.getProvider().createBaritone(this.mc);
|
||||
this.baritone.registerBehavior(ExampleBaritoneControl::new);
|
||||
}
|
||||
|
||||
public void onLoginSuccess(GameProfile profile, NetHandlerPlayClient netHandlerPlayClient) {
|
||||
|
||||
@@ -21,6 +21,7 @@ import baritone.api.bot.IBaritoneUser;
|
||||
import baritone.api.utils.Helper;
|
||||
import baritone.utils.ObjectAllocator;
|
||||
import baritone.utils.accessor.IGameSettings;
|
||||
import baritone.utils.accessor.IMinecraft;
|
||||
import com.google.common.util.concurrent.ListenableFuture;
|
||||
import com.mojang.authlib.minecraft.MinecraftSessionService;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -31,6 +32,7 @@ import net.minecraft.client.main.GameConfiguration;
|
||||
import net.minecraft.client.settings.GameSettings;
|
||||
import net.minecraft.client.settings.KeyBinding;
|
||||
import net.minecraft.client.tutorial.Tutorial;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.EnumHandSide;
|
||||
import net.minecraft.util.Session;
|
||||
@@ -57,6 +59,12 @@ public final class BotMinecraft extends Minecraft implements Helper {
|
||||
super(gameConfig);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public Entity getRenderViewEntity() {
|
||||
return Minecraft.getMinecraft().getRenderViewEntity();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public Session getSession() {
|
||||
@@ -103,6 +111,7 @@ public final class BotMinecraft extends Minecraft implements Helper {
|
||||
|
||||
public static BotMinecraft allocate(IBaritoneUser user) {
|
||||
BotMinecraft bm = ObjectAllocator.allocate(BotMinecraft.class);
|
||||
((IMinecraft) (Object) bm).setGameDir(Minecraft.getMinecraft().gameDir);
|
||||
bm.user = user;
|
||||
bm.tutorial = new Tutorial(bm);
|
||||
bm.gameSettings = createGameSettings(bm);
|
||||
|
||||
28
src/main/java/baritone/utils/accessor/IMinecraft.java
Normal file
28
src/main/java/baritone/utils/accessor/IMinecraft.java
Normal file
@@ -0,0 +1,28 @@
|
||||
/*
|
||||
* This file is part of Baritone.
|
||||
*
|
||||
* Baritone is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Baritone is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package baritone.utils.accessor;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
/**
|
||||
* @author Brady
|
||||
*/
|
||||
public interface IMinecraft {
|
||||
|
||||
void setGameDir(File gameDir);
|
||||
}
|
||||
Reference in New Issue
Block a user