Beginning of work to flatten all special flowers. not compiling yet

more work. almost done.

Compiling and launching worlds

Fix models and other bugs

Cleanup ,fix flower langs and tooltips

remove old specialflower blockstate json
This commit is contained in:
Vincent Lee committed 2019-05-08 23:04:53 -05:00
1 parent bd095808b7
commit bf6dccfcd2
335 files changed
+4240 -4364

No files matched your search

@@ -11,15 +11,9 @@
package vazkii.botania.api;
import com.google.common.base.Preconditions;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import net.minecraft.block.Block;
import net.minecraft.block.BlockCarpet;
import net.minecraft.block.BlockStainedGlass;
import net.minecraft.block.BlockStainedGlassPane;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
import net.minecraft.init.SoundEvents;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.EnumDyeColor;
@@ -28,42 +22,32 @@ import net.minecraft.item.IArmorMaterial;
import net.minecraft.item.IItemTier;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.state.EnumProperty;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.registry.RegistryNamespaced;
import net.minecraft.util.registry.RegistryNamespacedDefaultedByKey;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.IRegistryDelegate;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.internal.DummyMethodHandler;
import vazkii.botania.api.internal.DummySubTile;
import vazkii.botania.api.internal.IInternalMethodHandler;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.lexicon.KnowledgeType;
import vazkii.botania.api.lexicon.LexiconCategory;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.recipe.RecipeBrew;
import vazkii.botania.api.recipe.RecipeElvenTrade;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.recipe.RecipeMiniFlower;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipePureDaisy;
import vazkii.botania.api.recipe.RecipeRuneAltar;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.wiki.IWikiProvider;
import vazkii.botania.api.wiki.SimpleWikiProvider;
import vazkii.botania.api.wiki.WikiHooks;
import vazkii.botania.common.item.ModItems;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -72,6 +56,8 @@ import java.util.Set;
import java.util.function.Function;
public final class BotaniaAPI {
@CapabilityInject(IFloatingFlower.class)
public static Capability<IFloatingFlower> FLOATING_FLOWER_CAP;
private static final List<LexiconCategory> categories = new ArrayList<>();
private static final List<LexiconEntry> allEntries = new ArrayList<>();
@@ -88,8 +74,6 @@ public final class BotaniaAPI {
public static final List<RecipeBrew> brewRecipes = new ArrayList<>();
public static final List<RecipeManaInfusion> miniFlowerRecipes = new ArrayList<>();
public static final ResourceLocation DUMMY_SUBTILE_NAME = new ResourceLocation("botania", "dummy");
public static Map<ResourceLocation, Integer> oreWeights = Collections.emptyMap();
public static Map<ResourceLocation, Integer> oreWeightsNether = Collections.emptyMap();
@@ -14,7 +14,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.subtile.SubTileEntity;
import java.util.Collections;
import java.util.Map;
@@ -25,55 +24,11 @@ import java.util.Map;
@OnlyIn(Dist.CLIENT)
public final class BotaniaAPIClient {
private static final Map<ResourceLocation, ModelResourceLocation> subtileBlockModels = Maps.newHashMap();
private static final Map<ResourceLocation, ModelResourceLocation> subtileItemModels = Maps.newHashMap();
private static final Map<IFloatingFlower.IslandType, ModelResourceLocation> islandTypeModels = Maps.newHashMap();
private BotaniaAPIClient() {
}
/**
* Register your model for the given subtile class here.
* Call this during {@code ModelRegistryEvent}. Calling it anytime after blockModels have already baked does not guarantee that your model will work.
* Your model json must specify key "tintindex" in all the faces it wants tint applied.
* Tint is applied whenever a player recolors the flower using floral dye
*
* @param subTileName The String ID of the subtile
* @param model A path to a blockstate json and variant to be used for this subtile
* @param itemModel A path to a blockstate json and variant to be used for this subtile's item form
*/
public static void registerSubtileModel(ResourceLocation subTileName, ModelResourceLocation model, ModelResourceLocation itemModel) {
subtileBlockModels.put(subTileName, model);
subtileItemModels.put(subTileName, itemModel);
}
/**
* Register your model for the given subtile class here.
* Call this DURING PREINIT.
* Your model json must specify key "tintindex" in all the faces it wants tint applied.
* Tint is applied whenever a player recolors the flower using floral dye
*
* @param subTileName The String ID of the subtile
* @param model A path to a blockstate json and variant to be used the block. The item model will be drawn from the same blockstate json, from variant "inventory"
*/
public static void registerSubtileModel(ResourceLocation subTileName, ModelResourceLocation model) {
registerSubtileModel(subTileName, model, new ModelResourceLocation(model.getNamespace() + ":" + model.getPath(), "inventory"));
}
/**
* @return An immutable and live view of the registered subtile block model map
*/
public static Map<ResourceLocation, ModelResourceLocation> getRegisteredSubtileBlockModels() {
return Collections.unmodifiableMap(subtileBlockModels);
}
/**
* @return An immutable and live view of the registered subtile item model map
*/
public static Map<ResourceLocation, ModelResourceLocation> getRegisteredSubtileItemModels() {
return Collections.unmodifiableMap(subtileItemModels);
}
/**
* Registers your model for island type islandType here.
* Call this during {@code ModelRegistryEvent}.
@@ -0,0 +1,23 @@
package vazkii.botania.api.capability;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.item.IFloatingFlower;
public class FloatingFlowerImpl implements IFloatingFlower {
private IslandType type = IslandType.GRASS;
@Override
public ItemStack getDisplayStack() {
return ItemStack.EMPTY;
}
@Override
public IslandType getIslandType() {
return type;
}
@Override
public void setIslandType(IslandType type) {
this.type = type;
}
}
@@ -13,7 +13,6 @@ package vazkii.botania.api.internal;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -31,8 +30,7 @@ import vazkii.botania.api.recipe.RecipeElvenTrade;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipeRuneAltar;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import java.util.List;
@@ -117,31 +115,6 @@ public class DummyMethodHandler implements IInternalMethodHandler {
return new DummyPage(key);
}
@Override
public ItemStack getSubTileAsStack(SubTileType subTile) {
return ItemStack.EMPTY;
}
@Override
public ItemStack getSubTileAsFloatingFlowerStack(SubTileType subTile) {
return getSubTileAsStack(subTile);
}
@Override
public SubTileType getStackSubTileKey(ItemStack stack) {
return null;
}
@Override
public ModelResourceLocation getSubTileBlockModelForName(String name) {
return new ModelResourceLocation("builtin/missing", "missing");
}
@Override
public ModelResourceLocation getSubTileItemModelForName(String name) {
return new ModelResourceLocation("builtin/missing", "missing");
}
@Override
public IManaNetwork getManaNetworkInstance() {
return DummyManaNetwork.instance;
@@ -154,7 +127,7 @@ public class DummyMethodHandler implements IInternalMethodHandler {
public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ItemStack bindDisplay, boolean properlyBound) {}
@Override
public ItemStack getBindDisplayForFlowerType(SubTileEntity e) {
public ItemStack getBindDisplayForFlowerType(TileEntitySpecialFlower e) {
return ItemStack.EMPTY;
}
@@ -1,21 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jan 24, 2014, 4:17:33 PM (GMT)]
*/
package vazkii.botania.api.internal;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileType;
public class DummySubTile extends SubTileEntity {
public DummySubTile(SubTileType type) {
super(type);
}
}
@@ -13,7 +13,6 @@ package vazkii.botania.api.internal;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -33,8 +32,7 @@ import vazkii.botania.api.recipe.RecipeElvenTrade;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipeRuneAltar;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import java.util.List;
@@ -79,18 +77,6 @@ public interface IInternalMethodHandler {
public IManaNetwork getManaNetworkInstance();
public ItemStack getSubTileAsStack(SubTileType subTile);
public ItemStack getSubTileAsFloatingFlowerStack(SubTileType subTile);
public SubTileType getStackSubTileKey(ItemStack stack);
@OnlyIn(Dist.CLIENT)
public ModelResourceLocation getSubTileBlockModelForName(String name);
@OnlyIn(Dist.CLIENT)
public ModelResourceLocation getSubTileItemModelForName(String name);
public boolean shouldForceCheck();
public int getPassiveFlowerDecay();
@@ -107,7 +93,7 @@ public interface IInternalMethodHandler {
@OnlyIn(Dist.CLIENT)
public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ItemStack bindDisplay, boolean properlyBound);
public ItemStack getBindDisplayForFlowerType(SubTileEntity e);
public ItemStack getBindDisplayForFlowerType(TileEntitySpecialFlower e);
public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText);
@@ -11,19 +11,51 @@
package vazkii.botania.api.item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.INBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
/**
* A capability interface marking a TE as a floating flower
*/
public interface IFloatingFlower {
public ItemStack getDisplayStack();
/**
* @return The itemstack to display on top of the island
*/
ItemStack getDisplayStack();
public IslandType getIslandType();
IslandType getIslandType();
public void setIslandType(IslandType type);
void setIslandType(IslandType type);
public class IslandType {
private static final HashMap<String, IslandType> registry = new HashMap<>();
class Storage implements Capability.IStorage<IFloatingFlower> {
@Nullable
@Override
public INBTBase writeNBT(Capability<IFloatingFlower> capability, IFloatingFlower instance, EnumFacing side) {
NBTTagCompound ret = new NBTTagCompound();
ret.putString("islandType", instance.getIslandType().typeName);
return ret;
}
@Override
public void readNBT(Capability<IFloatingFlower> capability, IFloatingFlower instance, EnumFacing side, INBTBase nbt) {
if(nbt instanceof NBTTagCompound) {
IslandType t = IslandType.ofType(((NBTTagCompound) nbt).getString("islandType"));
if(t != null) {
instance.setIslandType(t);
}
}
}
}
class IslandType {
private static final Map<String, IslandType> registry = new HashMap<>();
public static final IslandType GRASS = new IslandType("GRASS");
public static final IslandType PODZOL = new IslandType("PODZOL");
@@ -44,14 +76,18 @@ public interface IFloatingFlower {
* @param name The name of this floating flower island type
*/
public IslandType(String name) {
if (registry.containsKey(name)) throw new IllegalArgumentException(name+" already registered!");
typeName = name;
registry.put(name, this);
synchronized (registry) {
if (registry.containsKey(name)) throw new IllegalArgumentException(name+" already registered!");
registry.put(name, this);
}
}
public static IslandType ofType(String typeStr) {
IslandType type = registry.get(typeStr);
return type == null ? GRASS : type;
synchronized (registry) {
IslandType type = registry.get(typeStr);
return type == null ? GRASS : type;
}
}
@Override
@@ -10,7 +10,7 @@
*/
package vazkii.botania.api.item;
import net.minecraft.item.BlockItemUseContext;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
/**
* An Item that implements this can be placed by a Rannuncarpus.
@@ -21,5 +21,5 @@ public interface IFlowerPlaceable {
* @param ctx The placement context, aiming downwards towards the downward neighbor position
* @return Whether the block was placed successfully
*/
boolean tryPlace(SubTileEntity flower, BlockItemUseContext ctx);
boolean tryPlace(TileEntitySpecialFlower flower, BlockItemUseContext ctx);
}
@@ -1,38 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Apr 22, 2015, 5:57:59 PM (GMT)]
*/
package vazkii.botania.api.recipe;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.subtile.SubTileType;
public class RecipeMiniFlower extends RecipeManaInfusion {
public RecipeMiniFlower(SubTileType mini, SubTileType flower, int mana) {
super(mini.getRegistryName(), BotaniaAPI.internalHandler.getSubTileAsStack(mini), Ingredient.fromStacks(BotaniaAPI.internalHandler.getSubTileAsStack(flower)), mana);
setCatalyst(RecipeManaInfusion.alchemy.getDefaultState());
}
@Override
public boolean matches(ItemStack stack) {
ResourceLocation key = BotaniaAPI.internalHandler.getStackSubTileKey(stack).getRegistryName();
ItemStack[] matching = getInput().getMatchingStacks();
if(matching.length == 0)
return false;
ResourceLocation input = BotaniaAPI.internalHandler.getStackSubTileKey(matching[0]).getRegistryName();
return key != null && key.equals(input);
}
}
@@ -13,15 +13,10 @@ package vazkii.botania.api.recipe;
import com.google.common.base.Preconditions;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.tags.Tag;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.api.subtile.SubTileEntity;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
public class RecipePureDaisy {
@@ -48,7 +43,7 @@ public class RecipePureDaisy {
/**
* This gets called every tick, please be careful with your checks.
*/
public boolean matches(World world, BlockPos pos, SubTileEntity pureDaisy, IBlockState state) {
public boolean matches(World world, BlockPos pos, TileEntitySpecialFlower pureDaisy, IBlockState state) {
if(input instanceof Block)
return state.getBlock() == input;
@@ -63,7 +58,7 @@ public class RecipePureDaisy {
* Should only place the block if !world.isRemote, but should return true if it would've placed
* it otherwise. You may return false to cancel the normal particles and do your own.
*/
public boolean set(World world, BlockPos pos, SubTileEntity pureDaisy) {
public boolean set(World world, BlockPos pos, TileEntitySpecialFlower pureDaisy) {
if(!world.isRemote)
world.setBlockState(pos, outputState);
return true;
@@ -1,31 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Aug 26, 2014, 5:42:16 PM (GMT)]
*/
package vazkii.botania.api.subtile;
import net.minecraft.util.ResourceLocation;
/**
* A TileEntity that implements this contains a SubTileEntity.
*/
public interface ISubTileContainer {
/**
* Gets the SubTile in this block. Generally shouldn't return null, but in that
* case use the fallback DummySubTile.
*/
public SubTileEntity getSubTile();
/**
* Sets the SubTile on this block from it's name.
*/
public void setSubTile(SubTileType type);
}
@@ -1,26 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [29/12/2015, 23:00:06 (GMT)]
*/
package vazkii.botania.api.subtile;
/**
* An extension of ISubTileContainer that allows for the SubTile to be "slowed down".
* Slowing down is the action that happens when a flower is planted in Podzol or Mycellium.
* Any flowers that pick up items from the ground should have a delay on the time the item
* needs to be on the floor equal to the value of getSlowDownFactor().
*/
public interface ISubTileSlowableContainer extends ISubTileContainer {
public static final int SLOWDOWN_FACTOR_PODZOL = 5;
public static final int SLOWDOWN_FACTOR_MYCEL = 10;
public int getSlowdownFactor();
}
@@ -1,74 +0,0 @@
package vazkii.botania.api.subtile;
import com.google.common.base.Preconditions;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.registries.ForgeRegistryEntry;
import javax.annotation.Nullable;
import java.util.List;
import java.util.function.Function;
/**
* Analog to {@link net.minecraft.tileentity.TileEntityType}, but for subtiles
*/
public class SubTileType extends ForgeRegistryEntry<SubTileType> {
public static final String SPECIAL_FLOWER_PREFIX = "flower.";
public static final String GENERATING_TYPE = "botania.flowerType.generating";
public static final String FUNCTIONAL_TYPE = "botania.flowerType.generating";
public static final String MISC_TYPE = "botania.flowerType.misc";
private final String type;
private final Function<SubTileType, ? extends SubTileEntity> factory;
private boolean showInCreative = true;
/**
* @param typeKey Translation key for this subtile type, usually {@link #GENERATING_TYPE} or {@link #FUNCTIONAL_TYPE}
* @param factory Function to create new subtiles of this type
*/
public SubTileType(String typeKey, Function<SubTileType, ? extends SubTileEntity> factory) {
this.type = typeKey;
this.factory = Preconditions.checkNotNull(factory);
}
public SubTileType setShowInCreative(boolean show) {
this.showInCreative = show;
return this;
}
public boolean shouldShowInCreative() {
return showInCreative;
}
public String getTranslationKey(ItemStack stack) {
String id = getRegistryName().toString().replaceAll(":", ".");
return "block." + SPECIAL_FLOWER_PREFIX + id;
}
/**
* Gets the lore text for the flower item, displayed in the item's tooltip.
*/
@Nullable
public ITextComponent getLore(ItemStack stack) {
String id = getRegistryName().toString().replaceAll(":", ".");
return new TextComponentTranslation("block." + SPECIAL_FLOWER_PREFIX + id + ".reference");
}
public SubTileEntity create() {
return this.factory.apply(this);
}
public String getType() {
return type;
}
/**
* Adds additional text to the tooltip. This text is added before {@link #getLore(ItemStack)}
*/
public void addTooltip(ItemStack stack, World world, List<ITextComponent> tooltip) {
tooltip.add(new TextComponentTranslation(getType()).applyTextStyle(TextFormatting.BLUE));
}
}
@@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
@@ -31,7 +32,7 @@ import java.awt.Color;
/**
* The basic class for a Functional Flower.
*/
public class SubTileFunctional extends SubTileEntity {
public class TileEntityFunctionalFlower extends TileEntitySpecialFlower {
public static final int LINK_RANGE = 10;
@@ -51,7 +52,7 @@ public class SubTileFunctional extends SubTileEntity {
BlockPos cachedPoolCoordinates = null;
public SubTileFunctional(SubTileType type) {
public TileEntityFunctionalFlower(TileEntityType<?> type) {
super(type);
}
@@ -63,8 +64,8 @@ public class SubTileFunctional extends SubTileEntity {
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
linkPool();
@@ -80,16 +81,16 @@ public class SubTileFunctional extends SubTileEntity {
if(acceptsRedstone()) {
redstoneSignal = 0;
for(EnumFacing dir : EnumFacing.values()) {
int redstoneSide = supertile.getWorld().getRedstonePower(supertile.getPos().offset(dir), dir);
int redstoneSide = getWorld().getRedstonePower(getPos().offset(dir), dir);
redstoneSignal = Math.max(redstoneSignal, redstoneSide);
}
}
if(supertile.getWorld().isRemote) {
if(getWorld().isRemote) {
double particleChance = 1F - (double) mana / (double) getMaxMana() / 3.5F;
Color color = new Color(getColor());
if(Math.random() > particleChance)
BotaniaAPI.internalHandler.sparkleFX(supertile.getWorld(), supertile.getPos().getX() + 0.3 + Math.random() * 0.5, supertile.getPos().getY() + 0.5 + Math.random() * 0.5, supertile.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5);
BotaniaAPI.internalHandler.sparkleFX(getWorld(), getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() + 0.5 + Math.random() * 0.5, getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5);
}
}
@@ -100,9 +101,9 @@ public class SubTileFunctional extends SubTileEntity {
if(cachedPoolCoordinates != null) {
needsNew = false;
if(supertile.getWorld().isBlockLoaded(cachedPoolCoordinates)) {
if(getWorld().isBlockLoaded(cachedPoolCoordinates)) {
needsNew = true;
TileEntity tileAt = supertile.getWorld().getTileEntity(cachedPoolCoordinates);
TileEntity tileAt = getWorld().getTileEntity(cachedPoolCoordinates);
if(tileAt != null && tileAt instanceof IManaPool && !tileAt.isRemoved()) {
linkedPool = tileAt;
needsNew = false;
@@ -111,16 +112,16 @@ public class SubTileFunctional extends SubTileEntity {
}
}
} else {
TileEntity tileAt = supertile.getWorld().getTileEntity(linkedPool.getPos());
TileEntity tileAt = getWorld().getTileEntity(linkedPool.getPos());
if(tileAt != null && tileAt instanceof IManaPool)
linkedPool = tileAt;
}
if(needsNew && ticksExisted == 1) { // Only for new flowers
IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance();
int size = network.getAllPoolsInWorld(supertile.getWorld()).size();
int size = network.getAllPoolsInWorld(getWorld()).size();
if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) {
linkedPool = network.getClosestPool(supertile.getPos(), supertile.getWorld(), LINK_RANGE);
linkedPool = network.getClosestPool(getPos(), getWorld(), LINK_RANGE);
sizeLastCheck = size;
}
}
@@ -202,7 +203,7 @@ public class SubTileFunctional extends SubTileEntity {
int range = 10;
range *= range;
double dist = pos.distanceSq(supertile.getPos());
double dist = pos.distanceSq(getPos());
if(range >= dist) {
TileEntity tile = player.world.getTileEntity(pos);
if(tile instanceof IManaPool) {
@@ -215,13 +216,13 @@ public class SubTileFunctional extends SubTileEntity {
}
public boolean isValidBinding() {
return linkedPool != null && linkedPool.hasWorld() && !linkedPool.isRemoved() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool;
return linkedPool != null && linkedPool.hasWorld() && !linkedPool.isRemoved() && getWorld().isBlockLoaded(linkedPool.getPos(), false) && getWorld().getTileEntity(linkedPool.getPos()) == linkedPool;
}
@OnlyIn(Dist.CLIENT)
@Override
public void renderHUD(Minecraft mc) {
String name = I18n.format("tile.botania:flower." + getUnlocalizedName() + ".name");
String name = I18n.format(getBlockState().getBlock().getTranslationKey());
int color = getColor();
BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding());
}
@@ -20,6 +20,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
@@ -38,7 +39,7 @@ import java.util.List;
/**
* The basic class for a Generating Flower.
*/
public class SubTileGenerating extends SubTileEntity {
public class TileEntityGeneratingFlower extends TileEntitySpecialFlower {
public static final int LINK_RANGE = 6;
@@ -60,7 +61,7 @@ public class SubTileGenerating extends SubTileEntity {
BlockPos cachedCollectorCoordinates = null;
public SubTileGenerating(SubTileType type) {
public TileEntityGeneratingFlower(TileEntityType<?> type) {
super(type);
}
@@ -72,14 +73,14 @@ public class SubTileGenerating extends SubTileEntity {
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
linkCollector();
if(canGeneratePassively()) {
int delay = getDelayBetweenPassiveGeneration();
if(delay > 0 && ticksExisted % delay == 0 && !supertile.getWorld().isRemote) {
if(delay > 0 && ticksExisted % delay == 0 && !getWorld().isRemote) {
if(shouldSyncPassiveGeneration())
sync();
addMana(getValueForPassiveGeneration());
@@ -90,12 +91,12 @@ public class SubTileGenerating extends SubTileEntity {
if(acceptsRedstone()) {
redstoneSignal = 0;
for(EnumFacing dir : EnumFacing.values()) {
int redstoneSide = supertile.getWorld().getRedstonePower(supertile.getPos().offset(dir), dir);
int redstoneSide = getWorld().getRedstonePower(getPos().offset(dir), dir);
redstoneSignal = Math.max(redstoneSignal, redstoneSide);
}
}
if(supertile.getWorld().isRemote) {
if(getWorld().isRemote) {
double particleChance = 1F - (double) mana / (double) getMaxMana() / 3.5F;
Color color = new Color(getColor());
if(Math.random() > particleChance) {
@@ -103,20 +104,20 @@ public class SubTileGenerating extends SubTileEntity {
double x = getPos().getX() + offset.x;
double y = getPos().getY() + offset.y;
double z = getPos().getZ() + offset.z;
BotaniaAPI.internalHandler.sparkleFX(supertile.getWorld(), x + 0.3 + Math.random() * 0.5, y + 0.5 + Math.random() * 0.5, z + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5);
BotaniaAPI.internalHandler.sparkleFX(getWorld(), x + 0.3 + Math.random() * 0.5, y + 0.5 + Math.random() * 0.5, z + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5);
}
}
boolean passive = isPassiveFlower();
if(!supertile.getWorld().isRemote) {
if(!getWorld().isRemote) {
int muhBalance = BotaniaAPI.internalHandler.getPassiveFlowerDecay();
if(passive && muhBalance > 0 && passiveDecayTicks > muhBalance) {
IBlockState state = supertile.getWorld().getBlockState(supertile.getPos());
supertile.getWorld().playEvent(2001, supertile.getPos(), Block.getStateId(state));
if(Blocks.DEAD_BUSH.getDefaultState().isValidPosition(supertile.getWorld(), supertile.getPos()))
supertile.getWorld().setBlockState(supertile.getPos(), Blocks.DEAD_BUSH.getDefaultState());
else supertile.getWorld().removeBlock(supertile.getPos());
IBlockState state = getWorld().getBlockState(getPos());
getWorld().playEvent(2001, getPos(), Block.getStateId(state));
if(Blocks.DEAD_BUSH.getDefaultState().isValidPosition(getWorld(), getPos()))
getWorld().setBlockState(getPos(), Blocks.DEAD_BUSH.getDefaultState());
else getWorld().removeBlock(getPos());
}
}
@@ -131,9 +132,9 @@ public class SubTileGenerating extends SubTileEntity {
if(cachedCollectorCoordinates != null) {
needsNew = false;
if(supertile.getWorld().isBlockLoaded(cachedCollectorCoordinates)) {
if(getWorld().isBlockLoaded(cachedCollectorCoordinates)) {
needsNew = true;
TileEntity tileAt = supertile.getWorld().getTileEntity(cachedCollectorCoordinates);
TileEntity tileAt = getWorld().getTileEntity(cachedCollectorCoordinates);
if(tileAt instanceof IManaCollector && !tileAt.isRemoved()) {
linkedCollector = tileAt;
needsNew = false;
@@ -142,16 +143,16 @@ public class SubTileGenerating extends SubTileEntity {
}
}
} else {
TileEntity tileAt = supertile.getWorld().getTileEntity(linkedCollector.getPos());
TileEntity tileAt = getWorld().getTileEntity(linkedCollector.getPos());
if(tileAt instanceof IManaCollector)
linkedCollector = tileAt;
}
if(needsNew && ticksExisted == 1) { // New flowers only
IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance();
int size = network.getAllCollectorsInWorld(supertile.getWorld()).size();
int size = network.getAllCollectorsInWorld(getWorld()).size();
if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) {
linkedCollector = network.getClosestCollector(supertile.getPos(), supertile.getWorld(), LINK_RANGE);
linkedCollector = network.getClosestCollector(getPos(), getWorld(), LINK_RANGE);
sizeLastCheck = size;
}
}
@@ -295,7 +296,7 @@ public class SubTileGenerating extends SubTileEntity {
int range = 6;
range *= range;
double dist = pos.distanceSq(supertile.getPos());
double dist = pos.distanceSq(getPos());
if(range >= dist) {
TileEntity tile = player.world.getTileEntity(pos);
if(tile instanceof IManaCollector) {
@@ -309,13 +310,13 @@ public class SubTileGenerating extends SubTileEntity {
public boolean isValidBinding() {
return linkedCollector != null && !linkedCollector.isRemoved() && supertile.getWorld().getTileEntity(linkedCollector.getPos()) == linkedCollector;
return linkedCollector != null && !linkedCollector.isRemoved() && getWorld().getTileEntity(linkedCollector.getPos()) == linkedCollector;
}
@OnlyIn(Dist.CLIENT)
@Override
public void renderHUD(Minecraft mc) {
String name = I18n.format("tile.botania:flower." + getUnlocalizedName() + ".name");
String name = I18n.format(getBlockState().getBlock().getTranslationKey());
int color = getColor();
BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding());
}
@@ -10,86 +10,179 @@
*/
package vazkii.botania.api.subtile;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
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.tags.BlockTags;
import net.minecraft.tags.Tag;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ITickable;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.registries.ForgeRegistries;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.capability.FloatingFlowerImpl;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.wand.IWandBindable;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.string.TileRedStringRelay;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
/**
* A Sub-TileEntity, this is used for the flower system. Make sure to map subclasses
* of this using BotaniaAPI.mapSubTile(String, Class). Any subclass of this must have
* a no parameter constructor.
* Common superclass of all magical flower TE's
*/
public class SubTileEntity {
public class TileEntitySpecialFlower extends TileEntity implements ITickable, IWandBindable {
public static final ResourceLocation DING_SOUND_EVENT = new ResourceLocation("botania", "ding");
public static final int SLOWDOWN_FACTOR_PODZOL = 5;
public static final int SLOWDOWN_FACTOR_MYCEL = 10;
private static final Tag<Block> FLOATING_TAG = new BlockTags.Wrapper(new ResourceLocation("botania", "special_floating_flowers"));
protected TileEntity supertile;
private final IFloatingFlower floatingData = new FloatingFlowerImpl() {
@Override
public ItemStack getDisplayStack() {
ResourceLocation id = getType().getRegistryName();
Item item = ForgeRegistries.ITEMS.getValue(id);
if(item != null) {
return new ItemStack(item);
} else {
return super.getDisplayStack();
}
}
};
private final LazyOptional<IFloatingFlower> floatingDataCap = LazyOptional.of(() -> floatingData);
public int ticksExisted = 0;
private final SubTileType type;
/** true if this flower is working on Enchanted Soil **/
public boolean overgrowth = false;
/** true if this flower is working on Enchanted Soil and this is the second tick **/
public boolean overgrowthBoost = false;
/** The Tag items should use to store which sub tile they are. **/
public static final String TAG_TYPE = "type";
public static final String TAG_TICKS_EXISTED = "ticksExisted";
private static final String TAG_FLOATING_DATA = "floating";
public SubTileEntity(SubTileType type) {
this.type = type;
public TileEntitySpecialFlower(TileEntityType<?> type) {
super(type);
}
public final SubTileType getType() {
return type;
@Override
public final void tick() {
TileEntity tileBelow = world.getTileEntity(pos.down());
if(tileBelow instanceof TileRedStringRelay) {
BlockPos coords = ((TileRedStringRelay) tileBelow).getBinding();
if(coords != null) {
BlockPos currPos = pos;
setPos(coords);
tickFlower();
setPos(currPos);
return;
}
}
boolean special = isOnSpecialSoil();
if(special) {
this.overgrowth = true;
if(isOvergrowthAffected()) {
tickFlower();
overgrowthBoost = true;
}
}
tickFlower();
overgrowth = false;
overgrowthBoost = false;
}
public final BlockPos getPos() {
return supertile.getPos();
@Nonnull
@Override
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing side) {
if(cap == BotaniaAPI.FLOATING_FLOWER_CAP) {
if(hasWorld() && getWorld().getBlockState(getPos()).isIn(FLOATING_TAG)) {
return floatingDataCap.cast();
}
}
return super.getCapability(cap, side);
}
public final World getWorld() {
return supertile.getWorld();
public boolean isFloating() {
return getCapability(BotaniaAPI.FLOATING_FLOWER_CAP).isPresent();
}
public void setSupertile(TileEntity tile) {
supertile = tile;
public boolean isOnSpecialSoil() {
if(isFloating()) {
return false;
} else {
return world.getBlockState(pos.down()).getBlock() == ModBlocks.enchantedSoil;
}
}
public void onUpdate() {
public void tickFlower() {
ticksExisted++;
}
public final void writeToPacketNBTInternal(NBTTagCompound cmp) {
cmp.putInt(TAG_TICKS_EXISTED, ticksExisted);
writeToPacketNBT(cmp);
}
public final void readFromPacketNBTInternal(NBTTagCompound cmp) {
@Override
public final void read(NBTTagCompound cmp) {
super.read(cmp);
if(cmp.contains(TAG_TICKS_EXISTED))
ticksExisted = cmp.getInt(TAG_TICKS_EXISTED);
if(cmp.contains(TAG_FLOATING_DATA))
BotaniaAPI.FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA));
readFromPacketNBT(cmp);
}
@Nonnull
@Override
public final NBTTagCompound write(NBTTagCompound cmp) {
cmp.putInt(TAG_TICKS_EXISTED, ticksExisted);
cmp.put(TAG_FLOATING_DATA, BotaniaAPI.FLOATING_FLOWER_CAP.writeNBT(floatingData, null));
writeToPacketNBT(cmp);
return cmp;
}
@Override
public SPacketUpdateTileEntity getUpdatePacket() {
NBTTagCompound cmp = new NBTTagCompound();
writeToPacketNBT(cmp);
return new SPacketUpdateTileEntity(getPos(), -1, cmp);
}
@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
IFloatingFlower.IslandType oldType = floatingData.getIslandType();
super.onDataPacket(net, packet);
if(oldType != floatingData.getIslandType() && isFloating()) {
world.markBlockRangeForRenderUpdate(pos, pos);
}
}
@Nonnull
@Override
public NBTTagCompound getUpdateTag() {
return write(new NBTTagCompound());
}
/**
* Writes some extra data to a network packet. This data is read
* by readFromPacketNBT on the client that receives the packet.
@@ -105,29 +198,13 @@ public class SubTileEntity {
public void readFromPacketNBT(NBTTagCompound cmp) { }
public void sync() {
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(supertile);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this);
}
public String getUnlocalizedName() {
return getType().getRegistryName().toString();
}
/**
* Gets the block model path for this subtile
*/
@OnlyIn(Dist.CLIENT)
public ModelResourceLocation getBlockModel() {
return BotaniaAPI.internalHandler.getSubTileBlockModelForName(getUnlocalizedName());
}
/**
* Gets the item model path for this subtile
*/
@OnlyIn(Dist.CLIENT)
public ModelResourceLocation getItemModel() {
return BotaniaAPI.internalHandler.getSubTileItemModelForName(getUnlocalizedName());
}
/**
* Called when a Wand of the Forest is used on this sub tile. Note that the
* player parameter can be null if this is called from a dispenser.
@@ -156,14 +233,6 @@ public class SubTileEntity {
*/
public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) {}
/**
* Triggered by {@link TileEntity#receiveClientEvent} via {@link net.minecraft.block.Block#eventReceived} and {@link World#addBlockEvent}
*/
public boolean receiveClientEvent(int id, int param)
{
return false;
}
/**
* Allows additional processing of sub tile drops
*/
@@ -183,6 +252,7 @@ public class SubTileEntity {
* when the sub tile is being hovered with a wand of the forest.
*/
@OnlyIn(Dist.CLIENT)
@Override
public BlockPos getBinding() {
return null;
}
@@ -200,12 +270,13 @@ public class SubTileEntity {
* Gets a BlockPos instance with the position of this sub tile.
*/
public BlockPos toBlockPos() {
return supertile.getPos();
return getPos();
}
/**
* @see IWandBindable#canSelect(EntityPlayer, ItemStack, net.minecraft.util.math.BlockPos, net.minecraft.util.EnumFacing)
*/
@Override
public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) {
return false;
}
@@ -213,6 +284,7 @@ public class SubTileEntity {
/**
* @see IWandBindable#bindTo(EntityPlayer, ItemStack, net.minecraft.util.math.BlockPos, net.minecraft.util.EnumFacing)
*/
@Override
public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) {
return false;
}
@@ -253,13 +325,26 @@ public class SubTileEntity {
}
/**
* Gets ths slowdown factor of this SubTile.
* @see ISubTileSlowableContainer
* Allow for the SubTile to be "slowed down".
* Slowing down is the action that happens when a flower is planted in Podzol or Mycellium.
* Any flowers that pick up items from the ground should have a delay on the time the item
* needs to be on the floor equal to the value of this method..
*/
public int getSlowdownFactor() {
if(supertile instanceof ISubTileSlowableContainer) {
ISubTileSlowableContainer slowable = (ISubTileSlowableContainer) supertile;
return slowable.getSlowdownFactor();
if(isFloating()) {
IFloatingFlower.IslandType type = floatingData.getIslandType();
if(type == IFloatingFlower.IslandType.MYCEL)
return SLOWDOWN_FACTOR_MYCEL;
else if(type == IFloatingFlower.IslandType.PODZOL)
return SLOWDOWN_FACTOR_PODZOL;
} else {
Block below = world.getBlockState(getPos().down()).getBlock();
if(below == Blocks.MYCELIUM)
return SLOWDOWN_FACTOR_MYCEL;
if(below == Blocks.PODZOL) {
return SLOWDOWN_FACTOR_PODZOL;
}
}
return 0;
@@ -14,6 +14,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lib.LibBlockNames;
@@ -37,7 +38,7 @@ public final class ModChallenges {
addChallenge(EnumChallengeLevel.EASY, "recordFarm", new ItemStack(Items.MUSIC_DISC_13));
addChallenge(EnumChallengeLevel.EASY, "reedFarm", new ItemStack(Blocks.SUGAR_CANE));
addChallenge(EnumChallengeLevel.EASY, "cobbleGen", new ItemStack(Blocks.COBBLESTONE));
addChallenge(EnumChallengeLevel.EASY, "pureDaisy", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY));
addChallenge(EnumChallengeLevel.EASY, "pureDaisy", new ItemStack(ModSubtiles.pureDaisy));
addChallenge(EnumChallengeLevel.EASY, "battery", new ItemStack(ModBlocks.manaPool));
addChallenge(EnumChallengeLevel.NORMAL, "apothecaryRefill", new ItemStack(ModBlocks.defaultAltar));
@@ -45,15 +46,15 @@ public final class ModChallenges {
addChallenge(EnumChallengeLevel.NORMAL, "fullCropFarm", new ItemStack(Items.WHEAT_SEEDS));
addChallenge(EnumChallengeLevel.NORMAL, "animalFarm", new ItemStack(Items.LEATHER));
addChallenge(EnumChallengeLevel.NORMAL, "boneMealFarm", new ItemStack(Items.BONE_MEAL));
addChallenge(EnumChallengeLevel.NORMAL, "orechid", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID));
addChallenge(EnumChallengeLevel.NORMAL, "orechid", new ItemStack(ModSubtiles.orechid));
addChallenge(EnumChallengeLevel.HARD, "mobTower", new ItemStack(Items.BONE));
addChallenge(EnumChallengeLevel.HARD, "entropinnyumSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENTROPINNYUM));
addChallenge(EnumChallengeLevel.HARD, "spectrolusSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTROLUS));
addChallenge(EnumChallengeLevel.HARD, "shulkMeNotSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SHULK_ME_NOT));
addChallenge(EnumChallengeLevel.HARD, "entropinnyumSetup", new ItemStack(ModSubtiles.entropinnyum));
addChallenge(EnumChallengeLevel.HARD, "spectrolusSetup", new ItemStack(ModSubtiles.spectrolus));
addChallenge(EnumChallengeLevel.HARD, "shulkMeNotSetup", new ItemStack(ModSubtiles.shulkMeNot));
addChallenge(EnumChallengeLevel.HARD, "potionBrewer", new ItemStack(ModBlocks.brewery));
addChallenge(EnumChallengeLevel.LUNATIC, "kekimurusSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS));
addChallenge(EnumChallengeLevel.LUNATIC, "kekimurusSetup", new ItemStack(ModSubtiles.kekimurus));
addChallenge(EnumChallengeLevel.LUNATIC, "autoQuarry", new ItemStack(Items.DIAMOND_PICKAXE));
addChallenge(EnumChallengeLevel.LUNATIC, "runeCrafter", new ItemStack(ModItems.runeWater));
}
@@ -25,9 +25,8 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.api.distmarker.Dist;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.subtile.ISubTileContainer;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.entity.EntityMagicLandmine;
@@ -66,10 +65,9 @@ public final class BlockHighlightRenderHandler {
}
TileEntity tile = mc.world.getTileEntity(bPos);
if(tile == null || !(tile instanceof ISubTileContainer))
if(tile == null || !(tile instanceof TileEntitySpecialFlower))
break boundTile;
ISubTileContainer container = (ISubTileContainer) tile;
SubTileEntity subtile = container.getSubTile();
TileEntitySpecialFlower subtile = (TileEntitySpecialFlower) tile;
if(subtile == null)
break boundTile;
RadiusDescriptor descriptor = subtile.getRadius();
@@ -20,14 +20,14 @@ import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EnumPlayerModelParts;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.ForgeRegistries;
import vazkii.botania.api.item.IBaubleRender.Helper;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.common.Botania;
import vazkii.botania.common.BotaniaRegistries;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.version.VersionChecker;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
@@ -95,8 +95,8 @@ public final class ContributorFancinessHandler implements LayerRenderer<EntityPl
flowerMap.put(key, new ItemStack(ModBlocks.getFlower(EnumDyeColor.byId(i))));
} catch(NumberFormatException e) {
// todo 1.13 backward compat for camelCase names
SubTileType type = BotaniaRegistries.SUBTILES.getValue(new ResourceLocation(LibMisc.MOD_ID, value));
flowerMap.put(key, ItemBlockSpecialFlower.ofType(type));
Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(LibMisc.MOD_ID, value));
flowerMap.put(key, new ItemStack(item));
}
}
}
@@ -8,29 +8,20 @@
*/
package vazkii.botania.client.core.handler;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.RenderSprite;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.client.model.animation.TileEntityRendererAnimation;
import net.minecraftforge.client.model.obj.OBJLoader;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.client.registry.RenderingRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.registries.IRegistryDelegate;
import vazkii.botania.api.BotaniaAPIClient;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.client.model.SpecialFlowerModel;
import vazkii.botania.client.render.entity.RenderBabylonWeapon;
import vazkii.botania.client.render.entity.RenderCorporeaSpark;
import vazkii.botania.client.render.entity.RenderDoppleganger;
@@ -42,22 +33,6 @@ import vazkii.botania.client.render.entity.RenderSnowballStack;
import vazkii.botania.client.render.entity.RenderSpark;
import vazkii.botania.client.render.tile.*;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.subtile.SubTileManastar;
import vazkii.botania.common.block.subtile.SubTilePureDaisy;
import vazkii.botania.common.block.subtile.functional.*;
import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose;
import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon;
import vazkii.botania.common.block.subtile.generating.SubTileEndoflame;
import vazkii.botania.common.block.subtile.generating.SubTileEntropinnyum;
import vazkii.botania.common.block.subtile.generating.SubTileGourmaryllis;
import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas;
import vazkii.botania.common.block.subtile.generating.SubTileKekimurus;
import vazkii.botania.common.block.subtile.generating.SubTileMunchdew;
import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus;
import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia;
import vazkii.botania.common.block.subtile.generating.SubTileShulkMeNot;
import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus;
import vazkii.botania.common.block.subtile.generating.SubTileThermalily;
import vazkii.botania.common.block.tile.*;
import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
@@ -79,15 +54,12 @@ import vazkii.botania.common.entity.EntitySpark;
import vazkii.botania.common.entity.EntityThornChakram;
import vazkii.botania.common.entity.EntityVineBall;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID)
public final class ModelHandler {
@SubscribeEvent
public static void registerModels(ModelRegistryEvent evt) {
ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE);
registerSubtiles();
RenderTileFloatingFlower renderTileFloatingFlower = new RenderTileFloatingFlower();
@@ -100,7 +72,6 @@ public final class ModelHandler {
ClientRegistry.bindTileEntitySpecialRenderer(TileEnchanter.class, new RenderTileEnchanter());
ClientRegistry.bindTileEntitySpecialRenderer(TileAlfPortal.class, new RenderTileAlfPortal());
ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingFlower.class, renderTileFloatingFlower);
ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingSpecialFlower.class, renderTileFloatingFlower);
ClientRegistry.bindTileEntitySpecialRenderer(TileTinyPotato.class, new RenderTileTinyPotato());
ClientRegistry.bindTileEntitySpecialRenderer(TileStarfield.class, new RenderTileStarfield());
ClientRegistry.bindTileEntitySpecialRenderer(TileBrewery.class, new RenderTileBrewery());
@@ -151,60 +122,6 @@ public final class ModelHandler {
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SCORCHED, new ModelResourceLocation("botania:mini_island", "variant=scorched"));
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.INFUSED, new ModelResourceLocation("botania:mini_island", "variant=infused"));
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MUTATED, new ModelResourceLocation("botania:mini_island", "variant=mutated"));
/* todo 1.13
BotaniaAPIClient.registerSubtileModel(SubTileManastar.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MANASTAR.toString()));
BotaniaAPIClient.registerSubtileModel(SubTilePureDaisy.class, new ModelResourceLocation(LibBlockNames.SUBTILE_PUREDAISY.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileEndoflame.class, new ModelResourceLocation(LibBlockNames.SUBTILE_ENDOFLAME.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileHydroangeas.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HYDROANGEAS.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileThermalily.class, new ModelResourceLocation(LibBlockNames.SUBTILE_THERMALILY.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileArcaneRose.class, new ModelResourceLocation(LibBlockNames.SUBTILE_ARCANE_ROSE.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileMunchdew.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MUNCHDEW.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileEntropinnyum.class, new ModelResourceLocation(LibBlockNames.SUBTILE_ENTROPINNYUM.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileKekimurus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_KEKIMURUS.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileGourmaryllis.class, new ModelResourceLocation(LibBlockNames.SUBTILE_GOURMARYLLIS.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileNarslimmus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_NARSLIMMUS.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileSpectrolus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SPECTROLUS.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileDandelifeon.class, new ModelResourceLocation(LibBlockNames.SUBTILE_DANDELIFEON.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileRafflowsia.class, new ModelResourceLocation(LibBlockNames.SUBTILE_RAFFLOWSIA.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileShulkMeNot.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SHULK_ME_NOT.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BELLETHORN.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BELLETHORN + "_chibi"));
BotaniaAPIClient.registerSubtileModel(SubTileDreadthorn.class, new ModelResourceLocation(LibBlockNames.SUBTILE_DREADTHORN.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileHeiseiDream.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HEISEI_DREAM.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileTigerseye.class, new ModelResourceLocation(LibBlockNames.SUBTILE_TIGERSEYE.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileJadedAmaranthus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_JADED_AMARANTHUS.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileOrechid.class, new ModelResourceLocation(LibBlockNames.SUBTILE_ORECHID.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileOrechidIgnem.class, new ModelResourceLocation(LibBlockNames.SUBTILE_ORECHID_IGNEM.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileFallenKanade.class, new ModelResourceLocation(LibBlockNames.SUBTILE_FALLEN_KANADE.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileExoflame.class, new ModelResourceLocation(LibBlockNames.SUBTILE_EXOFLAME.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.class, new ModelResourceLocation(LibBlockNames.SUBTILE_AGRICARNATION.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_AGRICARNATION + "_chibi"));
BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HOPPERHOCK.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HOPPERHOCK + "_chibi"));
BotaniaAPIClient.registerSubtileModel(SubTileTangleberrie.class, new ModelResourceLocation(LibBlockNames.SUBTILE_TANGLEBERRIE.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileJiyuulia.class, new ModelResourceLocation(LibBlockNames.SUBTILE_JIYUULIA.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_RANNUNCARPUS.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_RANNUNCARPUS + "_chibi"));
BotaniaAPIClient.registerSubtileModel(SubTileHyacidus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HYACIDUS.toString()));
BotaniaAPIClient.registerSubtileModel(SubTilePollidisiac.class, new ModelResourceLocation(LibBlockNames.SUBTILE_POLLIDISIAC.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileClayconia.class, new ModelResourceLocation(LibBlockNames.SUBTILE_CLAYCONIA.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileClayconia.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_CLAYCONIA + "_chibi"));
BotaniaAPIClient.registerSubtileModel(SubTileLoonuim.class, new ModelResourceLocation(LibBlockNames.SUBTILE_LOONIUM.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileDaffomill.class, new ModelResourceLocation(LibBlockNames.SUBTILE_DAFFOMILL.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileVinculotus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_VINCULOTUS.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileSpectranthemum.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SPECTRANTHEMUM.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileMedumone.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MEDUMONE.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MARIMORPHOSIS.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MARIMORPHOSIS + "_chibi"));
BotaniaAPIClient.registerSubtileModel(SubTileBubbell.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BUBBELL.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileBubbell.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BUBBELL + "_chibi"));
BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SOLEGNOLIA.toString()));
BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SOLEGNOLIA + "_chibi"));
BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BERGAMUTE.toString()));
*/
}
private ModelHandler() {}
@@ -22,7 +22,6 @@ import mezz.jei.api.runtime.IJeiRuntime;
import mezz.jei.api.runtime.IRecipesGui;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.tags.BlockTags;
@@ -34,7 +33,6 @@ import vazkii.botania.client.gui.crafting.ContainerCraftingHalo;
import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory;
import vazkii.botania.client.integration.jei.crafting.AncientWillRecipeWrapper;
import vazkii.botania.client.integration.jei.crafting.CompositeLensRecipeWrapper;
import vazkii.botania.client.integration.jei.crafting.SpecialFloatingFlowerWrapper;
import vazkii.botania.client.integration.jei.crafting.TerraPickTippingRecipeWrapper;
import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeCategory;
import vazkii.botania.client.integration.jei.manapool.ManaPoolRecipeCategory;
@@ -49,7 +47,6 @@ import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.crafting.recipe.AncientWillRecipe;
import vazkii.botania.common.crafting.recipe.CompositeLensRecipe;
import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe;
import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
@@ -70,8 +67,6 @@ public class JEIBotaniaPlugin implements IModPlugin {
@Override
public void registerItemSubtypes(@Nonnull ISubtypeRegistration subtypeRegistry) {
subtypeRegistry.registerSubtypeInterpreter(ModBlocks.specialFlower.asItem(), stack -> ItemBlockSpecialFlower.getType(stack).toString());
subtypeRegistry.registerSubtypeInterpreter(ModBlocks.floatingSpecialFlower.asItem(), stack -> ItemBlockSpecialFlower.getType(stack).toString());
subtypeRegistry.registerSubtypeInterpreter(ModItems.brewVial, ItemBrewBase::getSubtype);
subtypeRegistry.registerSubtypeInterpreter(ModItems.brewFlask, ItemBrewBase::getSubtype);
subtypeRegistry.registerSubtypeInterpreter(ModItems.incenseStick, ItemBrewBase::getSubtype);
@@ -98,7 +93,6 @@ public class JEIBotaniaPlugin implements IModPlugin {
@Override
public void registerVanillaCategoryExtensions(IVanillaCategoryExtensionRegistration registration) {
registration.getCraftingCategory().addCategoryExtension(SpecialFloatingFlowerRecipe.class, SpecialFloatingFlowerWrapper::new);
registration.getCraftingCategory().addCategoryExtension(AncientWillRecipe.class, AncientWillRecipeWrapper::new);
registration.getCraftingCategory().addCategoryExtension(TerraPickTippingRecipe.class, TerraPickTippingRecipeWrapper::new);
registration.getCraftingCategory().addCategoryExtension(CompositeLensRecipe.class, CompositeLensRecipeWrapper::new);
@@ -157,12 +151,12 @@ public class JEIBotaniaPlugin implements IModPlugin {
registry.addRecipeCatalyst(new ItemStack(ModBlocks.mesaAltar), PetalApothecaryRecipeCategory.UID);
registry.addRecipeCatalyst(new ItemStack(ModBlocks.mossyAltar), PetalApothecaryRecipeCategory.UID);
registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(SUBTILE_ORECHID), OrechidRecipeCategory.UID);
registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), ModSubtiles.orechid), OrechidRecipeCategory.UID);
registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(SUBTILE_ORECHID_IGNEM), OrechidIgnemRecipeCategory.UID);
registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), ModSubtiles.orechidIgnem), OrechidIgnemRecipeCategory.UID);
registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(SUBTILE_PUREDAISY), PureDaisyRecipeCategory.UID);
registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), ModSubtiles.pureDaisy), PureDaisyRecipeCategory.UID);
registry.addRecipeCatalyst(ModSubtiles.orechid, OrechidRecipeCategory.UID);
registry.addRecipeCatalyst(ModSubtiles.orechidFloating, OrechidRecipeCategory.UID);
registry.addRecipeCatalyst(ModSubtiles.orechidIgnem, OrechidIgnemRecipeCategory.UID);
registry.addRecipeCatalyst(ModSubtiles.orechidIgnemFloating, OrechidIgnemRecipeCategory.UID);
registry.addRecipeCatalyst(ModSubtiles.pureDaisy, PureDaisyRecipeCategory.UID);
registry.addRecipeCatalyst(ModSubtiles.pureDaisyFloating, PureDaisyRecipeCategory.UID);
registry.addRecipeCatalyst(new ItemStack(ModBlocks.runeAltar), RunicAltarRecipeCategory.UID);
@@ -1,46 +0,0 @@
package vazkii.botania.client.integration.jei.crafting;
import com.google.common.collect.ImmutableList;
import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.category.extensions.vanilla.crafting.ICraftingCategoryExtension;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
public class SpecialFloatingFlowerWrapper implements ICraftingCategoryExtension {
private final List<List<ItemStack>> inputs = new ArrayList<>();
private final ItemStack output;
private final ResourceLocation name;
public SpecialFloatingFlowerWrapper(SpecialFloatingFlowerRecipe recipe) {
name = recipe.getId();
inputs.add(ImmutableList.of(ItemBlockSpecialFlower.ofType(recipe.flowerType)));
List<ItemStack> normalFloaters = new ArrayList<>();
for(EnumDyeColor color : EnumDyeColor.values()) {
normalFloaters.add(new ItemStack(ModBlocks.getFloatingFlower(color)));
}
inputs.add(normalFloaters);
output = ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), recipe.flowerType);
}
@Override
public void setIngredients(@Nonnull IIngredients ingredients) {
ingredients.setInputLists(VanillaTypes.ITEM, inputs);
ingredients.setOutput(VanillaTypes.ITEM, output);
}
@Nullable
@Override
public ResourceLocation getRegistryName() {
return name;
}
}
@@ -18,6 +18,7 @@ import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.category.IRecipeCategory;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
@@ -39,7 +40,7 @@ public class OrechidIgnemRecipeCategory implements IRecipeCategory<OrechidIgnemR
localizedName = I18n.format("botania.nei.orechidIgnem");
overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pure_daisy_overlay.png"),
0, 0, 64, 46);
icon = guiHelper.createDrawableIngredient(ItemBlockSpecialFlower.ofType(ModSubtiles.orechidIgnem));
icon = guiHelper.createDrawableIngredient(new ItemStack(ModSubtiles.orechidIgnem));
}
@Nonnull
@@ -86,7 +87,7 @@ public class OrechidIgnemRecipeCategory implements IRecipeCategory<OrechidIgnemR
itemStacks.set(0, ingredients.getInputs(VanillaTypes.ITEM).get(0));
itemStacks.init(1, true, 70, 12);
itemStacks.set(1, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID_IGNEM));
itemStacks.set(1, new ItemStack(ModSubtiles.orechidIgnem));
itemStacks.init(2, true, 99, 12);
itemStacks.set(2, ingredients.getOutputs(VanillaTypes.ITEM).get(0));
@@ -50,7 +50,7 @@ public class OrechidRecipeCategory implements IRecipeCategory<OrechidRecipeWrapp
localizedName = I18n.format("botania.nei.orechid");
overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pure_daisy_overlay.png"),
0, 0, 64, 46);
icon = guiHelper.createDrawableIngredient(ItemBlockSpecialFlower.ofType(ModSubtiles.orechid));
icon = guiHelper.createDrawableIngredient(new ItemStack(ModSubtiles.orechid));
}
@Nonnull
@@ -118,7 +118,7 @@ public class OrechidRecipeCategory implements IRecipeCategory<OrechidRecipeWrapp
itemStacks.set(0, ingredients.getInputs(VanillaTypes.ITEM).get(0));
itemStacks.init(1, true, 70, 12);
itemStacks.set(1, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID));
itemStacks.set(1, new ItemStack(ModSubtiles.orechid));
itemStacks.init(2, true, 99, 12);
itemStacks.set(2, ingredients.getOutputs(VanillaTypes.ITEM).get(0));
@@ -47,7 +47,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory<RecipePureDaisy>
localizedName = I18n.format("botania.nei.pureDaisy");
overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pure_daisy_overlay.png"),
0, 0, 64, 46);
icon = guiHelper.createDrawableIngredient(ItemBlockSpecialFlower.ofType(ModSubtiles.pureDaisy));
icon = guiHelper.createDrawableIngredient(new ItemStack(ModSubtiles.pureDaisy));
}
@Nonnull
@@ -131,7 +131,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory<RecipePureDaisy>
}
recipeLayout.getItemStacks().init(1, true, 70, 12);
recipeLayout.getItemStacks().set(1, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY));
recipeLayout.getItemStacks().set(1, new ItemStack(ModSubtiles.pureDaisy));
if(outputFluid) {
recipeLayout.getFluidStacks().init(2, false, 99, 12, 16, 16, 1000, false, null);
@@ -41,7 +41,6 @@ import vazkii.botania.api.BotaniaAPIClient;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.Botania;
import vazkii.botania.common.BotaniaRegistries;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.BlockFloatingFlower;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
@@ -92,23 +91,13 @@ public class FloatingFlowerModel implements IBakedModel {
@Nonnull
@Override
public List<BakedQuad> getQuads(IBlockState state, EnumFacing face, @Nonnull Random rand) {
if(state.getBlock() != ModBlocks.floatingSpecialFlower && !(state.getBlock() instanceof BlockFloatingFlower))
if(!(state.getBlock() instanceof BlockFloatingFlower))
return Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand);
if(true) // todo 1.13
return ImmutableList.of();
IExtendedBlockState realState = (IExtendedBlockState) state;
IFloatingFlower.IslandType islandType = realState.getValue(BotaniaStateProps.ISLAND_TYPE);
ResourceLocation identifier;
if(state.getBlock() == ModBlocks.floatingSpecialFlower) {
// Magic flower
identifier = realState.getValue(BotaniaStateProps.SUBTILE_ID);
} else {
// Mundane flower
identifier = state.getBlock().getRegistryName();
}
return getModel(islandType, identifier).getQuads(state, face, rand);
return getModel(islandType, state.getBlock().getRegistryName()).getQuads(state, face, rand);
}
// Get the model for this islandtype + flower type combination. If it's not cached already, generate it.
@@ -131,17 +120,15 @@ public class FloatingFlowerModel implements IBakedModel {
islandModel = modelManager.getMissingModel();
}
IBakedModel flowerModel;
Item item;
if(identifier.getPath().endsWith(LibBlockNames.FLOATING_FLOWER_SUFFIX)) {
ResourceLocation shinyId = new ResourceLocation(identifier.getNamespace(), identifier.getPath().replaceAll(LibBlockNames.FLOATING_FLOWER_SUFFIX, LibBlockNames.SHINY_FLOWER_SUFFIX));
Item shinyFlower = ForgeRegistries.ITEMS.getValue(shinyId);
flowerModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(new ItemStack(shinyFlower));
item = ForgeRegistries.ITEMS.getValue(shinyId);
} else {
ItemStack stack = ItemBlockSpecialFlower.ofType(BotaniaRegistries.SUBTILES.getValue(identifier));
IBakedModel specialFlowerModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(stack);
flowerModel = specialFlowerModel.getOverrides().getModelWithOverrides(specialFlowerModel, stack, null, null);
item = ForgeRegistries.ITEMS.getValue(identifier);
}
IBakedModel flowerModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(new ItemStack(item));
// Enhance!
CompositeBakedModel model = new CompositeBakedModel(flowerModel, islandModel);
@@ -232,17 +219,7 @@ public class FloatingFlowerModel implements IBakedModel {
public IBakedModel getModelWithOverrides(IBakedModel model, ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) {
// Items always have GRASS island
IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS;
ResourceLocation identifier;
if(Block.getBlockFromItem(stack.getItem()) == ModBlocks.floatingSpecialFlower) {
// Magic flower
identifier = ItemBlockSpecialFlower.getType(stack).getRegistryName();
} else {
// Mundane flower
identifier = stack.getItem().getRegistryName();
}
return FloatingFlowerModel.this.getModel(islandType, identifier);
return FloatingFlowerModel.this.getModel(islandType, stack.getItem().getRegistryName());
}
};
}
@@ -1,240 +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.client.model;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.IUnbakedModel;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.model.ItemOverrideList;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ICustomModelLoader;
import net.minecraftforge.client.model.IModel;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.client.model.PerspectiveMapWrapper;
import net.minecraftforge.client.model.SimpleModelState;
import net.minecraftforge.common.model.IModelState;
import net.minecraftforge.common.model.TRSRTransformation;
import net.minecraftforge.common.property.IExtendedBlockState;
import org.apache.commons.lang3.tuple.Pair;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.BotaniaAPIClient;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import javax.annotation.Nonnull;
import javax.vecmath.Matrix4f;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.function.Function;
public class SpecialFlowerModel implements IUnbakedModel {
private static final ModelResourceLocation MISSING = new ModelResourceLocation("builtin/missing", "missing");
private final ModelResourceLocation baseModel;
private final ImmutableMap<ResourceLocation, ModelResourceLocation> blockModels;
private final ImmutableMap<ResourceLocation, ModelResourceLocation> itemModels;
private SpecialFlowerModel(ModelResourceLocation baseModel,
ImmutableMap<ResourceLocation, ModelResourceLocation> blockModels,
ImmutableMap<ResourceLocation, ModelResourceLocation> itemModels) {
this.baseModel = baseModel;
this.blockModels = blockModels;
this.itemModels = itemModels;
}
@Override
public Collection<ResourceLocation> getDependencies() {
ImmutableSet.Builder<ResourceLocation> builder = ImmutableSet.builder();
if(!MISSING.equals(baseModel))
builder.add(baseModel);
builder.addAll(blockModels.values());
builder.addAll(itemModels.values());
// Force island models to be loaded and baked. See FloatingFlowerModel.
builder.addAll(BotaniaAPIClient.getRegisteredIslandTypeModels().values());
return builder.build();
}
@Override
public Collection<ResourceLocation> getTextures(Function<ResourceLocation, IUnbakedModel> modelGetter, Set<String> errors) {
return ImmutableList.of();
}
@Override
public IBakedModel bake(Function<ResourceLocation, IUnbakedModel> modelGetter, Function<ResourceLocation, TextureAtlasSprite> spriteGetter, IModelState state, boolean uvlock, VertexFormat format) {
ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> transforms = PerspectiveMapWrapper.getTransforms(state);
IModelState transformState = new SimpleModelState(transforms);
IBakedModel baseModelBaked = ModelLoaderRegistry.getModelOrMissing(baseModel)
.bake(modelGetter, spriteGetter, state, uvlock, format);
ImmutableMap.Builder<ResourceLocation, IBakedModel> bakedBlockBuilder = ImmutableMap.builder();
for(Map.Entry<ResourceLocation, ModelResourceLocation> e : blockModels.entrySet()) {
IModel model = ModelLoaderRegistry.getModelOrMissing(e.getValue());
if(model != ModelLoaderRegistry.getMissingModel())
bakedBlockBuilder.put(e.getKey(), model.bake(modelGetter, spriteGetter, state, uvlock, format));
}
ImmutableMap.Builder<ResourceLocation, IBakedModel> bakedItemBuilder = ImmutableMap.builder();
for(Map.Entry<ResourceLocation, ModelResourceLocation> e : itemModels.entrySet()) {
IModel model = ModelLoaderRegistry.getModelOrMissing(e.getValue());
if(model != ModelLoaderRegistry.getMissingModel())
bakedItemBuilder.put(e.getKey(), model.bake(modelGetter, spriteGetter, state, uvlock, format));
}
return new SpecialFlowerBakedModel(baseModelBaked, bakedBlockBuilder.build(), bakedItemBuilder.build(), transforms);
}
@Override
public IModelState getDefaultState() {
return TRSRTransformation.identity();
}
@Override
public IUnbakedModel process(ImmutableMap<String, String> customData) {
// Load the base variant from blockstate json, and also add all the model paths we received from external API
ModelResourceLocation base = baseModel;
if(customData.containsKey("base"))
// Forge blockstate gives custom data in json form, have to drop the quotes
base = new ModelResourceLocation(customData.get("base").substring(1, customData.get("base").length() - 1));
ImmutableMap<ResourceLocation, ModelResourceLocation> blockModels = ImmutableMap.copyOf(BotaniaAPIClient.getRegisteredSubtileBlockModels());
ImmutableMap<ResourceLocation, ModelResourceLocation> itemModels = ImmutableMap.copyOf(BotaniaAPIClient.getRegisteredSubtileItemModels());
return new SpecialFlowerModel(base, blockModels, itemModels);
}
public enum Loader implements ICustomModelLoader {
INSTANCE {
@Override
public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) {
}
@Override
public boolean accepts(ResourceLocation modelLocation) {
return modelLocation.getNamespace().equals("botania_special") && (
modelLocation.getPath().equals("specialflower") ||
modelLocation.getPath().equals("models/block/specialflower") ||
modelLocation.getPath().equals("models/item/specialflower"));
}
@Override
public IUnbakedModel loadModel(ResourceLocation modelLocation) {
// Load a dummy model for now, all actual blockModels added in process().
return new SpecialFlowerModel(new ModelResourceLocation("builtin/missing", "missing"), ImmutableMap.of(), ImmutableMap.of());
}
}
}
private static class SpecialFlowerBakedModel implements IBakedModel {
private final IBakedModel baseModel;
private final ImmutableMap<ResourceLocation, IBakedModel> bakedBlockModels;
private final ImmutableMap<ResourceLocation, IBakedModel> bakedItemModels;
private final ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> transforms;
SpecialFlowerBakedModel(IBakedModel baseModel,
ImmutableMap<ResourceLocation, IBakedModel> bakedBlockModels,
ImmutableMap<ResourceLocation, IBakedModel> bakedItemModels,
ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> cameraTransforms) {
this.baseModel = baseModel;
this.bakedBlockModels = bakedBlockModels;
this.bakedItemModels = bakedItemModels;
this.transforms = cameraTransforms;
}
@Nonnull
@Override
public List<BakedQuad> getQuads(IBlockState state, EnumFacing face, Random rand) {
IExtendedBlockState extendedState = (IExtendedBlockState) state;
ResourceLocation subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID);
IBakedModel model = bakedBlockModels.get(subtileId == null ? BotaniaAPI.DUMMY_SUBTILE_NAME : subtileId);
if(model == null)
model = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel();
return model.getQuads(state, face, rand);
}
@Nonnull
@Override
public ItemOverrideList getOverrides() {
return itemHandler;
}
private final ItemStack roseFallback = new ItemStack(Blocks.POPPY);
private final ItemOverrideList itemHandler = new ItemOverrideList() {
@Nonnull
@Override
public IBakedModel getModelWithOverrides(@Nonnull IBakedModel original, ItemStack stack, World world, EntityLivingBase living) {
IBakedModel model = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack));
if(model == null)
model = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack));
if(model == null)
model = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(roseFallback);
return model;
}
};
@Override
public boolean isAmbientOcclusion() {
return baseModel.isAmbientOcclusion();
}
@Override
public boolean isGui3d() {
return baseModel.isGui3d();
}
@Override
public boolean isBuiltInRenderer() {
return baseModel.isBuiltInRenderer();
}
@Nonnull
@Override
public TextureAtlasSprite getParticleTexture() {
return baseModel.getParticleTexture();
}
@Nonnull
@Override
public ItemCameraTransforms getItemCameraTransforms() {
return baseModel.getItemCameraTransforms();
}
@Override
public Pair<? extends IBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) {
return PerspectiveMapWrapper.handlePerspective(this, transforms, cameraTransformType);
}
}
}
@@ -19,6 +19,9 @@ import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.LazyOptional;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -29,14 +32,11 @@ public class RenderTileFloatingFlower extends TileEntityRenderer {
@Override
public void render(@Nonnull TileEntity tile, double d0, double d1, double d2, float t, int digProgress) {
if(ConfigHandler.CLIENT.staticFloaters.get())
LazyOptional<IFloatingFlower> floatingOpt = tile.getCapability(BotaniaAPI.FLOATING_FLOWER_CAP);
if(!floatingOpt.isPresent())
return;
if (tile != null)
if (!tile.getWorld().isBlockLoaded(tile.getPos(), false))
return;
IFloatingFlower floatingData = floatingOpt.orElseThrow(NullPointerException::new);
BlockRendererDispatcher brd = Minecraft.getInstance().getBlockRendererDispatcher();
GlStateManager.pushMatrix();
GlStateManager.color4f(1F, 1F, 1F, 1F);
@@ -54,10 +54,12 @@ public class RenderTileFloatingFlower extends TileEntityRenderer {
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
/* todo 1.13
IBlockState state = tile.getWorld().getBlockState(tile.getPos());
state = state.getBlock().getExtendedState(state, tile.getWorld(), tile.getPos());
IBakedModel model = brd.getBlockModelShapes().getModelManager().getModel(new ModelResourceLocation("botania:floating_special_flower", "inventory"));
brd.getBlockModelRenderer().renderModelBrightness(model, state, 1.0F, true);
*/
GlStateManager.popMatrix();
@@ -23,6 +23,7 @@ import net.minecraft.item.crafting.RecipeSerializers;
import net.minecraft.world.storage.loot.conditions.LootConditionManager;
import net.minecraft.world.storage.loot.functions.LootFunctionManager;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.fml.DeferredWorkQueue;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.ModList;
@@ -40,6 +41,8 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.ColorHelper;
import vazkii.botania.api.capability.FloatingFlowerImpl;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.lexicon.ITwoNamedPage;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
@@ -135,10 +138,10 @@ public class Botania {
MinecraftForge.EVENT_BUS.addListener(this::serverAboutToStart);
MinecraftForge.EVENT_BUS.addListener(this::serverStarting);
MinecraftForge.EVENT_BUS.addListener(this::serverStopping);
BotaniaRegistries.init();
}
private void commonSetup(FMLCommonSetupEvent event) {
CapabilityManager.INSTANCE.register(IFloatingFlower.class, new IFloatingFlower.Storage(), FloatingFlowerImpl::new);
gardenOfGlassLoaded = ModList.get().isLoaded("gardenofglass");
thaumcraftLoaded = ModList.get().isLoaded("thaumcraft");
bcApiLoaded = ModList.get().isLoaded("buildcraftlib");
@@ -1,20 +0,0 @@
package vazkii.botania.common;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.RegistryBuilder;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.common.lib.LibMisc;
public class BotaniaRegistries {
public static final IForgeRegistry<SubTileType> SUBTILES = new RegistryBuilder<SubTileType>()
.setName(new ResourceLocation(LibMisc.MOD_ID, "subtiles"))
.setType(SubTileType.class)
.setDefaultKey(BotaniaAPI.DUMMY_SUBTILE_NAME)
.disableSaving()
.create();
// To force class load
public static void init() {}
}
@@ -10,82 +10,52 @@
*/
package vazkii.botania.common.block;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.fluid.IFluidState;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorldReader;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.subtile.ISpecialFlower;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.api.wand.IWandHUD;
import vazkii.botania.api.wand.IWandable;
import vazkii.botania.common.BotaniaRegistries;
import vazkii.botania.common.block.decor.BlockFloatingFlower;
import vazkii.botania.common.block.tile.TileFloatingSpecialFlower;
import vazkii.botania.common.block.tile.TileSpecialFlower;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.core.handler.ConfigHandler;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.function.Supplier;
public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD {
private final Supplier<? extends TileEntitySpecialFlower> teProvider;
public BlockFloatingSpecialFlower(Properties props) {
public BlockFloatingSpecialFlower(Properties props, Supplier<? extends TileEntitySpecialFlower> teProvider) {
super(EnumDyeColor.WHITE, props);
this.teProvider = teProvider;
}
/* todo 1.13
@Nonnull
@Override
public BlockStateContainer createBlockState() {
return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.SUBTILE_ID, BotaniaStateProps.ISLAND_TYPE });
}
@Nonnull
@Override
public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockReader world, BlockPos pos) {
state = super.getExtendedState(state, world, pos);
TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos);
if (te instanceof TileFloatingSpecialFlower) {
state = ((IExtendedBlockState) state).with(BotaniaStateProps.SUBTILE_ID, ((TileFloatingSpecialFlower) te).subTileName);
}
return state;
}
*/
@Override
public int getLightValue(@Nonnull IBlockState state, IWorldReader world, @Nonnull BlockPos pos) {
if(world.getBlockState(pos).getBlock() != this)
return world.getBlockState(pos).getLightValue(world, pos);
TileEntity tile = world.getTileEntity(pos);
return tile instanceof TileSpecialFlower ? ((TileSpecialFlower) tile).getLightValue() : lightValue;
return tile instanceof TileEntitySpecialFlower ? ((TileEntitySpecialFlower) tile).getLightValue() : lightValue;
}
@Override
@@ -95,12 +65,12 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
@Override
public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) {
return ((TileSpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride();
return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride();
}
@Override
public int getWeakPower(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing side) {
return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side);
return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getPowerLevel(side);
}
@Override
@@ -117,25 +87,9 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
@Override
public void animateTick(IBlockState state, World world, BlockPos pos, Random rand) {}
@Override
public void fillItemGroup(ItemGroup tab, NonNullList<ItemStack> stacks) {
for(SubTileType type : BotaniaRegistries.SUBTILES) {
if(type.shouldShowInCreative()) {
stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(this), type));
}
}
}
@Nonnull
@Override
public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull IBlockReader world, @Nonnull BlockPos pos, EntityPlayer player) {
SubTileType type = ((TileSpecialFlower) world.getTileEntity(pos)).getSubTile().getType();
return ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), type);
}
@Override
public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) {
((TileSpecialFlower) world.getTileEntity(pos)).onBlockHarvested(world, pos, state, player);
((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockHarvested(world, pos, state, player);
}
@Override
@@ -159,49 +113,48 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
@Override
public void getDrops(@Nonnull IBlockState state, NonNullList<ItemStack> list, World world, BlockPos pos, int fortune) {
super.getDrops(state, list, world, pos, fortune);
TileEntity tile = world.getTileEntity(pos);
if(tile != null) {
SubTileType type = ((TileSpecialFlower) tile).getSubTile().getType();
list.add(ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), type));
((TileSpecialFlower) tile).getDrops(list);
((TileEntitySpecialFlower) tile).getDrops(list);
}
}
@Override
public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) {
return ((TileSpecialFlower) world.getTileEntity(pos)).onWanded(stack, player);
return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onWanded(player, stack);
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) {
((TileSpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack);
((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack);
}
@Override
public boolean onBlockActivated(IBlockState state, World world, BlockPos pos, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ) || super.onBlockActivated(state, world, pos, player, hand, side, hitX, hitY, hitZ);
return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ) || super.onBlockActivated(state, world, pos, player, hand, side, hitX, hitY, hitZ);
}
@Override
public void onBlockAdded(IBlockState state, World world, BlockPos pos, IBlockState oldState) {
((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state);
((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state);
}
@OnlyIn(Dist.CLIENT)
@Override
public void renderHUD(Minecraft mc, World world, BlockPos pos) {
((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc);
((TileEntitySpecialFlower) world.getTileEntity(pos)).renderHUD(mc);
}
@Nonnull
@Override
public TileEntity createTileEntity(@Nonnull IBlockState state, @Nonnull IBlockReader world) {
return new TileFloatingSpecialFlower();
return teProvider.get();
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return ((TileSpecialFlower) world.getTileEntity(pos)).getEntry();
return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getEntry();
}
}
@@ -11,7 +11,6 @@
package vazkii.botania.common.block;
import net.minecraft.block.BlockFlower;
import net.minecraft.block.SoundType;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityLivingBase;
@@ -25,8 +24,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
@@ -34,41 +31,27 @@ import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorldReader;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.subtile.ISpecialFlower;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.api.wand.IWandHUD;
import vazkii.botania.api.wand.IWandable;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.BotaniaRegistries;
import vazkii.botania.common.block.tile.TileSpecialFlower;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.item.material.ItemDye;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.function.Supplier;
public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD {
private static final VoxelShape SHAPE = makeCuboidShape(4.8, 0, 4.8, 12.8, 16, 12.8);
private final Supplier<? extends TileEntitySpecialFlower> teProvider;
protected BlockSpecialFlower(Properties props) {
protected BlockSpecialFlower(Properties props, Supplier<? extends TileEntitySpecialFlower> teProvider) {
super(props);
this.teProvider = teProvider;
}
@Nonnull
@@ -78,27 +61,12 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
return SHAPE.withOffset(shift.x, shift.y, shift.z);
}
/* todo 1.13
@Nonnull
@Override
public IExtendedBlockState getExtendedState(@Nonnull IBlockState state, IBlockReader world, BlockPos pos) {
TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos);
if (te instanceof TileSpecialFlower && ((TileSpecialFlower) te).getSubTile() != null) {
Class<? extends SubTileEntity> clazz = ((TileSpecialFlower) te).getSubTile().getClass();
ResourceLocation id = BotaniaAPI.getSubTileStringMapping(clazz);
return ((IExtendedBlockState) state).with(BotaniaStateProps.SUBTILE_ID, id);
} else {
return (IExtendedBlockState) state;
}
}
*/
@Override
public int getLightValue(@Nonnull IBlockState state, IWorldReader world, @Nonnull BlockPos pos) {
if(world.getBlockState(pos).getBlock() != this)
return world.getBlockState(pos).getLightValue(world, pos);
return world.getTileEntity(pos) == null ? 0 : ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue();
return world.getTileEntity(pos) == null ? 0 : ((TileEntitySpecialFlower) world.getTileEntity(pos)).getLightValue();
}
@Override
@@ -108,12 +76,12 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
@Override
public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) {
return ((TileSpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride();
return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getComparatorInputOverride();
}
@Override
public int getWeakPower(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing side) {
return ((TileSpecialFlower) world.getTileEntity(pos)).getPowerLevel(side);
return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getPowerLevel(side);
}
@Override
@@ -126,22 +94,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
return true;
}
@Override
public void fillItemGroup(ItemGroup tab, @Nonnull NonNullList<ItemStack> stacks) {
for(SubTileType type : BotaniaRegistries.SUBTILES) {
if(type.shouldShowInCreative()) {
stacks.add(ItemBlockSpecialFlower.ofType(type));
}
}
}
@Nonnull
@Override
public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull IBlockReader world, @Nonnull BlockPos pos, EntityPlayer player) {
SubTileType type = ((TileSpecialFlower) world.getTileEntity(pos)).getSubTile().getType();
return ItemBlockSpecialFlower.ofType(type);
}
@Override
protected boolean isValidGround(IBlockState state, IBlockReader worldIn, BlockPos pos) {
return state.getBlock() == ModBlocks.redStringRelay
@@ -151,7 +103,8 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
@Override
public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) {
((TileSpecialFlower) world.getTileEntity(pos)).onBlockHarvested(world, pos, state, player);
super.onBlockHarvested(world, pos, state, player);
((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockHarvested(world, pos, state, player);
}
@Override
@@ -175,12 +128,11 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
@Override
public void getDrops(@Nonnull IBlockState state, NonNullList<ItemStack> list, World world, BlockPos pos, int fortune) {
super.getDrops(state, list, world, pos, fortune);
TileEntity tile = world.getTileEntity(pos);
if(tile != null) {
SubTileType type = ((TileSpecialFlower) tile).getSubTile().getType();
list.add(ItemBlockSpecialFlower.ofType(type));
((TileSpecialFlower) tile).getDrops(list);
if(tile instanceof TileEntitySpecialFlower) {
((TileEntitySpecialFlower) tile).getDrops(list);
}
}
@@ -188,7 +140,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
public boolean eventReceived(IBlockState state, World world, BlockPos pos, int par5, int par6) {
super.eventReceived(state, world, pos, par5, par6);
TileEntity tileentity = world.getTileEntity(pos);
return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false;
return tileentity != null && tileentity.receiveClientEvent(par5, par6);
}
@Override
@@ -199,27 +151,27 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
@Nonnull
@Override
public TileEntity createTileEntity(@Nonnull IBlockState state, @Nonnull IBlockReader world) {
return new TileSpecialFlower();
return teProvider.get();
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return ((TileSpecialFlower) world.getTileEntity(pos)).getEntry();
return ((TileEntitySpecialFlower) world.getTileEntity(pos)).getEntry();
}
@Override
public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) {
return ((TileSpecialFlower) world.getTileEntity(pos)).onWanded(stack, player);
return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onWanded(player, stack);
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) {
((TileSpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack);
((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack);
}
@Override
public void onBlockAdded(IBlockState state, World world, BlockPos pos, IBlockState oldState) {
((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state);
((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state);
}
@Override
@@ -233,12 +185,12 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
return true;
}
return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ);
return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ);
}
@OnlyIn(Dist.CLIENT)
@Override
public void renderHUD(Minecraft mc, World world, BlockPos pos) {
((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc);
((TileEntitySpecialFlower) world.getTileEntity(pos)).renderHUD(mc);
}
}
@@ -25,12 +25,8 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.DummySubTile;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.state.enums.LuminizerVariant;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.client.render.tile.RenderTilePylon;
import vazkii.botania.client.render.tile.TEISR;
import vazkii.botania.common.block.corporea.BlockCorporeaCrystalCube;
@@ -67,22 +63,6 @@ import vazkii.botania.common.block.string.BlockRedStringDispenser;
import vazkii.botania.common.block.string.BlockRedStringFertilizer;
import vazkii.botania.common.block.string.BlockRedStringInterceptor;
import vazkii.botania.common.block.string.BlockRedStringRelay;
import vazkii.botania.common.block.subtile.SubTileManastar;
import vazkii.botania.common.block.subtile.SubTilePureDaisy;
import vazkii.botania.common.block.subtile.functional.*;
import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose;
import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon;
import vazkii.botania.common.block.subtile.generating.SubTileEndoflame;
import vazkii.botania.common.block.subtile.generating.SubTileEntropinnyum;
import vazkii.botania.common.block.subtile.generating.SubTileGourmaryllis;
import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas;
import vazkii.botania.common.block.subtile.generating.SubTileKekimurus;
import vazkii.botania.common.block.subtile.generating.SubTileMunchdew;
import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus;
import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia;
import vazkii.botania.common.block.subtile.generating.SubTileShulkMeNot;
import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus;
import vazkii.botania.common.block.subtile.generating.SubTileThermalily;
import vazkii.botania.common.block.tile.*;
import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel;
@@ -108,10 +88,8 @@ import vazkii.botania.common.block.tile.string.TileRedStringRelay;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockDreamwood;
import vazkii.botania.common.item.block.ItemBlockElven;
import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower;
import vazkii.botania.common.item.block.ItemBlockMod;
import vazkii.botania.common.item.block.ItemBlockPool;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.item.block.ItemBlockTinyPotato;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
@@ -163,7 +141,6 @@ public final class ModBlocks {
@ObjectHolder(LibBlockNames.LIVING_WOOD_PATTERN_FRAMED) public static Block livingwoodPatternFramed;
@ObjectHolder(LibBlockNames.LIVING_WOOD_GLIMMERING) public static Block livingwoodGlimmering;
@ObjectHolder(LibBlockNames.SPECIAL_FLOWER) public static Block specialFlower;
@ObjectHolder(LibBlockNames.SPREADER) public static Block manaSpreader;
@ObjectHolder(LibBlockNames.SPREADER_REDSTONE) public static Block redstoneSpreader;
@ObjectHolder(LibBlockNames.SPREADER_ELVEN) public static Block elvenSpreader;
@@ -289,7 +266,6 @@ public final class ModBlocks {
@ObjectHolder(LibBlockNames.RED_STRING_FERTILIZER) public static Block redStringFertilizer;
@ObjectHolder(LibBlockNames.RED_STRING_COMPARATOR) public static Block redStringComparator;
@ObjectHolder(LibBlockNames.RED_STRING_RELAY) public static Block redStringRelay;
@ObjectHolder(LibBlockNames.FLOATING_SPECIAL_FLOWER) public static Block floatingSpecialFlower;
@ObjectHolder(LibBlockNames.MANA_FLAME) public static Block manaFlame;
@ObjectHolder(LibBlockNames.PRISM) public static Block prism;
@ObjectHolder(LibBlockNames.ENCHANTED_SOIL) public static Block enchantedSoil;
@@ -413,7 +389,6 @@ public final class ModBlocks {
register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_WOOD_FRAMED);
register(r, new BlockModLexiconable(builder, decorative), LibBlockNames.LIVING_WOOD_PATTERN_FRAMED);
register(r, new BlockModLexiconable(builder.lightValue(12), decorative), LibBlockNames.LIVING_WOOD_GLIMMERING);
register(r, new BlockSpecialFlower(Block.Properties.from(Blocks.POPPY)), LibBlockNames.SPECIAL_FLOWER);
builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD);
register(r, new BlockSpreader(BlockSpreader.Variant.MANA, builder), LibBlockNames.SPREADER);
@@ -500,7 +475,6 @@ public final class ModBlocks {
}
builder = Block.Properties.create(Material.GROUND).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15);
register(r, new BlockFloatingSpecialFlower(builder), LibBlockNames.FLOATING_SPECIAL_FLOWER);
for(EnumDyeColor color : EnumDyeColor.values()) {
register(r, new BlockFloatingFlower(color, builder), color.getName() + LibBlockNames.FLOATING_FLOWER_SUFFIX);
}
@@ -636,7 +610,6 @@ public final class ModBlocks {
r.register(new ItemBlockMod(livingwoodFramed, props).setRegistryName(livingwoodFramed.getRegistryName()));
r.register(new ItemBlockMod(livingwoodPatternFramed, props).setRegistryName(livingwoodPatternFramed.getRegistryName()));
r.register(new ItemBlockMod(livingwoodGlimmering, props).setRegistryName(livingwoodGlimmering.getRegistryName()));
r.register(new ItemBlockSpecialFlower(specialFlower, props).setRegistryName(specialFlower.getRegistryName()));
r.register(new ItemBlockMod(manaSpreader, props).setRegistryName(manaSpreader.getRegistryName()));
r.register(new ItemBlockMod(redstoneSpreader, props).setRegistryName(redstoneSpreader.getRegistryName()));
r.register(new ItemBlockMod(elvenSpreader, props).setRegistryName(elvenSpreader.getRegistryName()));
@@ -743,7 +716,6 @@ public final class ModBlocks {
r.register(new ItemBlockMod(redStringFertilizer, props).setRegistryName(redStringFertilizer.getRegistryName()));
r.register(new ItemBlockMod(redStringComparator, props).setRegistryName(redStringComparator.getRegistryName()));
r.register(new ItemBlockMod(redStringRelay, props).setRegistryName(redStringRelay.getRegistryName()));
r.register(new ItemBlockFloatingSpecialFlower(floatingSpecialFlower, props).setRegistryName(floatingSpecialFlower.getRegistryName()));
r.register(new ItemBlockMod(prism, props).setRegistryName(prism.getRegistryName()));
r.register(new ItemBlockMod(enchantedSoil, props).setRegistryName(enchantedSoil.getRegistryName()));
r.register(new ItemBlockMod(petalBlockWhite, props).setRegistryName(petalBlockWhite.getRegistryName()));
@@ -831,9 +803,13 @@ public final class ModBlocks {
r.register(new ItemBlockMod(mutatedGrass, props).setRegistryName(mutatedGrass.getRegistryName()));
r.register(new ItemBlockMod(animatedTorch, props).setRegistryName(animatedTorch.getRegistryName()));
}
public static <V extends IForgeRegistryEntry<V>> void register(IForgeRegistry<V> reg, IForgeRegistryEntry<V> thing, ResourceLocation name) {
reg.register(thing.setRegistryName(name));
}
public static <V extends IForgeRegistryEntry<V>> void register(IForgeRegistry<V> reg, IForgeRegistryEntry<V> thing, String name) {
reg.register(thing.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)));
register(reg, thing, new ResourceLocation(LibMisc.MOD_ID, name));
}
public static void addDispenserBehaviours() {
@@ -848,7 +824,6 @@ public final class ModBlocks {
public static void initTileEntities(RegistryEvent.Register<TileEntityType<?>> evt) {
IForgeRegistry<TileEntityType<?>> r = evt.getRegistry();
r.register(TileEntityType.Builder.create(TileAltar::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ALTAR));
r.register(TileEntityType.Builder.create(TileSpecialFlower::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER));
r.register(TileEntityType.Builder.create(TileSpreader::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SPREADER));
r.register(TileEntityType.Builder.create(TilePool::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.POOL));
r.register(TileEntityType.Builder.create(TileRuneAltar::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RUNE_ALTAR));
@@ -878,7 +853,6 @@ public final class ModBlocks {
r.register(TileEntityType.Builder.create(TileRedStringFertilizer::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_FERTILIZER));
r.register(TileEntityType.Builder.create(TileRedStringComparator::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_COMPARATOR));
r.register(TileEntityType.Builder.create(TileRedStringRelay::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_RELAY));
r.register(TileEntityType.Builder.create(TileFloatingSpecialFlower::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FLOATING_SPECIAL_FLOWER));
r.register(TileEntityType.Builder.create(TileManaFlame::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_FLAME));
r.register(TileEntityType.Builder.create(TilePrism::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PRISM));
r.register(TileEntityType.Builder.create(TileCorporeaIndex::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INDEX));
@@ -1,13 +1,22 @@
package vazkii.botania.common.block;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.ObjectHolder;
import org.apache.commons.lang3.tuple.Pair;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.DummySubTile;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.common.block.subtile.SubTileManastar;
import vazkii.botania.common.block.subtile.SubTilePureDaisy;
import vazkii.botania.common.block.subtile.functional.*;
@@ -24,119 +33,214 @@ import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia;
import vazkii.botania.common.block.subtile.generating.SubTileShulkMeNot;
import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus;
import vazkii.botania.common.block.subtile.generating.SubTileThermalily;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
import java.util.Arrays;
import java.util.List;
import java.util.function.Supplier;
import static vazkii.botania.common.block.ModBlocks.register;
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
@ObjectHolder(LibMisc.MOD_ID)
public class ModSubtiles {
@ObjectHolder("dummy") public static SubTileType dummy;
@ObjectHolder("pure_daisy") public static SubTileType pureDaisy;
@ObjectHolder("manastar") public static SubTileType manastar;
@ObjectHolder("pure_daisy") public static Block pureDaisy;
@ObjectHolder("manastar") public static Block manastar;
@ObjectHolder("hydroangeas") public static Block hydroangeas;
@ObjectHolder("endoflame") public static Block endoflame;
@ObjectHolder("thermalily") public static Block thermalily;
@ObjectHolder("rosa_arcana") public static Block rosaArcana;
@ObjectHolder("munchdew") public static Block munchdew;
@ObjectHolder("entropinnyum") public static Block entropinnyum;
@ObjectHolder("kekimurus") public static Block kekimurus;
@ObjectHolder("gourmaryllis") public static Block gourmaryllis;
@ObjectHolder("narslimmus") public static Block narslimmus;
@ObjectHolder("spectrolus") public static Block spectrolus;
@ObjectHolder("dandelifeon") public static Block dandelifeon;
@ObjectHolder("rafflowsia") public static Block rafflowsia;
@ObjectHolder("shulk_me_not") public static Block shulkMeNot;
@ObjectHolder("bellethorn") public static Block bellethorn;
@ObjectHolder("bellethorn_chibi") public static Block bellethornChibi;
@ObjectHolder("bergamute") public static Block bergamute;
@ObjectHolder("dreadthorn") public static Block dreadthorn;
@ObjectHolder("heisei_dream") public static Block heiseiDream;
@ObjectHolder("tigerseye") public static Block tigerseye;
@ObjectHolder("jaded_amaranthus") public static Block jadedAmaranthus;
@ObjectHolder("orechid") public static Block orechid;
@ObjectHolder("fallen_kanade") public static Block fallenKanade;
@ObjectHolder("exoflame") public static Block exoflame;
@ObjectHolder("agricarnation") public static Block agricarnation;
@ObjectHolder("agricarnation_chibi") public static Block agricarnationChibi;
@ObjectHolder("hopperhock") public static Block hopperhock;
@ObjectHolder("hopperhock_chibi") public static Block hopperhockChibi;
@ObjectHolder("tangleberrie") public static Block tangleberrie;
@ObjectHolder("jiyuulia") public static Block jiyuulia;
@ObjectHolder("rannuncarpus") public static Block rannuncarpus;
@ObjectHolder("rannuncarpus_chibi") public static Block rannuncarpusChibi;
@ObjectHolder("hyacidus") public static Block hyacidus;
@ObjectHolder("pollidisiac") public static Block pollidisiac;
@ObjectHolder("clayconia") public static Block clayconia;
@ObjectHolder("clayconia_chibi") public static Block clayconiaChibi;
@ObjectHolder("loonium") public static Block loonium;
@ObjectHolder("daffomill") public static Block daffomill;
@ObjectHolder("vinculotus") public static Block vinculotus;
@ObjectHolder("spectranthemum") public static Block spectranthemum;
@ObjectHolder("medumone") public static Block medumone;
@ObjectHolder("marimorphosis") public static Block marimorphosis;
@ObjectHolder("marimorphosis_chibi") public static Block marimorphosisChibi;
@ObjectHolder("bubbell") public static Block bubbell;
@ObjectHolder("bubbell_chibi") public static Block bubbellChibi;
@ObjectHolder("solegnolia") public static Block solegnolia;
@ObjectHolder("solegnolia_chibi") public static Block solegnoliaChibi;
@ObjectHolder("orechid_ignem") public static Block orechidIgnem;
@ObjectHolder("floating_pure_daisy") public static Block pureDaisyFloating;
@ObjectHolder("floating_manastar") public static Block manastarFloating;
@ObjectHolder("floating_hydroangeas") public static Block hydroangeasFloating;
@ObjectHolder("floating_endoflame") public static Block endoflameFloating;
@ObjectHolder("floating_thermalily") public static Block thermalilyFloating;
@ObjectHolder("floating_rosa_arcana") public static Block rosaArcanaFloating;
@ObjectHolder("floating_munchdew") public static Block munchdewFloating;
@ObjectHolder("floating_entropinnyum") public static Block entropinnyumFloating;
@ObjectHolder("floating_kekimurus") public static Block kekimurusFloating;
@ObjectHolder("floating_gourmaryllis") public static Block gourmaryllisFloating;
@ObjectHolder("floating_narslimmus") public static Block narslimmusFloating;
@ObjectHolder("floating_spectrolus") public static Block spectrolusFloating;
@ObjectHolder("floating_dandelifeon") public static Block dandelifeonFloating;
@ObjectHolder("floating_rafflowsia") public static Block rafflowsiaFloating;
@ObjectHolder("floating_shulk_me_not") public static Block shulkMeNotFloating;
@ObjectHolder("floating_bellethorn") public static Block bellethornFloating;
@ObjectHolder("floating_bellethorn_chibi") public static Block bellethornChibiFloating;
@ObjectHolder("floating_bergamute") public static Block bergamuteFloating;
@ObjectHolder("floating_dreadthorn") public static Block dreadthornFloating;
@ObjectHolder("floating_heisei_dream") public static Block heiseiDreamFloating;
@ObjectHolder("floating_tigerseye") public static Block tigerseyeFloating;
@ObjectHolder("floating_jaded_amaranthus") public static Block jadedAmaranthusFloating;
@ObjectHolder("floating_orechid") public static Block orechidFloating;
@ObjectHolder("floating_fallen_kanade") public static Block fallenKanadeFloating;
@ObjectHolder("floating_exoflame") public static Block exoflameFloating;
@ObjectHolder("floating_agricarnation") public static Block agricarnationFloating;
@ObjectHolder("floating_agricarnation_chibi") public static Block agricarnationChibiFloating;
@ObjectHolder("floating_hopperhock") public static Block hopperhockFloating;
@ObjectHolder("floating_hopperhock_chibi") public static Block hopperhockChibiFloating;
@ObjectHolder("floating_tangleberrie") public static Block tangleberrieFloating;
@ObjectHolder("floating_jiyuulia") public static Block jiyuuliaFloating;
@ObjectHolder("floating_rannuncarpus") public static Block rannuncarpusFloating;
@ObjectHolder("floating_rannuncarpus_chibi") public static Block rannuncarpusChibiFloating;
@ObjectHolder("floating_hyacidus") public static Block hyacidusFloating;
@ObjectHolder("floating_pollidisiac") public static Block pollidisiacFloating;
@ObjectHolder("floating_clayconia") public static Block clayconiaFloating;
@ObjectHolder("floating_clayconia_chibi") public static Block clayconiaChibiFloating;
@ObjectHolder("floating_loonium") public static Block looniumFloating;
@ObjectHolder("floating_daffomill") public static Block daffomillFloating;
@ObjectHolder("floating_vinculotus") public static Block vinculotusFloating;
@ObjectHolder("floating_spectranthemum") public static Block spectranthemumFloating;
@ObjectHolder("floating_medumone") public static Block medumoneFloating;
@ObjectHolder("floating_marimorphosis") public static Block marimorphosisFloating;
@ObjectHolder("floating_marimorphosis_chibi") public static Block marimorphosisChibiFloating;
@ObjectHolder("floating_bubbell") public static Block bubbellFloating;
@ObjectHolder("floating_bubbell_chibi") public static Block bubbellChibiFloating;
@ObjectHolder("floating_solegnolia") public static Block solegnoliaFloating;
@ObjectHolder("floating_solegnolia_chibi") public static Block solegnoliaChibiFloating;
@ObjectHolder("floating_orechid_ignem") public static Block orechidIgnemFloating;
private static ResourceLocation floating(ResourceLocation orig) {
return new ResourceLocation(orig.getNamespace(), "floating_" + orig.getPath());
}
@ObjectHolder("hydroangeas") public static SubTileType hydroangeas;
@ObjectHolder("endoflame") public static SubTileType endoflame;
@ObjectHolder("thermalily") public static SubTileType thermalily;
@ObjectHolder("rosa_arcana") public static SubTileType rosaArcana;
@ObjectHolder("munchdew") public static SubTileType munchdew;
@ObjectHolder("entropinnyum") public static SubTileType entropinnyum;
@ObjectHolder("kekimurus") public static SubTileType kekimurus;
@ObjectHolder("gourmaryllis") public static SubTileType gourmaryllis;
@ObjectHolder("narslimmus") public static SubTileType narslimmus;
@ObjectHolder("spectrolus") public static SubTileType spectrolus;
@ObjectHolder("dandelifeon") public static SubTileType dandelifeon;
@ObjectHolder("rafflowsia") public static SubTileType rafflowsia;
@ObjectHolder("shulk_me_not") public static SubTileType shulkMeNot;
private static ResourceLocation chibi(ResourceLocation orig) {
return new ResourceLocation(orig.getNamespace(), orig.getPath() + "_chibi");
}
@ObjectHolder("bellethorn") public static SubTileType bellethorn;
@ObjectHolder("bellethorn_chibi") public static SubTileType bellethornChibi;
@ObjectHolder("bergamute") public static SubTileType bergamute;
@ObjectHolder("dreadthorn") public static SubTileType dreadthorn;
@ObjectHolder("heisei_dream") public static SubTileType heiseiDream;
@ObjectHolder("tigerseye") public static SubTileType tigerseye;
@ObjectHolder("jaded_amaranthus") public static SubTileType jadedAmaranthus;
@ObjectHolder("orechid") public static SubTileType orechid;
@ObjectHolder("fallen_kanade") public static SubTileType fallenKanade;
@ObjectHolder("exoflame") public static SubTileType exoflame;
@ObjectHolder("agricarnation") public static SubTileType agricarnation;
@ObjectHolder("agricarnation_chibi") public static SubTileType agricarnationChibi;
@ObjectHolder("hopperhock") public static SubTileType hopperhock;
@ObjectHolder("hopperhock_chibi") public static SubTileType hopperhockChibi;
@ObjectHolder("tangleberrie") public static SubTileType tangleberrie;
@ObjectHolder("jiyuulia") public static SubTileType jiyuulia;
@ObjectHolder("rannuncarpus") public static SubTileType rannuncarpus;
@ObjectHolder("rannuncarpus_chibi") public static SubTileType rannuncarpusChibi;
@ObjectHolder("hyacidus") public static SubTileType hyacidus;
@ObjectHolder("pollidisiac") public static SubTileType pollidisiac;
@ObjectHolder("clayconia") public static SubTileType clayconia;
@ObjectHolder("clayconia_chibi") public static SubTileType clayconiaChibi;
@ObjectHolder("loonium") public static SubTileType loonium;
@ObjectHolder("daffomill") public static SubTileType daffomill;
@ObjectHolder("vinculotus") public static SubTileType vinculotus;
@ObjectHolder("spectranthemum") public static SubTileType spectranthemum;
@ObjectHolder("medumone") public static SubTileType medumone;
@ObjectHolder("marimorphosis") public static SubTileType marimorphosis;
@ObjectHolder("marimorphosis_chibi") public static SubTileType marimorphosisChibi;
@ObjectHolder("bubbell") public static SubTileType bubbell;
@ObjectHolder("bubbell_chibi") public static SubTileType bubbellChibi;
@ObjectHolder("solegnolia") public static SubTileType solegnolia;
@ObjectHolder("solegnolia_chibi") public static SubTileType solegnoliaChibi;
@ObjectHolder("orechid_ignem") public static SubTileType orechidIgnem;
private static final List<Pair<Supplier<? extends TileEntitySpecialFlower>, ResourceLocation>> TYPES = ImmutableList.<Pair<Supplier<? extends TileEntitySpecialFlower>, ResourceLocation>>of(
Pair.of(SubTilePureDaisy::new, LibBlockNames.SUBTILE_PUREDAISY),
Pair.of(SubTileManastar::new, LibBlockNames.SUBTILE_MANASTAR),
Pair.of(SubTileEndoflame::new, LibBlockNames.SUBTILE_ENDOFLAME),
Pair.of(SubTileHydroangeas::new, LibBlockNames.SUBTILE_HYDROANGEAS),
Pair.of(SubTileThermalily::new, LibBlockNames.SUBTILE_THERMALILY),
Pair.of(SubTileArcaneRose::new, LibBlockNames.SUBTILE_ARCANE_ROSE),
Pair.of(SubTileMunchdew::new, LibBlockNames.SUBTILE_MUNCHDEW),
Pair.of(SubTileEntropinnyum::new, LibBlockNames.SUBTILE_ENTROPINNYUM),
Pair.of(SubTileKekimurus::new, LibBlockNames.SUBTILE_KEKIMURUS),
Pair.of(SubTileGourmaryllis::new, LibBlockNames.SUBTILE_GOURMARYLLIS),
Pair.of(SubTileNarslimmus::new, LibBlockNames.SUBTILE_NARSLIMMUS),
Pair.of(SubTileSpectrolus::new, LibBlockNames.SUBTILE_SPECTROLUS),
Pair.of(SubTileDandelifeon::new, LibBlockNames.SUBTILE_DANDELIFEON),
Pair.of(SubTileRafflowsia::new, LibBlockNames.SUBTILE_RAFFLOWSIA),
Pair.of(SubTileShulkMeNot::new, LibBlockNames.SUBTILE_SHULK_ME_NOT),
Pair.of(SubTileBellethorn::new, LibBlockNames.SUBTILE_BELLETHORN),
Pair.of(SubTileBellethorn.Mini::new, chibi(LibBlockNames.SUBTILE_BELLETHORN)),
Pair.of(SubTileBergamute::new, LibBlockNames.SUBTILE_BERGAMUTE),
Pair.of(SubTileDreadthorn::new, LibBlockNames.SUBTILE_DREADTHORN),
Pair.of(SubTileHeiseiDream::new, LibBlockNames.SUBTILE_HEISEI_DREAM),
Pair.of(SubTileTigerseye::new, LibBlockNames.SUBTILE_TIGERSEYE),
Pair.of(SubTileJadedAmaranthus::new, LibBlockNames.SUBTILE_JADED_AMARANTHUS),
Pair.of(SubTileOrechid::new, LibBlockNames.SUBTILE_ORECHID),
Pair.of(SubTileFallenKanade::new, LibBlockNames.SUBTILE_FALLEN_KANADE),
Pair.of(SubTileExoflame::new, LibBlockNames.SUBTILE_EXOFLAME),
Pair.of(SubTileAgricarnation::new, LibBlockNames.SUBTILE_AGRICARNATION),
Pair.of(SubTileAgricarnation.Mini::new, chibi(LibBlockNames.SUBTILE_AGRICARNATION)),
Pair.of(SubTileHopperhock::new, LibBlockNames.SUBTILE_HOPPERHOCK),
Pair.of(SubTileHopperhock.Mini::new, chibi(LibBlockNames.SUBTILE_HOPPERHOCK)),
Pair.of(SubTileTangleberrie::new, LibBlockNames.SUBTILE_TANGLEBERRIE),
Pair.of(SubTileJiyuulia::new, LibBlockNames.SUBTILE_JIYUULIA),
Pair.of(SubTileRannuncarpus::new, LibBlockNames.SUBTILE_RANNUNCARPUS),
Pair.of(SubTileRannuncarpus.Mini::new, chibi(LibBlockNames.SUBTILE_RANNUNCARPUS)),
Pair.of(SubTileHyacidus::new, LibBlockNames.SUBTILE_HYACIDUS),
Pair.of(SubTilePollidisiac::new, LibBlockNames.SUBTILE_POLLIDISIAC),
Pair.of(SubTileClayconia::new, LibBlockNames.SUBTILE_CLAYCONIA),
Pair.of(SubTileClayconia.Mini::new, chibi(LibBlockNames.SUBTILE_CLAYCONIA)),
Pair.of(SubTileLoonuim::new, LibBlockNames.SUBTILE_LOONIUM),
Pair.of(SubTileDaffomill::new, LibBlockNames.SUBTILE_DAFFOMILL),
Pair.of(SubTileVinculotus::new, LibBlockNames.SUBTILE_VINCULOTUS),
Pair.of(SubTileSpectranthemum::new, LibBlockNames.SUBTILE_SPECTRANTHEMUM),
Pair.of(SubTileMedumone::new, LibBlockNames.SUBTILE_MEDUMONE),
Pair.of(SubTileMarimorphosis::new, LibBlockNames.SUBTILE_MARIMORPHOSIS),
Pair.of(SubTileMarimorphosis.Mini::new, chibi(LibBlockNames.SUBTILE_MARIMORPHOSIS)),
Pair.of(SubTileBubbell::new, LibBlockNames.SUBTILE_BUBBELL),
Pair.of(SubTileBubbell.Mini::new, chibi(LibBlockNames.SUBTILE_BUBBELL)),
Pair.of(SubTileSolegnolia::new, LibBlockNames.SUBTILE_SOLEGNOLIA),
Pair.of(SubTileSolegnolia.Mini::new, chibi(LibBlockNames.SUBTILE_SOLEGNOLIA)),
Pair.of(SubTileOrechidIgnem::new, LibBlockNames.SUBTILE_ORECHID_IGNEM)
);
@SubscribeEvent
public static void initSubtiles(RegistryEvent.Register<SubTileType> evt) {
IForgeRegistry<SubTileType> r = evt.getRegistry();
r.register(new SubTileType(SubTileType.MISC_TYPE, DummySubTile::new).setRegistryName(BotaniaAPI.DUMMY_SUBTILE_NAME));
r.register(new SubTileType(SubTileType.MISC_TYPE, SubTilePureDaisy::new).setRegistryName(LibBlockNames.SUBTILE_PUREDAISY));
r.register(new SubTileType(SubTileType.MISC_TYPE, SubTileManastar::new).setRegistryName(LibBlockNames.SUBTILE_MANASTAR));
public static void registerBlocks(RegistryEvent.Register<Block> evt) {
IForgeRegistry<Block> r = evt.getRegistry();
Block.Properties props = Block.Properties.from(Blocks.POPPY);
Block.Properties floatProps = Block.Properties.create(Material.GROUND).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15);
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileHydroangeas::new).setRegistryName(LibBlockNames.SUBTILE_HYDROANGEAS));
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileEndoflame::new).setRegistryName(LibBlockNames.SUBTILE_ENDOFLAME));
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileThermalily::new).setRegistryName(LibBlockNames.SUBTILE_THERMALILY));
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileArcaneRose::new).setRegistryName(LibBlockNames.SUBTILE_ARCANE_ROSE));
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileMunchdew::new).setRegistryName(LibBlockNames.SUBTILE_MUNCHDEW));
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileEntropinnyum::new).setRegistryName(LibBlockNames.SUBTILE_ENTROPINNYUM));
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileKekimurus::new).setRegistryName(LibBlockNames.SUBTILE_KEKIMURUS));
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileGourmaryllis::new).setRegistryName(LibBlockNames.SUBTILE_GOURMARYLLIS));
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileNarslimmus::new).setRegistryName(LibBlockNames.SUBTILE_NARSLIMMUS));
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileSpectrolus::new).setRegistryName(LibBlockNames.SUBTILE_SPECTROLUS));
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileDandelifeon::new).setRegistryName(LibBlockNames.SUBTILE_DANDELIFEON));
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileRafflowsia::new).setRegistryName(LibBlockNames.SUBTILE_RAFFLOWSIA));
r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileShulkMeNot::new).setRegistryName(LibBlockNames.SUBTILE_SHULK_ME_NOT));
for (Pair<Supplier<? extends TileEntitySpecialFlower>, ResourceLocation> type : TYPES) {
register(r, new BlockSpecialFlower(props, type.getLeft()), type.getValue());
register(r, new BlockFloatingSpecialFlower(floatProps, type.getLeft()), floating(type.getValue()));
}
}
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBellethorn::new).setRegistryName(LibBlockNames.SUBTILE_BELLETHORN));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBellethorn.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_BELLETHORN.getPath() + "_chibi"));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileDreadthorn::new).setRegistryName(LibBlockNames.SUBTILE_DREADTHORN));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileHeiseiDream::new).setRegistryName(LibBlockNames.SUBTILE_HEISEI_DREAM));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileTigerseye::new).setRegistryName(LibBlockNames.SUBTILE_TIGERSEYE));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileJadedAmaranthus::new).setRegistryName(LibBlockNames.SUBTILE_JADED_AMARANTHUS));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileOrechid::new).setRegistryName(LibBlockNames.SUBTILE_ORECHID));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileOrechidIgnem::new).setRegistryName(LibBlockNames.SUBTILE_ORECHID_IGNEM));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileFallenKanade::new).setRegistryName(LibBlockNames.SUBTILE_FALLEN_KANADE));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileExoflame::new).setRegistryName(LibBlockNames.SUBTILE_EXOFLAME));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileAgricarnation::new).setRegistryName(LibBlockNames.SUBTILE_AGRICARNATION));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileAgricarnation.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_AGRICARNATION.getPath() + "_chibi"));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileHopperhock::new).setRegistryName(LibBlockNames.SUBTILE_HOPPERHOCK));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileHopperhock.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_HOPPERHOCK.getPath() + "_chibi"));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileTangleberrie::new).setRegistryName(LibBlockNames.SUBTILE_TANGLEBERRIE));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileJiyuulia::new).setRegistryName(LibBlockNames.SUBTILE_JIYUULIA));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileRannuncarpus::new).setRegistryName(LibBlockNames.SUBTILE_RANNUNCARPUS));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileRannuncarpus.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_RANNUNCARPUS.getPath() + "_chibi"));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileHyacidus::new).setRegistryName(LibBlockNames.SUBTILE_HYACIDUS));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTilePollidisiac::new).setRegistryName(LibBlockNames.SUBTILE_POLLIDISIAC));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileClayconia::new).setRegistryName(LibBlockNames.SUBTILE_CLAYCONIA));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileClayconia.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_CLAYCONIA.getPath() + "_chibi"));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileLoonuim::new).setRegistryName(LibBlockNames.SUBTILE_LOONIUM));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileDaffomill::new).setRegistryName(LibBlockNames.SUBTILE_DAFFOMILL));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileVinculotus::new).setRegistryName(LibBlockNames.SUBTILE_VINCULOTUS));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileSpectranthemum::new).setRegistryName(LibBlockNames.SUBTILE_SPECTRANTHEMUM));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileMedumone::new).setRegistryName(LibBlockNames.SUBTILE_MEDUMONE));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileMarimorphosis::new).setRegistryName(LibBlockNames.SUBTILE_MARIMORPHOSIS));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileMarimorphosis.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_MARIMORPHOSIS.getPath() + "_chibi"));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBubbell::new).setRegistryName(LibBlockNames.SUBTILE_BUBBELL));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBubbell.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_BUBBELL.getPath() + "_chibi"));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileSolegnolia::new).setRegistryName(LibBlockNames.SUBTILE_SOLEGNOLIA));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileSolegnolia.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_SOLEGNOLIA.getPath() + "_chibi"));
r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBergamute::new).setRegistryName(LibBlockNames.SUBTILE_BERGAMUTE));
@SubscribeEvent
public static void registerItemBlocks(RegistryEvent.Register<Item> evt) {
IForgeRegistry<Block> b = ForgeRegistries.BLOCKS;
IForgeRegistry<Item> r = evt.getRegistry();
Item.Properties props = ModItems.defaultBuilder();
for (Pair<Supplier<? extends TileEntitySpecialFlower>, ResourceLocation> type : TYPES) {
Block block = b.getValue(type.getRight());
Block floating = b.getValue(floating(type.getRight()));
register(r, new ItemBlockSpecialFlower(block, props), type.getRight());
register(r, new ItemBlockSpecialFlower(floating, props), floating(type.getRight()));
}
}
@SubscribeEvent
public static void registerTEs(RegistryEvent.Register<TileEntityType<?>> evt) {
IForgeRegistry<TileEntityType<?>> r = evt.getRegistry();
for (Pair<Supplier<? extends TileEntitySpecialFlower>, ResourceLocation> type : TYPES) {
register(r, TileEntityType.Builder.create(type.getLeft()).build(null), type.getRight());
}
}
}
@@ -42,7 +42,6 @@ import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.block.tile.TileFloatingFlower;
import vazkii.botania.common.block.tile.TileFloatingSpecialFlower;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.item.IFloatingFlowerVariant;
import vazkii.botania.common.lexicon.LexiconData;
@@ -80,27 +79,6 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable {
return BlockRenderLayer.CUTOUT;
}
/* todo 1.13
@Nonnull
@Override
public BlockStateContainer createBlockState() {
return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.ISLAND_TYPE });
}
@Nonnull
@Override
public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockReader world, BlockPos pos) {
state = getActualState(state, world, pos);
TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos);
if (te instanceof TileFloatingFlower) {
state = ((IExtendedBlockState) state).with(BotaniaStateProps.ISLAND_TYPE, ((TileFloatingFlower) te).getIslandType());
} else if (te instanceof TileFloatingSpecialFlower) {
state = ((IExtendedBlockState) state).with(BotaniaStateProps.ISLAND_TYPE, ((TileFloatingSpecialFlower) te).getIslandType());
}
return state;
}
*/
@OnlyIn(Dist.CLIENT)
@Override
public void animateTick(IBlockState state, World world, BlockPos pos, Random rand) {
@@ -11,40 +11,46 @@
package vazkii.botania.common.block.subtile;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
public class SubTileManastar extends TileEntitySpecialFlower {
@ObjectHolder(LibMisc.MOD_ID + ":manastar")
public static TileEntityType<SubTileManastar> TYPE;
public class SubTileManastar extends SubTileEntity {
private static final int SET_STATE_EVENT = 0;
private static final int NONE = 0, DECREASING = 1, INCREASING = 2;
private int lastMana = 0;
private int state = NONE;
public SubTileManastar(SubTileType type) {
super(type);
public SubTileManastar() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(getWorld().isRemote) {
if(state != NONE && Math.random() > 0.6)
Botania.proxy.wispFX(supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.75 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, state == INCREASING ? 0.05F : 1F, 0.05F, state == INCREASING ? 1F : 0.05F, (float) Math.random() / 7, (float) -Math.random() / 50);
Botania.proxy.wispFX(getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.75 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, state == INCREASING ? 0.05F : 1F, 0.05F, state == INCREASING ? 1F : 0.05F, (float) Math.random() / 7, (float) -Math.random() / 50);
} else {
int mana = 0;
for(EnumFacing dir : MathHelper.HORIZONTALS) {
BlockPos pos = supertile.getPos().offset(dir);
BlockPos pos = getPos().offset(dir);
if(getWorld().isBlockLoaded(pos)) {
TileEntity tile = supertile.getWorld().getTileEntity(pos);
TileEntity tile = getWorld().getTileEntity(pos);
if(tile instanceof IManaPool)
mana += ((IManaPool) tile).getCurrentMana();
}
@@ -52,7 +58,7 @@ public class SubTileManastar extends SubTileEntity {
int newState = mana > lastMana ? INCREASING : mana < lastMana ? DECREASING : NONE;
if(newState != state)
getWorld().addBlockEvent(getPos(), supertile.getBlockState().getBlock(), SET_STATE_EVENT, newState);
getWorld().addBlockEvent(getPos(), getBlockState().getBlock(), SET_STATE_EVENT, newState);
if(ticksExisted % 60 == 0)
lastMana = mana;
@@ -13,21 +13,26 @@ package vazkii.botania.common.block.subtile;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.recipe.RecipePureDaisy;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.Arrays;
public class SubTilePureDaisy extends SubTileEntity {
public class SubTilePureDaisy extends TileEntitySpecialFlower {
@ObjectHolder(LibMisc.MOD_ID + ":pure_daisy")
public static TileEntityType<SubTilePureDaisy> TYPE;
private static final String TAG_POSITION = "position";
private static final String TAG_TICKS_REMAINING = "ticksRemaining";
@@ -51,14 +56,14 @@ public class SubTilePureDaisy extends SubTileEntity {
// Bitfield of active positions, used clientside for particles
private int activePositions = 0;
public SubTilePureDaisy(SubTileType type) {
super(type);
public SubTilePureDaisy() {
super(TYPE);
Arrays.fill(ticksRemaining, -1);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(getWorld().isRemote) {
for (int i = 0; i < POSITIONS.length; i++) {
@@ -76,8 +81,8 @@ public class SubTilePureDaisy extends SubTileEntity {
positionAt = 0;
BlockPos acoords = POSITIONS[positionAt];
BlockPos coords = supertile.getPos().add(acoords);
World world = supertile.getWorld();
BlockPos coords = getPos().add(acoords);
World world = getWorld();
if(!world.isAirBlock(coords)) {
world.profiler.startSection("findRecipe");
RecipePureDaisy recipe = findRecipe(coords);
@@ -92,9 +97,9 @@ public class SubTilePureDaisy extends SubTileEntity {
ticksRemaining[positionAt] = -1;
if(recipe.set(world,coords, this)) {
world.addBlockEvent(getPos(), supertile.getBlockState().getBlock(), RECIPE_COMPLETE_EVENT, positionAt);
world.addBlockEvent(getPos(), getBlockState().getBlock(), RECIPE_COMPLETE_EVENT, positionAt);
if(ConfigHandler.COMMON.blockBreakParticles.get())
supertile.getWorld().playEvent(2001, coords, Block.getStateId(recipe.getOutputState()));
getWorld().playEvent(2001, coords, Block.getStateId(recipe.getOutputState()));
}
}
} else ticksRemaining[positionAt] = -1;
@@ -112,7 +117,7 @@ public class SubTilePureDaisy extends SubTileEntity {
}
if (newActivePositions != activePositions) {
getWorld().addBlockEvent(getPos(), supertile.getBlockState().getBlock(), UPDATE_ACTIVE_EVENT, newActivePositions);
getWorld().addBlockEvent(getPos(), getBlockState().getBlock(), UPDATE_ACTIVE_EVENT, newActivePositions);
}
}
@@ -159,7 +164,7 @@ public class SubTilePureDaisy extends SubTileEntity {
public void readFromPacketNBT(NBTTagCompound cmp) {
positionAt = cmp.getInt(TAG_POSITION);
if(supertile.getWorld() != null && !supertile.getWorld().isRemote)
if(getWorld() != null && !getWorld().isRemote)
for(int i = 0; i < ticksRemaining.length; i++)
ticksRemaining[i] = cmp.getInt(TAG_TICKS_REMAINING + i);
}
@@ -19,30 +19,39 @@ import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.tags.BlockTags;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
public class SubTileAgricarnation extends SubTileFunctional {
public class SubTileAgricarnation extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":agricarnation")
public static TileEntityType<SubTileAgricarnation> TYPE;
private static final int RANGE = 5;
private static final int RANGE_MINI = 2;
public SubTileAgricarnation(SubTileType type) {
public SubTileAgricarnation(TileEntityType<?> type) {
super(type);
}
@Override
public void onUpdate() {
super.onUpdate();
public SubTileAgricarnation() {
this(TYPE);
}
if(supertile.getWorld().isRemote)
@Override
public void tickFlower() {
super.tickFlower();
if(getWorld().isRemote)
return;
if(ticksExisted % 200 == 0)
@@ -50,22 +59,22 @@ public class SubTileAgricarnation extends SubTileFunctional {
if(ticksExisted % 6 == 0 && redstoneSignal == 0) {
int range = getRange();
int x = supertile.getPos().getX() + supertile.getWorld().rand.nextInt(range * 2 + 1) - range;
int z = supertile.getPos().getZ() + supertile.getWorld().rand.nextInt(range * 2 + 1) - range;
int x = getPos().getX() + getWorld().rand.nextInt(range * 2 + 1) - range;
int z = getPos().getZ() + getWorld().rand.nextInt(range * 2 + 1) - range;
for(int i = 4; i > -2; i--) {
int y = supertile.getPos().getY() + i;
int y = getPos().getY() + i;
BlockPos pos = new BlockPos(x, y, z);
if(supertile.getWorld().isAirBlock(pos))
if(getWorld().isAirBlock(pos))
continue;
if(isPlant(pos) && mana > 5) {
Block block = supertile.getWorld().getBlockState(pos).getBlock();
Block block = getWorld().getBlockState(pos).getBlock();
mana -= 5;
supertile.getWorld().getPendingBlockTicks().scheduleTick(pos, block, 1);
getWorld().getPendingBlockTicks().scheduleTick(pos, block, 1);
if(ConfigHandler.COMMON.blockBreakParticles.get())
supertile.getWorld().playEvent(2005, pos, 6 + supertile.getWorld().rand.nextInt(4));
supertile.getWorld().playSound(null, x, y, z, ModSounds.agricarnation, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F);
getWorld().playEvent(2005, pos, 6 + getWorld().rand.nextInt(4));
getWorld().playSound(null, x, y, z, ModSounds.agricarnation, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F);
break;
}
@@ -79,13 +88,13 @@ public class SubTileAgricarnation extends SubTileFunctional {
}
private boolean isPlant(BlockPos pos) {
IBlockState state = supertile.getWorld().getBlockState(pos);
IBlockState state = getWorld().getBlockState(pos);
Block block = state.getBlock();
if(block == Blocks.GRASS || BlockTags.LEAVES.contains(block) || block instanceof BlockBush && !(block instanceof BlockCrops) && !(block instanceof BlockSapling))
return false;
Material mat = state.getMaterial();
return mat != null && (mat == Material.PLANTS || mat == Material.CACTUS || mat == Material.GRASS || mat == Material.LEAVES || mat == Material.GOURD) && block instanceof IGrowable && ((IGrowable) block).canGrow(supertile.getWorld(), pos, supertile.getWorld().getBlockState(pos), supertile.getWorld().isRemote);
return mat != null && (mat == Material.PLANTS || mat == Material.CACTUS || mat == Material.GRASS || mat == Material.LEAVES || mat == Material.GOURD) && block instanceof IGrowable && ((IGrowable) block).canGrow(getWorld(), pos, getWorld().getBlockState(pos), getWorld().isRemote);
}
@Override
@@ -113,8 +122,11 @@ public class SubTileAgricarnation extends SubTileFunctional {
}
public static class Mini extends SubTileAgricarnation {
public Mini(SubTileType type) {
super(type);
@ObjectHolder(LibMisc.MOD_ID + ":agricarnation_chibi")
public static TileEntityType<SubTileAgricarnation> TYPE;
public Mini() {
super(TYPE);
}
@Override public int getRange() { return RANGE_MINI; }
@@ -14,26 +14,35 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.EntityWitch;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.DamageSource;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
import java.util.function.Predicate;
public class SubTileBellethorn extends SubTileFunctional {
public class SubTileBellethorn extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":bellethorn")
public static TileEntityType<SubTileBellethorn> TYPE;
public static final int RANGE = 6;
public static final int RANGE_MINI = 1;
public SubTileBellethorn(SubTileType type) {
public SubTileBellethorn(TileEntityType<?> type) {
super(type);
}
public SubTileBellethorn() {
this(TYPE);
}
@Override
public int getColor() {
return 0xBA3421;
@@ -45,10 +54,10 @@ public class SubTileBellethorn extends SubTileFunctional {
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(supertile.getWorld().isRemote || redstoneSignal > 0)
if(getWorld().isRemote || redstoneSignal > 0)
return;
if(ticksExisted % 200 == 0)
@@ -58,7 +67,7 @@ public class SubTileBellethorn extends SubTileFunctional {
if(ticksExisted % 5 == 0) {
int range = getRange();
List<EntityLivingBase> entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-range, -range, -range), supertile.getPos().add(range + 1, range + 1, range + 1)), getSelector()::test);
List<EntityLivingBase> entities = getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(getPos().add(-range, -range, -range), getPos().add(range + 1, range + 1, range + 1)), getSelector()::test);
for(EntityLivingBase entity : entities) {
if(entity.hurtTime == 0 && mana >= manaToUse) {
@@ -102,8 +111,11 @@ public class SubTileBellethorn extends SubTileFunctional {
}
public static class Mini extends SubTileBellethorn {
public Mini(SubTileType type) {
super(type);
@ObjectHolder(LibMisc.MOD_ID + ":bellethorn_chibi")
public static TileEntityType<SubTileBellethorn.Mini> TYPE;
public Mini() {
super(TYPE);
}
@Override public int getRange() { return RANGE_MINI; }
@@ -1,28 +1,34 @@
package vazkii.botania.common.block.subtile.functional;
import net.minecraft.tileentity.TileEntityType;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.Collections;
import java.util.Set;
import java.util.WeakHashMap;
public class SubTileBergamute extends SubTileFunctional {
public class SubTileBergamute extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":bergamute")
public static TileEntityType<SubTileBergamute> TYPE;
private static final int RANGE = 4;
private static final Set<SubTileBergamute> existingFlowers = Collections.newSetFromMap(new WeakHashMap<>());
public SubTileBergamute(SubTileType type) {
super(type);
public SubTileBergamute() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if (supertile.getWorld().isRemote) {
if (getWorld().isRemote) {
if(!existingFlowers.contains(this)) {
existingFlowers.add(this);
}
@@ -33,8 +39,8 @@ public class SubTileBergamute extends SubTileFunctional {
protected static SubTileBergamute getBergamuteNearby(float x, float y, float z) {
return existingFlowers.stream()
.filter(f -> f.redstoneSignal == 0)
.filter(f -> f.supertile.getWorld().getTileEntity(f.supertile.getPos()) == f.supertile)
.filter(f -> f.supertile.getDistanceSq(x, y, z) <= RANGE * RANGE)
.filter(f -> f.getWorld().getTileEntity(f.getPos()) == f)
.filter(f -> f.getDistanceSq(x, y, z) <= RANGE * RANGE)
.findAny().orElse(null);
}
@@ -14,18 +14,23 @@ import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.ISubTileContainer;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.block.tile.TileFakeAir;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
public class SubTileBubbell extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":bubbell")
public static TileEntityType<SubTileBubbell> TYPE;
public class SubTileBubbell extends SubTileFunctional {
private static final int RANGE = 12;
private static final int RANGE_MINI = 6;
@@ -34,15 +39,19 @@ public class SubTileBubbell extends SubTileFunctional {
int range = 2;
public SubTileBubbell(SubTileType type) {
public SubTileBubbell(TileEntityType<?> type) {
super(type);
}
@Override
public void onUpdate() {
super.onUpdate();
public SubTileBubbell() {
this(TYPE);
}
if(supertile.getWorld().isRemote)
@Override
public void tickFlower() {
super.tickFlower();
if(getWorld().isRemote)
return;
if(ticksExisted % 200 == 0)
@@ -56,11 +65,11 @@ public class SubTileBubbell extends SubTileFunctional {
for(BlockPos pos : BlockPos.getAllInBoxMutable(getPos().add(-range, -range, -range), getPos().add(range, range, range))) {
if(getPos().distanceSq(pos) < range * range) {
IBlockState state = supertile.getWorld().getBlockState(pos);
IBlockState state = getWorld().getBlockState(pos);
if(state.getMaterial() == Material.WATER) {
supertile.getWorld().setBlockState(pos, ModBlocks.fakeAir.getDefaultState(), 2);
TileFakeAir air = (TileFakeAir) supertile.getWorld().getTileEntity(pos);
air.setFlower(supertile);
getWorld().setBlockState(pos, ModBlocks.fakeAir.getDefaultState(), 2);
TileFakeAir air = (TileFakeAir) getWorld().getTileEntity(pos);
air.setFlower(this);
}
}
}
@@ -69,12 +78,8 @@ public class SubTileBubbell extends SubTileFunctional {
public static boolean isValidBubbell(World world, BlockPos pos) {
TileEntity tile = world.getTileEntity(pos);
if(tile != null && tile instanceof ISubTileContainer) {
ISubTileContainer container = (ISubTileContainer) tile;
if(container.getSubTile() != null && container.getSubTile() instanceof SubTileBubbell) {
SubTileBubbell bubbell = (SubTileBubbell) container.getSubTile();
return bubbell.mana > COST_PER_TICK;
}
if(tile instanceof SubTileBubbell) {
return ((SubTileBubbell) tile).mana > COST_PER_TICK;
}
return false;
@@ -117,8 +122,11 @@ public class SubTileBubbell extends SubTileFunctional {
}
public static class Mini extends SubTileBubbell {
public Mini(SubTileType type) {
super(type);
@ObjectHolder(LibMisc.MOD_ID + ":bubbell_chibi")
public static TileEntityType<SubTileBubbell.Mini> TYPE;
public Mini() {
super(TYPE);
}
@Override public int getRange() { return RANGE_MINI; }
@@ -15,18 +15,23 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.List;
public class SubTileClayconia extends SubTileFunctional {
public class SubTileClayconia extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":clayconia")
public static TileEntityType<SubTileClayconia> TYPE;
private static final int COST = 80;
private static final int RANGE = 5;
@@ -35,23 +40,27 @@ public class SubTileClayconia extends SubTileFunctional {
private static final int RANGE_MINI = 2;
private static final int RANGE_Y_MINI = 1;
public SubTileClayconia(SubTileType type) {
public SubTileClayconia(TileEntityType<?> type) {
super(type);
}
@Override
public void onUpdate() {
super.onUpdate();
public SubTileClayconia() {
this(TYPE);
}
if(!supertile.getWorld().isRemote && ticksExisted % 5 == 0) {
@Override
public void tickFlower() {
super.tickFlower();
if(!getWorld().isRemote && ticksExisted % 5 == 0) {
if(mana >= COST) {
BlockPos coords = getCoordsToPut();
if(coords != null) {
supertile.getWorld().removeBlock(coords);
getWorld().removeBlock(coords);
if(ConfigHandler.COMMON.blockBreakParticles.get())
supertile.getWorld().playEvent(2001, coords, Block.getStateId(Blocks.SAND.getDefaultState()));
EntityItem item = new EntityItem(supertile.getWorld(), coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, new ItemStack(Items.CLAY_BALL));
supertile.getWorld().spawnEntity(item);
getWorld().playEvent(2001, coords, Block.getStateId(Blocks.SAND.getDefaultState()));
EntityItem item = new EntityItem(getWorld(), coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, new ItemStack(Items.CLAY_BALL));
getWorld().spawnEntity(item);
mana -= COST;
}
}
@@ -67,15 +76,15 @@ public class SubTileClayconia extends SubTileFunctional {
for(int i = -range; i < range + 1; i++)
for(int j = -rangeY; j < rangeY + 1; j++)
for(int k = -range; k < range + 1; k++) {
BlockPos pos = supertile.getPos().add(i, j, k);
Block block = supertile.getWorld().getBlockState(pos).getBlock();
BlockPos pos = getPos().add(i, j, k);
Block block = getWorld().getBlockState(pos).getBlock();
if(block == Blocks.SAND)
possibleCoords.add(pos);
}
if(possibleCoords.isEmpty())
return null;
return possibleCoords.get(supertile.getWorld().rand.nextInt(possibleCoords.size()));
return possibleCoords.get(getWorld().rand.nextInt(possibleCoords.size()));
}
@Override
@@ -107,8 +116,11 @@ public class SubTileClayconia extends SubTileFunctional {
}
public static class Mini extends SubTileClayconia {
public Mini(SubTileType type) {
super(type);
@ObjectHolder(LibMisc.MOD_ID + ":bellethorn_chibi")
public static TileEntityType<SubTileBellethorn.Mini> TYPE;
public Mini() {
super(TYPE);
}
@Override public int getRange() { return RANGE_MINI; }
@@ -17,24 +17,29 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.network.PacketHandler;
import vazkii.botania.common.network.PacketItemAge;
import java.util.List;
public class SubTileDaffomill extends SubTileFunctional {
public class SubTileDaffomill extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":daffomill")
public static TileEntityType<SubTileDaffomill> TYPE;
private static final String TAG_ORIENTATION = "orientation";
private static final String TAG_WIND_TICKS = "windTicks";
@@ -42,16 +47,16 @@ public class SubTileDaffomill extends SubTileFunctional {
private int windTicks = 0;
private EnumFacing orientation = EnumFacing.NORTH;
public SubTileDaffomill(SubTileType type) {
super(type);
public SubTileDaffomill() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(supertile.getWorld().rand.nextInt(4) == 0)
Botania.proxy.wispFX(supertile.getPos().getX() + Math.random(), supertile.getPos().getY() + Math.random(), supertile.getPos().getZ() + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, orientation.getXOffset() * 0.1F, orientation.getYOffset() * 0.1F, orientation.getZOffset() * 0.1F);
if(getWorld().rand.nextInt(4) == 0)
Botania.proxy.wispFX(getPos().getX() + Math.random(), getPos().getY() + Math.random(), getPos().getZ() + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, orientation.getXOffset() * 0.1F, orientation.getYOffset() * 0.1F, orientation.getZOffset() * 0.1F);
if(windTicks == 0 && mana > 0) {
windTicks = 20;
@@ -62,7 +67,7 @@ public class SubTileDaffomill extends SubTileFunctional {
AxisAlignedBB axis = aabbForOrientation();
if(axis != null) {
List<EntityItem> items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, axis);
List<EntityItem> items = getWorld().getEntitiesWithinAABB(EntityItem.class, axis);
int slowdown = getSlowdownFactor();
for(EntityItem item : items) {
if(item.isAlive() && item.age >= slowdown) {
@@ -78,9 +83,9 @@ public class SubTileDaffomill extends SubTileFunctional {
}
private AxisAlignedBB aabbForOrientation() {
int x = supertile.getPos().getX();
int y = supertile.getPos().getY();
int z = supertile.getPos().getZ();
int x = getPos().getX();
int y = getPos().getY();
int z = getPos().getZ();
int w = 2;
int h = 3;
int l = 16;
@@ -133,7 +138,7 @@ public class SubTileDaffomill extends SubTileFunctional {
@Override
public RadiusDescriptor getRadius() {
AxisAlignedBB aabb = aabbForOrientation();
aabb = new AxisAlignedBB(aabb.minX, supertile.getPos().getY(), aabb.minZ, aabb.maxX, aabb.maxY, aabb.maxZ);
aabb = new AxisAlignedBB(aabb.minX, getPos().getY(), aabb.minZ, aabb.maxX, aabb.maxY, aabb.maxZ);
return new RadiusDescriptor.Rectangle(toBlockPos(), aabb);
}
@@ -12,16 +12,21 @@ package vazkii.botania.common.block.subtile.functional;
import net.minecraft.entity.Entity;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.tileentity.TileEntityType;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.function.Predicate;
public class SubTileDreadthorn extends SubTileBellethorn {
@ObjectHolder(LibMisc.MOD_ID + ":dreadthorn")
public static TileEntityType<SubTileDreadthorn> TYPE;
public SubTileDreadthorn(SubTileType type) {
super(type);
public SubTileDreadthorn() {
super(TYPE);
}
@Override
@@ -17,37 +17,42 @@ import net.minecraft.item.ItemStack;
import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.crafting.VanillaRecipeTypes;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.item.IExoflameHeatable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
public class SubTileExoflame extends SubTileFunctional {
public class SubTileExoflame extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":exoflame")
public static TileEntityType<SubTileExoflame> TYPE;
private static final int RANGE = 5;
private static final int RANGE_Y = 2;
private static final int COST = 300;
public SubTileExoflame(SubTileType type) {
super(type);
public SubTileExoflame() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(supertile.getWorld().isRemote)
if(getWorld().isRemote)
return;
boolean did = false;
for(BlockPos pos : BlockPos.getAllInBox(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE, RANGE_Y, RANGE))) {
TileEntity tile = supertile.getWorld().getTileEntity(pos);
IBlockState state = supertile.getWorld().getBlockState(pos);
TileEntity tile = getWorld().getTileEntity(pos);
IBlockState state = getWorld().getBlockState(pos);
Block block = state.getBlock();
if(tile != null) {
if(tile instanceof TileEntityFurnace && block == Blocks.FURNACE) {
@@ -56,7 +61,7 @@ public class SubTileExoflame extends SubTileFunctional {
if(canSmelt && mana > 2) {
if(furnace.getField(0) < 2) { // Field 0 -> Burn time
if(furnace.getField(0) == 0)
supertile.getWorld().setBlockState(pos, state.with(BlockStateProperties.LIT, true));
getWorld().setBlockState(pos, state.with(BlockStateProperties.LIT, true));
furnace.setField(0, 200);
mana = Math.max(0, mana - COST);
}
@@ -13,32 +13,37 @@ package vazkii.botania.common.block.subtile.functional;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.potion.PotionEffect;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.world.dimension.EndDimension;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileFallenKanade extends SubTileFunctional {
public class SubTileFallenKanade extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":fallen_kanade")
public static TileEntityType<SubTileFallenKanade> TYPE;
private static final int RANGE = 2;
private static final int COST = 120;
public SubTileFallenKanade(SubTileType type) {
super(type);
public SubTileFallenKanade() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(!supertile.getWorld().isRemote && !(supertile.getWorld().getDimension() instanceof EndDimension)) {
if(!getWorld().isRemote && !(getWorld().getDimension() instanceof EndDimension)) {
boolean did = false;
List<EntityPlayer> players = supertile.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
List<EntityPlayer> players = getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
for(EntityPlayer player : players) {
if(player.getActivePotionEffect(MobEffects.REGENERATION) == null && mana >= COST) {
player.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, 59, 2, true, true));
@@ -14,42 +14,42 @@ import com.google.common.base.Predicates;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.ai.EntityAIAttackMelee;
import net.minecraft.entity.ai.EntityAIBase;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry;
import net.minecraft.entity.monster.IMob;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibObfuscation;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.List;
public class SubTileHeiseiDream extends SubTileFunctional {
public class SubTileHeiseiDream extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":heisei_dream")
public static TileEntityType<SubTileHeiseiDream> TYPE;
private static final int RANGE = 5;
public SubTileHeiseiDream(SubTileType type) {
super(type);
public SubTileHeiseiDream() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(supertile.getWorld().isRemote)
if(getWorld().isRemote)
return;
final int cost = 100;
@SuppressWarnings("unchecked")
List<IMob> mobs = (List) supertile.getWorld().getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)), Predicates.instanceOf(IMob.class));
List<IMob> mobs = (List) getWorld().getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)), Predicates.instanceOf(IMob.class));
if(mobs.size() > 1 && mana >= cost)
for(IMob mob : mobs) {
@@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
@@ -28,21 +29,25 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.registries.ObjectHolder;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.corporea.InvWithLocation;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.mana.IManaItem;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.helper.InventoryHelper;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.List;
public class SubTileHopperhock extends SubTileFunctional {
public class SubTileHopperhock extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":hopperhock")
public static TileEntityType<SubTileHopperhock> TYPE;
private static final String TAG_FILTER_TYPE = "filterType";
private static final int RANGE_MANA = 10;
@@ -53,23 +58,27 @@ public class SubTileHopperhock extends SubTileFunctional {
private int filterType = 0;
public SubTileHopperhock(SubTileType type) {
public SubTileHopperhock(TileEntityType<?> type) {
super(type);
}
@Override
public void onUpdate() {
super.onUpdate();
public SubTileHopperhock() {
this(TYPE);
}
if(supertile.getWorld().isRemote || redstoneSignal > 0)
@Override
public void tickFlower() {
super.tickFlower();
if(getWorld().isRemote || redstoneSignal > 0)
return;
boolean pulledAny = false;
int range = getRange();
BlockPos pos = supertile.getPos();
BlockPos pos = getPos();
List<EntityItem> items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1)));
List<EntityItem> items = getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1)));
int slowdown = getSlowdownFactor();
for(EntityItem item : items) {
@@ -84,7 +93,7 @@ public class SubTileHopperhock extends SubTileFunctional {
for(EnumFacing dir : EnumFacing.values()) {
BlockPos pos_ = pos.offset(dir);
InvWithLocation inv = InventoryHelper.getInventoryWithLocation(supertile.getWorld(), pos_, dir.getOpposite());
InvWithLocation inv = InventoryHelper.getInventoryWithLocation(getWorld(), pos_, dir.getOpposite());
if(inv != null) {
List<ItemStack> filter = getFilterForInventory(pos_, true);
boolean canAccept = canAcceptItem(stack, filter, filterType);
@@ -157,12 +166,12 @@ public class SubTileHopperhock extends SubTileFunctional {
List<ItemStack> filter = new ArrayList<>();
if(recursiveForDoubleChests) {
TileEntity tileEntity = supertile.getWorld().getTileEntity(pos);
Block chest = supertile.getWorld().getBlockState(pos).getBlock();
TileEntity tileEntity = getWorld().getTileEntity(pos);
Block chest = getWorld().getBlockState(pos).getBlock();
if(tileEntity instanceof TileEntityChest)
for(EnumFacing dir : MathHelper.HORIZONTALS)
if(supertile.getWorld().getBlockState(pos.offset(dir)).getBlock() == chest) {
if(getWorld().getBlockState(pos.offset(dir)).getBlock() == chest) {
filter.addAll(getFilterForInventory(pos.offset(dir), false));
break;
}
@@ -170,7 +179,7 @@ public class SubTileHopperhock extends SubTileFunctional {
for(EnumFacing dir : MathHelper.HORIZONTALS) {
AxisAlignedBB aabb = new AxisAlignedBB(pos.offset(dir));
List<EntityItemFrame> frames = supertile.getWorld().getEntitiesWithinAABB(EntityItemFrame.class, aabb);
List<EntityItemFrame> frames = getWorld().getEntitiesWithinAABB(EntityItemFrame.class, aabb);
for(EntityItemFrame frame : frames) {
if(frame.facingDirection == dir)
filter.add(frame.getDisplayedItem());
@@ -254,8 +263,11 @@ public class SubTileHopperhock extends SubTileFunctional {
}
public static class Mini extends SubTileHopperhock {
public Mini(SubTileType type) {
super(type);
@ObjectHolder(LibMisc.MOD_ID + ":hopperhock_chibi")
public static TileEntityType<SubTileBellethorn> TYPE;
public Mini() {
super(TYPE);
}
@Override public int getRange() { return mana > 0 ? RANGE_MANA_MINI : RANGE_MINI; }
@@ -15,33 +15,38 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.potion.PotionEffect;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileHyacidus extends SubTileFunctional {
public class SubTileHyacidus extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":hyacidus")
public static TileEntityType<SubTileHyacidus> TYPE;
private static final int RANGE = 6;
public SubTileHyacidus(SubTileType type) {
super(type);
public SubTileHyacidus() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(supertile.getWorld().isRemote || redstoneSignal > 0)
if(getWorld().isRemote || redstoneSignal > 0)
return;
final int cost = 20;
List<EntityLivingBase> entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
List<EntityLivingBase> entities = getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
for(EntityLivingBase entity : entities) {
if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(MobEffects.POISON) == null && mana >= cost && !entity.world.isRemote && entity.getCreatureAttribute() != CreatureAttribute.UNDEAD) {
entity.addPotionEffect(new PotionEffect(MobEffects.POISON, 60, 0));
@@ -14,50 +14,54 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
public class SubTileJadedAmaranthus extends SubTileFunctional {
public class SubTileJadedAmaranthus extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":jaded_amaranthus")
public static TileEntityType<SubTileJadedAmaranthus> TYPE;
private static final int COST = 100;
final int RANGE = 4;
public SubTileJadedAmaranthus(SubTileType type) {
super(type);
public SubTileJadedAmaranthus() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(supertile.getWorld().isRemote || redstoneSignal > 0)
if(getWorld().isRemote || redstoneSignal > 0)
return;
if(ticksExisted % 30 == 0 && mana >= COST) {
BlockPos pos = new BlockPos(
supertile.getPos().getX() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1),
supertile.getPos().getY() + RANGE,
supertile.getPos().getZ() - RANGE + supertile.getWorld().rand.nextInt(RANGE * 2 + 1)
getPos().getX() - RANGE + getWorld().rand.nextInt(RANGE * 2 + 1),
getPos().getY() + RANGE,
getPos().getZ() - RANGE + getWorld().rand.nextInt(RANGE * 2 + 1)
);
BlockPos up = pos.up();
for(int i = 0; i < RANGE * 2; i++) {
IBlockState stateAbove = supertile.getWorld().getBlockState(up);
EnumDyeColor color = EnumDyeColor.byId(supertile.getWorld().rand.nextInt(16));
IBlockState stateAbove = getWorld().getBlockState(up);
EnumDyeColor color = EnumDyeColor.byId(getWorld().rand.nextInt(16));
IBlockState flower = ModBlocks.getFlower(color).getDefaultState();
if((supertile.getWorld().isAirBlock(up) || stateAbove.getMaterial() != Material.WATER && flower.isValidPosition(supertile.getWorld(), up))) {
if((getWorld().isAirBlock(up) || stateAbove.getMaterial() != Material.WATER && flower.isValidPosition(getWorld(), up))) {
if(ConfigHandler.COMMON.blockBreakParticles.get())
supertile.getWorld().playEvent(2001, up, Block.getStateId(flower));
supertile.getWorld().setBlockState(up, flower);
getWorld().playEvent(2001, up, Block.getStateId(flower));
getWorld().setBlockState(up, flower);
mana -= COST;
sync();
@@ -10,14 +10,19 @@
*/
package vazkii.botania.common.block.subtile.functional;
import net.minecraft.tileentity.TileEntityType;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
public class SubTileJiyuulia extends SubTileTangleberrie {
@ObjectHolder(LibMisc.MOD_ID + ":jiyuulia")
public static TileEntityType<SubTileJiyuulia> TYPE;
public SubTileJiyuulia(SubTileType type) {
super(type);
public SubTileJiyuulia() {
super(TYPE);
}
@Override
@@ -32,20 +32,21 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.Tag;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraft.world.storage.loot.LootContext;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
@@ -54,7 +55,9 @@ import java.util.List;
import java.util.Random;
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
public class SubTileLoonuim extends SubTileFunctional {
public class SubTileLoonuim extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":loonium")
public static TileEntityType<SubTileLoonuim> TYPE;
private static final int COST = 35000;
private static final int RANGE = 5;
@@ -64,15 +67,15 @@ public class SubTileLoonuim extends SubTileFunctional {
private ResourceLocation lootTable = new ResourceLocation("minecraft", "chests/simple_dungeon");
public SubTileLoonuim(SubTileType type) {
super(type);
public SubTileLoonuim() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
World world = supertile.getWorld();
World world = getWorld();
if(!world.isRemote && redstoneSignal == 0 && ticksExisted % 100 == 0 && mana >= COST) {
Random rand = world.rand;
@@ -88,9 +91,9 @@ public class SubTileLoonuim extends SubTileFunctional {
} while(stack.isEmpty() || BLACKLIST.contains(stack.getItem()));
int bound = RANGE * 2 + 1;
int xp = supertile.getPos().getX() - RANGE + rand.nextInt(bound);
int yp = supertile.getPos().getY();
int zp = supertile.getPos().getZ() - RANGE + rand.nextInt(bound);
int xp = getPos().getX() - RANGE + rand.nextInt(bound);
int yp = getPos().getY();
int zp = getPos().getZ() - RANGE + rand.nextInt(bound);
BlockPos pos = new BlockPos(xp, yp - 1, zp);
do {
@@ -14,23 +14,27 @@ import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.block.state.pattern.BlockStateMatcher;
import net.minecraft.init.Blocks;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.BiomeDictionary.Type;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
public class SubTileMarimorphosis extends SubTileFunctional {
public class SubTileMarimorphosis extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":marimorphosis")
public static TileEntityType<SubTileMarimorphosis> TYPE;
private static final int COST = 12;
private static final int RANGE = 8;
@@ -50,14 +54,18 @@ public class SubTileMarimorphosis extends SubTileFunctional {
Type.MESA
};
public SubTileMarimorphosis(SubTileType type) {
public SubTileMarimorphosis(TileEntityType<?> type) {
super(type);
}
public SubTileMarimorphosis() {
this(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
if(supertile.getWorld().isRemote || redstoneSignal > 0)
public void tickFlower() {
super.tickFlower();
if(getWorld().isRemote || redstoneSignal > 0)
return;
if(mana >= COST && ticksExisted % 2 == 0) {
@@ -65,9 +73,9 @@ public class SubTileMarimorphosis extends SubTileFunctional {
if(coords != null) {
IBlockState state = getStoneToPut(coords);
if(state != null) {
supertile.getWorld().setBlockState(coords, state);
getWorld().setBlockState(coords, state);
if(ConfigHandler.COMMON.blockBreakParticles.get())
supertile.getWorld().playEvent(2001, coords, Block.getStateId(state));
getWorld().playEvent(2001, coords, Block.getStateId(state));
mana -= COST;
sync();
@@ -77,7 +85,7 @@ public class SubTileMarimorphosis extends SubTileFunctional {
}
public IBlockState getStoneToPut(BlockPos coords) {
Set<Type> types = BiomeDictionary.getTypes(supertile.getWorld().getBiome(coords));
Set<Type> types = BiomeDictionary.getTypes(getWorld().getBiome(coords));
List<Block> values = new ArrayList<>();
for (Type type : TYPES) {
@@ -90,7 +98,7 @@ public class SubTileMarimorphosis extends SubTileFunctional {
values.add(block);
}
return values.get(supertile.getWorld().rand.nextInt(values.size())).getDefaultState();
return values.get(getWorld().rand.nextInt(values.size())).getDefaultState();
}
private Block biomeTypeToBlock(Type biomeType) {
@@ -115,14 +123,14 @@ public class SubTileMarimorphosis extends SubTileFunctional {
BlockStateMatcher matcher = BlockStateMatcher.forBlock(Blocks.STONE);
for(BlockPos pos : BlockPos.getAllInBox(getPos().add(-range, -rangeY, -range), getPos().add(range, rangeY, range))) {
IBlockState state = supertile.getWorld().getBlockState(pos);
if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, matcher))
IBlockState state = getWorld().getBlockState(pos);
if(state.getBlock().isReplaceableOreGen(state, getWorld(), pos, matcher))
possibleCoords.add(pos);
}
if(possibleCoords.isEmpty())
return null;
return possibleCoords.get(supertile.getWorld().rand.nextInt(possibleCoords.size()));
return possibleCoords.get(getWorld().rand.nextInt(possibleCoords.size()));
}
@Override
@@ -159,8 +167,11 @@ public class SubTileMarimorphosis extends SubTileFunctional {
}
public static class Mini extends SubTileMarimorphosis {
public Mini(SubTileType type) {
super(type);
@ObjectHolder(LibMisc.MOD_ID + ":marimorphosis_chibi")
public static TileEntityType<SubTileMarimorphosis.Mini> TYPE;
public Mini() {
super(TYPE);
}
@Override public int getRange() { return RANGE_MINI; }
@@ -14,29 +14,34 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.potion.PotionEffect;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileMedumone extends SubTileFunctional {
public class SubTileMedumone extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":medumone")
public static TileEntityType<SubTileMedumone> TYPE;
private static final int RANGE = 6;
public SubTileMedumone(SubTileType type) {
super(type);
public SubTileMedumone() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(!supertile.getWorld().isRemote && mana > 0) {
List<EntityLivingBase> entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
if(!getWorld().isRemote && mana > 0) {
List<EntityLivingBase> entities = getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
for(EntityLivingBase entity : entities)
if(!(entity instanceof EntityPlayer)) {
@@ -13,31 +13,33 @@ package vazkii.botania.common.block.subtile.functional;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.Tag;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.WeightedRandom;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Predicate;
public class SubTileOrechid extends SubTileFunctional {
public class SubTileOrechid extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":orechid")
public static TileEntityType<SubTileOrechid> TYPE;
private static final int COST = 17500;
private static final int COST_GOG = 700;
@@ -47,15 +49,19 @@ public class SubTileOrechid extends SubTileFunctional {
private static final int RANGE_Y = 3;
private static final int TRIES = 20;
public SubTileOrechid(SubTileType type) {
public SubTileOrechid(TileEntityType<?> type) {
super(type);
}
@Override
public void onUpdate() {
super.onUpdate();
public SubTileOrechid() {
this(TYPE);
}
if(supertile.getWorld().isRemote || redstoneSignal > 0 || !canOperate())
@Override
public void tickFlower() {
super.tickFlower();
if(getWorld().isRemote || redstoneSignal > 0 || !canOperate())
return;
int cost = getCost();
@@ -64,10 +70,10 @@ public class SubTileOrechid extends SubTileFunctional {
if(coords != null) {
IBlockState state = getOreToPut();
if(state != null) {
supertile.getWorld().setBlockState(coords, state);
getWorld().setBlockState(coords, state);
if(ConfigHandler.COMMON.blockBreakParticles.get())
supertile.getWorld().playEvent(2001, coords, Block.getStateId(state));
supertile.getWorld().playSound(null, supertile.getPos(), ModSounds.orechid, SoundCategory.BLOCKS, 2F, 1F);
getWorld().playEvent(2001, coords, Block.getStateId(state));
getWorld().playSound(null, getPos(), ModSounds.orechid, SoundCategory.BLOCKS, 2F, 1F);
mana -= cost;
sync();
@@ -83,7 +89,7 @@ public class SubTileOrechid extends SubTileFunctional {
for(ResourceLocation s : map.keySet())
values.add(new TagRandomItem(map.get(s), s));
ResourceLocation ore = ((TagRandomItem) WeightedRandom.getRandomItem(supertile.getWorld().rand, values)).s;
ResourceLocation ore = ((TagRandomItem) WeightedRandom.getRandomItem(getWorld().rand, values)).s;
Tag<Block> tag = BlockTags.getCollection().get(ore);
if(tag != null && !tag.getAllElements().isEmpty()) {
return tag.getRandomElement(getWorld().getRandom()).getDefaultState();
@@ -97,14 +103,14 @@ public class SubTileOrechid extends SubTileFunctional {
List<BlockPos> possibleCoords = new ArrayList<>();
for(BlockPos pos : BlockPos.getAllInBox(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE, RANGE_Y, RANGE))) {
IBlockState state = supertile.getWorld().getBlockState(pos);
if(state.getBlock().isReplaceableOreGen(state, supertile.getWorld(), pos, getReplaceMatcher()))
IBlockState state = getWorld().getBlockState(pos);
if(state.getBlock().isReplaceableOreGen(state, getWorld(), pos, getReplaceMatcher()))
possibleCoords.add(pos);
}
if(possibleCoords.isEmpty())
return null;
return possibleCoords.get(supertile.getWorld().rand.nextInt(possibleCoords.size()));
return possibleCoords.get(getWorld().rand.nextInt(possibleCoords.size()));
}
public boolean canOperate() {
@@ -12,26 +12,31 @@ package vazkii.botania.common.block.subtile.functional;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.Map;
import java.util.function.Predicate;
public class SubTileOrechidIgnem extends SubTileOrechid {
@ObjectHolder(LibMisc.MOD_ID + ":orechid_ignem")
public static TileEntityType<SubTileOrechidIgnem> TYPE;
private static final int COST = 20000;
public SubTileOrechidIgnem(SubTileType type) {
super(type);
public SubTileOrechidIgnem() {
super(TYPE);
}
@Override
public boolean canOperate() {
return supertile.getWorld().getDimension().isNether();
return getWorld().getDimension().isNether();
}
@Override
@@ -13,33 +13,37 @@ package vazkii.botania.common.block.subtile.functional;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibObfuscation;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTilePollidisiac extends SubTileFunctional {
public class SubTilePollidisiac extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":pollidisiac")
public static TileEntityType<SubTilePollidisiac> TYPE;
private static final int RANGE = 6;
public SubTilePollidisiac(SubTileType type) {
super(type);
public SubTilePollidisiac() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(!supertile.getWorld().isRemote) {
if(!getWorld().isRemote) {
int manaCost = 12;
List<EntityItem> items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
List<EntityAnimal> animals = supertile.getWorld().getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
List<EntityItem> items = getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
List<EntityAnimal> animals = getWorld().getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
int slowdown = getSlowdownFactor();
for(EntityAnimal animal : animals) {
@@ -58,7 +62,7 @@ public class SubTilePollidisiac extends SubTileFunctional {
mana -= manaCost;
animal.inLove = 1200;
supertile.getWorld().setEntityState(animal, (byte)18);
getWorld().setEntityState(animal, (byte)18);
}
}
}
@@ -16,44 +16,40 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUseContext;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.registries.ObjectHolder;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.item.IFlowerPlaceable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.ISubTileContainer;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibObfuscation;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
public class SubTileRannuncarpus extends SubTileFunctional {
public class SubTileRannuncarpus extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":rannuncarpus")
public static TileEntityType<SubTileRannuncarpus> TYPE;
private static final int RANGE = 2;
private static final int RANGE_Y = 3;
@@ -65,19 +61,23 @@ public class SubTileRannuncarpus extends SubTileFunctional {
private static final int RANGE_PLACE_MINI = 2;
private static final int RANGE_PLACE_Y_MINI = 2;
public SubTileRannuncarpus(SubTileType type) {
public SubTileRannuncarpus(TileEntityType<?> type) {
super(type);
}
@Override
public void onUpdate() {
super.onUpdate();
public SubTileRannuncarpus() {
this(TYPE);
}
if(supertile.getWorld().isRemote || redstoneSignal > 0)
@Override
public void tickFlower() {
super.tickFlower();
if(getWorld().isRemote || redstoneSignal > 0)
return;
if(ticksExisted % 10 == 0) {
List<EntityItem> items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1)));
List<EntityItem> items = getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1)));
List<BlockPos> validPositions = getCandidatePositions();
int slowdown = getSlowdownFactor();
@@ -89,8 +89,8 @@ public class SubTileRannuncarpus extends SubTileFunctional {
Item stackItem = stack.getItem();
if(stackItem instanceof ItemBlock || stackItem instanceof IFlowerPlaceable) {
if(!validPositions.isEmpty()) {
BlockPos coords = validPositions.get(supertile.getWorld().rand.nextInt(validPositions.size()));
BlockItemUseContext ctx = new RannuncarpusPlaceContext(supertile.getWorld(), stack, coords, EnumFacing.UP, 0, 0, 0);
BlockPos coords = validPositions.get(getWorld().rand.nextInt(validPositions.size()));
BlockItemUseContext ctx = new RannuncarpusPlaceContext(getWorld(), stack, coords, EnumFacing.UP, 0, 0, 0);
boolean success = false;
if(stackItem instanceof IFlowerPlaceable) {
@@ -101,8 +101,8 @@ public class SubTileRannuncarpus extends SubTileFunctional {
if(success) {
if(ConfigHandler.COMMON.blockBreakParticles.get()) {
IBlockState state = supertile.getWorld().getBlockState(ctx.getPos());
supertile.getWorld().playEvent(2001, coords, Block.getStateId(state));
IBlockState state = getWorld().getBlockState(ctx.getPos());
getWorld().playEvent(2001, coords, Block.getStateId(state));
}
validPositions.remove(coords);
if(mana > 1)
@@ -116,18 +116,18 @@ public class SubTileRannuncarpus extends SubTileFunctional {
}
public IBlockState getUnderlyingBlock() {
return supertile.getWorld().getBlockState(supertile.getPos().down(supertile instanceof IFloatingFlower ? 1 : 2));
return getWorld().getBlockState(getPos().down(isFloating() ? 1 : 2));
}
private List<BlockPos> getCandidatePositions() {
int rangePlace = getRange();
int rangePlaceY = getRangeY();
BlockPos pos = supertile.getPos();
BlockPos pos = getPos();
IBlockState filter = getUnderlyingBlock();
List<BlockPos> ret = new ArrayList<>();
for (BlockPos pos_ : BlockPos.getAllInBox(pos.add(-rangePlace, -rangePlaceY, -rangePlace), pos.add(rangePlace, rangePlaceY, rangePlace))) {
if (filter == supertile.getWorld().getBlockState(pos_))
if (filter == getWorld().getBlockState(pos_))
ret.add(pos_);
}
return ret;
@@ -194,8 +194,11 @@ public class SubTileRannuncarpus extends SubTileFunctional {
}
public static class Mini extends SubTileRannuncarpus {
public Mini(SubTileType type) {
super(type);
@ObjectHolder(LibMisc.MOD_ID + ":rannuncarpus_chibi")
public static TileEntityType<SubTileRannuncarpus.Mini> TYPE;
public Mini() {
super(TYPE);
}
@Override public int getRange() { return mana > 0 ? RANGE_PLACE_MANA_MINI : RANGE_PLACE_MINI; }
@@ -12,29 +12,38 @@ package vazkii.botania.common.block.subtile.functional;
import com.google.common.collect.MapMaker;
import net.minecraft.entity.Entity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.Collections;
import java.util.Set;
public class SubTileSolegnolia extends SubTileFunctional {
public class SubTileSolegnolia extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":solegnolia")
public static TileEntityType<SubTileSolegnolia> TYPE;
private static final double RANGE = 5;
private static final double RANGE_MINI = 1;
private static final Set<SubTileSolegnolia> existingFlowers = Collections.newSetFromMap(new MapMaker().concurrencyLevel(2).weakKeys().makeMap());
public SubTileSolegnolia(SubTileType type) {
public SubTileSolegnolia(TileEntityType<?> type) {
super(type);
}
public SubTileSolegnolia() {
this(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(!existingFlowers.contains(this)) {
existingFlowers.add(this);
@@ -49,9 +58,9 @@ public class SubTileSolegnolia extends SubTileFunctional {
public static boolean hasSolegnoliaAround(Entity e) {
return existingFlowers.stream()
.filter(f -> f.redstoneSignal == 0)
.filter(f -> f.supertile.getWorld() == e.world)
.filter(f -> f.supertile.getWorld().getTileEntity(f.supertile.getPos()) == f.supertile)
.filter(f -> f.supertile.getDistanceSq(e.posX, e.posY, e.posZ) <= f.getRange() * f.getRange())
.filter(f -> f.getWorld() == e.world)
.filter(f -> f.getWorld().getTileEntity(f.getPos()) == f)
.filter(f -> f.getDistanceSq(e.posX, e.posY, e.posZ) <= f.getRange() * f.getRange())
.findAny().isPresent();
}
@@ -80,8 +89,11 @@ public class SubTileSolegnolia extends SubTileFunctional {
}
public static class Mini extends SubTileSolegnolia {
public Mini(SubTileType type) {
super(type);
@ObjectHolder(LibMisc.MOD_ID + ":solegnolia_chibi")
public static TileEntityType<SubTileSolegnolia.Mini> TYPE;
public Mini() {
super(TYPE);
}
@Override public double getRange() { return RANGE_MINI; }
@@ -17,25 +17,28 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.mana.IManaItem;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.network.PacketBotaniaEffect;
import vazkii.botania.common.network.PacketHandler;
import java.util.List;
public class SubTileSpectranthemum extends SubTileFunctional {
public class SubTileSpectranthemum extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":spectranthemum")
public static TileEntityType<SubTileSpectranthemum> TYPE;
private static final String TAG_BIND_X = "bindX";
private static final String TAG_BIND_Y = "bindY";
@@ -49,20 +52,20 @@ public class SubTileSpectranthemum extends SubTileFunctional {
private BlockPos bindPos = new BlockPos(0, -1, 0);
public SubTileSpectranthemum(SubTileType type) {
super(type);
public SubTileSpectranthemum() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(!supertile.getWorld().isRemote && redstoneSignal == 0 && supertile.getWorld().isBlockLoaded(bindPos)) {
BlockPos pos = supertile.getPos();
if(!getWorld().isRemote && redstoneSignal == 0 && getWorld().isBlockLoaded(bindPos)) {
BlockPos pos = getPos();
boolean did = false;
List<EntityItem> items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(-RANGE, -RANGE, -RANGE), pos.add(RANGE + 1, RANGE + 1, RANGE + 1)));
List<EntityItem> items = getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(-RANGE, -RANGE, -RANGE), pos.add(RANGE + 1, RANGE + 1, RANGE + 1)));
int slowdown = getSlowdownFactor();
for(EntityItem item : items) {
@@ -139,7 +142,7 @@ public class SubTileSpectranthemum extends SubTileFunctional {
public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) {
boolean bound = super.bindTo(player, wand, pos, side);
if(!bound && !pos.equals(bindPos) && pos.distanceSq(supertile.getPos()) <= BIND_RANGE * BIND_RANGE && !pos.equals(supertile.getPos())) {
if(!bound && !pos.equals(bindPos) && pos.distanceSq(getPos()) <= BIND_RANGE * BIND_RANGE && !pos.equals(getPos())) {
bindPos = pos;
sync();
@@ -12,38 +12,47 @@ package vazkii.botania.common.block.subtile.functional;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileTangleberrie extends SubTileFunctional {
public class SubTileTangleberrie extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":tangleberrie")
public static TileEntityType<SubTileTangleberrie> TYPE;
public SubTileTangleberrie(SubTileType type) {
public SubTileTangleberrie(TileEntityType<?> type) {
super(type);
}
public SubTileTangleberrie() {
this(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(mana > 0) {
double x1 = supertile.getPos().getX() + 0.5;
double y1 = supertile.getPos().getY() + 0.5;
double z1 = supertile.getPos().getZ() + 0.5;
double x1 = getPos().getX() + 0.5;
double y1 = getPos().getY() + 0.5;
double z1 = getPos().getZ() + 0.5;
double maxDist = getMaxDistance();
double range = getRange();
AxisAlignedBB boundingBox = new AxisAlignedBB(x1 - range, y1 - range, z1 - range, x1 + range + 1, y1 + range + 1, z1 + range + 1);
List<EntityLivingBase> entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, boundingBox);
List<EntityLivingBase> entities = getWorld().getEntitiesWithinAABB(EntityLivingBase.class, boundingBox);
for(EntityLivingBase entity : entities) {
if(entity instanceof EntityPlayer || !entity.isNonBoss())
@@ -57,7 +66,7 @@ public class SubTileTangleberrie extends SubTileFunctional {
if(distance > maxDist && distance < range) {
MathHelper.setEntityMotionFromVector(entity, new Vector3(x1, y1, z1), getMotionVelocity());
if(supertile.getWorld().rand.nextInt(3) == 0)
if(getWorld().rand.nextInt(3) == 0)
Botania.proxy.sparkleFX(x2 + Math.random() * entity.width, y2 + Math.random() * entity.height, z2 + Math.random() * entity.width, 0.5F, 0.5F, 0.5F, 1F, 3);
}
}
@@ -18,38 +18,42 @@ import net.minecraft.entity.item.EntityEnderCrystal;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.passive.EntityOcelot;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibObfuscation;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.List;
public class SubTileTigerseye extends SubTileFunctional {
public class SubTileTigerseye extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":tigerseye")
public static TileEntityType<SubTileTigerseye> TYPE;
private static final int RANGE = 10;
private static final int RANGE_Y = 4;
public SubTileTigerseye(SubTileType type) {
super(type);
public SubTileTigerseye() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(supertile.getWorld().isRemote)
if(getWorld().isRemote)
return;
final int cost = 70;
boolean shouldAfffect = mana >= cost;
List<EntityLiving> entities = supertile.getWorld().getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1)));
List<EntityLiving> entities = getWorld().getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE_Y, -RANGE), getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1)));
for(EntityLiving entity : entities) {
List<EntityAITaskEntry> entries = new ArrayList<>(entity.tasks.taskEntries);
@@ -11,45 +11,46 @@
package vazkii.botania.common.block.subtile.functional;
import net.minecraft.entity.monster.EntityEnderman;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.EnderTeleportEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.registries.ObjectHolder;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
public class SubTileVinculotus extends SubTileFunctional {
public class SubTileVinculotus extends TileEntityFunctionalFlower {
@ObjectHolder(LibMisc.MOD_ID + ":vinculotus")
public static TileEntityType<SubTileVinculotus> TYPE;
// Must store position since red string spoofers are only active during onUpdate
// Must store position since red string spoofers are only active during tick
// But our main logic runs outside, in the event handler
public static final Map<SubTileVinculotus, BlockPos> existingFlowers = new WeakHashMap<>();
private static final int RANGE = 64;
public SubTileVinculotus(SubTileType type) {
super(type);
public SubTileVinculotus() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(!supertile.getWorld().isRemote) {
if(!getWorld().isRemote) {
BlockPos pos = existingFlowers.get(this);
if (pos == null || !pos.equals(getPos()))
existingFlowers.put(this, getPos());
@@ -91,7 +92,7 @@ public class SubTileVinculotus extends SubTileFunctional {
SubTileVinculotus flower = e.getKey();
BlockPos activePos = e.getValue();
if(flower == null || flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.getEntityLiving().world || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile)
if(flower == null || flower.redstoneSignal > 0 || flower.mana <= cost || flower.getWorld() != event.getEntityLiving().world || flower.getWorld().getTileEntity(flower.getPos()) != flower)
continue;
double x = activePos.getX() + 0.5;
@@ -12,32 +12,37 @@ package vazkii.botania.common.block.subtile.generating;
import net.minecraft.entity.item.EntityXPOrb;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.helper.ExperienceHelper;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileArcaneRose extends SubTileGenerating {
public class SubTileArcaneRose extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":rosa_arcana")
public static TileEntityType<SubTileArcaneRose> TYPE;
private static final int RANGE = 1;
public SubTileArcaneRose(SubTileType type) {
super(type);
public SubTileArcaneRose() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(mana >= getMaxMana())
return;
List<EntityPlayer> players = supertile.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
List<EntityPlayer> players = getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
for(EntityPlayer player : players)
if(ExperienceHelper.getPlayerXP(player) >= 1 && player.onGround) {
ExperienceHelper.drainPlayerXP(player, 1);
@@ -45,7 +50,7 @@ public class SubTileArcaneRose extends SubTileGenerating {
return;
}
List<EntityXPOrb> orbs = supertile.getWorld().getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
List<EntityXPOrb> orbs = getWorld().getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
for(EntityXPOrb orb : orbs) {
mana += orb.getXpValue() * 35;
orb.remove();
@@ -13,20 +13,25 @@ package vazkii.botania.common.block.subtile.generating;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.block.tile.TileCell;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.List;
public class SubTileDandelifeon extends SubTileGenerating {
public class SubTileDandelifeon extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":dandelifeon")
public static TileEntityType<SubTileDandelifeon> TYPE;
private static final int RANGE = 12;
private static final int SPEED = 10;
@@ -45,15 +50,15 @@ public class SubTileDandelifeon extends SubTileGenerating {
{ +0, -1 }
};
public SubTileDandelifeon(SubTileType type) {
super(type);
public SubTileDandelifeon() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(!supertile.getWorld().isRemote && redstoneSignal > 0 && ticksExisted % SPEED == 0)
if(!getWorld().isRemote && redstoneSignal > 0 && ticksExisted % SPEED == 0)
runSimulation();
}
@@ -93,7 +98,7 @@ public class SubTileDandelifeon extends SubTileGenerating {
}
}
BlockPos pos = supertile.getPos();
BlockPos pos = getPos();
for(int[] change : changes) {
BlockPos pos_ = pos.add(-RANGE + change[0], 0, -RANGE + change[1]);
@@ -111,7 +116,7 @@ public class SubTileDandelifeon extends SubTileGenerating {
int diam = RANGE * 2 + 1;
int[][] table = new int[diam][diam];
BlockPos pos = supertile.getPos();
BlockPos pos = getPos();
for(int i = 0; i < diam; i++)
for(int j = 0; j < diam; j++) {
@@ -123,9 +128,9 @@ public class SubTileDandelifeon extends SubTileGenerating {
}
private int getCellGeneration(BlockPos pos) {
TileEntity tile = supertile.getWorld().getTileEntity(pos);
TileEntity tile = getWorld().getTileEntity(pos);
if(tile instanceof TileCell)
return ((TileCell) tile).isSameFlower(supertile) ? ((TileCell) tile).getGeneration() : 0;
return ((TileCell) tile).isSameFlower(this) ? ((TileCell) tile).getGeneration() : 0;
return -1;
}
@@ -165,7 +170,7 @@ public class SubTileDandelifeon extends SubTileGenerating {
}
void setBlockForGeneration(BlockPos pos, int gen, int prevGen) {
World world = supertile.getWorld();
World world = getWorld();
IBlockState stateAt = world.getBlockState(pos);
Block blockAt = stateAt.getBlock();
TileEntity tile = world.getTileEntity(pos);
@@ -176,11 +181,11 @@ public class SubTileDandelifeon extends SubTileGenerating {
} else if(blockAt == ModBlocks.cellBlock) {
if(gen < 0)
world.removeBlock(pos);
else ((TileCell) tile).setGeneration(supertile, gen);
} else if(gen >= 0 && blockAt.isAir(stateAt, supertile.getWorld(), pos)) {
else ((TileCell) tile).setGeneration(this, gen);
} else if(gen >= 0 && blockAt.isAir(stateAt, getWorld(), pos)) {
world.setBlockState(pos, ModBlocks.cellBlock.getDefaultState());
tile = world.getTileEntity(pos);
((TileCell) tile).setGeneration(supertile, gen);
((TileCell) tile).setGeneration(this, gen);
}
}
@@ -14,23 +14,27 @@ import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Particles;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.block.mana.BlockSpreader;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
public class SubTileEndoflame extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":endoflame")
public static TileEntityType<SubTileEndoflame> TYPE;
public class SubTileEndoflame extends SubTileGenerating {
private static final String TAG_BURN_TIME = "burnTime";
private static final int FUEL_CAP = 32000;
private static final int RANGE = 3;
@@ -38,21 +42,21 @@ public class SubTileEndoflame extends SubTileGenerating {
private int burnTime = 0;
public SubTileEndoflame(SubTileType type) {
super(type);
public SubTileEndoflame() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(burnTime > 0)
burnTime--;
if(getWorld().isRemote) {
if(burnTime > 0 && supertile.getWorld().rand.nextInt(10) == 0) {
if(burnTime > 0 && getWorld().rand.nextInt(10) == 0) {
Vec3d offset = getWorld().getBlockState(getPos()).getOffset(getWorld(), getPos()).add(0.4, 0.7, 0.4);
supertile.getWorld().addParticle(Particles.FLAME, supertile.getPos().getX() + offset.x + Math.random() * 0.2, supertile.getPos().getY() + offset.y, supertile.getPos().getZ() + offset.z + Math.random() * 0.2, 0.0D, 0.0D, 0.0D);
getWorld().addParticle(Particles.FLAME, getPos().getX() + offset.x + Math.random() * 0.2, getPos().getY() + offset.y, getPos().getZ() + offset.z + Math.random() * 0.2, 0.0D, 0.0D, 0.0D);
}
return;
}
@@ -62,7 +66,7 @@ public class SubTileEndoflame extends SubTileGenerating {
if(mana < getMaxMana()) {
int slowdown = getSlowdownFactor();
for(EntityItem item : supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)))) {
for(EntityItem item : getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)))) {
if(item.age >= 59 + slowdown && !item.removed) {
ItemStack stack = item.getItem();
if(stack.isEmpty() || stack.getItem().hasContainerItem(stack))
@@ -73,7 +77,7 @@ public class SubTileEndoflame extends SubTileGenerating {
this.burnTime = Math.min(FUEL_CAP, burnTime) / 2;
stack.shrink(1);
supertile.getWorld().playSound(null, supertile.getPos(), ModSounds.endoflame, SoundCategory.BLOCKS, 0.2F, 1F);
getWorld().playSound(null, getPos(), ModSounds.endoflame, SoundCategory.BLOCKS, 0.2F, 1F);
getWorld().addBlockEvent(getPos(), getWorld().getBlockState(getPos()).getBlock(), START_BURN_EVENT, item.getEntityId());
sync();
@@ -14,42 +14,45 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityTNTPrimed;
import net.minecraft.init.Particles;
import net.minecraft.init.SoundEvents;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.network.PacketBotaniaEffect;
import vazkii.botania.common.network.PacketHandler;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileEntropinnyum extends SubTileGenerating {
public class SubTileEntropinnyum extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":entropinnyum")
public static TileEntityType<SubTileEntropinnyum> TYPE;
private static final int RANGE = 12;
private static final int EXPLODE_EFFECT_EVENT = 0;
public SubTileEntropinnyum(SubTileType type) {
super(type);
public SubTileEntropinnyum() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(!supertile.getWorld().isRemote && mana == 0) {
List<EntityTNTPrimed> tnts = supertile.getWorld().getEntitiesWithinAABB(EntityTNTPrimed.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
if(!getWorld().isRemote && mana == 0) {
List<EntityTNTPrimed> tnts = getWorld().getEntitiesWithinAABB(EntityTNTPrimed.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
for(EntityTNTPrimed tnt : tnts) {
if(tnt.getFuse() == 1 && !tnt.removed && !supertile.getWorld().getBlockState(new BlockPos(tnt)).getMaterial().isLiquid()) {
tnt.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 0.2F, (1F + (supertile.getWorld().rand.nextFloat() - supertile.getWorld().rand.nextFloat()) * 0.2F) * 0.7F);
if(tnt.getFuse() == 1 && !tnt.removed && !getWorld().getBlockState(new BlockPos(tnt)).getMaterial().isLiquid()) {
tnt.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 0.2F, (1F + (getWorld().rand.nextFloat() - getWorld().rand.nextFloat()) * 0.2F) * 0.7F);
tnt.remove();
mana += getMaxMana();
sync();
getWorld().addBlockEvent(getPos(), supertile.getBlockState().getBlock(), EXPLODE_EFFECT_EVENT, tnt.getEntityId());
getWorld().addBlockEvent(getPos(), getBlockState().getBlock(), EXPLODE_EFFECT_EVENT, tnt.getEntityId());
break;
}
}
@@ -13,25 +13,29 @@ package vazkii.botania.common.block.subtile.generating;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Particles;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.particles.ItemParticleData;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.WorldServer;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileGourmaryllis extends SubTileGenerating {
public class SubTileGourmaryllis extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":gourmaryllis")
public static TileEntityType<SubTileGourmaryllis> TYPE;
private static final String TAG_COOLDOWN = "cooldown";
private static final String TAG_DIGESTING_MANA = "digestingMana";
@@ -44,15 +48,15 @@ public class SubTileGourmaryllis extends SubTileGenerating {
private ItemStack lastFood = ItemStack.EMPTY;
private int lastFoodCount = 0;
public SubTileGourmaryllis(SubTileType type) {
super(type);
public SubTileGourmaryllis() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if (supertile.getWorld().isRemote)
if (getWorld().isRemote)
return;
if(cooldown > -1)
@@ -65,20 +69,20 @@ public class SubTileGourmaryllis extends SubTileGenerating {
digestingMana = 0;
float burpPitch = 1 - (lastFoodCount - 1) * 0.05F;
getWorld().playSound(null, supertile.getPos(), SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.BLOCKS, 1, burpPitch);
getWorld().playSound(null, getPos(), SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.BLOCKS, 1, burpPitch);
sync();
} else if(cooldown % munchInterval == 0) {
getWorld().playSound(null, supertile.getPos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 0.5f, 1);
getWorld().playSound(null, getPos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 0.5f, 1);
Vec3d offset = getWorld().getBlockState(getPos()).getOffset(getWorld(), getPos()).add(0.4, 0.6, 0.4);
((WorldServer) supertile.getWorld()).spawnParticle(new ItemParticleData(Particles.ITEM, lastFood), supertile.getPos().getX()+offset.x, supertile.getPos().getY()+offset.y, supertile.getPos().getZ()+offset.z, 10, 0.1D, 0.1D, 0.1D, 0.03D);
((WorldServer) getWorld()).spawnParticle(new ItemParticleData(Particles.ITEM, lastFood), getPos().getX()+offset.x, getPos().getY()+offset.y, getPos().getZ()+offset.z, 10, 0.1D, 0.1D, 0.1D, 0.03D);
}
}
int slowdown = getSlowdownFactor();
List<EntityItem> items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
List<EntityItem> items = getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
for(EntityItem item : items) {
ItemStack stack = item.getItem();
@@ -99,7 +103,7 @@ public class SubTileGourmaryllis extends SubTileGenerating {
cooldown = val * 10;
item.playSound(SoundEvents.ENTITY_GENERIC_EAT, 0.2F, 0.6F);
sync();
((WorldServer) supertile.getWorld()).spawnParticle(new ItemParticleData(Particles.ITEM, stack), item.posX, item.posY, item.posZ, 20, 0.1D, 0.1D, 0.1D, 0.05D);
((WorldServer) getWorld()).spawnParticle(new ItemParticleData(Particles.ITEM, stack), item.posX, item.posY, item.posZ, 20, 0.1D, 0.1D, 0.1D, 0.05D);
}
item.remove();
@@ -21,24 +21,29 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tags.FluidTags;
import net.minecraft.tags.Tag;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
public class SubTileHydroangeas extends SubTileGenerating {
public class SubTileHydroangeas extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":hydroangeas")
public static TileEntityType<SubTileHydroangeas> TYPE;
private static final String TAG_BURN_TIME = "burnTime";
private static final String TAG_COOLDOWN = "cooldown";
@@ -47,44 +52,48 @@ public class SubTileHydroangeas extends SubTileGenerating {
int burnTime, cooldown;
public SubTileHydroangeas(SubTileType type) {
public SubTileHydroangeas() {
this(TYPE);
}
public SubTileHydroangeas(TileEntityType<?> type) {
super(type);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(cooldown > 0) {
cooldown--;
for(int i = 0; i < 3; i++)
Botania.proxy.wispFX(supertile.getPos().getX() + 0.5 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.5 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5 + Math.random() * 0.2 - 0.1, 0.1F, 0.1F, 0.1F, (float) Math.random() / 6, (float) -Math.random() / 30);
Botania.proxy.wispFX(getPos().getX() + 0.5 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.5 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5 + Math.random() * 0.2 - 0.1, 0.1F, 0.1F, 0.1F, (float) Math.random() / 6, (float) -Math.random() / 30);
}
if(burnTime == 0) {
if(mana < getMaxMana() && !supertile.getWorld().isRemote) {
if(mana < getMaxMana() && !getWorld().isRemote) {
List<BlockPos> offsets = Arrays.asList(OFFSETS);
Collections.shuffle(offsets);
for(BlockPos offset : offsets) {
BlockPos pos = supertile.getPos().add(offset);
BlockPos pos = getPos().add(offset);
IFluidState fstate = supertile.getWorld().getFluidState(pos);
IFluidState fstate = getWorld().getFluidState(pos);
Tag<Fluid> search = getMaterialToSearchFor();
if(fstate.isTagged(search)
&& (getBlockToSearchBelow() == null
|| supertile.getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow())
|| getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow())
&& fstate.isSource()) {
if(search != FluidTags.WATER)
supertile.getWorld().setBlockState(pos, Blocks.AIR.getDefaultState());
getWorld().setBlockState(pos, Blocks.AIR.getDefaultState());
else {
int waterAround = 0;
for(EnumFacing dir : EnumFacing.values())
if(supertile.getWorld().getFluidState(pos.offset(dir)).isTagged(search))
if(getWorld().getFluidState(pos.offset(dir)).isTagged(search))
waterAround++;
if(waterAround < 2)
supertile.getWorld().setBlockState(pos, Blocks.AIR.getDefaultState());
getWorld().setBlockState(pos, Blocks.AIR.getDefaultState());
}
if(cooldown == 0)
@@ -98,7 +107,7 @@ public class SubTileHydroangeas extends SubTileGenerating {
}
}
} else {
if(supertile.getWorld().rand.nextInt(8) == 0)
if(getWorld().rand.nextInt(8) == 0)
doBurnParticles();
burnTime--;
if(burnTime == 0) {
@@ -109,7 +118,7 @@ public class SubTileHydroangeas extends SubTileGenerating {
}
public void doBurnParticles() {
Botania.proxy.wispFX(supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.05F, 0.05F, 0.7F, (float) Math.random() / 6, (float) -Math.random() / 60);
Botania.proxy.wispFX(getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, 0.05F, 0.05F, 0.7F, (float) Math.random() / 6, (float) -Math.random() / 60);
}
public Tag<Fluid> getMaterialToSearchFor() {
@@ -121,7 +130,7 @@ public class SubTileHydroangeas extends SubTileGenerating {
}
public void playSound() {
supertile.getWorld().playSound(null, supertile.getPos(), SoundEvents.ENTITY_GENERIC_DRINK, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F);
getWorld().playSound(null, getPos(), SoundEvents.ENTITY_GENERIC_DRINK, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F);
}
public int getBurnTime() {
@@ -188,7 +197,7 @@ public class SubTileHydroangeas extends SubTileGenerating {
@Override
public int getDelayBetweenPassiveGeneration() {
boolean rain = supertile.getWorld().getBiome(supertile.getPos()).getPrecipitation() == Biome.RainType.RAIN && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering());
boolean rain = getWorld().getBiome(getPos()).getPrecipitation() == Biome.RainType.RAIN && (getWorld().isRaining() || getWorld().isThundering());
return rain ? 2 : 3;
}
@@ -14,46 +14,51 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockCake;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.SoundEvents;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
public class SubTileKekimurus extends SubTileGenerating {
public class SubTileKekimurus extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":kekimurus")
public static TileEntityType<SubTileKekimurus> TYPE;
private static final int RANGE = 5;
public SubTileKekimurus(SubTileType type) {
super(type);
public SubTileKekimurus() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if (supertile.getWorld().isRemote)
if (getWorld().isRemote)
return;
int mana = 1800;
if(getMaxMana() - this.mana >= mana && !supertile.getWorld().isRemote && ticksExisted % 80 == 0) {
if(getMaxMana() - this.mana >= mana && !getWorld().isRemote && ticksExisted % 80 == 0) {
for(int i = 0; i < RANGE * 2 + 1; i++)
for(int j = 0; j < RANGE * 2 + 1; j++)
for(int k = 0; k < RANGE * 2 + 1; k++) {
BlockPos pos = supertile.getPos().add(i - RANGE, j - RANGE, k - RANGE);
IBlockState state = supertile.getWorld().getBlockState(pos);
BlockPos pos = getPos().add(i - RANGE, j - RANGE, k - RANGE);
IBlockState state = getWorld().getBlockState(pos);
Block block = state.getBlock();
if(block instanceof BlockCake) {
int nextSlicesEaten = state.get(BlockCake.BITES) + 1;
if(nextSlicesEaten > 6)
supertile.getWorld().removeBlock(pos);
else supertile.getWorld().setBlockState(pos, state.with(BlockCake.BITES, nextSlicesEaten), 1 | 2);
getWorld().removeBlock(pos);
else getWorld().setBlockState(pos, state.with(BlockCake.BITES, nextSlicesEaten), 1 | 2);
supertile.getWorld().playEvent(2001, pos, Block.getStateId(state));
supertile.getWorld().playSound(null, supertile.getPos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 1F, 0.5F + (float) Math.random() * 0.5F);
getWorld().playEvent(2001, pos, Block.getStateId(state));
getWorld().playSound(null, getPos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 1F, 0.5F + (float) Math.random() * 0.5F);
this.mana += mana;
sync();
return;
@@ -11,28 +11,32 @@
package vazkii.botania.common.block.subtile.generating;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tags.BlockTags;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class SubTileMunchdew extends SubTileGenerating {
public class SubTileMunchdew extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":munchdew")
public static TileEntityType<SubTileMunchdew> TYPE;
private static final String TAG_COOLDOWN = "cooldown";
private static final String TAG_ATE_ONCE = "ateOnce";
@@ -44,13 +48,13 @@ public class SubTileMunchdew extends SubTileGenerating {
private int ticksWithoutEating = -1;
private int cooldown = 0;
public SubTileMunchdew(SubTileType type) {
super(type);
public SubTileMunchdew() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(getWorld().isRemote)
return;
@@ -66,13 +70,13 @@ public class SubTileMunchdew extends SubTileGenerating {
eatLeaves : {
if(getMaxMana() - mana >= manaPerLeaf && ticksExisted % 4 == 0) {
List<BlockPos> coords = new ArrayList<>();
BlockPos pos = supertile.getPos();
BlockPos pos = getPos();
nextCoord:
for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-RANGE, 0, -RANGE), pos.add(RANGE, RANGE_Y, RANGE))) {
if(supertile.getWorld().getBlockState(pos_).getBlock().isIn(BlockTags.LEAVES)) {
if(getWorld().getBlockState(pos_).getBlock().isIn(BlockTags.LEAVES)) {
for(EnumFacing dir : EnumFacing.values()) {
if(supertile.getWorld().isAirBlock(pos_.offset(dir))) {
if(getWorld().isAirBlock(pos_.offset(dir))) {
coords.add(pos_);
break nextCoord;
}
@@ -85,12 +89,12 @@ public class SubTileMunchdew extends SubTileGenerating {
Collections.shuffle(coords);
BlockPos breakCoords = coords.get(0);
IBlockState state = supertile.getWorld().getBlockState(breakCoords);
supertile.getWorld().removeBlock(breakCoords);
IBlockState state = getWorld().getBlockState(breakCoords);
getWorld().removeBlock(breakCoords);
ticksWithoutEating = 0;
ateOnce = true;
if(ConfigHandler.COMMON.blockBreakParticles.get())
supertile.getWorld().playEvent(2001, breakCoords, Block.getStateId(state));
getWorld().playEvent(2001, breakCoords, Block.getStateId(state));
mana += manaPerLeaf;
}
}
@@ -13,43 +13,46 @@ package vazkii.botania.common.block.subtile.generating;
import net.minecraft.entity.monster.EntitySlime;
import net.minecraft.init.Particles;
import net.minecraft.init.SoundEvents;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.SharedSeedRandom;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.event.entity.living.LivingSpawnEvent;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
public class SubTileNarslimmus extends SubTileGenerating {
public class SubTileNarslimmus extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":narslimmus")
public static TileEntityType<SubTileNarslimmus> TYPE;
public static final String TAG_WORLD_SPAWNED = "Botania:WorldSpawned";
private static final int RANGE = 2;
public SubTileNarslimmus(SubTileType type) {
super(type);
public SubTileNarslimmus() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if(ticksExisted % 5 == 0) {
List<EntitySlime> slimes = supertile.getWorld().getEntitiesWithinAABB(EntitySlime.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
List<EntitySlime> slimes = getWorld().getEntitiesWithinAABB(EntitySlime.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
for(EntitySlime slime : slimes) {
if(slime.getEntityData().getBoolean(TAG_WORLD_SPAWNED) && slime.isAlive()) {
int size = slime.getSlimeSize();
@@ -15,67 +15,72 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.Tag;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.ISubTileContainer;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nullable;
import java.util.List;
public class SubTileRafflowsia extends SubTileGenerating {
public class SubTileRafflowsia extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":rafflowsia")
public static TileEntityType<SubTileRafflowsia> TYPE;
private static final String TAG_LAST_FLOWER = "lastFlower";
private static final String TAG_LAST_FLOWER_TIMES = "lastFlowerTimes";
private static final Tag<Block> SPECIAL_FLOWERS = new BlockTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "special_flowers"));
private String lastFlower;
@Nullable
private Block lastFlower;
private int lastFlowerTimes;
private static final int RANGE = 5;
public SubTileRafflowsia(SubTileType type) {
super(type);
public SubTileRafflowsia() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
int mana = 2100;
if(getMaxMana() - this.mana >= mana && !supertile.getWorld().isRemote && ticksExisted % 40 == 0) {
if(getMaxMana() - this.mana >= mana && !getWorld().isRemote && ticksExisted % 40 == 0) {
for(int i = 0; i < RANGE * 2 + 1; i++)
for(int j = 0; j < RANGE * 2 + 1; j++)
for(int k = 0; k < RANGE * 2 + 1; k++) {
BlockPos pos = supertile.getPos().add(i - RANGE, j - RANGE, k - RANGE);
BlockPos pos = getPos().add(i - RANGE, j - RANGE, k - RANGE);
TileEntity tile = supertile.getWorld().getTileEntity(pos);
if(tile instanceof ISubTileContainer) {
SubTileEntity stile = ((ISubTileContainer) tile).getSubTile();
String name = stile.getUnlocalizedName();
if(!(stile instanceof SubTileRafflowsia)) {
boolean last = name.equals(lastFlower);
if(last)
lastFlowerTimes++;
else {
lastFlower = name;
lastFlowerTimes = 1;
}
float mod = 1F / lastFlowerTimes;
getWorld().destroyBlock(pos, false);
this.mana += mana * mod;
sync();
return;
IBlockState state = getWorld().getBlockState(pos);
if(state.isIn(SPECIAL_FLOWERS) && state.getBlock() != ModSubtiles.rafflowsia) {
if(state.getBlock() == lastFlower)
lastFlowerTimes++;
else {
lastFlower = state.getBlock();
lastFlowerTimes = 1;
}
float mod = 1F / lastFlowerTimes;
getWorld().destroyBlock(pos, false);
this.mana += mana * mod;
sync();
return;
}
}
}
@@ -85,7 +90,8 @@ public class SubTileRafflowsia extends SubTileGenerating {
public void writeToPacketNBT(NBTTagCompound cmp) {
super.writeToPacketNBT(cmp);
cmp.putString(TAG_LAST_FLOWER, lastFlower);
if(lastFlower != null)
cmp.putString(TAG_LAST_FLOWER, lastFlower.getRegistryName().toString());
cmp.putInt(TAG_LAST_FLOWER_TIMES, lastFlowerTimes);
}
@@ -93,7 +99,9 @@ public class SubTileRafflowsia extends SubTileGenerating {
public void readFromPacketNBT(NBTTagCompound cmp) {
super.readFromPacketNBT(cmp);
lastFlower = cmp.getString(TAG_LAST_FLOWER);
ResourceLocation id = ResourceLocation.tryCreate(cmp.getString(TAG_LAST_FLOWER));
if(id != null)
lastFlower = ForgeRegistries.BLOCKS.getValue(id);
lastFlowerTimes = cmp.getInt(TAG_LAST_FLOWER_TIMES);
}
@@ -102,7 +110,8 @@ public class SubTileRafflowsia extends SubTileGenerating {
super.populateDropStackNBTs(drops);
ItemStack stack = drops.get(0);
ItemNBTHelper.setString(stack, TAG_LAST_FLOWER, lastFlower);
if(lastFlower != null)
ItemNBTHelper.setString(stack, TAG_LAST_FLOWER, lastFlower.getRegistryName().toString());
ItemNBTHelper.setInt(stack, TAG_LAST_FLOWER_TIMES, lastFlowerTimes);
}
@@ -110,7 +119,9 @@ public class SubTileRafflowsia extends SubTileGenerating {
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) {
super.onBlockPlacedBy(world, pos, state, entity, stack);
lastFlower = ItemNBTHelper.getString(stack, TAG_LAST_FLOWER, "");
ResourceLocation id = ResourceLocation.tryCreate(ItemNBTHelper.getString(stack, TAG_LAST_FLOWER, ""));
if(id != null)
lastFlower = ForgeRegistries.BLOCKS.getValue(id);
lastFlowerTimes = ItemNBTHelper.getInt(stack, TAG_LAST_FLOWER_TIMES, 0);
}
@@ -9,28 +9,33 @@ import net.minecraft.entity.monster.IMob;
import net.minecraft.init.MobEffects;
import net.minecraft.init.Particles;
import net.minecraft.init.SoundEvents;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
public class SubTileShulkMeNot extends SubTileGenerating {
public class SubTileShulkMeNot extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":shulk_me_not")
public static TileEntityType<SubTileShulkMeNot> TYPE;
private static final int RADIUS = 8;
public SubTileShulkMeNot(SubTileType type) {
super(type);
public SubTileShulkMeNot() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
int generate = getMaxMana();
@@ -15,30 +15,33 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Blocks;
import net.minecraft.init.Particles;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.particles.ItemParticleData;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.WorldServer;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.registries.ObjectHolder;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.awt.Color;
import java.util.List;
public class SubTileSpectrolus extends SubTileGenerating {
public class SubTileSpectrolus extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":spectrolus")
public static TileEntityType<SubTileSpectrolus> TYPE;
private static final String TAG_NEXT_COLOR = "nextColor";
@@ -46,18 +49,18 @@ public class SubTileSpectrolus extends SubTileGenerating {
private EnumDyeColor nextColor = EnumDyeColor.WHITE;
public SubTileSpectrolus(SubTileType type) {
super(type);
public SubTileSpectrolus() {
super(TYPE);
}
@Override
public void onUpdate() {
super.onUpdate();
public void tickFlower() {
super.tickFlower();
if (supertile.getWorld().isRemote)
if (getWorld().isRemote)
return;
List<EntityItem> items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
List<EntityItem> items = getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(getPos().add(-RANGE, -RANGE, -RANGE), getPos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
int slowdown = getSlowdownFactor();
for(EntityItem item : items) {
@@ -71,7 +74,7 @@ public class SubTileSpectrolus extends SubTileGenerating {
nextColor = nextColor == EnumDyeColor.BLACK ? EnumDyeColor.WHITE : EnumDyeColor.values()[nextColor.ordinal() + 1];
sync();
((WorldServer) supertile.getWorld()).spawnParticle(new ItemParticleData(Particles.ITEM, stack), item.posX, item.posY, item.posZ, 20, 0.1D, 0.1D, 0.1D, 0.05D);
((WorldServer) getWorld()).spawnParticle(new ItemParticleData(Particles.ITEM, stack), item.posX, item.posY, item.posZ, 20, 0.1D, 0.1D, 0.1D, 0.05D);
}
item.remove();
@@ -14,17 +14,22 @@ import net.minecraft.block.material.Material;
import net.minecraft.fluid.Fluid;
import net.minecraft.tags.FluidTags;
import net.minecraft.tags.Tag;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.SoundCategory;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
public class SubTileThermalily extends SubTileHydroangeas {
@ObjectHolder(LibMisc.MOD_ID + ":thermalily")
public static TileEntityType<SubTileThermalily> TYPE;
public SubTileThermalily(SubTileType type) {
super(type);
public SubTileThermalily() {
super(TYPE);
}
@Override
@@ -39,7 +44,7 @@ public class SubTileThermalily extends SubTileHydroangeas {
@Override
public void doBurnParticles() {
Botania.proxy.wispFX(supertile.getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, supertile.getPos().getY() + 0.9 + Math.random() * 0.2 - 0.1, supertile.getPos().getZ() + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60);
Botania.proxy.wispFX(getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.9 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60);
}
@Override
@@ -49,7 +54,7 @@ public class SubTileThermalily extends SubTileHydroangeas {
@Override
public void playSound() {
supertile.getWorld().playSound(null, supertile.getPos(), ModSounds.thermalily, SoundCategory.BLOCKS, 0.2F, 1F);
getWorld().playSound(null, getPos(), ModSounds.thermalily, SoundCategory.BLOCKS, 0.2F, 1F);
}
@Override
@@ -10,69 +10,82 @@
*/
package vazkii.botania.common.block.tile;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.registries.ObjectHolder;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.capability.FloatingFlowerImpl;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.BlockFloatingFlower;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
public class TileFloatingFlower extends TileMod implements IFloatingFlower {
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class TileFloatingFlower extends TileMod {
@ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.MINI_ISLAND)
public static TileEntityType<TileFloatingFlower> TYPE;
private static final String TAG_ISLAND_TYPE = "islandType";
public static ItemStack forcedStack = ItemStack.EMPTY;
private IslandType type = IslandType.GRASS;
private static final String TAG_FLOATING_DATA = "floating";
public static ItemStack forcedStack = ItemStack.EMPTY;
private final IFloatingFlower floatingData = new FloatingFlowerImpl() {
@Override
public ItemStack getDisplayStack() {
if(!forcedStack.isEmpty()) {
ItemStack retStack = forcedStack;
forcedStack = ItemStack.EMPTY;
return retStack;
} else {
Block b = getBlockState().getBlock();
if(b instanceof BlockFloatingFlower) {
return new ItemStack(ModBlocks.getShinyFlower(((BlockFloatingFlower) b).color));
} else {
return ItemStack.EMPTY;
}
}
}
};
private final LazyOptional<IFloatingFlower> floatingDataCap = LazyOptional.of(() -> floatingData);
public TileFloatingFlower() {
super(TYPE);
}
@Nonnull
@Override
public ItemStack getDisplayStack() {
if(!forcedStack.isEmpty()) {
ItemStack retStack = forcedStack;
forcedStack = ItemStack.EMPTY;
return retStack;
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing side) {
if(cap == BotaniaAPI.FLOATING_FLOWER_CAP) {
return floatingDataCap.cast();
}
return new ItemStack(getBlockState().getBlock());
return super.getCapability(cap, side);
}
@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
IslandType oldType = getIslandType();
IFloatingFlower.IslandType oldType = floatingData.getIslandType();
super.onDataPacket(net, packet);
if(oldType != getIslandType()) {
if(oldType != floatingData.getIslandType()) {
world.markBlockRangeForRenderUpdate(pos, pos);
}
}
@Override
public IslandType getIslandType() {
return type;
}
@Override
public void setIslandType(IslandType type) {
this.type = type;
}
@Override
public void writePacketNBT(NBTTagCompound cmp) {
cmp.putString(TAG_ISLAND_TYPE, type.toString());
cmp.put(TAG_FLOATING_DATA, BotaniaAPI.FLOATING_FLOWER_CAP.writeNBT(floatingData, null));
}
@Override
public void readPacketNBT(NBTTagCompound cmp) {
type = IslandType.ofType(cmp.getString(TAG_ISLAND_TYPE));
BotaniaAPI.FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA));
}
}
@@ -1,76 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Nov 17, 2014, 5:41:58 PM (GMT)]
*/
package vazkii.botania.common.block.tile;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFloatingFlower {
public static final String TAG_ISLAND_TYPE = "islandType";
private IslandType type = IslandType.GRASS;
@Override
public boolean isOnSpecialSoil() {
return false;
}
@Override
public ItemStack getDisplayStack() {
return ItemBlockSpecialFlower.ofType(getSubTile().getType());
}
@Override
public IslandType getIslandType() {
return type;
}
@Override
public void setIslandType(IslandType type) {
this.type = type;
}
@Override
public void writePacketNBT(NBTTagCompound cmp) {
super.writePacketNBT(cmp);
cmp.putString(TAG_ISLAND_TYPE, type.toString());
}
@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
IslandType oldType = getIslandType();
super.onDataPacket(net, packet);
if(oldType != getIslandType()) {
world.markBlockRangeForRenderUpdate(pos, pos);
}
}
@Override
public void readPacketNBT(NBTTagCompound cmp) {
super.readPacketNBT(cmp);
type = IslandType.ofType(cmp.getString(TAG_ISLAND_TYPE));
}
@Override
public int getSlowdownFactor() {
IslandType type = getIslandType();
if (type == IslandType.MYCEL)
return SLOWDOWN_FACTOR_MYCEL;
else if (type == IslandType.PODZOL)
return SLOWDOWN_FACTOR_PODZOL;
return 0;
}
}
@@ -1,233 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jan 22, 2014, 7:21:51 PM (GMT)]
*/
package vazkii.botania.common.block.tile;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ITickable;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.ISubTileSlowableContainer;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.wand.IWandBindable;
import vazkii.botania.common.BotaniaRegistries;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.string.TileRedStringRelay;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer, ITickable {
@ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.SPECIAL_FLOWER)
public static TileEntityType<TileSpecialFlower> TYPE;
private static final String TAG_SUBTILE_NAME = "subTileName";
private static final String TAG_SUBTILE_CMP = "subTileCmp";
private SubTileEntity subTile;
public TileSpecialFlower() {
super(TYPE);
}
@Override
public SubTileEntity getSubTile() {
return subTile;
}
@Override
public void setSubTile(SubTileType type) {
setSubTile(type.create());
}
private void setSubTile(SubTileEntity tile) {
subTile = tile;
subTile.setSupertile(this);
}
@Override
public void tick() {
if(subTile != null) {
world.profiler.startSection(() -> subTile.getType().getRegistryName().toString());
TileEntity tileBelow = world.getTileEntity(pos.down());
if(tileBelow instanceof TileRedStringRelay) {
BlockPos coords = ((TileRedStringRelay) tileBelow).getBinding();
if(coords != null) {
BlockPos currPos = pos;
setPos(coords);
subTile.onUpdate();
setPos(currPos);
world.profiler.endSection();
return;
}
}
boolean special = isOnSpecialSoil();
if(special) {
subTile.overgrowth = true;
if(subTile.isOvergrowthAffected()) {
subTile.onUpdate();
subTile.overgrowthBoost = true;
}
}
subTile.onUpdate();
subTile.overgrowth = false;
subTile.overgrowthBoost = false;
world.profiler.endSection();
}
}
public boolean isOnSpecialSoil() {
return world.getBlockState(pos.down()).getBlock() == ModBlocks.enchantedSoil;
}
@Override
public void writePacketNBT(NBTTagCompound cmp) {
super.writePacketNBT(cmp);
if(subTile != null) {
cmp.putString(TAG_SUBTILE_NAME, subTile.getType().getRegistryName().toString());
NBTTagCompound subCmp = new NBTTagCompound();
cmp.put(TAG_SUBTILE_CMP, subCmp);
subTile.writeToPacketNBTInternal(subCmp);
}
}
@Override
public void readPacketNBT(NBTTagCompound cmp) {
super.readPacketNBT(cmp);
if(cmp.contains(TAG_SUBTILE_NAME)) {
ResourceLocation id = new ResourceLocation(cmp.getString(TAG_SUBTILE_NAME));
if(subTile == null || !id.equals(subTile.getType().getRegistryName()))
setSubTile(BotaniaRegistries.SUBTILES.getValue(id));
subTile.readFromPacketNBTInternal(cmp.getCompound(TAG_SUBTILE_CMP));
}
}
public LexiconEntry getEntry() {
return subTile == null ? null : subTile.getEntry();
}
public boolean onWanded(ItemStack wand, EntityPlayer player) {
return subTile == null ? false : subTile.onWanded(player, wand);
}
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) {
if (subTile != null)
subTile.onBlockPlacedBy(world, pos, state, entity, stack);
}
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
return subTile == null ? false : subTile.onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ);
}
public void onBlockAdded(World world, BlockPos pos, IBlockState state) {
if (subTile != null)
subTile.onBlockAdded(world, pos, state);
}
public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) {
if (subTile != null)
subTile.onBlockHarvested(world, pos, state, player);
}
public List<ItemStack> getDrops(List<ItemStack> list) {
if (subTile != null)
subTile.getDrops(list);
return list;
}
@Override
public boolean receiveClientEvent(int id, int param) {
if(subTile != null)
return subTile.receiveClientEvent(id, param);
return super.receiveClientEvent(id, param);
}
@OnlyIn(Dist.CLIENT)
public void renderHUD(Minecraft mc) {
if(subTile != null)
subTile.renderHUD(mc);
}
@Override
public BlockPos getBinding() {
if(subTile == null)
return null;
return subTile.getBinding();
}
@Override
public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) {
if(subTile == null)
return false;
return subTile.canSelect(player, wand, pos, side);
}
@Override
public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) {
if(subTile == null)
return false;
return subTile.bindTo(player, wand, pos, side);
}
public int getLightValue() {
if(subTile == null)
return 0;
return subTile.getLightValue();
}
public int getComparatorInputOverride() {
if(subTile == null)
return 0;
return subTile.getComparatorInputOverride();
}
public int getPowerLevel(EnumFacing side) {
if(subTile == null)
return 0;
return subTile.getPowerLevel(side);
}
@Override
public int getSlowdownFactor() {
Block below = world.getBlockState(getPos().down()).getBlock();
if(below == Blocks.MYCELIUM)
return SLOWDOWN_FACTOR_MYCEL;
if(below == Blocks.PODZOL) {
return SLOWDOWN_FACTOR_PODZOL;
}
return 0;
}
}
@@ -18,7 +18,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.ISubTileContainer;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
@@ -37,7 +37,7 @@ public class TileRedStringRelay extends TileRedString {
Block block = world.getBlockState(pos).getBlock();
TileEntity tile = world.getTileEntity(pos);
return (block instanceof BlockFlower || block instanceof BlockMushroom || block instanceof BlockDoublePlant) && (tile == null || !(tile instanceof ISubTileContainer));
return (block instanceof BlockFlower || block instanceof BlockMushroom || block instanceof BlockDoublePlant) && (tile == null || !(tile instanceof TileEntitySpecialFlower));
}
}
@@ -13,8 +13,11 @@ package vazkii.botania.common.core;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.tags.ItemTags;
import net.minecraft.util.IItemProvider;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.ForgeRegistryEntry;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
@@ -24,6 +27,7 @@ import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.Comparator;
public final class BotaniaCreativeTab extends ItemGroup {
@@ -55,7 +59,7 @@ public final class BotaniaCreativeTab extends ItemGroup {
for(EnumDyeColor color : EnumDyeColor.values())
addItem(ModBlocks.getFlower(color));
addItem(ModBlocks.specialFlower);
addTag(new ResourceLocation(LibMisc.MOD_ID, "special_flowers"));
for(EnumDyeColor color : EnumDyeColor.values())
this.addItem(ModItems.getPetal(color));
addItem(ModItems.pestleAndMortar);
@@ -430,7 +434,7 @@ public final class BotaniaCreativeTab extends ItemGroup {
addItem(ModBlocks.getShinyFlower(color));
for(EnumDyeColor color : EnumDyeColor.values())
addItem(ModBlocks.getFloatingFlower(color));
addItem(ModBlocks.floatingSpecialFlower);
addTag(new ResourceLocation(LibMisc.MOD_ID, "special_floating_flowers"));
addItem(ModBlocks.petalBlockWhite);
addItem(ModBlocks.petalBlockOrange);
addItem(ModBlocks.petalBlockMagenta);
@@ -623,6 +627,12 @@ public final class BotaniaCreativeTab extends ItemGroup {
ModItems.cosmetics.values().forEach(this::addItem);
}
private void addTag(ResourceLocation tagId) {
ItemTags.getCollection().getOrCreate(tagId).getAllElements().stream()
.sorted(Comparator.comparing(ForgeRegistryEntry::getRegistryName))
.forEach(this::addItem);
}
private void addItem(IItemProvider item) {
item.asItem().fillItemGroup(this, list);
}
@@ -14,8 +14,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -39,10 +37,9 @@ import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipeRuneAltar;
import vazkii.botania.api.subtile.ISpecialFlower;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.client.core.handler.BossBarHandler;
import vazkii.botania.client.core.handler.HUDHandler;
import vazkii.botania.common.Botania;
@@ -96,16 +93,6 @@ public class InternalMethodHandler extends DummyMethodHandler {
return new PageCraftingRecipe(key, recipe);
}
@Override
public ModelResourceLocation getSubTileBlockModelForName(String name) {
return BotaniaAPIClient.getRegisteredSubtileBlockModels().get(name);
}
@Override
public ModelResourceLocation getSubTileItemModelForName(String name) {
return BotaniaAPIClient.getRegisteredSubtileItemModels().get(name);
}
@Override
public LexiconPage petalRecipesPage(String key, List<RecipePetals> recipes) {
return new PagePetalRecipe<>(key, recipes);
@@ -156,21 +143,6 @@ public class InternalMethodHandler extends DummyMethodHandler {
return new PageMultiblock(key, mb);
}
@Override
public ItemStack getSubTileAsStack(SubTileType subTile) {
return ItemBlockSpecialFlower.ofType(subTile);
}
@Override
public ItemStack getSubTileAsFloatingFlowerStack(SubTileType subTile) {
return ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), subTile);
}
@Override
public SubTileType getStackSubTileKey(ItemStack stack) {
return ItemBlockSpecialFlower.getType(stack);
}
@Override
public IManaNetwork getManaNetworkInstance() {
return ManaNetworkHandler.instance;
@@ -192,8 +164,8 @@ public class InternalMethodHandler extends DummyMethodHandler {
}
@Override
public ItemStack getBindDisplayForFlowerType(SubTileEntity e) {
return e instanceof SubTileGenerating ? new ItemStack(ModBlocks.manaSpreader) : e instanceof SubTileFunctional ? new ItemStack(ModBlocks.manaPool) : new ItemStack(ModItems.twigWand);
public ItemStack getBindDisplayForFlowerType(TileEntitySpecialFlower e) {
return e instanceof TileEntityGeneratingFlower ? new ItemStack(ModBlocks.manaSpreader) : e instanceof TileEntityFunctionalFlower ? new ItemStack(ModBlocks.manaPool) : new ItemStack(ModItems.twigWand);
}
@Override
@@ -11,54 +11,23 @@
package vazkii.botania.common.crafting;
import com.google.common.collect.ImmutableList;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.crafting.VanillaRecipeTypes;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
import net.minecraftforge.fml.server.ServerLifecycleHooks;
import net.minecraftforge.registries.IForgeRegistry;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.common.Botania;
import vazkii.botania.common.BotaniaRegistries;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.crafting.recipe.AncientWillRecipe;
import vazkii.botania.common.crafting.recipe.ArmorUpgradeRecipe;
import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe;
import vazkii.botania.common.crafting.recipe.CompositeLensRecipe;
import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe;
import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe;
import vazkii.botania.common.crafting.recipe.HelmRevealingRecipe;
import vazkii.botania.common.crafting.recipe.KeepIvyRecipe;
import vazkii.botania.common.crafting.recipe.LensDyeingRecipe;
import vazkii.botania.common.crafting.recipe.ManaGunClipRecipe;
import vazkii.botania.common.crafting.recipe.ManaGunLensRecipe;
import vazkii.botania.common.crafting.recipe.ManaGunRemoveLensRecipe;
import vazkii.botania.common.crafting.recipe.ManaUpgradeRecipe;
import vazkii.botania.common.crafting.recipe.PhantomInkRecipe;
import vazkii.botania.common.crafting.recipe.ShapelessManaUpgradeRecipe;
import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe;
import vazkii.botania.common.crafting.recipe.SpellClothRecipe;
import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.lib.LibOreDict;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
public final class ModCraftingRecipes {
public static ResourceLocation recipeLexicon;
@@ -328,17 +297,6 @@ public final class ModCraftingRecipes {
public static ResourceLocation recipeFelPumpkin;
public static ResourceLocation recipeEndPortal;
@SubscribeEvent
public static void registerRecipes(FMLServerStartingEvent evt) {
evt.getServer().getResourceManager().addReloadListener(manager -> {
// todo 1.13 have each subtile responsible for itself
for (ResourceLocation s : BotaniaRegistries.SUBTILES.getKeys()) {
ResourceLocation id = new ResourceLocation(LibMisc.MOD_ID, "floating_" + s.toString().replaceAll(":", "_"));
evt.getServer().getRecipeManager().addRecipe(new SpecialFloatingFlowerRecipe(id, s));
}
});
}
public static void init() {
// Can't do this in RegistryEvent.Register event handler since it seems JSON recipes aren't loaded yet
recipesPetals = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.PETAL));
@@ -16,10 +16,10 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.tags.ItemTags;
import net.minecraft.util.IItemProvider;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.api.imc.IMC;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.ModSubtiles;
@@ -178,7 +178,7 @@ public final class ModManaAlchemyRecipes {
IMCSender.send(IMC.REGISTER_MANA_INFUSION, mini(ModSubtiles.solegnoliaChibi, ModSubtiles.solegnolia));
}
private static RecipeManaInfusion mini(SubTileType mini, SubTileType full) {
return RecipeManaInfusion.alchemy(mini.getRegistryName(), ItemBlockSpecialFlower.ofType(mini), new IngredientNBTSubset(ItemBlockSpecialFlower.ofType(full)), 2500);
private static RecipeManaInfusion mini(IItemProvider mini, IItemProvider full) {
return RecipeManaInfusion.alchemy(mini.asItem().getRegistryName(), new ItemStack(mini), Ingredient.fromItems(full), 2500);
}
}
@@ -18,6 +18,7 @@ import net.minecraft.util.ResourceLocation;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.item.ModItems;
@@ -110,54 +111,54 @@ public final class ModPetalRecipes {
Ingredient pixieDust = Ingredient.fromItems(ModItems.pixieDust);
Ingredient gaiaSpirit = Ingredient.fromItems(ModItems.lifeEssence);
pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white);
manastarRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MANASTAR), lightBlue, green, red, cyan);
pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.pureDaisy), white, white, white, white);
manastarRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.manastar), lightBlue, green, red, cyan);
endoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME), brown, brown, red, lightGray);
hydroangeasRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYDROANGEAS), blue, blue, cyan, cyan);
thermalilyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_THERMALILY), red, orange, orange, runeEarth, runeFire);
arcaneRoseRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ARCANE_ROSE), pink, pink, purple, purple, lime, runeMana);
munchdewRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MUNCHDEW), lime, lime, red, red, green, runeGluttony);
entropinnyumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENTROPINNYUM), red, red, gray, gray, white, white, runeWrath, runeFire);
kekimurusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS), white, white, orange, orange, brown, brown,runeGluttony, pixieDust);
gourmaryllisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_GOURMARYLLIS), lightGray, lightGray, yellow, yellow, red, runeFire, runeSummer);
narslimmusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NARSLIMMUS), lime, lime, green, green, black, runeSummer, runeWater);
spectrolusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTROLUS), red, red, green, green, blue, blue, white, white, runeWinter, runeAir, pixieDust);
rafflowsiaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_RAFFLOWSIA), purple, purple, green, green, black, runeEarth, runePride, pixieDust);
shulkMeNotRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SHULK_ME_NOT), purple, purple, magenta, magenta, lightGray, gaiaSpirit, runeEnvy, runeWrath);
dandelifeonRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DANDELIFEON), purple, purple, lime, green, runeWater, runeFire, runeEarth, runeAir, gaiaSpirit);
endoflameRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.endoflame), brown, brown, red, lightGray);
hydroangeasRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.hydroangeas), blue, blue, cyan, cyan);
thermalilyRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.thermalily), red, orange, orange, runeEarth, runeFire);
arcaneRoseRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.rosaArcana), pink, pink, purple, purple, lime, runeMana);
munchdewRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.munchdew), lime, lime, red, red, green, runeGluttony);
entropinnyumRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.entropinnyum), red, red, gray, gray, white, white, runeWrath, runeFire);
kekimurusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.kekimurus), white, white, orange, orange, brown, brown,runeGluttony, pixieDust);
gourmaryllisRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.gourmaryllis), lightGray, lightGray, yellow, yellow, red, runeFire, runeSummer);
narslimmusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.narslimmus), lime, lime, green, green, black, runeSummer, runeWater);
spectrolusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.spectrolus), red, red, green, green, blue, blue, white, white, runeWinter, runeAir, pixieDust);
rafflowsiaRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.rafflowsia), purple, purple, green, green, black, runeEarth, runePride, pixieDust);
shulkMeNotRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.shulkMeNot), purple, purple, magenta, magenta, lightGray, gaiaSpirit, runeEnvy, runeWrath);
dandelifeonRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.dandelifeon), purple, purple, lime, green, runeWater, runeFire, runeEarth, runeAir, gaiaSpirit);
jadedAmaranthusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JADED_AMARANTHUS), purple, lime, green, runeSpring, redstoneRoot);
bellethorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), red, red, red, cyan, cyan, redstoneRoot);
dreadthorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DREADTHORN), black, black, black, cyan, cyan, redstoneRoot);
heiseiDreamRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HEISEI_DREAM), magenta, magenta, purple, pink, runeWrath, pixieDust);
tigerseyeRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_TIGERSEYE), yellow, brown, orange, lime, runeAutumn);
jadedAmaranthusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.jadedAmaranthus), purple, lime, green, runeSpring, redstoneRoot);
bellethorneRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.bellethorn), red, red, red, cyan, cyan, redstoneRoot);
dreadthorneRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.dreadthorn), black, black, black, cyan, cyan, redstoneRoot);
heiseiDreamRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.heiseiDream), magenta, magenta, purple, pink, runeWrath, pixieDust);
tigerseyeRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.tigerseye), yellow, brown, orange, lime, runeAutumn);
if(Botania.gardenOfGlassLoaded)
orechidRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID), gray, gray, yellow, yellow, green, green, red, red);
else orechidRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID), gray, gray, yellow, green, red, runePride, runeGreed, redstoneRoot, pixieDust);
orechidRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.orechid), gray, gray, yellow, yellow, green, green, red, red);
else orechidRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.orechid), gray, gray, yellow, green, red, runePride, runeGreed, redstoneRoot, pixieDust);
orechidIgnemRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID_IGNEM), red, red, white, white, pink, runePride, runeGreed, redstoneRoot, pixieDust);
orechidIgnemRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.orechidIgnem), red, red, white, white, pink, runePride, runeGreed, redstoneRoot, pixieDust);
if(ConfigHandler.COMMON.fallenKanadeEnabled.get())
fallenKanadeRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_FALLEN_KANADE), white, white, yellow, yellow, orange, runeSpring);
exoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_EXOFLAME), red, red, gray, lightGray, runeFire, runeSummer);
agricarnationRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_AGRICARNATION), lime, lime, green, yellow, runeSpring, redstoneRoot);
hopperhockRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HOPPERHOCK), gray, gray, lightGray, lightGray, runeAir, redstoneRoot);
tangleberrieRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_TANGLEBERRIE), cyan, cyan, gray, lightGray, runeAir, runeEarth);
jiyuuliaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JIYUULIA), pink, pink, purple, lightGray, runeWater, runeAir);
rannuncarpusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_RANNUNCARPUS), orange, orange, yellow, runeEarth, redstoneRoot);
hyacidusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYACIDUS), purple, purple, magenta, magenta, green, runeWater, runeAutumn, redstoneRoot);
pollidisiacRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_POLLIDISIAC), red, red, pink, pink, orange, runeLust, runeFire);
clayconiaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_CLAYCONIA), lightGray, lightGray, gray, cyan, runeEarth);
looniumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_LOONIUM), green, green, green, green, gray, runeSloth, runeGluttony, runeEnvy, redstoneRoot, pixieDust);
daffomillRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAFFOMILL), white, white, brown, yellow, runeAir, redstoneRoot);
vinculotusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_VINCULOTUS), black, black, purple, purple, green, runeWater, runeSloth, runeLust, redstoneRoot);
spectranthemumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTRANTHEMUM), white, white, lightGray, lightGray, cyan, runeEnvy, runeWater, redstoneRoot, pixieDust);
medumoneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MEDUMONE), brown, brown, gray, gray, runeEarth, redstoneRoot);
marimorphosisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MARIMORPHOSIS), gray, yellow, green, red, runeEarth, runeFire, redstoneRoot);
bubbellRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BUBBELL), cyan, cyan, lightBlue, lightBlue, blue, blue, runeWater, runeSummer, pixieDust);
solegnoliaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SOLEGNOLIA), brown, brown, red, blue, redstoneRoot);
bergamuteRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BERGAMUTE), orange, green, green, redstoneRoot);
fallenKanadeRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.fallenKanade), white, white, yellow, yellow, orange, runeSpring);
exoflameRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.exoflame), red, red, gray, lightGray, runeFire, runeSummer);
agricarnationRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.agricarnation), lime, lime, green, yellow, runeSpring, redstoneRoot);
hopperhockRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.hopperhock), gray, gray, lightGray, lightGray, runeAir, redstoneRoot);
tangleberrieRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.tangleberrie), cyan, cyan, gray, lightGray, runeAir, runeEarth);
jiyuuliaRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.jiyuulia), pink, pink, purple, lightGray, runeWater, runeAir);
rannuncarpusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.rannuncarpus), orange, orange, yellow, runeEarth, redstoneRoot);
hyacidusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.hyacidus), purple, purple, magenta, magenta, green, runeWater, runeAutumn, redstoneRoot);
pollidisiacRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.pollidisiac), red, red, pink, pink, orange, runeLust, runeFire);
clayconiaRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.clayconia), lightGray, lightGray, gray, cyan, runeEarth);
looniumRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.loonium), green, green, green, green, gray, runeSloth, runeGluttony, runeEnvy, redstoneRoot, pixieDust);
daffomillRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.daffomill), white, white, brown, yellow, runeAir, redstoneRoot);
vinculotusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.vinculotus), black, black, purple, purple, green, runeWater, runeSloth, runeLust, redstoneRoot);
spectranthemumRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.spectranthemum), white, white, lightGray, lightGray, cyan, runeEnvy, runeWater, redstoneRoot, pixieDust);
medumoneRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.medumone), brown, brown, gray, gray, runeEarth, redstoneRoot);
marimorphosisRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.marimorphosis), gray, yellow, green, red, runeEarth, runeFire, redstoneRoot);
bubbellRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.bubbell), cyan, cyan, lightBlue, lightBlue, blue, blue, runeWater, runeSummer, pixieDust);
solegnoliaRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.solegnolia), brown, brown, red, blue, redstoneRoot);
bergamuteRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.bergamute), orange, green, green, redstoneRoot);
ItemStack stack = new ItemStack(Items.PLAYER_HEAD);
ItemNBTHelper.setString(stack, "SkullOwner", "Vazkii");
@@ -1,121 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Nov 17, 2014, 6:34:36 PM (GMT)]
*/
package vazkii.botania.common.crafting.recipe;
import com.google.gson.JsonObject;
import net.minecraft.block.Block;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.IRecipeHidden;
import net.minecraft.item.crafting.IRecipeSerializer;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.JsonUtils;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.common.BotaniaRegistries;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.BlockFloatingFlower;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
public class SpecialFloatingFlowerRecipe extends IRecipeHidden {
private static final ResourceLocation TYPE_ID = new ResourceLocation(LibMisc.MOD_ID, "special_floating_flower");
public final ResourceLocation flowerType;
public SpecialFloatingFlowerRecipe(ResourceLocation id, ResourceLocation flowerType) {
super(id);
this.flowerType = flowerType;
}
@Override
public boolean matches(@Nonnull IInventory inv, @Nonnull World world) {
boolean foundFloatingFlower = false;
boolean foundSpecialFlower = false;
for(int i = 0; i < inv.getSizeInventory(); i++) {
ItemStack stack = inv.getStackInSlot(i);
if(!stack.isEmpty()) {
if(Block.getBlockFromItem(stack.getItem()) instanceof BlockFloatingFlower)
foundFloatingFlower = true;
else if(stack.getItem() == ModBlocks.specialFlower.asItem() && ItemBlockSpecialFlower.getType(stack).equals(flowerType))
foundSpecialFlower = true;
else return false; // Found an invalid item, breaking the recipe
}
}
return foundFloatingFlower && foundSpecialFlower;
}
@Nonnull
@Override
public ItemStack getCraftingResult(@Nonnull IInventory inv) {
ItemStack specialFlower = ItemStack.EMPTY;
for(int i = 0; i < inv.getSizeInventory(); i++) {
ItemStack stack = inv.getStackInSlot(i);
if(!stack.isEmpty() && stack.getItem() == ModBlocks.specialFlower.asItem() && ItemBlockSpecialFlower.getType(stack).equals(flowerType))
specialFlower = stack;
}
if(specialFlower.isEmpty())
return ItemStack.EMPTY;
SubTileType type = BotaniaRegistries.SUBTILES.getValue(flowerType);
return ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), type);
}
@Override
public boolean canFit(int width, int height) {
return width * height >= 2;
}
@Nonnull
@Override
public IRecipeSerializer<?> getSerializer() {
return SERIALIZER;
}
public static final IRecipeSerializer<SpecialFloatingFlowerRecipe> SERIALIZER = new IRecipeSerializer<SpecialFloatingFlowerRecipe>() {
@Nonnull
@Override
public SpecialFloatingFlowerRecipe read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) {
ResourceLocation flowerType = new ResourceLocation(JsonUtils.getString(json, "flower_type"));
return new SpecialFloatingFlowerRecipe(recipeId, flowerType);
}
@Nonnull
@Override
public SpecialFloatingFlowerRecipe read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) {
ResourceLocation flowerType = buffer.readResourceLocation();
return new SpecialFloatingFlowerRecipe(recipeId, flowerType);
}
@Override
public void write(@Nonnull PacketBuffer buffer, @Nonnull SpecialFloatingFlowerRecipe recipe) {
buffer.writeResourceLocation(recipe.flowerType);
}
@Nonnull
@Override
public ResourceLocation getName() {
return TYPE_ID;
}
};
}
@@ -10,22 +10,17 @@
*/
package vazkii.botania.common.item;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemUseContext;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.api.mana.IManaCollector;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.subtile.ISubTileContainer;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.lib.LibItemNames;
import javax.annotation.Nonnull;
import java.util.function.BiFunction;
@@ -45,16 +40,16 @@ public class ItemObedienceStick extends ItemMod {
TileEntity tileAt = world.getTileEntity(pos);
if(tileAt instanceof IManaPool || tileAt instanceof IManaCollector) {
boolean pool = tileAt instanceof IManaPool;
BiFunction<SubTileEntity, TileEntity, Boolean> act = pool ? functionalActuator : generatingActuator;
int range = pool ? SubTileFunctional.LINK_RANGE : SubTileGenerating.LINK_RANGE;
BiFunction<TileEntitySpecialFlower, TileEntity, Boolean> act = pool ? functionalActuator : generatingActuator;
int range = pool ? TileEntityFunctionalFlower.LINK_RANGE : TileEntityGeneratingFlower.LINK_RANGE;
for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-range, -range, -range), pos.add(range, range, range))) {
if(pos_.distanceSq(pos) > range * range)
continue;
TileEntity tile = world.getTileEntity(pos_);
if(tile instanceof ISubTileContainer) {
SubTileEntity subtile = ((ISubTileContainer) tile).getSubTile();
if(tile instanceof TileEntitySpecialFlower) {
TileEntitySpecialFlower subtile = ((TileEntitySpecialFlower) tile);
if(act.apply(subtile, tileAt)) {
Vector3 orig = new Vector3(pos_.getX() + 0.5, pos_.getY() + 0.5, pos_.getZ() + 0.5);
Vector3 end = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
@@ -69,17 +64,17 @@ public class ItemObedienceStick extends ItemMod {
return EnumActionResult.PASS;
}
private static final BiFunction<SubTileEntity, TileEntity, Boolean> generatingActuator = (flower, tile) -> {
if(flower instanceof SubTileGenerating) {
((SubTileGenerating) flower).linkToForcefully(tile);
private static final BiFunction<TileEntitySpecialFlower, TileEntity, Boolean> generatingActuator = (flower, tile) -> {
if(flower instanceof TileEntityGeneratingFlower) {
((TileEntityGeneratingFlower) flower).linkToForcefully(tile);
return true;
}
return false;
};
private static final BiFunction<SubTileEntity, TileEntity, Boolean> functionalActuator = (flower, tile) -> {
if(flower instanceof SubTileFunctional) {
((SubTileFunctional) flower).linkToForcefully(tile);
private static final BiFunction<TileEntitySpecialFlower, TileEntity, Boolean> functionalActuator = (flower, tile) -> {
if(flower instanceof TileEntityFunctionalFlower) {
((TileEntityFunctionalFlower) flower).linkToForcefully(tile);
return true;
}
return false;
@@ -1,33 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Nov 17, 2014, 5:39:08 PM (GMT)]
*/
package vazkii.botania.common.item.block;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentTranslation;
import javax.annotation.Nonnull;
public class ItemBlockFloatingSpecialFlower extends ItemBlockSpecialFlower {
public ItemBlockFloatingSpecialFlower(Block block, Properties props) {
super(block, props);
}
@Nonnull
@Override
public ITextComponent getDisplayName(@Nonnull ItemStack stack) {
ITextComponent flowerName = super.getDisplayName(stack);
return new TextComponentTranslation("botaniamisc.floatingPrefix").appendSibling(flowerName);
}
}
@@ -10,29 +10,22 @@
*/
package vazkii.botania.common.item.block;
import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementManager;
import net.minecraft.advancements.PlayerAdvancements;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.Tag;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -40,13 +33,8 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.IRecipeKeyProvider;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.api.subtile.SubTileType;
import vazkii.botania.common.BotaniaRegistries;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.TileSpecialFlower;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.PlayerHelper;
@@ -56,109 +44,31 @@ import javax.annotation.Nonnull;
import java.util.List;
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider {
public class ItemBlockSpecialFlower extends ItemBlockMod {
private static final Tag<Item> GENERATING = new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "generating_special_flowers"));
private static final Tag<Item> FUNCTIONAL = new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "functional_special_flowers"));
private static final Tag<Item> MISC = new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "misc_special_flowers"));
public ItemBlockSpecialFlower(Block block1, Properties props) {
super(block1, props);
}
@Override
public boolean placeBlock(BlockItemUseContext ctx, @Nonnull IBlockState newState) {
boolean placed = super.placeBlock(ctx, newState);
if(placed) {
World world = ctx.getWorld();
BlockPos pos = ctx.getPos();
ItemStack stack = ctx.getItem();
SubTileType type = getType(ctx.getItem());
TileEntity te = world.getTileEntity(pos);
if(te instanceof TileSpecialFlower) {
TileSpecialFlower tile = (TileSpecialFlower) te;
tile.setSubTile(type);
tile.onBlockAdded(world, pos, newState);
tile.onBlockPlacedBy(world, pos, newState, ctx.getPlayer(), stack);
if(!world.isRemote)
world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 8);
}
}
return placed;
}
@Nonnull
@Override
public String getTranslationKey(ItemStack stack) {
return getType(stack).getTranslationKey(stack);
}
@OnlyIn(Dist.CLIENT)
@Override
public void addInformation(@Nonnull ItemStack par1ItemStack, World world, @Nonnull List<ITextComponent> stacks, @Nonnull ITooltipFlag flag) {
SubTileType type = getType(par1ItemStack);
type.addTooltip(par1ItemStack, world, stacks);
public void addInformation(@Nonnull ItemStack stack, World world, @Nonnull List<ITextComponent> tooltip, @Nonnull ITooltipFlag flag) {
if(GENERATING.contains(this)) {
tooltip.add(new TextComponentTranslation("botania.flowerType.generating").applyTextStyles(TextFormatting.ITALIC, TextFormatting.BLUE));
} else if(FUNCTIONAL.contains(this)) {
tooltip.add(new TextComponentTranslation("botania.flowerType.functional").applyTextStyles(TextFormatting.ITALIC, TextFormatting.BLUE));
} else if(MISC.contains(this)) {
tooltip.add(new TextComponentTranslation("botania.flowerType.misc").applyTextStyles(TextFormatting.ITALIC, TextFormatting.BLUE));
}
if(ConfigHandler.CLIENT.referencesEnabled.get()) {
ITextComponent lore = type.getLore(par1ItemStack);
if(lore != null)
stacks.add(lore.applyTextStyles(TextFormatting.ITALIC, TextFormatting.GRAY));
String key = getTranslationKey() + ".reference";
ITextComponent lore = new TextComponentTranslation(key);
if(!lore.getString().equals(key))
tooltip.add(lore.applyTextStyles(TextFormatting.ITALIC, TextFormatting.GRAY));
}
}
@Override
public String getCreatorModId(ItemStack itemStack) {
return getType(itemStack).getRegistryName().getNamespace();
}
public static SubTileType getType(ItemStack stack) {
ResourceLocation id = BotaniaAPI.DUMMY_SUBTILE_NAME;
if(stack.hasTag()) {
id = new ResourceLocation(ItemNBTHelper.getString(stack, SubTileEntity.TAG_TYPE, BotaniaAPI.DUMMY_SUBTILE_NAME.toString()));
}
return BotaniaRegistries.SUBTILES.getValue(id);
}
public static ItemStack ofType(ResourceLocation type) {
return ofType(BotaniaRegistries.SUBTILES.getValue(type));
}
public static ItemStack ofType(SubTileType type) {
return ofType(new ItemStack(ModBlocks.specialFlower), type);
}
public static ItemStack ofType(ItemStack stack, ResourceLocation type) {
return ofType(stack, BotaniaRegistries.SUBTILES.getValue(type));
}
public static ItemStack ofType(ItemStack stack, SubTileType type) {
ItemNBTHelper.setString(stack, SubTileEntity.TAG_TYPE, type.getRegistryName().toString());
return stack;
}
@Override
public String getKey(ItemStack stack) {
return "flower." + getType(stack);
}
@SubscribeEvent
public static void onItemPickup(EntityItemPickupEvent evt) {
if(evt.getItem().getItem().getItem() == Item.getItemFromBlock(ModBlocks.specialFlower)) {
SubTileType type = getType(evt.getItem().getItem());
/* todo 1.13 use tags after flattening
Class subtile = BotaniaAPI.getSubTileMapping(type);
if(SubTileGenerating.class.isAssignableFrom(subtile)) {
PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/generating_flower"), "code_triggered");
}
if(SubTileFunctional.class.isAssignableFrom(subtile)) {
PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/functional_flower"), "code_triggered");
}
*/
if(BotaniaAPI.DUMMY_SUBTILE_NAME.equals(type.getRegistryName())) {
PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "challenge/null_flower"), "code_triggered");
}
}
}
}
@@ -24,6 +24,7 @@ import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModMultiblocks;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.brew.ModBrews;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.crafting.ModBrewRecipes;
@@ -355,7 +356,7 @@ public final class LexiconData {
.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY),
new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingwoodTwig), new PageText("4"),
new PagePetalRecipe<>("3", ModPetalRecipes.pureDaisyRecipe))
.setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY));
.setIcon(new ItemStack(ModSubtiles.pureDaisy));
pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingwood));
pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingrock));
LexiconRecipeMappings.map(new ItemStack(ModBlocks.livingwood), pureDaisy, 1);
@@ -537,7 +538,7 @@ public final class LexiconData {
flowerShrinking = new BasicLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers);
flowerShrinking.setPriority()
.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", BotaniaAPI.miniFlowerRecipes))
.setIcon(ItemBlockSpecialFlower.ofType(new ResourceLocation(LibBlockNames.SUBTILE_BELLETHORN.getNamespace(), LibBlockNames.SUBTILE_BELLETHORN.getPath() + "_chibi")));
.setIcon(new ItemStack(ModSubtiles.bellethornChibi));
flowerSpeed = new BasicLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers);
flowerSpeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1"));
@@ -1,18 +1,5 @@
{
"forge_marker": 1,
"variants": {
"": [{
"model": "botania:block/shapes/cross_tinted",
"textures": {
"cross": "botania:blocks/flower_func_agricarnation"
}
}],
"inventory": [{
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "botania:blocks/flower_func_agricarnation"
}
}]
}
{
"variants": {
"": { "model": "botania:block/agricarnation" }
}
}
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "botania:block/agricarnation_chibi" }
}
}
@@ -1,18 +0,0 @@
{
"forge_marker": 1,
"variants": {
"": [{
"model": "botania:block/shapes/cross_tinted",
"textures": {
"cross": "botania:blocks/flower_func_agricarnation_chibi"
}
}],
"inventory": [{
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "botania:blocks/flower_func_agricarnation_chibi"
}
}]
}
}
@@ -1,18 +0,0 @@
{
"forge_marker": 1,
"variants": {
"": [{
"model": "botania:block/shapes/cross_tinted",
"textures": {
"cross": "botania:blocks/flower_gen_arcane_rose"
}
}],
"inventory": [{
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "botania:blocks/flower_gen_arcane_rose"
}
}]
}
}
@@ -1,18 +1,5 @@
{
"forge_marker": 1,
"variants": {
"": [{
"model": "botania:block/shapes/cross_tinted",
"textures": {
"cross": "botania:blocks/flower_func_bellethorne"
}
}],
"inventory": [{
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "botania:blocks/flower_func_bellethorne"
}
}]
}
{
"variants": {
"": { "model": "botania:block/bellethorn" }
}
}
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "botania:block/bellethorn_chibi" }
}
}
@@ -1,18 +0,0 @@
{
"forge_marker": 1,
"variants": {
"": [{
"model": "botania:block/shapes/cross_tinted",
"textures": {
"cross": "botania:blocks/flower_func_bellethorne_chibi"
}
}],
"inventory": [{
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "botania:blocks/flower_func_bellethorne_chibi"
}
}]
}
}
@@ -1,18 +1,5 @@
{
"forge_marker": 1,
"variants": {
"": [{
"model": "botania:block/shapes/cross_tinted",
"textures": {
"cross": "botania:blocks/flower_func_bergamute"
}
}],
"inventory": [{
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "botania:blocks/flower_func_bergamute"
}
}]
}
{
"variants": {
"": { "model": "botania:block/bergamute" }
}
}
@@ -1,18 +1,5 @@
{
"forge_marker": 1,
"variants": {
"": [{
"model": "botania:block/shapes/cross_tinted",
"textures": {
"cross": "botania:blocks/flower_func_bubbell"
}
}],
"inventory": [{
"model": "builtin/generated",
"transform": "forge:default-item",
"textures": {
"layer0": "botania:blocks/flower_func_bubbell"
}
}]
}
{
"variants": {
"": { "model": "botania:block/bubbell" }
}
}
@@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "botania:block/bubbell_chibi" }
}
}
Loaded 100 of 335 files, more files were not shown because too many files have changed in this diff. Show more