Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

improve builder error messaging, fix fluid block detection

Browse source
This commit is contained in:
asiekierka 2014-12-11 16:48:21 +01:00
parent 51d8c06b9f
commit cc7d3397f5
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
common/buildcraft/builders/HeuristicBlockDetection.java
View file

@ -8,6 +8,7 @@ import net.minecraft.init.Blocks;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidBlock;
import buildcraft.api.blueprints.SchematicBlock;
import buildcraft.api.blueprints.SchematicFluid;
import buildcraft.builders.schematics.SchematicBlockCreative;
@ -37,12 +38,7 @@ public final class HeuristicBlockDetection {
}
}
} */
// Register fluids
for (Fluid f : FluidRegistry.getRegisteredFluids().values()) {
SchematicRegistry.INSTANCE.registerSchematicBlock(f.getBlock(), SchematicFluid.class, new FluidStack(f, 1000));
}
// Register blocks
Iterator i = Block.blockRegistry.iterator();
while (i.hasNext()) {
@ -67,7 +63,14 @@ public final class HeuristicBlockDetection {
if (creativeOnly) {
SchematicRegistry.INSTANCE.registerSchematicBlock(block, meta, SchematicBlockCreative.class);
} else {
SchematicRegistry.INSTANCE.registerSchematicBlock(block, meta, SchematicBlock.class);
if (block instanceof IFluidBlock) {
IFluidBlock fblock = (IFluidBlock) block;
if (fblock.getFluid() != null) {
SchematicRegistry.INSTANCE.registerSchematicBlock(block, meta, SchematicFluid.class, new FluidStack(fblock.getFluid(), 1000));
}
} else {
SchematicRegistry.INSTANCE.registerSchematicBlock(block, meta, SchematicBlock.class);
}
}
} catch (Exception e) {
e.printStackTrace();

2
common/buildcraft/core/blueprints/SchematicRegistry.java
View file

@ -96,7 +96,7 @@ public final class SchematicRegistry implements ISchematicRegistry {
public void registerSchematicBlock(Block block, int meta, Class<? extends Schematic> clazz, Object... params) {
if (block == null || Block.blockRegistry.getNameForObject(block) == null || "null".equals(Block.blockRegistry.getNameForObject(block))) {
BCLog.logger.warn("Builder: Mod tried to register block schematic with a null name! Ignoring.");
BCLog.logger.warn("Builder: Mod tried to register block '" + (block != null ? block.getClass().getName() : "null") + "' schematic with a null name! Ignoring.");
return;
}
if (schematicBlocks.containsKey(toStringKey(block, meta))) {