mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 11:19:19 +00:00
Flatten pools
This commit is contained in:
1 parent
d8d0d0ff13
commit
91b9c2e0c8
45 files changed
+214
-179
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.PoolVariant;
|
||||
import vazkii.botania.api.state.enums.PylonVariant;
|
||||
import vazkii.botania.api.state.enums.QuartzVariant;
|
||||
import vazkii.botania.api.state.enums.SpreaderVariant;
|
||||
@@ -151,9 +150,6 @@ public final class BotaniaStateProps {
|
||||
// BlockPlatform
|
||||
public static final PropertyEnum<PlatformVariant> PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class);
|
||||
|
||||
// BlockPool
|
||||
public static final PropertyEnum<PoolVariant> POOL_VARIANT = PropertyEnum.create("variant", PoolVariant.class);
|
||||
|
||||
// BlockPrism
|
||||
public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens");
|
||||
|
||||
|
||||
@@ -1,26 +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 PoolVariant implements IStringSerializable {
|
||||
DEFAULT,
|
||||
CREATIVE,
|
||||
DILUTED,
|
||||
FABULOUS;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -38,7 +38,7 @@ public final class ModChallenges {
|
||||
addChallenge(EnumChallengeLevel.EASY, "reedFarm", new ItemStack(Items.REEDS));
|
||||
addChallenge(EnumChallengeLevel.EASY, "cobbleGen", new ItemStack(Blocks.COBBLESTONE));
|
||||
addChallenge(EnumChallengeLevel.EASY, "pureDaisy", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY));
|
||||
addChallenge(EnumChallengeLevel.EASY, "battery", new ItemStack(ModBlocks.pool));
|
||||
addChallenge(EnumChallengeLevel.EASY, "battery", new ItemStack(ModBlocks.manaPool));
|
||||
|
||||
addChallenge(EnumChallengeLevel.NORMAL, "apothecaryRefill", new ItemStack(ModBlocks.altar));
|
||||
addChallenge(EnumChallengeLevel.NORMAL, "treeFarm", new ItemStack(Blocks.SAPLING));
|
||||
|
||||
@@ -19,11 +19,11 @@ import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.brew.Brew;
|
||||
import vazkii.botania.api.brew.IBrewItem;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.PoolVariant;
|
||||
import vazkii.botania.api.state.enums.SpreaderVariant;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.BlockCamo;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.mana.BlockPool;
|
||||
import vazkii.botania.common.block.tile.TileCamo;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
import vazkii.botania.common.entity.EntityManaBurst;
|
||||
@@ -53,14 +53,14 @@ public final class ColorHandler {
|
||||
// Pool
|
||||
blocks.registerBlockColorHandler(
|
||||
(state, world, pos, tintIndex) -> {
|
||||
if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) {
|
||||
if (((BlockPool) state.getBlock()).variant == BlockPool.Variant.FABULOUS) {
|
||||
float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks;
|
||||
return Color.HSBtoRGB(time * 0.005F, 0.6F, 1F);
|
||||
} else {
|
||||
return state.getValue(BotaniaStateProps.COLOR).getColorValue();
|
||||
}
|
||||
},
|
||||
ModBlocks.pool
|
||||
ModBlocks.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool
|
||||
);
|
||||
|
||||
// Spreader
|
||||
@@ -117,7 +117,7 @@ public final class ColorHandler {
|
||||
items.registerItemColorHandler(handler, petals);
|
||||
|
||||
items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).getBlock().getStateFromMeta(s.getMetadata()), null, null, t),
|
||||
ModBlocks.petalBlock, ModBlocks.pool, ModBlocks.spreader);
|
||||
ModBlocks.petalBlock, ModBlocks.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool, ModBlocks.spreader);
|
||||
|
||||
items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, (float) ((ItemManaMirror) ModItems.manaMirror).getMana(s) / (float) TilePool.MAX_MANA, 1F) : -1, ModItems.manaMirror);
|
||||
|
||||
|
||||
@@ -24,7 +24,6 @@ import vazkii.botania.api.recipe.RecipePetals;
|
||||
import vazkii.botania.api.recipe.RecipePureDaisy;
|
||||
import vazkii.botania.api.recipe.RecipeRuneAltar;
|
||||
import vazkii.botania.api.state.enums.AltarVariant;
|
||||
import vazkii.botania.api.state.enums.PoolVariant;
|
||||
import vazkii.botania.client.gui.crafting.ContainerCraftingHalo;
|
||||
import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory;
|
||||
import vazkii.botania.client.integration.jei.brewery.BreweryRecipeWrapper;
|
||||
@@ -87,9 +86,10 @@ public class JEIBotaniaPlugin implements IModPlugin {
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.brewery), BreweryRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.alfPortal), ElvenTradeRecipeCategory.UID);
|
||||
|
||||
for(PoolVariant v : PoolVariant.values()) {
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.pool, 1, v.ordinal()), ManaPoolRecipeCategory.UID);
|
||||
}
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.manaPool), ManaPoolRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.creativePool), ManaPoolRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.dilutedPool), ManaPoolRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.fabulousPool), ManaPoolRecipeCategory.UID);
|
||||
|
||||
for(AltarVariant v : AltarVariant.values()) {
|
||||
if(v == AltarVariant.MOSSY) continue;
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory {
|
||||
private final IDrawable background;
|
||||
private final String localizedName;
|
||||
private final IDrawable overlay;
|
||||
private final ItemStack renderStack = new ItemStack(ModBlocks.pool);
|
||||
private final ItemStack renderStack = new ItemStack(ModBlocks.manaPool);
|
||||
|
||||
public ManaPoolRecipeCategory(IGuiHelper guiHelper) {
|
||||
background = guiHelper.createBlankDrawable(168, 64);
|
||||
|
||||
@@ -14,9 +14,9 @@ import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.entity.RenderMinecart;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import vazkii.botania.api.state.enums.PoolVariant;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.render.tile.RenderTilePool;
|
||||
import vazkii.botania.common.block.mana.BlockPool;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
import vazkii.botania.common.entity.EntityPoolMinecart;
|
||||
|
||||
@@ -30,7 +30,7 @@ public class RenderPoolMinecart extends RenderMinecart<EntityPoolMinecart> {
|
||||
|
||||
@Override
|
||||
protected void renderCartContents(EntityPoolMinecart poolCart, float partialTicks, @Nonnull IBlockState state) {
|
||||
RenderTilePool.forceVariant = PoolVariant.DEFAULT;
|
||||
RenderTilePool.forceVariant = BlockPool.Variant.DEFAULT;
|
||||
RenderTilePool.forceManaNumber = poolCart.getMana();
|
||||
TileEntityRendererDispatcher.instance.getRenderer(TilePool.class).render(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1, 0);
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
@@ -21,13 +22,13 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.mana.IPoolOverlayProvider;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.PoolVariant;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.handler.MultiblockRenderHandler;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.core.proxy.ClientProxy;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.mana.BlockPool;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
@@ -37,13 +38,13 @@ import java.util.Random;
|
||||
public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
|
||||
|
||||
// Overrides for when we call this TESR without an actual pool
|
||||
public static PoolVariant forceVariant = PoolVariant.DEFAULT;
|
||||
public static BlockPool.Variant forceVariant = BlockPool.Variant.DEFAULT;
|
||||
public static int forceManaNumber = -1;
|
||||
|
||||
@Override
|
||||
public void render(@Nonnull TilePool pool, double d0, double d1, double d2, float f, int digProgress, float unused) {
|
||||
if(pool != null && (!pool.getWorld().isBlockLoaded(pool.getPos(), false)
|
||||
|| pool.getWorld().getBlockState(pool.getPos()).getBlock() != ModBlocks.pool))
|
||||
|| !(pool.getBlockType() instanceof BlockPool)))
|
||||
return;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
@@ -59,7 +60,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
}
|
||||
|
||||
boolean fab = pool == null ? forceVariant == PoolVariant.FABULOUS : pool.getWorld().getBlockState(pool.getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS;
|
||||
boolean fab = pool == null ? forceVariant == BlockPool.Variant.FABULOUS : ((BlockPool) pool.getBlockType()).variant == BlockPool.Variant.FABULOUS;
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
int color = 0xFFFFFF;
|
||||
@@ -75,7 +76,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
|
||||
int red = (color & 0xFF0000) >> 16;
|
||||
int green = (color & 0xFF00) >> 8;
|
||||
int blue = color & 0xFF;
|
||||
IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool == null ? ModBlocks.pool.getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, forceVariant) : pool.getWorld().getBlockState(pool.getPos()));
|
||||
IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool == null ? poolForVariant(forceVariant) : pool.getWorld().getBlockState(pool.getPos()));
|
||||
Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, red / 255F, green / 255F, blue / 255F);
|
||||
}
|
||||
|
||||
@@ -138,11 +139,11 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
|
||||
}
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
forceVariant = PoolVariant.DEFAULT;
|
||||
forceVariant = BlockPool.Variant.DEFAULT;
|
||||
forceManaNumber = -1;
|
||||
}
|
||||
|
||||
public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) {
|
||||
private void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) {
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, ClientProxy.POSITION_TEX_LMAP);
|
||||
tessellator.getBuffer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).lightmap(brightness, brightness).endVertex();
|
||||
@@ -152,4 +153,14 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
|
||||
tessellator.draw();
|
||||
}
|
||||
|
||||
private IBlockState poolForVariant(BlockPool.Variant v) {
|
||||
switch (v) {
|
||||
default:
|
||||
case DEFAULT: return ModBlocks.manaPool.getDefaultState();
|
||||
case CREATIVE: return ModBlocks.creativePool.getDefaultState();
|
||||
case DILUTED: return ModBlocks.dilutedPool.getDefaultState();
|
||||
case FABULOUS: return ModBlocks.fabulousPool.getDefaultState();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -132,7 +132,10 @@ public final class ModBlocks {
|
||||
public static final Block livingwood = new BlockLivingwood();
|
||||
public static final Block specialFlower = new BlockSpecialFlower();
|
||||
public static final Block spreader = new BlockSpreader();
|
||||
public static final Block pool = new BlockPool();
|
||||
public static final Block manaPool = new BlockPool(BlockPool.Variant.DEFAULT);
|
||||
public static final Block creativePool = new BlockPool(BlockPool.Variant.CREATIVE);
|
||||
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 pistonRelay = new BlockPistonRelay();
|
||||
@@ -246,7 +249,10 @@ public final class ModBlocks {
|
||||
r.register(livingwood);
|
||||
r.register(specialFlower);
|
||||
r.register(spreader);
|
||||
r.register(pool);
|
||||
r.register(manaPool);
|
||||
r.register(creativePool);
|
||||
r.register(dilutedPool);
|
||||
r.register(fabulousPool);
|
||||
r.register(runeAltar);
|
||||
r.register(pylon);
|
||||
r.register(pistonRelay);
|
||||
@@ -363,7 +369,10 @@ public final class ModBlocks {
|
||||
r.register(new ItemBlockWithMetadataAndName(livingwood).setRegistryName(livingwood.getRegistryName()));
|
||||
r.register(new ItemBlockSpecialFlower(specialFlower).setRegistryName(specialFlower.getRegistryName()));
|
||||
r.register(new ItemBlockWithMetadataAndName(spreader).setRegistryName(spreader.getRegistryName()));
|
||||
r.register(new ItemBlockPool(pool).setRegistryName(pool.getRegistryName()));
|
||||
r.register(new ItemBlockPool(manaPool).setRegistryName(manaPool.getRegistryName()));
|
||||
r.register(new ItemBlockPool(creativePool).setRegistryName(creativePool.getRegistryName()));
|
||||
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(pistonRelay).setRegistryName(pistonRelay.getRegistryName()));
|
||||
|
||||
@@ -18,7 +18,6 @@ import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.renderer.block.statemap.StateMap;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -27,7 +26,6 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumBlockRenderType;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.ChunkCache;
|
||||
@@ -42,10 +40,8 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.PoolVariant;
|
||||
import vazkii.botania.api.wand.IWandHUD;
|
||||
import vazkii.botania.api.wand.IWandable;
|
||||
import vazkii.botania.client.core.handler.ModelHandler;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
@@ -54,39 +50,40 @@ import vazkii.botania.common.lib.LibBlockNames;
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexiconable {
|
||||
private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.5, 1);
|
||||
|
||||
public BlockPool() {
|
||||
super(Material.ROCK, LibBlockNames.POOL);
|
||||
public enum Variant {
|
||||
DEFAULT,
|
||||
CREATIVE,
|
||||
DILUTED,
|
||||
FABULOUS
|
||||
}
|
||||
|
||||
public final Variant variant;
|
||||
|
||||
public BlockPool(Variant v) {
|
||||
super(Material.ROCK, LibBlockNames.POOL_PREFIX + v.name().toLowerCase(Locale.ROOT));
|
||||
setHardness(2.0F);
|
||||
setResistance(10.0F);
|
||||
setSoundType(SoundType.STONE);
|
||||
BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE);
|
||||
setDefaultState(blockState.getBaseState()
|
||||
.withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT)
|
||||
.withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE));
|
||||
this.variant = v;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public BlockStateContainer createBlockState() {
|
||||
return new BlockStateContainer(this, BotaniaStateProps.POOL_VARIANT, BotaniaStateProps.COLOR);
|
||||
return new BlockStateContainer(this, BotaniaStateProps.COLOR);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetaFromState(IBlockState state) {
|
||||
return state.getValue(BotaniaStateProps.POOL_VARIANT).ordinal();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public IBlockState getStateFromMeta(int meta) {
|
||||
if (meta > PoolVariant.values().length) {
|
||||
meta = 0;
|
||||
}
|
||||
return getDefaultState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.values()[meta]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@@ -106,11 +103,6 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
|
||||
return AABB;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int damageDropped(IBlockState state) {
|
||||
return state.getBlock().getMetaFromState(state);
|
||||
}
|
||||
|
||||
// If harvesting, delay setting block to air so getDrops can read the TE
|
||||
@Override
|
||||
public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) {
|
||||
@@ -134,14 +126,6 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
|
||||
world.setBlockToAir(pos);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(CreativeTabs par2, NonNullList<ItemStack> par3) {
|
||||
par3.add(new ItemStack(this, 1, 0));
|
||||
par3.add(new ItemStack(this, 1, 2));
|
||||
par3.add(new ItemStack(this, 1, 3));
|
||||
par3.add(new ItemStack(this, 1, 1));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
@@ -196,7 +180,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
|
||||
@Nonnull
|
||||
@Override
|
||||
public EnumBlockRenderType getRenderType(IBlockState state) {
|
||||
if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS)
|
||||
if (variant == Variant.FABULOUS)
|
||||
return EnumBlockRenderType.ENTITYBLOCK_ANIMATED;
|
||||
else return EnumBlockRenderType.MODEL;
|
||||
}
|
||||
@@ -225,14 +209,14 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return world.getBlockState(pos).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS ? LexiconData.rainbowRod : LexiconData.pool;
|
||||
return variant == Variant.FABULOUS ? LexiconData.rainbowRod : LexiconData.pool;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModels() {
|
||||
ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.COLOR).build());
|
||||
ModelHandler.registerBlockToState(this, PoolVariant.values().length);
|
||||
super.registerModels();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
|
||||
@@ -34,6 +34,7 @@ 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;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.item.ItemLexicon;
|
||||
@@ -313,17 +314,16 @@ public class TileAlfPortal extends TileMod implements ITickable {
|
||||
}
|
||||
|
||||
public List<BlockPos> locatePylons() {
|
||||
List<BlockPos> list = new ArrayList();
|
||||
List<BlockPos> list = new ArrayList<>();
|
||||
int range = 5;
|
||||
|
||||
IBlockState pylonState = ModBlocks.pylon.getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.NATURA);
|
||||
IBlockState poolState = ModBlocks.pool.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) && checkPosition(pos.down(), poolState, true))
|
||||
if(checkPosition(pos, pylonState, false) && world.getBlockState(pos.down()).getBlock() instanceof BlockPool)
|
||||
list.add(pos);
|
||||
}
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ import vazkii.botania.api.state.enums.AlfPortalState;
|
||||
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;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.core.helper.Vector3;
|
||||
|
||||
@@ -41,7 +42,7 @@ public class TilePylon extends TileEntity implements ITickable {
|
||||
|
||||
if(activated && world.isRemote) {
|
||||
if(world.getBlockState(centerPos).getBlock() != getBlockForMeta()
|
||||
|| variant == PylonVariant.NATURA && (portalOff() || world.getBlockState(getPos().down()).getBlock() != ModBlocks.pool)) {
|
||||
|| variant == PylonVariant.NATURA && (portalOff() || !(world.getBlockState(getPos().down()).getBlock() instanceof BlockPool))) {
|
||||
activated = false;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -47,12 +47,12 @@ import vazkii.botania.api.mana.spark.ISparkAttachable;
|
||||
import vazkii.botania.api.mana.spark.ISparkEntity;
|
||||
import vazkii.botania.api.recipe.RecipeManaInfusion;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.PoolVariant;
|
||||
import vazkii.botania.client.core.handler.HUDHandler;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.mana.BlockPool;
|
||||
import vazkii.botania.common.block.tile.TileMod;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.core.handler.ManaNetworkHandler;
|
||||
@@ -60,8 +60,6 @@ import vazkii.botania.common.core.handler.ModSounds;
|
||||
import vazkii.botania.common.core.helper.Vector3;
|
||||
import vazkii.botania.common.item.ItemManaTablet;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.network.PacketBotaniaEffect;
|
||||
import vazkii.botania.common.network.PacketHandler;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.awt.Color;
|
||||
@@ -111,9 +109,9 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
|
||||
public boolean shouldRefresh(World world, BlockPos pos, @Nonnull IBlockState oldState, @Nonnull IBlockState newState) {
|
||||
if(oldState.getBlock() != newState.getBlock())
|
||||
return true;
|
||||
if(oldState.getBlock() != ModBlocks.pool || newState.getBlock() != ModBlocks.pool)
|
||||
if(!(oldState.getBlock() instanceof BlockPool) || !(newState.getBlock() instanceof BlockPool))
|
||||
return true;
|
||||
return oldState.getValue(BotaniaStateProps.POOL_VARIANT) != newState.getValue(BotaniaStateProps.POOL_VARIANT);
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -249,7 +247,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
|
||||
@Override
|
||||
public void update() {
|
||||
if(manaCap == -1)
|
||||
manaCap = world.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.DILUTED ? MAX_MANA_DILLUTED : MAX_MANA;
|
||||
manaCap = ((BlockPool) getBlockType()).variant == BlockPool.Variant.DILUTED ? MAX_MANA_DILLUTED : MAX_MANA;
|
||||
|
||||
if(!ManaNetworkHandler.instance.isPoolIn(this) && !isInvalid())
|
||||
ManaNetworkEvent.addPool(this);
|
||||
@@ -394,7 +392,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void renderHUD(Minecraft mc, ScaledResolution res) {
|
||||
ItemStack pool = new ItemStack(ModBlocks.pool, 1, world.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT).ordinal());
|
||||
ItemStack pool = new ItemStack(getBlockType());
|
||||
String name = I18n.format(pool.getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name");
|
||||
int color = 0x4444FF;
|
||||
HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name, res);
|
||||
@@ -436,12 +434,9 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
|
||||
|
||||
@Override
|
||||
public int getCurrentMana() {
|
||||
if(world != null) {
|
||||
IBlockState state = world.getBlockState(getPos());
|
||||
if(state.getProperties().containsKey(BotaniaStateProps.POOL_VARIANT))
|
||||
return state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.CREATIVE ? MAX_MANA : mana;
|
||||
if (getBlockType() instanceof BlockPool) {
|
||||
return ((BlockPool) getBlockType()).variant == BlockPool.Variant.CREATIVE ? MAX_MANA : mana;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -333,7 +333,10 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addItem(ModItems.manaTablet);
|
||||
addItem(ModItems.manaMirror);
|
||||
addItem(ModItems.manaBottle);
|
||||
addBlock(ModBlocks.pool);
|
||||
addBlock(ModBlocks.manaPool);
|
||||
addBlock(ModBlocks.creativePool);
|
||||
addBlock(ModBlocks.dilutedPool);
|
||||
addBlock(ModBlocks.fabulousPool);
|
||||
addBlock(ModBlocks.alchemyCatalyst);
|
||||
addBlock(ModBlocks.conjurationCatalyst);
|
||||
addBlock(ModBlocks.distributor);
|
||||
|
||||
@@ -202,7 +202,7 @@ public class InternalMethodHandler extends DummyMethodHandler {
|
||||
|
||||
@Override
|
||||
public ItemStack getBindDisplayForFlowerType(SubTileEntity e) {
|
||||
return e instanceof SubTileGenerating ? new ItemStack(ModBlocks.spreader) : e instanceof SubTileFunctional ? new ItemStack(ModBlocks.pool) : new ItemStack(ModItems.twigWand);
|
||||
return e instanceof SubTileGenerating ? new ItemStack(ModBlocks.spreader) : e instanceof SubTileFunctional ? new ItemStack(ModBlocks.manaPool) : new ItemStack(ModItems.twigWand);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -441,9 +441,9 @@ public final class ModCraftingRecipes {
|
||||
|
||||
recipesSpreader = allOfGroup(ModBlocks.spreader.getRegistryName());
|
||||
|
||||
recipePool = path("pool_0");
|
||||
recipePoolDiluted = path("pool_2");
|
||||
recipePoolFabulous = path("pool_3");
|
||||
recipePool = ModBlocks.manaPool.getRegistryName();
|
||||
recipePoolDiluted = ModBlocks.dilutedPool.getRegistryName();
|
||||
recipePoolFabulous = ModBlocks.fabulousPool.getRegistryName();
|
||||
recipeCobweb = path("web");
|
||||
|
||||
recipeSpark = ModItems.spark.getRegistryName();
|
||||
|
||||
@@ -61,7 +61,7 @@ public class EntityPoolMinecart extends EntityMinecart {
|
||||
@Nonnull
|
||||
@Override
|
||||
public IBlockState getDisplayTile() {
|
||||
return ModBlocks.pool.getDefaultState();
|
||||
return ModBlocks.manaPool.getDefaultState();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@@ -100,7 +100,7 @@ public class EntityPoolMinecart extends EntityMinecart {
|
||||
@Override
|
||||
public void killMinecart(DamageSource source) {
|
||||
super.killMinecart(source);
|
||||
dropItemWithOffset(Item.getItemFromBlock(ModBlocks.pool), 1, 0.0F);
|
||||
dropItemWithOffset(Item.getItemFromBlock(ModBlocks.manaPool), 1, 0.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -165,6 +165,15 @@ public class FlattenItems implements IFixableData {
|
||||
|
||||
return LibMisc.MOD_ID + ":" + LibBlockNames.AZULEJO_PREFIX + new_variant;
|
||||
});
|
||||
LOOKUP.put("botania:pool", i -> {
|
||||
switch (i) {
|
||||
default:
|
||||
case 0: return ModBlocks.manaPool.getRegistryName().toString();
|
||||
case 1: return ModBlocks.creativePool.getRegistryName().toString();
|
||||
case 2: return ModBlocks.dilutedPool.getRegistryName().toString();
|
||||
case 3: return ModBlocks.fabulousPool.getRegistryName().toString();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -18,18 +18,18 @@ import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import vazkii.botania.api.state.enums.PoolVariant;
|
||||
import vazkii.botania.common.block.mana.BlockPool;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.List;
|
||||
|
||||
public class ItemBlockPool extends ItemBlockWithMetadataAndName {
|
||||
public class ItemBlockPool extends ItemBlockMod {
|
||||
|
||||
public ItemBlockPool(Block par2Block) {
|
||||
super(par2Block);
|
||||
public ItemBlockPool(Block block) {
|
||||
super(block);
|
||||
addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "full"), (stack, worldIn, entityIn) -> {
|
||||
boolean renderFull = stack.getItemDamage() == PoolVariant.CREATIVE.ordinal() || stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull");
|
||||
boolean renderFull = ((BlockPool) block).variant == BlockPool.Variant.CREATIVE || stack.hasTagCompound() && stack.getTagCompound().getBoolean("RenderFull");
|
||||
return renderFull ? 1F : 0F;
|
||||
});
|
||||
}
|
||||
@@ -37,7 +37,7 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName {
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void addInformation(@Nonnull ItemStack par1ItemStack, World world, @Nonnull List<String> stacks, @Nonnull ITooltipFlag flag) {
|
||||
if(par1ItemStack.getItemDamage() == 1)
|
||||
if(((BlockPool) block).variant == BlockPool.Variant.CREATIVE)
|
||||
for(int i = 0; i < 2; i++)
|
||||
stacks.add(I18n.format("botaniamisc.creativePool" + i));
|
||||
}
|
||||
|
||||
@@ -435,7 +435,7 @@ public final class LexiconData {
|
||||
new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe),
|
||||
new PageCraftingRecipe("13", ModCraftingRecipes.recipeCobweb),
|
||||
new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe))
|
||||
.setIcon(new ItemStack(ModBlocks.pool));
|
||||
.setIcon(new ItemStack(ModBlocks.manaPool));
|
||||
|
||||
sparks = new BasicLexiconEntry(LibLexicon.MANA_SPARKS, categoryMana);
|
||||
sparks.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"),
|
||||
|
||||
@@ -54,7 +54,7 @@ public class PageManaInfusionRecipe extends PageRecipe {
|
||||
public PageManaInfusionRecipe(String unlocalizedName, List<RecipeManaInfusion> recipes) {
|
||||
super(unlocalizedName);
|
||||
this.recipes = recipes;
|
||||
renderStack = new ItemStack(ModBlocks.pool, 1, 0);
|
||||
renderStack = new ItemStack(ModBlocks.manaPool);
|
||||
ItemNBTHelper.setBoolean(renderStack, "RenderFull", true);
|
||||
}
|
||||
|
||||
@@ -81,7 +81,6 @@ public class PageManaInfusionRecipe extends PageRecipe {
|
||||
|
||||
renderItemAtGridPos(gui, 1, 1, (ItemStack) input, false);
|
||||
|
||||
renderStack.setItemDamage(recipe.getOutput().getItem() == Item.getItemFromBlock(ModBlocks.pool) ? 2 : 0);
|
||||
renderItemAtGridPos(gui, 2, 1, renderStack, false);
|
||||
|
||||
renderItemAtGridPos(gui, 3, 1, recipe.getOutput(), false);
|
||||
|
||||
@@ -19,6 +19,7 @@ public final class LibBlockNames {
|
||||
public static final String LIVING_WOOD = "livingwood";
|
||||
public static final String SPREADER = "spreader";
|
||||
public static final String POOL = "pool";
|
||||
public static final String POOL_PREFIX = POOL + "_";
|
||||
public static final String RUNE_ALTAR = "runeAltar";
|
||||
public static final String PYLON = "pylon";
|
||||
public static final String PISTON_RELAY = "pistonRelay";
|
||||
|
||||
Reference in new issue
Block a user