From 66ae784ed084e22fab5cc68d1cec8dcfa9e32611 Mon Sep 17 00:00:00 2001 From: SpaceToad Date: Fri, 4 Jul 2014 09:03:24 +0200 Subject: [PATCH] bucher -> butcher, close #1926 --- .../assets/buildcraft/lang/en_US.lang | 2 +- .../{robot_bucher.png => robot_butcher.png} | Bin common/buildcraft/BuildCraftSilicon.java | 4 ++-- ...BoardRobotBucher.java => BoardRobotButcher.java} | 6 +++--- ...obotBucherNBT.java => BoardRobotButcherNBT.java} | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) rename buildcraft_resources/assets/buildcraft/textures/entities/{robot_bucher.png => robot_butcher.png} (100%) rename common/buildcraft/core/robots/boards/{BoardRobotBucher.java => BoardRobotButcher.java} (93%) rename common/buildcraft/core/robots/boards/{BoardRobotBucherNBT.java => BoardRobotButcherNBT.java} (82%) diff --git a/buildcraft_resources/assets/buildcraft/lang/en_US.lang b/buildcraft_resources/assets/buildcraft/lang/en_US.lang index d2df6de0..9be5679c 100755 --- a/buildcraft_resources/assets/buildcraft/lang/en_US.lang +++ b/buildcraft_resources/assets/buildcraft/lang/en_US.lang @@ -11,7 +11,7 @@ buildcraft.boardRobotMiner=Miner buildcraft.boardRobotFarmer=Farmer buildcraft.boardRobotHarvester=Harvester buildcraft.boardRobotShovelman=Shovelman -buildcraft.boardRobotBucher=Bucher +buildcraft.boardRobotButcher=Butcher buildcraft.boardDetail.parameters=Parameters buildcraft.boardDetail.range=Range diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_bucher.png b/buildcraft_resources/assets/buildcraft/textures/entities/robot_butcher.png similarity index 100% rename from buildcraft_resources/assets/buildcraft/textures/entities/robot_bucher.png rename to buildcraft_resources/assets/buildcraft/textures/entities/robot_butcher.png diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index f32aebb2..b24b2c9f 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -43,7 +43,7 @@ import buildcraft.core.network.BuildCraftChannelHandler; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.robots.RobotIntegrationRecipe; import buildcraft.core.robots.boards.BoardRobotBomberNBT; -import buildcraft.core.robots.boards.BoardRobotBucherNBT; +import buildcraft.core.robots.boards.BoardRobotButcherNBT; import buildcraft.core.robots.boards.BoardRobotCarrierNBT; import buildcraft.core.robots.boards.BoardRobotFarmerNBT; import buildcraft.core.robots.boards.BoardRobotHarvesterNBT; @@ -155,7 +155,7 @@ public class BuildCraftSilicon extends BuildCraftMod { RedstoneBoardRegistry.instance.registerBoardClass(BoardRobotPlanterNBT.instance, 5); RedstoneBoardRegistry.instance.registerBoardClass(BoardRobotFarmerNBT.instance, 5); RedstoneBoardRegistry.instance.registerBoardClass(BoardRobotLeaveCutterNBT.instance, 5); - RedstoneBoardRegistry.instance.registerBoardClass(BoardRobotBucherNBT.instance, 5); + RedstoneBoardRegistry.instance.registerBoardClass(BoardRobotButcherNBT.instance, 5); RedstoneBoardRegistry.instance.registerBoardClass(BoardRobotShovelmanNBT.instance, 5); RedstoneBoardRegistry.instance.registerBoardClass(BoardRobotKnightNBT.instance, 1); RedstoneBoardRegistry.instance.registerBoardClass(BoardRobotBomberNBT.instance, 1); diff --git a/common/buildcraft/core/robots/boards/BoardRobotBucher.java b/common/buildcraft/core/robots/boards/BoardRobotButcher.java similarity index 93% rename from common/buildcraft/core/robots/boards/BoardRobotBucher.java rename to common/buildcraft/core/robots/boards/BoardRobotButcher.java index 1d8ac5be..cad44c48 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotBucher.java +++ b/common/buildcraft/core/robots/boards/BoardRobotButcher.java @@ -24,15 +24,15 @@ import buildcraft.core.robots.AIRobotGotoSleep; import buildcraft.core.robots.AIRobotSearchEntity; import buildcraft.core.robots.IEntityFilter; -public class BoardRobotBucher extends RedstoneBoardRobot { +public class BoardRobotButcher extends RedstoneBoardRobot { - public BoardRobotBucher(EntityRobotBase iRobot) { + public BoardRobotButcher(EntityRobotBase iRobot) { super(iRobot); } @Override public RedstoneBoardRobotNBT getNBTHandler() { - return BoardRobotBucherNBT.instance; + return BoardRobotButcherNBT.instance; } @Override diff --git a/common/buildcraft/core/robots/boards/BoardRobotBucherNBT.java b/common/buildcraft/core/robots/boards/BoardRobotButcherNBT.java similarity index 82% rename from common/buildcraft/core/robots/boards/BoardRobotBucherNBT.java rename to common/buildcraft/core/robots/boards/BoardRobotButcherNBT.java index 3f374c3f..5108afd4 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotBucherNBT.java +++ b/common/buildcraft/core/robots/boards/BoardRobotButcherNBT.java @@ -23,18 +23,18 @@ import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; import buildcraft.core.utils.StringUtils; -public final class BoardRobotBucherNBT extends RedstoneBoardRobotNBT { +public final class BoardRobotButcherNBT extends RedstoneBoardRobotNBT { - public static BoardRobotBucherNBT instance = new BoardRobotBucherNBT(); + public static BoardRobotButcherNBT instance = new BoardRobotButcherNBT(); private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", - DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_bucher.png"); + DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_butcher.png"); private IIcon icon; @Override public RedstoneBoardRobot create(NBTTagCompound nbt, EntityRobotBase robot) { - return new BoardRobotBucher(robot); + return new BoardRobotButcher(robot); } @Override @@ -44,12 +44,12 @@ public final class BoardRobotBucherNBT extends RedstoneBoardRobotNBT { @Override public String getID() { - return "buildcraft:boardRobotBucher"; + return "buildcraft:boardRobotButcher"; } @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) { - list.add(StringUtils.localize("buildcraft.boardRobotBucher")); + list.add(StringUtils.localize("buildcraft.boardRobotButcher")); } @Override