From e2cc51908bfb6e32d843734204c9eebfd232f17a Mon Sep 17 00:00:00 2001 From: Brady Date: Fri, 8 Mar 2019 23:18:00 -0600 Subject: [PATCH] Notch builds --- build.gradle | 8 ++++++-- src/api/java/baritone/api/Settings.java | 6 +++--- src/main/java/baritone/process/MineProcess.java | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 2aebcc50a..c6be17517 100755 --- a/build.gradle +++ b/build.gradle @@ -25,14 +25,17 @@ buildscript { name = 'forge' url = 'http://files.minecraftforge.net/maven' } + maven { + name = 'impactdevelopment-repo' + url = 'https://impactdevelopment.github.io/maven/' + } } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath group: 'com.github.ImpactDevelopment', name: 'ForgeGradle', version: '3.0.111' } } - import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask @@ -76,6 +79,7 @@ minecraft { minecraft { mappings channel: 'snapshot', version: '20190307-1.13.1' + reobfMappings 'notch' runs { client { diff --git a/src/api/java/baritone/api/Settings.java b/src/api/java/baritone/api/Settings.java index 58c34a142..41b5c7bc7 100644 --- a/src/api/java/baritone/api/Settings.java +++ b/src/api/java/baritone/api/Settings.java @@ -125,9 +125,9 @@ public final class Settings { * Blocks that Baritone is allowed to place (as throwaway, for sneak bridging, pillaring, etc.) */ public final Setting> acceptableThrowawayItems = new Setting<>(new ArrayList<>(Arrays.asList( - Item.getItemFromBlock(Blocks.DIRT), - Item.getItemFromBlock(Blocks.COBBLESTONE), - Item.getItemFromBlock(Blocks.NETHERRACK) + Blocks.DIRT.asItem(), + Blocks.COBBLESTONE.asItem(), + Blocks.NETHERRACK.asItem() ))); /** diff --git a/src/main/java/baritone/process/MineProcess.java b/src/main/java/baritone/process/MineProcess.java index 60c316660..7ef3c9ecd 100644 --- a/src/main/java/baritone/process/MineProcess.java +++ b/src/main/java/baritone/process/MineProcess.java @@ -189,7 +189,7 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro Set searchingFor = new HashSet<>(); for (Block block : mining) { Item drop = block.getItemDropped(block.getDefaultState(), world, null, 0).asItem(); - Item ore = Item.getItemFromBlock(block); + Item ore = block.asItem(); searchingFor.add(drop); searchingFor.add(ore); }