Move non-fluff blocks to new registreation system (yay no more registering in ctors)

This commit is contained in:
Vincent Lee committed 2017-06-24 23:47:59 -05:00
1 parent a6b37966a1
commit 901f70da88
35 files changed
+432 -437

No files matched your search

@@ -18,7 +18,11 @@ import com.google.common.collect.ImmutableList;
import net.minecraft.block.Block;
import net.minecraft.item.EnumDyeColor;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.registries.IForgeRegistry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.BiomeBrickVariant;
import vazkii.botania.api.state.enums.BiomeStoneVariant;
@@ -59,149 +63,155 @@ import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.item.block.ItemBlockModSlab;
import vazkii.botania.common.lib.LibBlockNames;
@Mod.EventBusSubscriber
public final class ModFluffBlocks {
public static List<Block> slabsToRegister = new ArrayList();
public static List<Block> slabsToRegister = new ArrayList<>();
public static Block livingwoodStairs;
public static Block livingwoodSlab;
public static Block livingwoodSlabFull;
public static Block livingwoodWall;
public static Block livingwoodPlankStairs;
public static Block livingwoodPlankSlab;
public static Block livingwoodPlankSlabFull;
public static Block livingrockStairs;
public static Block livingrockSlab;
public static Block livingrockSlabFull;
public static Block livingrockWall;
public static Block livingrockBrickStairs;
public static Block livingrockBrickSlab;
public static Block livingrockBrickSlabFull;
public static Block dreamwoodStairs;
public static Block dreamwoodSlab;
public static Block dreamwoodSlabFull;
public static Block dreamwoodWall;
public static Block dreamwoodPlankStairs;
public static Block dreamwoodPlankSlab;
public static Block dreamwoodPlankSlabFull;
public static final Block livingwoodStairs = new BlockLivingwoodStairs();
public static final Block livingwoodSlab = new BlockLivingwoodSlab(false);
public static final Block livingwoodSlabFull = new BlockLivingwoodSlab(true);
public static final Block livingwoodWall = new BlockLivingwoodWall();
public static final Block livingwoodPlankStairs = new BlockLivingwoodPlankStairs();
public static final Block livingwoodPlankSlab = new BlockLivingwoodPlankSlab(false);
public static final Block livingwoodPlankSlabFull = new BlockLivingwoodPlankSlab(true);
public static final Block livingrockStairs = new BlockLivingrockStairs();
public static final Block livingrockSlab = new BlockLivingrockSlab(false);
public static final Block livingrockSlabFull = new BlockLivingrockSlab(true);
public static final Block livingrockWall = new BlockLivingrockWall();
public static final Block livingrockBrickStairs = new BlockLivingrockBrickStairs();
public static final Block livingrockBrickSlab = new BlockLivingrockBrickSlab(false);
public static final Block livingrockBrickSlabFull = new BlockLivingrockBrickSlab(true);
public static final Block dreamwoodStairs = new BlockDreamwoodStairs();
public static final Block dreamwoodSlab = new BlockDreamwoodSlab(false);
public static final Block dreamwoodSlabFull = new BlockDreamwoodSlab(true);
public static final Block dreamwoodWall = new BlockDreamwoodWall();
public static final Block dreamwoodPlankStairs = new BlockDreamwoodPlankStairs();
public static final Block dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false);
public static final Block dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true);
public static Block darkQuartz;
public static Block darkQuartzSlab;
public static Block darkQuartzSlabFull;
public static Block darkQuartzStairs;
public static Block manaQuartz;
public static Block manaQuartzSlab;
public static Block manaQuartzSlabFull;
public static Block manaQuartzStairs;
public static Block blazeQuartz;
public static Block blazeQuartzSlab;
public static Block blazeQuartzSlabFull;
public static Block blazeQuartzStairs;
public static Block lavenderQuartz;
public static Block lavenderQuartzSlab;
public static Block lavenderQuartzSlabFull;
public static Block lavenderQuartzStairs;
public static Block redQuartz;
public static Block redQuartzSlab;
public static Block redQuartzSlabFull;
public static Block redQuartzStairs;
public static Block elfQuartz;
public static Block elfQuartzSlab;
public static Block elfQuartzSlabFull;
public static Block elfQuartzStairs;
public static Block sunnyQuartz;
public static Block sunnyQuartzSlab;
public static Block sunnyQuartzSlabFull;
public static Block sunnyQuartzStairs;
public static final Block darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK);
public static final Block darkQuartzSlab = new BlockSpecialQuartzSlab(darkQuartz, false);
public static final Block darkQuartzSlabFull = new BlockSpecialQuartzSlab(darkQuartz, true);
public static final Block darkQuartzStairs = new BlockSpecialQuartzStairs(darkQuartz);
public static final Block manaQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_MANA);
public static final Block manaQuartzSlab = new BlockSpecialQuartzSlab(manaQuartz, false);
public static final Block manaQuartzSlabFull = new BlockSpecialQuartzSlab(manaQuartz, true);
public static final Block manaQuartzStairs = new BlockSpecialQuartzStairs(manaQuartz);
public static final Block blazeQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_BLAZE);
public static final Block blazeQuartzSlab = new BlockSpecialQuartzSlab(blazeQuartz, false);
public static final Block blazeQuartzSlabFull = new BlockSpecialQuartzSlab(blazeQuartz, true);
public static final Block blazeQuartzStairs = new BlockSpecialQuartzStairs(blazeQuartz);
public static final Block lavenderQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_LAVENDER);
public static final Block lavenderQuartzSlab = new BlockSpecialQuartzSlab(lavenderQuartz, false);
public static final Block lavenderQuartzSlabFull = new BlockSpecialQuartzSlab(lavenderQuartz, true);
public static final Block lavenderQuartzStairs = new BlockSpecialQuartzStairs(lavenderQuartz);
public static final Block redQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_RED);
public static final Block redQuartzSlab = new BlockSpecialQuartzSlab(redQuartz, false);
public static final Block redQuartzSlabFull = new BlockSpecialQuartzSlab(redQuartz, true);
public static final Block redQuartzStairs = new BlockSpecialQuartzStairs(redQuartz);
public static final Block elfQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_ELF);
public static final Block elfQuartzSlab = new BlockSpecialQuartzSlab(elfQuartz, false);
public static final Block elfQuartzSlabFull = new BlockSpecialQuartzSlab(elfQuartz, true);
public static final Block elfQuartzStairs = new BlockSpecialQuartzStairs(elfQuartz);
public static final Block sunnyQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_SUNNY);
public static final Block sunnyQuartzSlab = new BlockSpecialQuartzSlab(sunnyQuartz, false);
public static final Block sunnyQuartzSlabFull = new BlockSpecialQuartzSlab(sunnyQuartz, true);
public static final Block sunnyQuartzStairs = new BlockSpecialQuartzStairs(sunnyQuartz);
public static Block biomeStoneA;
public static Block biomeStoneB;
public static Block pavement;
public static final Block biomeStoneA = new BlockBiomeStoneA();
public static final Block biomeStoneB = new BlockBiomeStoneB();
public static final Block pavement = new BlockPavement();
public static final Block[] biomeStoneStairs = new Block[24];
public static final Block[] biomeStoneSlabs = new Block[24];
public static final Block[] biomeStoneFullSlabs = new Block[24];
public static Block biomeStoneWall;
public static final Block biomeStoneWall = new BlockBiomeStoneWall();
public static final Block[] pavementStairs = new Block[BlockPavement.TYPES];
public static final Block[] pavementSlabs = new Block[BlockPavement.TYPES];
public static final Block[] pavementFullSlabs = new Block[BlockPavement.TYPES];
public static Block shimmerrockSlab;
public static Block shimmerrockSlabFull;
public static Block shimmerrockStairs;
public static Block shimmerwoodPlankSlab;
public static Block shimmerwoodPlankSlabFull;
public static Block shimmerwoodPlankStairs;
public static final Block shimmerrockSlab = new BlockShimmerrockSlab(false);
public static final Block shimmerrockSlabFull = new BlockShimmerrockSlab(true);
public static final Block shimmerrockStairs = new BlockShimmerrockStairs();
public static final Block shimmerwoodPlankSlab = new BlockShimmerwoodPlankSlab(false);
public static final Block shimmerwoodPlankSlabFull = new BlockShimmerwoodPlankSlab(true);
public static final Block shimmerwoodPlankStairs = new BlockShimmerwoodPlankStairs();
public static Block managlassPane;
public static Block alfglassPane;
public static Block bifrostPane;
public static final Block managlassPane = new BlockManaglassPane();
public static final Block alfglassPane = new BlockAlfglassPane();
public static final Block bifrostPane = new BlockBifrostPane();
public static void init() {
livingwoodStairs = new BlockLivingwoodStairs();
livingwoodSlab = new BlockLivingwoodSlab(false);
livingwoodSlabFull = new BlockLivingwoodSlab(true);
livingwoodWall = new BlockLivingwoodWall();
livingwoodPlankStairs = new BlockLivingwoodPlankStairs();
livingwoodPlankSlab = new BlockLivingwoodPlankSlab(false);
livingwoodPlankSlabFull = new BlockLivingwoodPlankSlab(true);
livingrockStairs = new BlockLivingrockStairs();
livingrockSlab = new BlockLivingrockSlab(false);
livingrockSlabFull = new BlockLivingrockSlab(true);
livingrockWall = new BlockLivingrockWall();
livingrockBrickStairs = new BlockLivingrockBrickStairs();
livingrockBrickSlab = new BlockLivingrockBrickSlab(false);
livingrockBrickSlabFull = new BlockLivingrockBrickSlab(true);
dreamwoodStairs = new BlockDreamwoodStairs();
dreamwoodSlab = new BlockDreamwoodSlab(false);
dreamwoodSlabFull = new BlockDreamwoodSlab(true);
dreamwoodWall = new BlockDreamwoodWall();
dreamwoodPlankStairs = new BlockDreamwoodPlankStairs();
dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false);
dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true);
biomeStoneA = new BlockBiomeStoneA();
biomeStoneB = new BlockBiomeStoneB();
pavement = new BlockPavement();
@SubscribeEvent
public static void register(RegistryEvent.Register<Block> evt) {
IForgeRegistry<Block> r = evt.getRegistry();
r.register(livingwoodStairs);
r.register(livingwoodSlab);
r.register(livingwoodSlabFull);
r.register(livingwoodWall);
r.register(livingwoodPlankStairs);
r.register(livingwoodPlankSlab);
r.register(livingwoodPlankSlabFull);
r.register(livingrockStairs);
r.register(livingrockSlab);
r.register(livingrockSlabFull);
r.register(livingrockWall);
r.register(livingrockBrickStairs);
r.register(livingrockBrickSlab);
r.register(livingrockBrickSlabFull);
r.register(dreamwoodStairs);
r.register(dreamwoodSlab);
r.register(dreamwoodSlabFull);
r.register(dreamwoodWall);
r.register(dreamwoodPlankStairs);
r.register(dreamwoodPlankSlab);
r.register(dreamwoodPlankSlabFull);
if(ConfigHandler.darkQuartzEnabled) {
darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK);
darkQuartzSlab = new BlockSpecialQuartzSlab(darkQuartz, false);
darkQuartzSlabFull = new BlockSpecialQuartzSlab(darkQuartz, true);
darkQuartzStairs = new BlockSpecialQuartzStairs(darkQuartz);
r.register(darkQuartz);
r.register(darkQuartzSlab);
r.register(darkQuartzSlabFull);
r.register(darkQuartzStairs);
}
r.register(manaQuartz);
r.register(manaQuartzSlab);
r.register(manaQuartzSlabFull);
r.register(manaQuartzStairs);
r.register(blazeQuartz);
r.register(blazeQuartzSlab);
r.register(blazeQuartzSlabFull);
r.register(blazeQuartzStairs);
r.register(lavenderQuartz);
r.register(lavenderQuartzSlab);
r.register(lavenderQuartzSlabFull);
r.register(lavenderQuartzStairs);
r.register(redQuartz);
r.register(redQuartzSlab);
r.register(redQuartzSlabFull);
r.register(redQuartzStairs);
r.register(elfQuartz);
r.register(elfQuartzSlab);
r.register(elfQuartzSlabFull);
r.register(elfQuartzStairs);
r.register(sunnyQuartz);
r.register(sunnyQuartzSlab);
r.register(sunnyQuartzSlabFull);
r.register(sunnyQuartzStairs);
manaQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_MANA);
manaQuartzSlab = new BlockSpecialQuartzSlab(manaQuartz, false);
manaQuartzSlabFull = new BlockSpecialQuartzSlab(manaQuartz, true);
manaQuartzStairs = new BlockSpecialQuartzStairs(manaQuartz);
blazeQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_BLAZE);
blazeQuartzSlab = new BlockSpecialQuartzSlab(blazeQuartz, false);
blazeQuartzSlabFull = new BlockSpecialQuartzSlab(blazeQuartz, true);
blazeQuartzStairs = new BlockSpecialQuartzStairs(blazeQuartz);
lavenderQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_LAVENDER);
lavenderQuartzSlab = new BlockSpecialQuartzSlab(lavenderQuartz, false);
lavenderQuartzSlabFull = new BlockSpecialQuartzSlab(lavenderQuartz, true);
lavenderQuartzStairs = new BlockSpecialQuartzStairs(lavenderQuartz);
redQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_RED);
redQuartzSlab = new BlockSpecialQuartzSlab(redQuartz, false);
redQuartzSlabFull = new BlockSpecialQuartzSlab(redQuartz, true);
redQuartzStairs = new BlockSpecialQuartzStairs(redQuartz);
elfQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_ELF);
elfQuartzSlab = new BlockSpecialQuartzSlab(elfQuartz, false);
elfQuartzSlabFull = new BlockSpecialQuartzSlab(elfQuartz, true);
elfQuartzStairs = new BlockSpecialQuartzStairs(elfQuartz);
sunnyQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_SUNNY);
sunnyQuartzSlab = new BlockSpecialQuartzSlab(sunnyQuartz, false);
sunnyQuartzSlabFull = new BlockSpecialQuartzSlab(sunnyQuartz, true);
sunnyQuartzStairs = new BlockSpecialQuartzStairs(sunnyQuartz);
r.register(biomeStoneA);
r.register(biomeStoneB);
r.register(pavement);
int count = 0;
for (BiomeStoneVariant variant : BiomeStoneVariant.values()) {
biomeStoneStairs[count] = new BlockBiomeStoneStairs(biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant));
biomeStoneSlabs[count] = new BlockBiomeStoneSlab(false, biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant), count);
biomeStoneFullSlabs[count] = new BlockBiomeStoneSlab(true, biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant), count);
r.register(biomeStoneStairs[count]);
r.register(biomeStoneSlabs[count]);
r.register(biomeStoneFullSlabs[count]);
count++;
}
@@ -213,9 +223,13 @@ public final class ModFluffBlocks {
biomeStoneStairs[count] = new BlockBiomeStoneStairs(biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant));
biomeStoneSlabs[count] = new BlockBiomeStoneSlab(false, biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant), count);
biomeStoneFullSlabs[count] = new BlockBiomeStoneSlab(true, biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant), count);
r.register(biomeStoneStairs[count]);
r.register(biomeStoneSlabs[count]);
r.register(biomeStoneFullSlabs[count]);
count++;
}
biomeStoneWall = new BlockBiomeStoneWall();
r.register(biomeStoneWall);
count = 0;
for (EnumDyeColor color : ImmutableList.of(EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE,
@@ -223,19 +237,22 @@ public final class ModFluffBlocks {
pavementStairs[count] = new BlockPavementStairs(color);
pavementSlabs[count] = new BlockPavementSlab(false, color, count);
pavementFullSlabs[count] = new BlockPavementSlab(true, color, count);
r.register(pavementStairs[count]);
r.register(pavementSlabs[count]);
r.register(pavementFullSlabs[count]);
count++;
}
shimmerrockSlab = new BlockShimmerrockSlab(false);
shimmerrockSlabFull = new BlockShimmerrockSlab(true);
shimmerrockStairs = new BlockShimmerrockStairs();
shimmerwoodPlankSlab = new BlockShimmerwoodPlankSlab(false);
shimmerwoodPlankSlabFull = new BlockShimmerwoodPlankSlab(true);
shimmerwoodPlankStairs = new BlockShimmerwoodPlankStairs();
r.register(shimmerrockSlab);
r.register(shimmerrockSlabFull);
r.register(shimmerrockStairs);
r.register(shimmerwoodPlankSlab);
r.register(shimmerwoodPlankSlabFull);
r.register(shimmerwoodPlankStairs);
managlassPane = new BlockManaglassPane();
alfglassPane = new BlockAlfglassPane();
bifrostPane = new BlockBifrostPane();
r.register(managlassPane);
r.register(alfglassPane);
r.register(bifrostPane);
for(Block b : slabsToRegister)
GameRegistry.register(new ItemBlockModSlab(b), b.getRegistryName());