final BC 7.0.3 commit
This commit is contained in:
parent
4b9db3bdbb
commit
f23ff7ac2e
2 changed files with 8 additions and 32 deletions
|
@ -8,9 +8,7 @@
|
||||||
*/
|
*/
|
||||||
package buildcraft.api.blueprints;
|
package buildcraft.api.blueprints;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
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<String, FMLMissingMappingsEvent.MissingMapping> 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) {
|
private Object getMissingMappingFromFML(boolean isBlock, String name, int i) {
|
||||||
String modName = name.split(":")[0];
|
String modName = name.split(":")[0];
|
||||||
if (Loader.isModLoaded(modName)) {
|
if (Loader.isModLoaded(modName)) {
|
||||||
|
|
|
@ -2,6 +2,14 @@ Everything from BuildCraft 6.4.14, and:
|
||||||
|
|
||||||
Improvements:
|
Improvements:
|
||||||
* [#2672] Add tooltips to robots and color-code energy information (asie)
|
* [#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:
|
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)
|
* Erratic robot recharge (hea3ven)
|
||||||
|
* Robot having invalid localized name (asie)
|
||||||
|
|
Loading…
Reference in a new issue