mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
Flatten apothecaries
This commit is contained in:
1 parent
b1598d701d
commit
168d484621
55 files changed
+253
-500
No files matched your search
@@ -22,7 +22,6 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import vazkii.botania.api.item.IFloatingFlower;
|
||||
import vazkii.botania.api.state.enums.AlfPortalState;
|
||||
import vazkii.botania.api.state.enums.AltarVariant;
|
||||
import vazkii.botania.api.state.enums.BiomeBrickVariant;
|
||||
import vazkii.botania.api.state.enums.BiomeStoneVariant;
|
||||
import vazkii.botania.api.state.enums.CratePattern;
|
||||
@@ -84,9 +83,6 @@ public final class BotaniaStateProps {
|
||||
// BlockAlfPortal
|
||||
public static final PropertyEnum<AlfPortalState> ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class);
|
||||
|
||||
// BlockAltar
|
||||
public static final PropertyEnum<AltarVariant> ALTAR_VARIANT = PropertyEnum.create("variant", AltarVariant.class);
|
||||
|
||||
// BlockBiomeStoneA
|
||||
public static final PropertyEnum<BiomeStoneVariant> BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class);
|
||||
|
||||
|
||||
@@ -1,32 +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 AltarVariant implements IStringSerializable {
|
||||
DEFAULT,
|
||||
FOREST,
|
||||
PLAINS,
|
||||
MOUNTAIN,
|
||||
FUNGAL,
|
||||
SWAMP,
|
||||
DESERT,
|
||||
TAIGA,
|
||||
MESA,
|
||||
MOSSY;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -40,7 +40,7 @@ public final class ModChallenges {
|
||||
addChallenge(EnumChallengeLevel.EASY, "pureDaisy", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY));
|
||||
addChallenge(EnumChallengeLevel.EASY, "battery", new ItemStack(ModBlocks.manaPool));
|
||||
|
||||
addChallenge(EnumChallengeLevel.NORMAL, "apothecaryRefill", new ItemStack(ModBlocks.altar));
|
||||
addChallenge(EnumChallengeLevel.NORMAL, "apothecaryRefill", new ItemStack(ModBlocks.defaultAltar));
|
||||
addChallenge(EnumChallengeLevel.NORMAL, "treeFarm", new ItemStack(Blocks.SAPLING));
|
||||
addChallenge(EnumChallengeLevel.NORMAL, "fullCropFarm", new ItemStack(Items.WHEAT_SEEDS));
|
||||
addChallenge(EnumChallengeLevel.NORMAL, "animalFarm", new ItemStack(Items.LEATHER));
|
||||
|
||||
@@ -23,7 +23,6 @@ import vazkii.botania.api.recipe.RecipeManaInfusion;
|
||||
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.client.gui.crafting.ContainerCraftingHalo;
|
||||
import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory;
|
||||
import vazkii.botania.client.integration.jei.brewery.BreweryRecipeWrapper;
|
||||
@@ -91,10 +90,16 @@ public class JEIBotaniaPlugin implements IModPlugin {
|
||||
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;
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.altar, 1, v.ordinal()), PetalApothecaryRecipeCategory.UID);
|
||||
}
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.defaultAltar), PetalApothecaryRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.forestAltar), PetalApothecaryRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.plainsAltar), PetalApothecaryRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.mountainAltar), PetalApothecaryRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.fungalAltar), PetalApothecaryRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.swampAltar), PetalApothecaryRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.desertAltar), PetalApothecaryRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.taigaAltar), PetalApothecaryRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.mesaAltar), PetalApothecaryRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(new ItemStack(ModBlocks.mossyAltar), PetalApothecaryRecipeCategory.UID);
|
||||
|
||||
registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType("puredaisy"), PureDaisyRecipeCategory.UID);
|
||||
registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), "puredaisy"), PureDaisyRecipeCategory.UID);
|
||||
|
||||
+1
-1
@@ -76,7 +76,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory {
|
||||
return;
|
||||
|
||||
recipeLayout.getItemStacks().init(0, true, 64, 52);
|
||||
recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.altar));
|
||||
recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.defaultAltar));
|
||||
|
||||
int index = 1;
|
||||
double angleBetweenEach = 360.0 / ingredients.getInputs(ItemStack.class).size();
|
||||
|
||||
@@ -33,8 +33,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {
|
||||
|
||||
@Override
|
||||
public void render(@Nonnull TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
|
||||
if(!altar.getWorld().isBlockLoaded(altar.getPos(), false)
|
||||
|| altar.getWorld().getBlockState(altar.getPos()).getBlock() != ModBlocks.altar)
|
||||
if(!altar.getWorld().isBlockLoaded(altar.getPos(), false))
|
||||
return;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
|
||||
@@ -12,25 +12,21 @@ package vazkii.botania.common.block;
|
||||
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.BlockRenderLayer;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.ChunkCache;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
@@ -44,9 +40,6 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.mana.ManaItemHandler;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.AltarVariant;
|
||||
import vazkii.botania.client.core.handler.ModelHandler;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.tile.TileAltar;
|
||||
import vazkii.botania.common.block.tile.TileSimpleInventory;
|
||||
@@ -57,17 +50,33 @@ import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.Locale;
|
||||
import java.util.Random;
|
||||
|
||||
public class BlockAltar extends BlockMod implements ILexiconable {
|
||||
|
||||
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0.125, 0.125, 0.875, 20.0/16, 0.875);
|
||||
|
||||
protected BlockAltar() {
|
||||
super(Material.ROCK, LibBlockNames.ALTAR);
|
||||
public enum Variant {
|
||||
DEFAULT,
|
||||
FOREST,
|
||||
PLAINS,
|
||||
MOUNTAIN,
|
||||
FUNGAL,
|
||||
SWAMP,
|
||||
DESERT,
|
||||
TAIGA,
|
||||
MESA,
|
||||
MOSSY
|
||||
}
|
||||
|
||||
public final Variant variant;
|
||||
|
||||
protected BlockAltar(Variant v) {
|
||||
super(Material.ROCK, LibBlockNames.APOTHECARY_PREFIX + v.name().toLowerCase(Locale.ROOT));
|
||||
setHardness(3.5F);
|
||||
setSoundType(SoundType.STONE);
|
||||
setDefaultState(blockState.getBaseState()
|
||||
.withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT));
|
||||
this.variant = v;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@@ -76,40 +85,6 @@ public class BlockAltar extends BlockMod implements ILexiconable {
|
||||
return AABB;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public BlockStateContainer createBlockState() {
|
||||
return new BlockStateContainer(this, BotaniaStateProps.ALTAR_VARIANT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetaFromState(IBlockState state) {
|
||||
return state.getValue(BotaniaStateProps.ALTAR_VARIANT).ordinal();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public IBlockState getStateFromMeta(int meta) {
|
||||
if (meta < 0 || meta >= AltarVariant.values().length ) {
|
||||
meta = 0;
|
||||
}
|
||||
return getDefaultState().withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.values()[meta]);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) {
|
||||
TileEntity te = worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos);
|
||||
if (te instanceof TileAltar) {
|
||||
TileAltar altar = (TileAltar) te;
|
||||
|
||||
if (altar.isMossy) {
|
||||
state = state.withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.MOSSY);
|
||||
}
|
||||
}
|
||||
return state;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Nonnull
|
||||
@Override
|
||||
@@ -117,10 +92,14 @@ public class BlockAltar extends BlockMod implements ILexiconable {
|
||||
return BlockRenderLayer.CUTOUT;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list) {
|
||||
for(int i = 0; i < 9; i++)
|
||||
list.add(new ItemStack(this, 1, i));
|
||||
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
|
||||
if(variant == Variant.MOSSY) {
|
||||
return Item.getItemFromBlock(ModBlocks.defaultAltar);
|
||||
} else {
|
||||
return super.getItemDropped(state, rand, fortune);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -211,11 +190,6 @@ public class BlockAltar extends BlockMod implements ILexiconable {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int damageDropped(IBlockState state) {
|
||||
return getMetaFromState(state);
|
||||
}
|
||||
|
||||
private boolean isValidWaterContainer(ItemStack stack) {
|
||||
if(stack.isEmpty() || stack.getCount() != 1)
|
||||
return false;
|
||||
@@ -281,11 +255,4 @@ public class BlockAltar extends BlockMod implements ILexiconable {
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.apothecary;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModels() {
|
||||
ModelHandler.registerBlockToState(this, AltarVariant.values().length - 1);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -127,7 +127,16 @@ import vazkii.botania.common.lib.LibOreDict;
|
||||
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
|
||||
public final class ModBlocks {
|
||||
public static final Block flower = new BlockModFlower();
|
||||
public static final Block altar = new BlockAltar();
|
||||
public static final Block defaultAltar = new BlockAltar(BlockAltar.Variant.DEFAULT);
|
||||
public static final Block forestAltar = new BlockAltar(BlockAltar.Variant.FOREST);
|
||||
public static final Block plainsAltar = new BlockAltar(BlockAltar.Variant.PLAINS);
|
||||
public static final Block mountainAltar = new BlockAltar(BlockAltar.Variant.MOUNTAIN);
|
||||
public static final Block fungalAltar = new BlockAltar(BlockAltar.Variant.FUNGAL);
|
||||
public static final Block swampAltar = new BlockAltar(BlockAltar.Variant.SWAMP);
|
||||
public static final Block desertAltar = new BlockAltar(BlockAltar.Variant.DESERT);
|
||||
public static final Block taigaAltar = new BlockAltar(BlockAltar.Variant.TAIGA);
|
||||
public static final Block mesaAltar = new BlockAltar(BlockAltar.Variant.MESA);
|
||||
public static final Block mossyAltar = new BlockAltar(BlockAltar.Variant.MOSSY);
|
||||
public static final Block livingrock = new BlockLivingrock();
|
||||
public static final Block livingwood = new BlockLivingwood();
|
||||
public static final Block specialFlower = new BlockSpecialFlower();
|
||||
@@ -248,7 +257,16 @@ public final class ModBlocks {
|
||||
IForgeRegistry<Block> r = evt.getRegistry();
|
||||
|
||||
r.register(flower);
|
||||
r.register(altar);
|
||||
r.register(defaultAltar);
|
||||
r.register(forestAltar);
|
||||
r.register(plainsAltar);
|
||||
r.register(mountainAltar);
|
||||
r.register(fungalAltar);
|
||||
r.register(swampAltar);
|
||||
r.register(desertAltar);
|
||||
r.register(taigaAltar);
|
||||
r.register(mesaAltar);
|
||||
r.register(mossyAltar);
|
||||
r.register(livingrock);
|
||||
r.register(livingwood);
|
||||
r.register(specialFlower);
|
||||
@@ -372,7 +390,16 @@ public final class ModBlocks {
|
||||
public static void registerItemBlocks(RegistryEvent.Register<Item> evt) {
|
||||
IForgeRegistry<Item> r = evt.getRegistry();
|
||||
r.register(new ItemBlockWithMetadataAndName(flower).setRegistryName(flower.getRegistryName()));
|
||||
r.register(new ItemBlockWithMetadataAndName(altar).setRegistryName(altar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(defaultAltar).setRegistryName(defaultAltar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(forestAltar).setRegistryName(forestAltar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(plainsAltar).setRegistryName(plainsAltar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(mountainAltar).setRegistryName(mountainAltar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(fungalAltar).setRegistryName(fungalAltar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(swampAltar).setRegistryName(swampAltar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(desertAltar).setRegistryName(desertAltar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(taigaAltar).setRegistryName(taigaAltar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(mesaAltar).setRegistryName(mesaAltar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(mossyAltar).setRegistryName(mossyAltar.getRegistryName()));
|
||||
r.register(new ItemBlockWithMetadataAndName(livingrock).setRegistryName(livingrock.getRegistryName()));
|
||||
r.register(new ItemBlockWithMetadataAndName(livingwood).setRegistryName(livingwood.getRegistryName()));
|
||||
r.register(new ItemBlockSpecialFlower(specialFlower).setRegistryName(specialFlower.getRegistryName()));
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.block.tile;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
@@ -24,8 +25,6 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.NetworkManager;
|
||||
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
|
||||
import net.minecraft.util.EnumParticleTypes;
|
||||
import net.minecraft.util.ITickable;
|
||||
import net.minecraft.util.SoundCategory;
|
||||
@@ -38,22 +37,16 @@ import net.minecraftforge.fluids.capability.IFluidHandlerItem;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import scala.reflect.internal.Trees.If;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.item.IPetalApothecary;
|
||||
import vazkii.botania.api.recipe.IFlowerComponent;
|
||||
import vazkii.botania.api.recipe.RecipePetals;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.AltarVariant;
|
||||
import vazkii.botania.client.core.handler.HUDHandler;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.core.handler.ModSounds;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemBalanceCloak;
|
||||
import vazkii.botania.common.network.PacketBotaniaEffect;
|
||||
import vazkii.botania.common.network.PacketHandler;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.awt.Color;
|
||||
@@ -74,7 +67,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary,
|
||||
public boolean hasWater = false;
|
||||
public boolean hasLava = false;
|
||||
|
||||
public boolean isMossy = false;
|
||||
private boolean mossyLegacy = false;
|
||||
|
||||
List<ItemStack> lastRecipe = null;
|
||||
int recipeKeepTicks = 0;
|
||||
@@ -84,14 +77,12 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary,
|
||||
if(world.isRemote || stack.isEmpty() || item.isDead)
|
||||
return false;
|
||||
|
||||
if(!isMossy && world.getBlockState(getPos()).getValue(BotaniaStateProps.ALTAR_VARIANT) == AltarVariant.DEFAULT) {
|
||||
if(stack.getItem() == Item.getItemFromBlock(Blocks.VINE)) {
|
||||
isMossy = true;
|
||||
world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock());
|
||||
stack.shrink(1);
|
||||
if(getBlockType() == ModBlocks.defaultAltar && stack.getItem() == Item.getItemFromBlock(Blocks.VINE)) {
|
||||
// todo 1.13 this resets the tile entity/drops all contents
|
||||
world.setBlockState(getPos(), ModBlocks.mossyAltar.getDefaultState());
|
||||
stack.shrink(1);
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
if(!hasWater() && !hasLava()) {
|
||||
@@ -190,7 +181,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary,
|
||||
lastRecipe.add(stack.copy());
|
||||
}
|
||||
recipeKeepTicks = 400;
|
||||
world.addBlockEvent(getPos(), ModBlocks.altar, SET_KEEP_TICKS_EVENT, 400);
|
||||
world.addBlockEvent(getPos(), getBlockType(), SET_KEEP_TICKS_EVENT, 400);
|
||||
}
|
||||
|
||||
public void trySetLastRecipe(EntityPlayer player) {
|
||||
@@ -238,6 +229,11 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary,
|
||||
@Override
|
||||
public void update() {
|
||||
if(!world.isRemote) {
|
||||
if(mossyLegacy) {
|
||||
world.setBlockState(getPos(), ModBlocks.mossyAltar.getDefaultState());
|
||||
mossyLegacy = false;
|
||||
}
|
||||
|
||||
List<EntityItem> items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 32D, 1)));
|
||||
|
||||
boolean didChange = false;
|
||||
@@ -264,7 +260,6 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary,
|
||||
}
|
||||
|
||||
if(hasLava()) {
|
||||
isMossy = false;
|
||||
world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.05, 0);
|
||||
if(Math.random() > 0.9)
|
||||
world.spawnParticle(EnumParticleTypes.LAVA, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.01, 0);
|
||||
@@ -282,7 +277,6 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary,
|
||||
|
||||
cmp.setBoolean(TAG_HAS_WATER, hasWater());
|
||||
cmp.setBoolean(TAG_HAS_LAVA, hasLava());
|
||||
cmp.setBoolean(TAG_IS_MOSSY, isMossy);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -291,15 +285,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary,
|
||||
|
||||
hasWater = cmp.getBoolean(TAG_HAS_WATER);
|
||||
hasLava = cmp.getBoolean(TAG_HAS_LAVA);
|
||||
isMossy = cmp.getBoolean(TAG_IS_MOSSY);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDataPacket(NetworkManager manager, SPacketUpdateTileEntity packet) {
|
||||
boolean lastMossy = isMossy;
|
||||
super.onDataPacket(manager, packet);
|
||||
if(isMossy != lastMossy)
|
||||
world.markBlockRangeForRenderUpdate(pos, pos);
|
||||
mossyLegacy = cmp.getBoolean(TAG_IS_MOSSY);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -198,7 +198,16 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addBlock(ModBlocks.spectralPlatform);
|
||||
addBlock(ModBlocks.infrangiblePlatform);
|
||||
addBlock(ModBlocks.alfPortal);
|
||||
addBlock(ModBlocks.altar);
|
||||
addBlock(ModBlocks.defaultAltar);
|
||||
addBlock(ModBlocks.forestAltar);
|
||||
addBlock(ModBlocks.plainsAltar);
|
||||
addBlock(ModBlocks.mountainAltar);
|
||||
addBlock(ModBlocks.fungalAltar);
|
||||
addBlock(ModBlocks.swampAltar);
|
||||
addBlock(ModBlocks.desertAltar);
|
||||
addBlock(ModBlocks.taigaAltar);
|
||||
addBlock(ModBlocks.mesaAltar);
|
||||
addBlock(ModBlocks.mossyAltar);
|
||||
addBlock(ModBlocks.runeAltar);
|
||||
addBlock(ModBlocks.terraPlate);
|
||||
addBlock(ModBlocks.brewery);
|
||||
|
||||
@@ -423,7 +423,7 @@ public final class ModCraftingRecipes {
|
||||
recipesPetalBlocks = allOfGroup(ModBlocks.petalBlock.getRegistryName());
|
||||
recipesReversePetalBlocks = allOfGroup("petal_block_deconstruct");
|
||||
|
||||
recipeApothecary = path("altar_0");
|
||||
recipeApothecary = ModBlocks.defaultAltar.getRegistryName();
|
||||
recipeLexicon = ModItems.lexicon.getRegistryName();
|
||||
recipesTwigWand = allOfGroup(ModItems.twigWand.getRegistryName());
|
||||
recipeLivingwoodTwig = ModItems.livingwoodTwig.getRegistryName();
|
||||
|
||||
@@ -6,6 +6,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.datafix.IFixableData;
|
||||
import vazkii.botania.api.item.IAncientWillContainer;
|
||||
import vazkii.botania.api.state.enums.CratePattern;
|
||||
import vazkii.botania.common.block.BlockAltar;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic;
|
||||
@@ -190,6 +191,7 @@ public class FlattenItems implements IFixableData {
|
||||
case 2: return ModBlocks.infrangiblePlatform.getRegistryName().toString();
|
||||
}
|
||||
});
|
||||
LOOKUP.put("botania:altar", i -> LibMisc.MOD_ID + ":" + LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.values()[i % 10].name().toLowerCase(Locale.ROOT));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -99,7 +99,7 @@ public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
|
||||
}
|
||||
|
||||
ItemStack getMiddleStack() {
|
||||
return new ItemStack(ModBlocks.altar);
|
||||
return new ItemStack(ModBlocks.defaultAltar);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -14,6 +14,7 @@ public final class LibBlockNames {
|
||||
|
||||
public static final String FLOWER = "flower";
|
||||
public static final String ALTAR = "altar";
|
||||
public static final String APOTHECARY_PREFIX = "apothecary_";
|
||||
public static final String SPECIAL_FLOWER = "specialFlower";
|
||||
public static final String LIVING_ROCK = "livingrock";
|
||||
public static final String LIVING_WOOD = "livingwood";
|
||||
|
||||
Reference in new issue
Block a user