Merge master

This commit is contained in:
Vincent Lee committed 2019-01-16 14:46:30 -06:00
commit eaaa55fdb0
254 files changed
+8593 -1893

No files matched your search

@@ -33,20 +33,7 @@ import vazkii.botania.common.block.corporea.BlockCorporeaFunnel;
import vazkii.botania.common.block.corporea.BlockCorporeaIndex;
import vazkii.botania.common.block.corporea.BlockCorporeaInterceptor;
import vazkii.botania.common.block.corporea.BlockCorporeaRetainer;
import vazkii.botania.common.block.decor.BlockBlaze;
import vazkii.botania.common.block.decor.BlockBuriedPetals;
import vazkii.botania.common.block.decor.BlockAzulejo;
import vazkii.botania.common.block.decor.BlockElfGlass;
import vazkii.botania.common.block.decor.BlockFloatingFlower;
import vazkii.botania.common.block.decor.BlockManaFlame;
import vazkii.botania.common.block.decor.BlockManaGlass;
import vazkii.botania.common.block.decor.BlockModMushroom;
import vazkii.botania.common.block.decor.BlockPetalBlock;
import vazkii.botania.common.block.decor.BlockShimmerrock;
import vazkii.botania.common.block.decor.BlockShimmerwoodPlanks;
import vazkii.botania.common.block.decor.BlockShinyFlower;
import vazkii.botania.common.block.decor.BlockStarfield;
import vazkii.botania.common.block.decor.BlockTinyPotato;
import vazkii.botania.common.block.decor.*;
import vazkii.botania.common.block.dispenser.BehaviourFelPumpkin;
import vazkii.botania.common.block.dispenser.BehaviourPoolMinecart;
import vazkii.botania.common.block.dispenser.BehaviourWand;
@@ -538,7 +525,7 @@ public final class ModBlocks {
r.register(new ItemBlockMod(pump).setRegistryName(pump.getRegistryName()));
r.register(new ItemBlockWithMetadataAndName(doubleFlower1).setRegistryName(doubleFlower1.getRegistryName()));
r.register(new ItemBlockWithMetadataAndName(doubleFlower2).setRegistryName(doubleFlower2.getRegistryName()));
r.register(new ItemBlockMod(blazeBlock).setRegistryName(blazeBlock.getRegistryName()));
r.register(new ItemBlockBlaze(blazeBlock).setRegistryName(blazeBlock.getRegistryName()));
r.register(new ItemBlockMod(corporeaInterceptor).setRegistryName(corporeaInterceptor.getRegistryName()));
r.register(new ItemBlockMod(corporeaCrystalCube).setRegistryName(corporeaCrystalCube.getRegistryName()));
r.register(new ItemBlockMod(incensePlate).setRegistryName(incensePlate.getRegistryName()));
@@ -714,7 +701,7 @@ public final class ModBlocks {
for(Class innerClazz : clazz.getDeclaredClasses())
if(innerClazz.getSimpleName().equals("Mini"))
BotaniaAPI.registerMiniSubTile(new ResourceLocation(key.getResourceDomain(), key.getResourcePath() + "Chibi"), innerClazz, key);
BotaniaAPI.registerMiniSubTile(new ResourceLocation(key.getNamespace(), key.getPath() + "Chibi"), innerClazz, key);
}
private static void registerTile(Class<? extends TileEntity> clazz, String key) {