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

@@ -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));
}
}