mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 19:29:31 +00:00
Flatten pylons
This commit is contained in:
1 parent
91b9c2e0c8
commit
3f9993d762
38 files changed
+142
-175
No files matched your search
@@ -31,7 +31,6 @@ import vazkii.botania.api.state.enums.LivingRockVariant;
|
||||
import vazkii.botania.api.state.enums.LivingWoodVariant;
|
||||
import vazkii.botania.api.state.enums.LuminizerVariant;
|
||||
import vazkii.botania.api.state.enums.PlatformVariant;
|
||||
import vazkii.botania.api.state.enums.PylonVariant;
|
||||
import vazkii.botania.api.state.enums.QuartzVariant;
|
||||
import vazkii.botania.api.state.enums.SpreaderVariant;
|
||||
|
||||
@@ -153,9 +152,6 @@ public final class BotaniaStateProps {
|
||||
// BlockPrism
|
||||
public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens");
|
||||
|
||||
// BlockPylon
|
||||
public static final PropertyEnum<PylonVariant> PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class);
|
||||
|
||||
// BlockSpreader
|
||||
public static final PropertyEnum<SpreaderVariant> SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class);
|
||||
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
/**
|
||||
* This class was created by <williewillus>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
* <p>
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*/
|
||||
package vazkii.botania.api.state.enums;
|
||||
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
public enum PylonVariant implements IStringSerializable {
|
||||
MANA,
|
||||
NATURA,
|
||||
GAIA;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -55,7 +55,6 @@ public final class ModelHandler {
|
||||
@SubscribeEvent
|
||||
public static void registerModels(ModelRegistryEvent evt) {
|
||||
ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE);
|
||||
OBJLoader.INSTANCE.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT));
|
||||
|
||||
registerSubtiles();
|
||||
|
||||
|
||||
@@ -225,7 +225,9 @@ public class ClientProxy implements IProxy {
|
||||
|
||||
ShaderHelper.initShaders();
|
||||
|
||||
IMultiblockRenderHook.renderHooks.put(ModBlocks.pylon, renderTilePylon);
|
||||
IMultiblockRenderHook.renderHooks.put(ModBlocks.manaPylon, renderTilePylon);
|
||||
IMultiblockRenderHook.renderHooks.put(ModBlocks.naturaPylon, renderTilePylon);
|
||||
IMultiblockRenderHook.renderHooks.put(ModBlocks.gaiaPylon, renderTilePylon);
|
||||
}
|
||||
|
||||
private void initAuxiliaryRender() {
|
||||
|
||||
@@ -12,7 +12,6 @@ package vazkii.botania.client.model;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import vazkii.botania.api.state.enums.PylonVariant;
|
||||
|
||||
public class ModelPylonMana extends ModelBase implements IPylonModel {
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ import java.util.Random;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
@@ -30,8 +31,6 @@ import net.minecraft.world.IBlockAccess;
|
||||
import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook;
|
||||
import vazkii.botania.api.lexicon.multiblock.Multiblock;
|
||||
import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.PylonVariant;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MultiblockRenderHandler;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
@@ -40,6 +39,7 @@ import vazkii.botania.client.model.IPylonModel;
|
||||
import vazkii.botania.client.model.ModelPylonGaia;
|
||||
import vazkii.botania.client.model.ModelPylonMana;
|
||||
import vazkii.botania.client.model.ModelPylonNatura;
|
||||
import vazkii.botania.common.block.BlockPylon;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.TilePylon;
|
||||
|
||||
@@ -54,20 +54,20 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> implem
|
||||
private final ModelPylonGaia gaiaModel = new ModelPylonGaia();
|
||||
|
||||
// Overrides for when we call this TESR without an actual pylon
|
||||
private static PylonVariant forceVariant = PylonVariant.MANA;
|
||||
private static BlockPylon.Variant forceVariant = BlockPylon.Variant.MANA;
|
||||
|
||||
@Override
|
||||
public void render(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
|
||||
boolean renderingItem = pylon == ForwardingTEISR.DUMMY;
|
||||
|
||||
if(!renderingItem && (!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || pylon.getWorld().getBlockState(pylon.getPos()).getBlock() != ModBlocks.pylon))
|
||||
if(!renderingItem && (!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || !(pylon.getBlockType() instanceof BlockPylon)))
|
||||
return;
|
||||
|
||||
renderPylon(pylon, d0, d1, d2, pticks, renderingItem);
|
||||
}
|
||||
|
||||
private void renderPylon(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, boolean renderingItem) {
|
||||
PylonVariant type = renderingItem ? forceVariant : ModBlocks.pylon.getStateFromMeta(pylon.getBlockMetadata()).getValue(BotaniaStateProps.PYLON_VARIANT);
|
||||
BlockPylon.Variant type = renderingItem ? forceVariant : ((BlockPylon) pylon.getBlockType()).variant;
|
||||
IPylonModel model;
|
||||
switch(type) {
|
||||
default:
|
||||
@@ -138,7 +138,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> implem
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
// Dirty hack to make the TEISR aware of the stack metas
|
||||
// Dirty hack to make the TESR know which variant of pylon it's rendering
|
||||
public static class ForwardingTEISR extends TileEntityItemStackRenderer {
|
||||
private static final TilePylon DUMMY = new TilePylon();
|
||||
|
||||
@@ -150,8 +150,8 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> implem
|
||||
|
||||
@Override
|
||||
public void renderByItem(ItemStack stack, float partialTicks) {
|
||||
if(stack.getItem() == Item.getItemFromBlock(ModBlocks.pylon)) {
|
||||
RenderTilePylon.forceVariant = PylonVariant.values()[MathHelper.clamp(stack.getItemDamage(), 0, PylonVariant.values().length)];
|
||||
if(Block.getBlockFromItem(stack.getItem()) instanceof BlockPylon) {
|
||||
RenderTilePylon.forceVariant = ((BlockPylon) Block.getBlockFromItem(stack.getItem())).variant;
|
||||
TileEntityRendererDispatcher.instance.render(DUMMY, 0, 0, 0, partialTicks);
|
||||
} else {
|
||||
compose.renderByItem(stack, partialTicks);
|
||||
@@ -161,10 +161,10 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> implem
|
||||
|
||||
@Override
|
||||
public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp) {
|
||||
forceVariant = state.getValue(BotaniaStateProps.PYLON_VARIANT);
|
||||
forceVariant = ((BlockPylon) state.getBlock()).variant;
|
||||
GlStateManager.translate(-0.5, -0.25, -0.5);
|
||||
renderPylon((TilePylon) comp.getTileEntity(), 0, 0, 0, 0, true);
|
||||
forceVariant = PylonVariant.MANA;
|
||||
forceVariant = BlockPylon.Variant.MANA;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -34,8 +34,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import thaumcraft.api.crafting.IInfusionStabiliser;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.PylonVariant;
|
||||
import vazkii.botania.client.core.handler.ModelHandler;
|
||||
import vazkii.botania.common.block.tile.TilePylon;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
@@ -43,18 +41,25 @@ import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.Locale;
|
||||
|
||||
@Optional.Interface(modid = "thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true)
|
||||
public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabiliser {
|
||||
|
||||
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 21.0/16, 0.875);
|
||||
|
||||
public BlockPylon() {
|
||||
super(Material.IRON, LibBlockNames.PYLON);
|
||||
public enum Variant {
|
||||
MANA,
|
||||
NATURA,
|
||||
GAIA
|
||||
}
|
||||
|
||||
public final Variant variant;
|
||||
public BlockPylon(Variant v) {
|
||||
super(Material.IRON, LibBlockNames.PYLON_PREFIX + v.name().toLowerCase(Locale.ROOT));
|
||||
setHardness(5.5F);
|
||||
setSoundType(SoundType.METAL);
|
||||
setLightLevel(0.5F);
|
||||
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA));
|
||||
this.variant = v;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@@ -63,37 +68,6 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi
|
||||
return AABB;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public BlockStateContainer createBlockState() {
|
||||
return new BlockStateContainer(this, BotaniaStateProps.PYLON_VARIANT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetaFromState(IBlockState state) {
|
||||
return state.getValue(BotaniaStateProps.PYLON_VARIANT).ordinal();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public IBlockState getStateFromMeta(int meta) {
|
||||
if (meta > PylonVariant.values().length) {
|
||||
meta = 0;
|
||||
}
|
||||
return getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.values()[meta]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int damageDropped(IBlockState state) {
|
||||
return getMetaFromState(state);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(CreativeTabs par2, NonNullList<ItemStack> par3) {
|
||||
for(int i = 0; i < PylonVariant.values().length; i++)
|
||||
par3.add(new ItemStack(this, 1, i));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOpaqueCube(IBlockState state) {
|
||||
return false;
|
||||
@@ -112,8 +86,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi
|
||||
|
||||
@Override
|
||||
public float getEnchantPowerBonus(World world, BlockPos pos) {
|
||||
IBlockState state = world.getBlockState(pos);
|
||||
if (state.getBlock() != this || state.getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA) {
|
||||
if (variant == Variant.MANA) {
|
||||
return 8;
|
||||
} else {
|
||||
return 15;
|
||||
@@ -133,8 +106,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
PylonVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT);
|
||||
return variant == PylonVariant.MANA ? LexiconData.pylon : variant == PylonVariant.NATURA ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual;
|
||||
return variant == Variant.MANA ? LexiconData.pylon : variant == Variant.NATURA ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -145,8 +117,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModels() {
|
||||
String[] names = { "mana", "natura", "gaia" };
|
||||
ModelHandler.registerCustomItemblock(this, names.length, i -> "pylon_" + names[i]);
|
||||
ModelHandler.registerInventoryVariant(this);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
|
||||
@@ -137,7 +137,9 @@ public final class ModBlocks {
|
||||
public static final Block dilutedPool = new BlockPool(BlockPool.Variant.DILUTED);
|
||||
public static final Block fabulousPool = new BlockPool(BlockPool.Variant.FABULOUS);
|
||||
public static final Block runeAltar = new BlockRuneAltar();
|
||||
public static final Block pylon = new BlockPylon();
|
||||
public static final Block manaPylon = new BlockPylon(BlockPylon.Variant.MANA);
|
||||
public static final Block naturaPylon = new BlockPylon(BlockPylon.Variant.NATURA);
|
||||
public static final Block gaiaPylon = new BlockPylon(BlockPylon.Variant.GAIA);
|
||||
public static final Block pistonRelay = new BlockPistonRelay();
|
||||
public static final Block distributor = new BlockDistributor();
|
||||
public static final Block manaVoid = new BlockManaVoid();
|
||||
@@ -254,7 +256,9 @@ public final class ModBlocks {
|
||||
r.register(dilutedPool);
|
||||
r.register(fabulousPool);
|
||||
r.register(runeAltar);
|
||||
r.register(pylon);
|
||||
r.register(manaPylon);
|
||||
r.register(naturaPylon);
|
||||
r.register(gaiaPylon);
|
||||
r.register(pistonRelay);
|
||||
r.register(distributor);
|
||||
r.register(manaVoid);
|
||||
@@ -374,7 +378,9 @@ public final class ModBlocks {
|
||||
r.register(new ItemBlockPool(dilutedPool).setRegistryName(dilutedPool.getRegistryName()));
|
||||
r.register(new ItemBlockPool(fabulousPool).setRegistryName(fabulousPool.getRegistryName()));
|
||||
r.register(new ItemBlockMod(runeAltar).setRegistryName(runeAltar.getRegistryName()));
|
||||
r.register(new ItemBlockWithMetadataAndName(pylon).setRegistryName(pylon.getRegistryName()));
|
||||
r.register(new ItemBlockMod(manaPylon).setRegistryName(manaPylon.getRegistryName()));
|
||||
r.register(new ItemBlockMod(naturaPylon).setRegistryName(naturaPylon.getRegistryName()));
|
||||
r.register(new ItemBlockMod(gaiaPylon).setRegistryName(gaiaPylon.getRegistryName()));
|
||||
r.register(new ItemBlockMod(pistonRelay).setRegistryName(pistonRelay.getRegistryName()));
|
||||
r.register(new ItemBlockMod(distributor).setRegistryName(distributor.getRegistryName()));
|
||||
r.register(new ItemBlockMod(manaVoid).setRegistryName(manaVoid.getRegistryName()));
|
||||
|
||||
@@ -31,7 +31,6 @@ import vazkii.botania.api.recipe.RecipeElvenTrade;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.AlfPortalState;
|
||||
import vazkii.botania.api.state.enums.LivingWoodVariant;
|
||||
import vazkii.botania.api.state.enums.PylonVariant;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.mana.BlockPool;
|
||||
@@ -317,13 +316,13 @@ public class TileAlfPortal extends TileMod implements ITickable {
|
||||
List<BlockPos> list = new ArrayList<>();
|
||||
int range = 5;
|
||||
|
||||
IBlockState pylonState = ModBlocks.pylon.getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.NATURA);
|
||||
IBlockState pylonState = ModBlocks.naturaPylon.getDefaultState();
|
||||
|
||||
for(int i = -range; i < range + 1; i++)
|
||||
for(int j = -range; j < range + 1; j++)
|
||||
for(int k = -range; k < range + 1; k++) {
|
||||
BlockPos pos = new BlockPos(i, j, k);
|
||||
if(checkPosition(pos, pylonState, false) && world.getBlockState(pos.down()).getBlock() instanceof BlockPool)
|
||||
if(world.getBlockState(pos) == pylonState && world.getBlockState(pos.down()).getBlock() instanceof BlockPool)
|
||||
list.add(pos);
|
||||
}
|
||||
|
||||
|
||||
@@ -104,7 +104,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl
|
||||
for(BlockPos o : OBSIDIAN_LOCATIONS)
|
||||
mb.addComponent(o.up(), Blocks.OBSIDIAN.getDefaultState());
|
||||
for(BlockPos p : PYLON_LOCATIONS.get(EnumFacing.Axis.X)) {
|
||||
mb.addComponent(p.up(), ModBlocks.pylon.getDefaultState());
|
||||
mb.addComponent(p.up(), ModBlocks.manaPylon.getDefaultState());
|
||||
mb.addComponent(new FlowerComponent(p, ModBlocks.flower));
|
||||
}
|
||||
for(BlockPos f : FLOWER_LOCATIONS)
|
||||
@@ -406,7 +406,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl
|
||||
return false;
|
||||
|
||||
for(BlockPos pylon : PYLON_LOCATIONS.get(axis))
|
||||
if(world.getBlockState(pos.add(pylon)).getBlock() != ModBlocks.pylon || !BotaniaAPI.internalHandler.isBotaniaFlower(world, pos.add(pylon).down()))
|
||||
if(world.getBlockState(pos.add(pylon)).getBlock() != ModBlocks.manaPylon || !BotaniaAPI.internalHandler.isBotaniaFlower(world, pos.add(pylon).down()))
|
||||
return false;
|
||||
|
||||
for(BlockPos flower : FLOWER_LOCATIONS)
|
||||
|
||||
@@ -16,8 +16,8 @@ import net.minecraft.util.ITickable;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.AlfPortalState;
|
||||
import vazkii.botania.api.state.enums.PylonVariant;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.BlockPylon;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.mana.BlockPool;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
@@ -35,21 +35,21 @@ public class TilePylon extends TileEntity implements ITickable {
|
||||
public void update() {
|
||||
++ticks;
|
||||
|
||||
if(world.getBlockState(getPos()).getBlock() != ModBlocks.pylon)
|
||||
if(!(getBlockType() instanceof BlockPylon))
|
||||
return;
|
||||
|
||||
PylonVariant variant = world.getBlockState(getPos()).getValue(BotaniaStateProps.PYLON_VARIANT);
|
||||
BlockPylon.Variant variant = ((BlockPylon) getBlockType()).variant;
|
||||
|
||||
if(activated && world.isRemote) {
|
||||
if(world.getBlockState(centerPos).getBlock() != getBlockForMeta()
|
||||
|| variant == PylonVariant.NATURA && (portalOff() || !(world.getBlockState(getPos().down()).getBlock() instanceof BlockPool))) {
|
||||
|| variant == BlockPylon.Variant.NATURA && (portalOff() || !(world.getBlockState(getPos().down()).getBlock() instanceof BlockPool))) {
|
||||
activated = false;
|
||||
return;
|
||||
}
|
||||
|
||||
Vector3 centerBlock = new Vector3(centerPos.getX() + 0.5, centerPos.getY() + 0.75 + (Math.random() - 0.5 * 0.25), centerPos.getZ() + 0.5);
|
||||
|
||||
if(variant == PylonVariant.NATURA) {
|
||||
if(variant == BlockPylon.Variant.NATURA) {
|
||||
if(ConfigHandler.elfPortalParticlesEnabled) {
|
||||
double worldTime = ticks;
|
||||
worldTime += new Random(pos.hashCode()).nextInt(1000);
|
||||
@@ -89,11 +89,11 @@ public class TilePylon extends TileEntity implements ITickable {
|
||||
}
|
||||
|
||||
if(world.rand.nextBoolean() && world.isRemote)
|
||||
Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random() * 1.5, pos.getZ() + Math.random(), variant == PylonVariant.GAIA ? 1F : 0.5F, variant == PylonVariant.NATURA ? 1F : 0.5F, variant == PylonVariant.NATURA ? 0.5F : 1F, (float) Math.random(), 2);
|
||||
Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random() * 1.5, pos.getZ() + Math.random(), variant == BlockPylon.Variant.GAIA ? 1F : 0.5F, variant == BlockPylon.Variant.NATURA ? 1F : 0.5F, variant == BlockPylon.Variant.NATURA ? 0.5F : 1F, (float) Math.random(), 2);
|
||||
}
|
||||
|
||||
private Block getBlockForMeta() {
|
||||
return world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA ? ModBlocks.enchanter : ModBlocks.alfPortal;
|
||||
return ((BlockPylon) getBlockType()).variant == BlockPylon.Variant.MANA ? ModBlocks.enchanter : ModBlocks.alfPortal;
|
||||
}
|
||||
|
||||
private boolean portalOff() {
|
||||
|
||||
@@ -208,7 +208,9 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addItem(ModItems.incenseStick);
|
||||
addItem(ModItems.bloodPendant);
|
||||
addBlock(ModBlocks.felPumpkin);
|
||||
addBlock(ModBlocks.pylon);
|
||||
addBlock(ModBlocks.manaPylon);
|
||||
addBlock(ModBlocks.naturaPylon);
|
||||
addBlock(ModBlocks.gaiaPylon);
|
||||
addBlock(ModBlocks.pistonRelay);
|
||||
addBlock(ModBlocks.hourglass);
|
||||
addBlock(ModBlocks.animatedTorch);
|
||||
|
||||
@@ -492,7 +492,7 @@ public final class ModCraftingRecipes {
|
||||
recipeBellows = ModBlocks.bellows.getRegistryName();
|
||||
recipeRedstoneRoot = ModItems.redstoneRoot.getRegistryName();
|
||||
recipesAltarMeta = allOfGroup("metamorphic_apothecary");
|
||||
recipePylon = path("pylon_0");
|
||||
recipePylon = ModBlocks.manaPylon.getRegistryName();
|
||||
recipeTurntable = ModBlocks.turntable.getRegistryName();
|
||||
recipeAlchemyCatalyst = ModBlocks.alchemyCatalyst.getRegistryName();
|
||||
recipeOpenCrate = path("opencrate_0");
|
||||
@@ -658,9 +658,9 @@ public final class ModCraftingRecipes {
|
||||
recipeThirdEye = ModItems.thirdEye.getRegistryName();
|
||||
recipeGoddessCharm = ModItems.goddessCharm.getRegistryName();
|
||||
recipeAlfPortal = ModBlocks.alfPortal.getRegistryName();
|
||||
recipeNaturaPylon = path("pylon_1");
|
||||
recipeNaturaPylon = ModBlocks.naturaPylon.getRegistryName();
|
||||
recipeDreamwoodTwig = ModItems.dreamwoodTwig.getRegistryName();
|
||||
recipeGaiaPylon = path("pylon_2");
|
||||
recipeGaiaPylon = ModBlocks.gaiaPylon.getRegistryName();
|
||||
recipeGaiaIngot = ModItems.gaiaIngot.getRegistryName();
|
||||
recipeLivingrockDecor1 = path("livingrock_1");
|
||||
recipeLivingrockDecor2 = path("livingrock_2");
|
||||
|
||||
@@ -70,7 +70,6 @@ import vazkii.botania.api.lexicon.multiblock.Multiblock;
|
||||
import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
|
||||
import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.PylonVariant;
|
||||
import vazkii.botania.client.core.handler.BossBarHandler;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.common.Botania;
|
||||
@@ -160,7 +159,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss {
|
||||
Multiblock mb = new Multiblock();
|
||||
|
||||
for(BlockPos p : PYLON_LOCATIONS)
|
||||
mb.addComponent(p.up(), ModBlocks.pylon.getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.GAIA));
|
||||
mb.addComponent(p.up(), ModBlocks.gaiaPylon.getDefaultState());
|
||||
|
||||
for(int i = 0; i < 3; i++)
|
||||
for(int j = 0; j < 3; j++)
|
||||
@@ -185,7 +184,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss {
|
||||
|
||||
IBlockState state = world.getBlockState(pos_);
|
||||
Block blockat = state.getBlock();
|
||||
if(blockat != ModBlocks.pylon || state.getValue(BotaniaStateProps.PYLON_VARIANT) != PylonVariant.GAIA) {
|
||||
if(blockat != ModBlocks.gaiaPylon) {
|
||||
if(!world.isRemote)
|
||||
player.sendMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setStyle(new Style().setColor(TextFormatting.RED)));
|
||||
return false;
|
||||
|
||||
@@ -174,6 +174,14 @@ public class FlattenItems implements IFixableData {
|
||||
case 3: return ModBlocks.fabulousPool.getRegistryName().toString();
|
||||
}
|
||||
});
|
||||
LOOKUP.put("botania:pylon", i -> {
|
||||
switch (i) {
|
||||
default:
|
||||
case 0: return ModBlocks.manaPylon.getRegistryName().toString();
|
||||
case 1: return ModBlocks.naturaPylon.getRegistryName().toString();
|
||||
case 2: return ModBlocks.gaiaPylon.getRegistryName().toString();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -22,6 +22,7 @@ public final class LibBlockNames {
|
||||
public static final String POOL_PREFIX = POOL + "_";
|
||||
public static final String RUNE_ALTAR = "runeAltar";
|
||||
public static final String PYLON = "pylon";
|
||||
public static final String PYLON_PREFIX = PYLON + "_";
|
||||
public static final String PISTON_RELAY = "pistonRelay";
|
||||
public static final String DISTRIBUTOR = "distributor";
|
||||
public static final String MANA_VOID = "manaVoid";
|
||||
|
||||
Reference in new issue
Block a user