From 379055f926b09d3763a35e3e5b541180e7521d68 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Wed, 1 Aug 2018 11:52:58 -0400 Subject: [PATCH] big move --- .gitignore | 45 +++++++++++++++++++ .../cabaletta/baritone/Baritone.java | 0 .../baritone/inventory}/AnotherStealer.java | 0 .../baritone/inventory}/CraftingTask.java | 0 .../baritone/inventory}/FoodManager.java | 0 .../baritone/inventory}/InventoryManager.java | 0 .../baritone/inventory}/SmeltingTask.java | 0 .../baritone/mining}/MickeyMine.java | 0 .../baritone/movement}/MovementManager.java | 0 .../cabaletta/baritone/pathfinding}/Node.java | 0 .../cabaletta/baritone/pathfinding}/Path.java | 0 .../baritone/pathfinding}/PathFinder.java | 0 .../baritone/pathfinding}/actions/Action.java | 0 .../pathfinding}/actions/ActionBridge.java | 0 .../pathfinding}/actions/ActionClimb.java | 0 .../pathfinding}/actions/ActionDescend.java | 0 .../actions/ActionDescendThree.java | 0 .../actions/ActionDescendTwo.java | 0 .../pathfinding}/actions/ActionFall.java | 0 .../pathfinding}/actions/ActionPillar.java | 0 .../actions/ActionPlaceOrBreak.java | 0 .../actions/ActionWalkDiagonal.java | 0 .../baritone/pathfinding}/goals/Goal.java | 0 .../pathfinding}/goals/GoalBlock.java | 0 .../pathfinding}/goals/GoalComposite.java | 0 .../pathfinding}/goals/GoalGetToBlock.java | 0 .../pathfinding}/goals/GoalRunAway.java | 0 .../pathfinding}/goals/GoalTwoBlocks.java | 0 .../baritone/pathfinding}/goals/GoalXZ.java | 0 .../pathfinding}/goals/GoalYLevel.java | 0 .../baritone/schematic}/Schematic.java | 0 .../baritone/schematic}/SchematicBuilder.java | 0 .../baritone/schematic}/SchematicLoader.java | 0 .../baritone/strategy}/EarlyGameStrategy.java | 0 {ui => src/cabaletta/baritone/ui}/AimBow.java | 0 .../cabaletta/baritone/ui}/GuiEscMenu.java | 0 .../cabaletta/baritone/ui}/LookManager.java | 0 .../cabaletta/baritone/ui}/PathRenderer.java | 0 .../cabaletta/baritone/ui}/Screenshot.java | 0 .../cabaletta/baritone/util}/Autorun.java | 0 .../baritone/util}/BlockPuncher.java | 0 .../cabaletta/baritone/util}/ChatCommand.java | 0 .../cabaletta/baritone/util}/FakeArrow.java | 0 .../cabaletta/baritone/util}/MCEdit.java | 0 .../cabaletta/baritone/util}/Manager.java | 0 .../cabaletta/baritone/util}/ManagerTick.java | 0 .../cabaletta/baritone/util}/Memory.java | 0 .../cabaletta/baritone/util}/Out.java | 0 .../cabaletta/baritone/util}/ToolSet.java | 0 src/minecraft/Start.java | 20 +++++++++ 50 files changed, 65 insertions(+) create mode 100644 .gitignore rename Baritone.java => src/cabaletta/baritone/Baritone.java (100%) rename {inventory => src/cabaletta/baritone/inventory}/AnotherStealer.java (100%) rename {inventory => src/cabaletta/baritone/inventory}/CraftingTask.java (100%) rename {inventory => src/cabaletta/baritone/inventory}/FoodManager.java (100%) rename {inventory => src/cabaletta/baritone/inventory}/InventoryManager.java (100%) rename {inventory => src/cabaletta/baritone/inventory}/SmeltingTask.java (100%) rename {mining => src/cabaletta/baritone/mining}/MickeyMine.java (100%) rename {movement => src/cabaletta/baritone/movement}/MovementManager.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/Node.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/Path.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/PathFinder.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/actions/Action.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/actions/ActionBridge.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/actions/ActionClimb.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/actions/ActionDescend.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/actions/ActionDescendThree.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/actions/ActionDescendTwo.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/actions/ActionFall.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/actions/ActionPillar.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/actions/ActionPlaceOrBreak.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/actions/ActionWalkDiagonal.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/goals/Goal.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/goals/GoalBlock.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/goals/GoalComposite.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/goals/GoalGetToBlock.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/goals/GoalRunAway.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/goals/GoalTwoBlocks.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/goals/GoalXZ.java (100%) rename {pathfinding => src/cabaletta/baritone/pathfinding}/goals/GoalYLevel.java (100%) rename {schematic => src/cabaletta/baritone/schematic}/Schematic.java (100%) rename {schematic => src/cabaletta/baritone/schematic}/SchematicBuilder.java (100%) rename {schematic => src/cabaletta/baritone/schematic}/SchematicLoader.java (100%) rename {strategy => src/cabaletta/baritone/strategy}/EarlyGameStrategy.java (100%) rename {ui => src/cabaletta/baritone/ui}/AimBow.java (100%) rename {ui => src/cabaletta/baritone/ui}/GuiEscMenu.java (100%) rename {ui => src/cabaletta/baritone/ui}/LookManager.java (100%) rename {ui => src/cabaletta/baritone/ui}/PathRenderer.java (100%) rename {ui => src/cabaletta/baritone/ui}/Screenshot.java (100%) rename {util => src/cabaletta/baritone/util}/Autorun.java (100%) rename {util => src/cabaletta/baritone/util}/BlockPuncher.java (100%) rename {util => src/cabaletta/baritone/util}/ChatCommand.java (100%) rename {util => src/cabaletta/baritone/util}/FakeArrow.java (100%) rename {util => src/cabaletta/baritone/util}/MCEdit.java (100%) rename {util => src/cabaletta/baritone/util}/Manager.java (100%) rename {util => src/cabaletta/baritone/util}/ManagerTick.java (100%) rename {util => src/cabaletta/baritone/util}/Memory.java (100%) rename {util => src/cabaletta/baritone/util}/Out.java (100%) rename {util => src/cabaletta/baritone/util}/ToolSet.java (100%) create mode 100644 src/minecraft/Start.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..f4ebca256 --- /dev/null +++ b/.gitignore @@ -0,0 +1,45 @@ +.DS_Store +/CHANGELOG +/LICENSE.txt +/bin/ +build.xml +/build/ +/cleanup.bat +/cleanup.sh +/conf/ +/decompile.bat +/decompile.sh +/dist/ +/docs/ +/eclipse/ +/getchangedsrc.bat +/getchangedsrc.sh +/jars/ +/logs/ +/mappingviewer/ +nbproject/ +/r +/recompile.bat +/recompile.sh +/reformat.bat +/reformat.sh +/reobfuscate.bat +/reobfuscate.sh +/reobfuscate_srg.bat +/reobfuscate_srg.sh +/runtime/ +/startclient.bat +/startclient.sh +/startserver.bat +/startserver.sh +/temp/ +/updateids.bat +/updateids.sh +/updatemcp.bat +/updatemcp.sh +/updatemd5.bat +/updatemd5.sh +/updatenames.bat +/updatenames.sh +/src/minecraft/net +/src/minecraft/mcp \ No newline at end of file diff --git a/Baritone.java b/src/cabaletta/baritone/Baritone.java similarity index 100% rename from Baritone.java rename to src/cabaletta/baritone/Baritone.java diff --git a/inventory/AnotherStealer.java b/src/cabaletta/baritone/inventory/AnotherStealer.java similarity index 100% rename from inventory/AnotherStealer.java rename to src/cabaletta/baritone/inventory/AnotherStealer.java diff --git a/inventory/CraftingTask.java b/src/cabaletta/baritone/inventory/CraftingTask.java similarity index 100% rename from inventory/CraftingTask.java rename to src/cabaletta/baritone/inventory/CraftingTask.java diff --git a/inventory/FoodManager.java b/src/cabaletta/baritone/inventory/FoodManager.java similarity index 100% rename from inventory/FoodManager.java rename to src/cabaletta/baritone/inventory/FoodManager.java diff --git a/inventory/InventoryManager.java b/src/cabaletta/baritone/inventory/InventoryManager.java similarity index 100% rename from inventory/InventoryManager.java rename to src/cabaletta/baritone/inventory/InventoryManager.java diff --git a/inventory/SmeltingTask.java b/src/cabaletta/baritone/inventory/SmeltingTask.java similarity index 100% rename from inventory/SmeltingTask.java rename to src/cabaletta/baritone/inventory/SmeltingTask.java diff --git a/mining/MickeyMine.java b/src/cabaletta/baritone/mining/MickeyMine.java similarity index 100% rename from mining/MickeyMine.java rename to src/cabaletta/baritone/mining/MickeyMine.java diff --git a/movement/MovementManager.java b/src/cabaletta/baritone/movement/MovementManager.java similarity index 100% rename from movement/MovementManager.java rename to src/cabaletta/baritone/movement/MovementManager.java diff --git a/pathfinding/Node.java b/src/cabaletta/baritone/pathfinding/Node.java similarity index 100% rename from pathfinding/Node.java rename to src/cabaletta/baritone/pathfinding/Node.java diff --git a/pathfinding/Path.java b/src/cabaletta/baritone/pathfinding/Path.java similarity index 100% rename from pathfinding/Path.java rename to src/cabaletta/baritone/pathfinding/Path.java diff --git a/pathfinding/PathFinder.java b/src/cabaletta/baritone/pathfinding/PathFinder.java similarity index 100% rename from pathfinding/PathFinder.java rename to src/cabaletta/baritone/pathfinding/PathFinder.java diff --git a/pathfinding/actions/Action.java b/src/cabaletta/baritone/pathfinding/actions/Action.java similarity index 100% rename from pathfinding/actions/Action.java rename to src/cabaletta/baritone/pathfinding/actions/Action.java diff --git a/pathfinding/actions/ActionBridge.java b/src/cabaletta/baritone/pathfinding/actions/ActionBridge.java similarity index 100% rename from pathfinding/actions/ActionBridge.java rename to src/cabaletta/baritone/pathfinding/actions/ActionBridge.java diff --git a/pathfinding/actions/ActionClimb.java b/src/cabaletta/baritone/pathfinding/actions/ActionClimb.java similarity index 100% rename from pathfinding/actions/ActionClimb.java rename to src/cabaletta/baritone/pathfinding/actions/ActionClimb.java diff --git a/pathfinding/actions/ActionDescend.java b/src/cabaletta/baritone/pathfinding/actions/ActionDescend.java similarity index 100% rename from pathfinding/actions/ActionDescend.java rename to src/cabaletta/baritone/pathfinding/actions/ActionDescend.java diff --git a/pathfinding/actions/ActionDescendThree.java b/src/cabaletta/baritone/pathfinding/actions/ActionDescendThree.java similarity index 100% rename from pathfinding/actions/ActionDescendThree.java rename to src/cabaletta/baritone/pathfinding/actions/ActionDescendThree.java diff --git a/pathfinding/actions/ActionDescendTwo.java b/src/cabaletta/baritone/pathfinding/actions/ActionDescendTwo.java similarity index 100% rename from pathfinding/actions/ActionDescendTwo.java rename to src/cabaletta/baritone/pathfinding/actions/ActionDescendTwo.java diff --git a/pathfinding/actions/ActionFall.java b/src/cabaletta/baritone/pathfinding/actions/ActionFall.java similarity index 100% rename from pathfinding/actions/ActionFall.java rename to src/cabaletta/baritone/pathfinding/actions/ActionFall.java diff --git a/pathfinding/actions/ActionPillar.java b/src/cabaletta/baritone/pathfinding/actions/ActionPillar.java similarity index 100% rename from pathfinding/actions/ActionPillar.java rename to src/cabaletta/baritone/pathfinding/actions/ActionPillar.java diff --git a/pathfinding/actions/ActionPlaceOrBreak.java b/src/cabaletta/baritone/pathfinding/actions/ActionPlaceOrBreak.java similarity index 100% rename from pathfinding/actions/ActionPlaceOrBreak.java rename to src/cabaletta/baritone/pathfinding/actions/ActionPlaceOrBreak.java diff --git a/pathfinding/actions/ActionWalkDiagonal.java b/src/cabaletta/baritone/pathfinding/actions/ActionWalkDiagonal.java similarity index 100% rename from pathfinding/actions/ActionWalkDiagonal.java rename to src/cabaletta/baritone/pathfinding/actions/ActionWalkDiagonal.java diff --git a/pathfinding/goals/Goal.java b/src/cabaletta/baritone/pathfinding/goals/Goal.java similarity index 100% rename from pathfinding/goals/Goal.java rename to src/cabaletta/baritone/pathfinding/goals/Goal.java diff --git a/pathfinding/goals/GoalBlock.java b/src/cabaletta/baritone/pathfinding/goals/GoalBlock.java similarity index 100% rename from pathfinding/goals/GoalBlock.java rename to src/cabaletta/baritone/pathfinding/goals/GoalBlock.java diff --git a/pathfinding/goals/GoalComposite.java b/src/cabaletta/baritone/pathfinding/goals/GoalComposite.java similarity index 100% rename from pathfinding/goals/GoalComposite.java rename to src/cabaletta/baritone/pathfinding/goals/GoalComposite.java diff --git a/pathfinding/goals/GoalGetToBlock.java b/src/cabaletta/baritone/pathfinding/goals/GoalGetToBlock.java similarity index 100% rename from pathfinding/goals/GoalGetToBlock.java rename to src/cabaletta/baritone/pathfinding/goals/GoalGetToBlock.java diff --git a/pathfinding/goals/GoalRunAway.java b/src/cabaletta/baritone/pathfinding/goals/GoalRunAway.java similarity index 100% rename from pathfinding/goals/GoalRunAway.java rename to src/cabaletta/baritone/pathfinding/goals/GoalRunAway.java diff --git a/pathfinding/goals/GoalTwoBlocks.java b/src/cabaletta/baritone/pathfinding/goals/GoalTwoBlocks.java similarity index 100% rename from pathfinding/goals/GoalTwoBlocks.java rename to src/cabaletta/baritone/pathfinding/goals/GoalTwoBlocks.java diff --git a/pathfinding/goals/GoalXZ.java b/src/cabaletta/baritone/pathfinding/goals/GoalXZ.java similarity index 100% rename from pathfinding/goals/GoalXZ.java rename to src/cabaletta/baritone/pathfinding/goals/GoalXZ.java diff --git a/pathfinding/goals/GoalYLevel.java b/src/cabaletta/baritone/pathfinding/goals/GoalYLevel.java similarity index 100% rename from pathfinding/goals/GoalYLevel.java rename to src/cabaletta/baritone/pathfinding/goals/GoalYLevel.java diff --git a/schematic/Schematic.java b/src/cabaletta/baritone/schematic/Schematic.java similarity index 100% rename from schematic/Schematic.java rename to src/cabaletta/baritone/schematic/Schematic.java diff --git a/schematic/SchematicBuilder.java b/src/cabaletta/baritone/schematic/SchematicBuilder.java similarity index 100% rename from schematic/SchematicBuilder.java rename to src/cabaletta/baritone/schematic/SchematicBuilder.java diff --git a/schematic/SchematicLoader.java b/src/cabaletta/baritone/schematic/SchematicLoader.java similarity index 100% rename from schematic/SchematicLoader.java rename to src/cabaletta/baritone/schematic/SchematicLoader.java diff --git a/strategy/EarlyGameStrategy.java b/src/cabaletta/baritone/strategy/EarlyGameStrategy.java similarity index 100% rename from strategy/EarlyGameStrategy.java rename to src/cabaletta/baritone/strategy/EarlyGameStrategy.java diff --git a/ui/AimBow.java b/src/cabaletta/baritone/ui/AimBow.java similarity index 100% rename from ui/AimBow.java rename to src/cabaletta/baritone/ui/AimBow.java diff --git a/ui/GuiEscMenu.java b/src/cabaletta/baritone/ui/GuiEscMenu.java similarity index 100% rename from ui/GuiEscMenu.java rename to src/cabaletta/baritone/ui/GuiEscMenu.java diff --git a/ui/LookManager.java b/src/cabaletta/baritone/ui/LookManager.java similarity index 100% rename from ui/LookManager.java rename to src/cabaletta/baritone/ui/LookManager.java diff --git a/ui/PathRenderer.java b/src/cabaletta/baritone/ui/PathRenderer.java similarity index 100% rename from ui/PathRenderer.java rename to src/cabaletta/baritone/ui/PathRenderer.java diff --git a/ui/Screenshot.java b/src/cabaletta/baritone/ui/Screenshot.java similarity index 100% rename from ui/Screenshot.java rename to src/cabaletta/baritone/ui/Screenshot.java diff --git a/util/Autorun.java b/src/cabaletta/baritone/util/Autorun.java similarity index 100% rename from util/Autorun.java rename to src/cabaletta/baritone/util/Autorun.java diff --git a/util/BlockPuncher.java b/src/cabaletta/baritone/util/BlockPuncher.java similarity index 100% rename from util/BlockPuncher.java rename to src/cabaletta/baritone/util/BlockPuncher.java diff --git a/util/ChatCommand.java b/src/cabaletta/baritone/util/ChatCommand.java similarity index 100% rename from util/ChatCommand.java rename to src/cabaletta/baritone/util/ChatCommand.java diff --git a/util/FakeArrow.java b/src/cabaletta/baritone/util/FakeArrow.java similarity index 100% rename from util/FakeArrow.java rename to src/cabaletta/baritone/util/FakeArrow.java diff --git a/util/MCEdit.java b/src/cabaletta/baritone/util/MCEdit.java similarity index 100% rename from util/MCEdit.java rename to src/cabaletta/baritone/util/MCEdit.java diff --git a/util/Manager.java b/src/cabaletta/baritone/util/Manager.java similarity index 100% rename from util/Manager.java rename to src/cabaletta/baritone/util/Manager.java diff --git a/util/ManagerTick.java b/src/cabaletta/baritone/util/ManagerTick.java similarity index 100% rename from util/ManagerTick.java rename to src/cabaletta/baritone/util/ManagerTick.java diff --git a/util/Memory.java b/src/cabaletta/baritone/util/Memory.java similarity index 100% rename from util/Memory.java rename to src/cabaletta/baritone/util/Memory.java diff --git a/util/Out.java b/src/cabaletta/baritone/util/Out.java similarity index 100% rename from util/Out.java rename to src/cabaletta/baritone/util/Out.java diff --git a/util/ToolSet.java b/src/cabaletta/baritone/util/ToolSet.java similarity index 100% rename from util/ToolSet.java rename to src/cabaletta/baritone/util/ToolSet.java diff --git a/src/minecraft/Start.java b/src/minecraft/Start.java new file mode 100644 index 000000000..46ccf4f22 --- /dev/null +++ b/src/minecraft/Start.java @@ -0,0 +1,20 @@ +import java.io.File; +import java.lang.reflect.Field; +import java.util.Arrays; + +import net.minecraft.client.main.Main; + +public class Start +{ + public static void main(String[] args) + { + Main.main(concat(new String[] {"--version", "mcp", "--accessToken", "0", "--assetsDir", "assets", "--assetIndex", "1.12", "--userProperties", "{}"}, args)); + } + + public static T[] concat(T[] first, T[] second) + { + T[] result = Arrays.copyOf(first, first.length + second.length); + System.arraycopy(second, 0, result, first.length, second.length); + return result; + } +}