From f23ff7ac2ee5e8c15a12401ff7cfeb27a60c9102 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sat, 2 May 2015 15:40:47 +0200 Subject: [PATCH] final BC 7.0.3 commit --- .../api/blueprints/MappingRegistry.java | 32 ------------------- buildcraft_resources/changelog/7.0.3 | 8 +++++ 2 files changed, 8 insertions(+), 32 deletions(-) diff --git a/api/buildcraft/api/blueprints/MappingRegistry.java b/api/buildcraft/api/blueprints/MappingRegistry.java index ceb67033..f4edc278 100755 --- a/api/buildcraft/api/blueprints/MappingRegistry.java +++ b/api/buildcraft/api/blueprints/MappingRegistry.java @@ -8,9 +8,7 @@ */ package buildcraft.api.blueprints; -import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -298,36 +296,6 @@ public class MappingRegistry { } } - private final Object getMissingMappingFromFML(boolean isBlock, String name, int i) { - String modName = name.split(":")[0]; - if (Loader.isModLoaded(modName)) { - try { - FMLMissingMappingsEvent.MissingMapping mapping = new FMLMissingMappingsEvent.MissingMapping( - (isBlock ? '\u0001' : '\u0020') + name, i - ); - ListMultimap missingMapping - = ArrayListMultimap.create(); - missingMapping.put(modName, mapping); - FMLMissingMappingsEvent event = new FMLMissingMappingsEvent(missingMapping); - for (ModContainer container : Loader.instance().getModList()) { - if (container instanceof FMLModContainer) { - event.applyModContainer(container); - ((FMLModContainer) container).handleModStateEvent(event); - if (mapping.getAction() != FMLMissingMappingsEvent.Action.DEFAULT) { - break; - } - } - } - if (mapping.getAction() == FMLMissingMappingsEvent.Action.REMAP) { - return mapping.getTarget(); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - return null; - } - private Object getMissingMappingFromFML(boolean isBlock, String name, int i) { String modName = name.split(":")[0]; if (Loader.isModLoaded(modName)) { diff --git a/buildcraft_resources/changelog/7.0.3 b/buildcraft_resources/changelog/7.0.3 index c0abd6ea..9160f99a 100644 --- a/buildcraft_resources/changelog/7.0.3 +++ b/buildcraft_resources/changelog/7.0.3 @@ -2,6 +2,14 @@ Everything from BuildCraft 6.4.14, and: Improvements: * [#2672] Add tooltips to robots and color-code energy information (asie) +* Massive List optimization (asie) +* Shift-click now clears gate slots (asie) +* Slight tweaks/optimizations to pipes (asie) Bugs fixed: +* [#2677] Robots not respecting work zones (hea3ven) +* [#2673] Crash with Packages (asie) +* [#2670] Items falling out of Auto Workbench (asie) +* {#2161] Item drops with Furnaces (asie) * Erratic robot recharge (hea3ven) +* Robot having invalid localized name (asie)