Merge pull request #950 from 0-x-2-2/commands

Remove retarded MC field.
This commit is contained in:
Leijurv 2019-09-19 14:07:59 -07:00 committed by GitHub
commit 3c914de690
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 6 deletions

View File

@ -23,7 +23,6 @@ import baritone.api.utils.Helper;
import baritone.api.utils.IPlayerContext;
import baritone.api.utils.command.execution.CommandExecution;
import baritone.api.utils.command.helpers.arguments.ArgConsumer;
import net.minecraft.client.Minecraft;
import java.util.Collections;
import java.util.List;
@ -35,7 +34,6 @@ public abstract class Command implements Helper {
protected IBaritone baritone;
protected IPlayerContext ctx;
protected Minecraft MC = mc;
/**
* The names of this command. This is what you put after the command prefix.
*/

View File

@ -41,7 +41,7 @@ public class ComeCommand extends Command {
@Override
protected void executed(String label, ArgConsumer args, Settings settings) {
args.requireMax(0);
Entity entity = MC.getRenderViewEntity();
Entity entity = mc.getRenderViewEntity();
if (isNull(entity)) {
throw new CommandInvalidStateException("render view entity is null");
}

View File

@ -42,7 +42,7 @@ public class ExploreFilterCommand extends Command {
@Override
protected void executed(String label, ArgConsumer args, Settings settings) {
args.requireMax(2);
File file = args.getDatatypePost(RelativeFile.class, MC.gameDir.getAbsoluteFile().getParentFile());
File file = args.getDatatypePost(RelativeFile.class, mc.gameDir.getAbsoluteFile().getParentFile());
boolean invert = false;
if (args.has()) {
if (args.getString().equalsIgnoreCase("invert")) {

View File

@ -38,8 +38,8 @@ public class RenderCommand extends Command {
protected void executed(String label, ArgConsumer args, Settings settings) {
args.requireMax(0);
BetterBlockPos origin = ctx.playerFeet();
int renderDistance = (MC.gameSettings.renderDistanceChunks + 1) * 16;
MC.renderGlobal.markBlockRangeForRenderUpdate(
int renderDistance = (mc.gameSettings.renderDistanceChunks + 1) * 16;
mc.renderGlobal.markBlockRangeForRenderUpdate(
origin.x - renderDistance,
0,
origin.z - renderDistance,