Made slabs register properly so they don't crash when being placed.

This commit is contained in:
Vasco Lavos committed 2016-09-21 17:55:25 +01:00
1 parent 02455bcd1f
commit 4bb2cadf72
2 files changed
+12 -2

No files matched your search

@@ -10,12 +10,15 @@
*/
package vazkii.botania.common.block;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.Block;
import net.minecraft.item.EnumDyeColor;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.BiomeBrickVariant;
import vazkii.botania.api.state.enums.BiomeStoneVariant;
@@ -53,10 +56,13 @@ import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall;
import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall;
import vazkii.botania.common.block.decor.walls.living.BlockLivingwoodWall;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.item.block.ItemBlockModSlab;
import vazkii.botania.common.lib.LibBlockNames;
public final class ModFluffBlocks {
public static List<Block> slabsToRegister = new ArrayList();
public static Block livingwoodStairs;
public static Block livingwoodSlab;
public static Block livingwoodSlabFull;
@@ -230,6 +236,9 @@ public final class ModFluffBlocks {
managlassPane = new BlockManaglassPane();
alfglassPane = new BlockAlfglassPane();
bifrostPane = new BlockBifrostPane();
for(Block b : slabsToRegister)
GameRegistry.register(new ItemBlockModSlab(b), b.getRegistryName());
}
}
@@ -28,6 +28,7 @@ import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.block.ItemBlockModSlab;
import vazkii.botania.common.lexicon.LexiconData;
@@ -51,8 +52,8 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM
}
setDefaultState(blockState.getBaseState().withProperty(HALF, EnumBlockHalf.BOTTOM).withProperty(DUMMY, DummyEnum.SINGLETON));
GameRegistry.register(this);
if (!isDouble())
GameRegistry.register(new ItemBlockModSlab(this), getRegistryName());
if(!isDouble())
ModFluffBlocks.slabsToRegister.add(this);
}
@Nonnull