code formatting

This commit is contained in:
Ell 2021-01-14 23:15:02 +01:00
parent 5350566f9c
commit f7f61a1f56
622 changed files with 7509 additions and 7220 deletions

View file

@ -1,5 +1,16 @@
There are a few bugs that cannot be fixed on my side, but get reported numerous times anyway. If your bug is any one of the following, please **do not** report it here. There are a few bugs that cannot be fixed on my side, but get reported numerous
- Fast Leaf Decay Crashes: See [#82](https://github.com/Ellpeck/NaturesAura/issues/82), [#87](https://github.com/Ellpeck/NaturesAura/issues/87), [#98](https://github.com/Ellpeck/NaturesAura/issues/98) or [#102](https://github.com/Ellpeck/NaturesAura/issues/102). times anyway. If your bug is any one of the following, please **do not** report
- Rapid Leaf Decay Crashes: See [#149](https://github.com/Ellpeck/NaturesAura/issues/149). it here.
- Fast Leaf Decay Crashes:
See [#82](https://github.com/Ellpeck/NaturesAura/issues/82)
, [#87](https://github.com/Ellpeck/NaturesAura/issues/87)
, [#98](https://github.com/Ellpeck/NaturesAura/issues/98)
or [#102](https://github.com/Ellpeck/NaturesAura/issues/102).
- Rapid Leaf Decay Crashes:
See [#149](https://github.com/Ellpeck/NaturesAura/issues/149).
- Book of Natural Aura model doesn't load: Update Patchouli. - Book of Natural Aura model doesn't load: Update Patchouli.
- Book of Natural Aura text spills over the page: You probably have Emojiful installed. See [Emojiful#8](https://github.com/InnovativeOnlineIndustries/Emojiful/issues/8). - Book of Natural Aura text spills over the page: You probably have Emojiful
installed.
See [Emojiful#8](https://github.com/InnovativeOnlineIndustries/Emojiful/issues/8)
.

File diff suppressed because it is too large Load diff

View file

@ -1,8 +1,14 @@
# NaturesAura # NaturesAura
Nature's Aura is a mod about collecting, using and replenishing the Aura naturally present in the world to create useful devices and unique mechanics.
Nature's Aura is a mod about collecting, using and replenishing the Aura
naturally present in the world to create useful devices and unique mechanics.
## Maven ## Maven
To add this project as a dependency (for using the [API](https://github.com/Ellpeck/NaturesAura/tree/main/src/main/java/de/ellpeck/naturesaura/api), for example), put this into your `build.gradle` file:
To add this project as a dependency (for using
the [API](https://github.com/Ellpeck/NaturesAura/tree/main/src/main/java/de/ellpeck/naturesaura/api)
, for example), put this into your `build.gradle` file:
``` ```
repositories { repositories {
maven { maven {
@ -14,4 +20,8 @@ dependencies {
compile "de.ellpeck.naturesaura:NaturesAura:VERSION" compile "de.ellpeck.naturesaura:NaturesAura:VERSION"
} }
``` ```
Replace VERSION with the version you want to use. You can find a list of versions by going to the [maven artifact](https://maven.ellpeck.de/de/ellpeck/naturesaura/NaturesAura/).
Replace VERSION with the version you want to use. You can find a list of
versions by going to
the [maven artifact](https://maven.ellpeck.de/de/ellpeck/naturesaura/NaturesAura/)
.

View file

@ -3,10 +3,8 @@ package de.ellpeck.naturesaura.api.aura.type;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import net.minecraft.util.RegistryKey; import net.minecraft.util.RegistryKey;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.world.DimensionType;
import net.minecraft.world.IWorld; import net.minecraft.world.IWorld;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.registries.ForgeRegistries;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;

View file

@ -2,7 +2,6 @@ package de.ellpeck.naturesaura.api.misc;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.world.DimensionType;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.util.INBTSerializable; import net.minecraftforge.common.util.INBTSerializable;

View file

@ -2,7 +2,6 @@ package de.ellpeck.naturesaura.api.multiblock;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.Map; import java.util.Map;

View file

@ -4,9 +4,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.tags.ITag; import net.minecraft.tags.ITag;
import net.minecraft.tags.Tag;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import net.minecraft.world.World; import net.minecraft.world.World;
public class Matcher { public class Matcher {

View file

@ -4,7 +4,9 @@ import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.blocks.tiles.TileEntityAncientLeaves; import de.ellpeck.naturesaura.blocks.tiles.TileEntityAncientLeaves;
import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.BlockStateGenerator;
import de.ellpeck.naturesaura.reg.*; import de.ellpeck.naturesaura.reg.*;
import net.minecraft.block.*; import net.minecraft.block.BlockState;
import net.minecraft.block.LeavesBlock;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.material.MaterialColor; import net.minecraft.block.material.MaterialColor;
import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.color.IBlockColor;

View file

@ -4,12 +4,13 @@ import de.ellpeck.naturesaura.blocks.tiles.TileEntityAuraBloom;
import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.BlockStateGenerator;
import de.ellpeck.naturesaura.data.ItemModelGenerator; import de.ellpeck.naturesaura.data.ItemModelGenerator;
import de.ellpeck.naturesaura.reg.*; import de.ellpeck.naturesaura.reg.*;
import net.minecraft.block.*; import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.BushBlock;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ITag;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -22,7 +23,6 @@ import net.minecraft.world.World;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
import java.util.function.Predicate;
import java.util.function.Supplier; import java.util.function.Supplier;
public class BlockAuraBloom extends BushBlock implements IModItem, ICustomBlockState, ICustomItemModel, ICustomRenderType { public class BlockAuraBloom extends BushBlock implements IModItem, ICustomBlockState, ICustomItemModel, ICustomRenderType {

View file

@ -4,7 +4,6 @@ import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.blocks.tiles.ModTileEntities; import de.ellpeck.naturesaura.blocks.tiles.ModTileEntities;
import de.ellpeck.naturesaura.blocks.tiles.TileEntityAuraTimer; import de.ellpeck.naturesaura.blocks.tiles.TileEntityAuraTimer;
import de.ellpeck.naturesaura.blocks.tiles.render.RenderAuraTimer; import de.ellpeck.naturesaura.blocks.tiles.render.RenderAuraTimer;
import de.ellpeck.naturesaura.blocks.tiles.render.RenderProjectileGenerator;
import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.BlockStateGenerator;
import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ICustomBlockState;
import de.ellpeck.naturesaura.reg.ICustomRenderType; import de.ellpeck.naturesaura.reg.ICustomRenderType;
@ -28,7 +27,6 @@ import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorldReader;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;

View file

@ -4,9 +4,6 @@ import de.ellpeck.naturesaura.blocks.tiles.TileEntityChorusGenerator;
import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.BlockStateGenerator;
import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ICustomBlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.tileentity.TileEntity;
import java.util.function.Supplier;
public class BlockChorusGenerator extends BlockContainerImpl implements ICustomBlockState { public class BlockChorusGenerator extends BlockContainerImpl implements ICustomBlockState {
public BlockChorusGenerator() { public BlockChorusGenerator() {

View file

@ -21,7 +21,6 @@ import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorld; import net.minecraft.world.IWorld;
import net.minecraft.world.IWorldReader;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.ServerWorld;

View file

@ -3,7 +3,9 @@ package de.ellpeck.naturesaura.blocks;
import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.BlockStateGenerator;
import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ICustomBlockState;
import de.ellpeck.naturesaura.reg.ICustomRenderType; import de.ellpeck.naturesaura.reg.ICustomRenderType;
import net.minecraft.block.*; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

View file

@ -8,7 +8,10 @@ import de.ellpeck.naturesaura.packet.PacketClient;
import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.packet.PacketParticles;
import de.ellpeck.naturesaura.reg.*; import de.ellpeck.naturesaura.reg.*;
import net.minecraft.block.*; import net.minecraft.block.AbstractRailBlock;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.item.minecart.AbstractMinecartEntity; import net.minecraft.entity.item.minecart.AbstractMinecartEntity;

View file

@ -9,7 +9,9 @@ import de.ellpeck.naturesaura.data.BlockStateGenerator;
import de.ellpeck.naturesaura.items.ModItems; import de.ellpeck.naturesaura.items.ModItems;
import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ICustomBlockState;
import de.ellpeck.naturesaura.reg.ITESRProvider; import de.ellpeck.naturesaura.reg.ITESRProvider;
import net.minecraft.block.*; import net.minecraft.block.AnvilBlock;
import net.minecraft.block.BlockState;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;

View file

@ -6,7 +6,10 @@ import de.ellpeck.naturesaura.reg.IColorProvidingBlock;
import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ICustomBlockState;
import de.ellpeck.naturesaura.reg.ICustomItemModel; import de.ellpeck.naturesaura.reg.ICustomItemModel;
import de.ellpeck.naturesaura.reg.ICustomRenderType; import de.ellpeck.naturesaura.reg.ICustomRenderType;
import net.minecraft.block.*; import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.RedstoneWireBlock;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.BlockItemUseContext;

View file

@ -4,7 +4,10 @@ import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.BlockStateGenerator;
import de.ellpeck.naturesaura.reg.*; import de.ellpeck.naturesaura.reg.*;
import net.minecraft.block.*; import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.LeavesBlock;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.material.MaterialColor; import net.minecraft.block.material.MaterialColor;
import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.color.IBlockColor;

View file

@ -9,7 +9,6 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderType;
import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.BlockItemUseContext;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShape;

View file

@ -2,7 +2,9 @@ package de.ellpeck.naturesaura.blocks;
import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.BlockStateGenerator;
import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ICustomBlockState;
import net.minecraft.block.*; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.IGrowable;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader;

View file

@ -14,9 +14,7 @@ import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingDamageEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
public class BlockSlimeSplitGenerator extends BlockContainerImpl implements IVisualizable, ICustomBlockState { public class BlockSlimeSplitGenerator extends BlockContainerImpl implements IVisualizable, ICustomBlockState {

View file

@ -4,9 +4,6 @@ import de.ellpeck.naturesaura.blocks.tiles.TileEntityWeatherChanger;
import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.BlockStateGenerator;
import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ICustomBlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.tileentity.TileEntity;
import java.util.function.Supplier;
public class BlockWeatherChanger extends BlockContainerImpl implements ICustomBlockState { public class BlockWeatherChanger extends BlockContainerImpl implements ICustomBlockState {
public BlockWeatherChanger() { public BlockWeatherChanger() {

View file

@ -1,13 +1,13 @@
package de.ellpeck.naturesaura.blocks; package de.ellpeck.naturesaura.blocks;
import de.ellpeck.naturesaura.Helper; import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.recipes.ModRecipes;
import de.ellpeck.naturesaura.recipes.TreeRitualRecipe;
import de.ellpeck.naturesaura.blocks.multi.Multiblocks; import de.ellpeck.naturesaura.blocks.multi.Multiblocks;
import de.ellpeck.naturesaura.blocks.tiles.ModTileEntities; import de.ellpeck.naturesaura.blocks.tiles.ModTileEntities;
import de.ellpeck.naturesaura.blocks.tiles.TileEntityWoodStand; import de.ellpeck.naturesaura.blocks.tiles.TileEntityWoodStand;
import de.ellpeck.naturesaura.blocks.tiles.render.RenderWoodStand; import de.ellpeck.naturesaura.blocks.tiles.render.RenderWoodStand;
import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.BlockStateGenerator;
import de.ellpeck.naturesaura.recipes.ModRecipes;
import de.ellpeck.naturesaura.recipes.TreeRitualRecipe;
import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ICustomBlockState;
import de.ellpeck.naturesaura.reg.ITESRProvider; import de.ellpeck.naturesaura.reg.ITESRProvider;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;

View file

@ -1,10 +1,6 @@
package de.ellpeck.naturesaura.blocks; package de.ellpeck.naturesaura.blocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.material.MaterialColor;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.NoFeatureConfig;
@SuppressWarnings("FieldNamingConvention") @SuppressWarnings("FieldNamingConvention")
public final class ModBlocks { public final class ModBlocks {

View file

@ -8,7 +8,6 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.HashMap; import java.util.HashMap;

View file

@ -1,6 +1,5 @@
package de.ellpeck.naturesaura.blocks.multi; package de.ellpeck.naturesaura.blocks.multi;
import de.ellpeck.naturesaura.ModConfig;
import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.multiblock.IMultiblock; import de.ellpeck.naturesaura.api.multiblock.IMultiblock;

View file

@ -4,7 +4,6 @@ import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.container.IAuraContainer; import de.ellpeck.naturesaura.api.aura.container.IAuraContainer;
import de.ellpeck.naturesaura.api.aura.container.NaturalAuraContainer; import de.ellpeck.naturesaura.api.aura.container.NaturalAuraContainer;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Direction;
public class TileEntityAncientLeaves extends TileEntityImpl { public class TileEntityAncientLeaves extends TileEntityImpl {

View file

@ -4,10 +4,10 @@ import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk; import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.api.aura.type.IAuraType; import de.ellpeck.naturesaura.api.aura.type.IAuraType;
import de.ellpeck.naturesaura.recipes.AnimalSpawnerRecipe;
import de.ellpeck.naturesaura.blocks.multi.Multiblocks; import de.ellpeck.naturesaura.blocks.multi.Multiblocks;
import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.packet.PacketParticles;
import de.ellpeck.naturesaura.recipes.AnimalSpawnerRecipe;
import de.ellpeck.naturesaura.recipes.ModRecipes; import de.ellpeck.naturesaura.recipes.ModRecipes;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemEntity;

View file

@ -12,8 +12,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.IItemHandlerModifiable;
import java.util.Map; import java.util.Map;

View file

@ -1,7 +1,6 @@
package de.ellpeck.naturesaura.blocks.tiles; package de.ellpeck.naturesaura.blocks.tiles;
import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk; import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.chunk.AuraChunk;
import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.packet.PacketParticles;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
@ -10,13 +9,15 @@ import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.ListNBT; import net.minecraft.nbt.ListNBT;
import net.minecraft.nbt.NBTUtil; import net.minecraft.nbt.NBTUtil;
import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvents; import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import java.util.*; import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Deque;
import java.util.List;
public class TileEntityChorusGenerator extends TileEntityImpl implements ITickableTileEntity { public class TileEntityChorusGenerator extends TileEntityImpl implements ITickableTileEntity {

View file

@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.Items; import net.minecraft.item.Items;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.EntityPredicates; import net.minecraft.util.EntityPredicates;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

View file

@ -5,18 +5,17 @@ import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.api.aura.container.BasicAuraContainer; import de.ellpeck.naturesaura.api.aura.container.BasicAuraContainer;
import de.ellpeck.naturesaura.api.aura.container.IAuraContainer; import de.ellpeck.naturesaura.api.aura.container.IAuraContainer;
import de.ellpeck.naturesaura.api.aura.type.IAuraType; import de.ellpeck.naturesaura.api.aura.type.IAuraType;
import de.ellpeck.naturesaura.recipes.AltarRecipe;
import de.ellpeck.naturesaura.blocks.multi.Multiblocks; import de.ellpeck.naturesaura.blocks.multi.Multiblocks;
import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticleStream; import de.ellpeck.naturesaura.packet.PacketParticleStream;
import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.packet.PacketParticles;
import de.ellpeck.naturesaura.recipes.AltarRecipe;
import de.ellpeck.naturesaura.recipes.ModRecipes; import de.ellpeck.naturesaura.recipes.ModRecipes;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.Ingredient;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvents; import net.minecraft.util.SoundEvents;

View file

@ -1,25 +1,23 @@
package de.ellpeck.naturesaura.blocks.tiles; package de.ellpeck.naturesaura.blocks.tiles;
import de.ellpeck.naturesaura.Helper; import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.recipes.ModRecipes;
import de.ellpeck.naturesaura.recipes.OfferingRecipe;
import de.ellpeck.naturesaura.blocks.multi.Multiblocks; import de.ellpeck.naturesaura.blocks.multi.Multiblocks;
import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.packet.PacketParticles;
import de.ellpeck.naturesaura.recipes.ModRecipes;
import de.ellpeck.naturesaura.recipes.OfferingRecipe;
import net.minecraft.block.Blocks;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
import net.minecraft.entity.effect.LightningBoltEntity; import net.minecraft.entity.effect.LightningBoltEntity;
import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.INBT; import net.minecraft.nbt.INBT;
import net.minecraft.nbt.ListNBT; import net.minecraft.nbt.ListNBT;
import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.IItemHandlerModifiable;
import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.ItemStackHandler;
@ -86,6 +84,11 @@ public class TileEntityOfferingTable extends TileEntityImpl implements ITickable
for (int i = 0; i < recipeCount; i++) for (int i = 0; i < recipeCount; i++)
this.itemsToSpawn.add(recipe.output.copy()); this.itemsToSpawn.add(recipe.output.copy());
if (Multiblocks.OFFERING_TABLE.forEach(this.pos, 'R', (pos, m) -> this.world.getBlockState(pos).getBlock() == Blocks.WITHER_ROSE)) {
for (int i = this.world.rand.nextInt(5) + 3; i >= 0; i--)
this.itemsToSpawn.add(new ItemStack(Items.BLACK_DYE));
}
LightningBoltEntity lightningboltentity = EntityType.LIGHTNING_BOLT.create(this.world); LightningBoltEntity lightningboltentity = EntityType.LIGHTNING_BOLT.create(this.world);
lightningboltentity.setEffectOnly(true); lightningboltentity.setEffectOnly(true);
lightningboltentity.moveForced(Vector3d.copyCenteredHorizontally(this.pos)); lightningboltentity.moveForced(Vector3d.copyCenteredHorizontally(this.pos));

View file

@ -1,7 +1,6 @@
package de.ellpeck.naturesaura.blocks.tiles; package de.ellpeck.naturesaura.blocks.tiles;
import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk; import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.chunk.AuraChunk;
import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.packet.PacketParticles;
import net.minecraft.entity.monster.MagmaCubeEntity; import net.minecraft.entity.monster.MagmaCubeEntity;

View file

@ -3,15 +3,11 @@ package de.ellpeck.naturesaura.blocks.tiles;
import de.ellpeck.naturesaura.Helper; import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk; import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.api.aura.type.IAuraType;
import de.ellpeck.naturesaura.api.misc.WeatherType; import de.ellpeck.naturesaura.api.misc.WeatherType;
import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EntityPredicates; import net.minecraft.util.EntityPredicates;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;

View file

@ -1,11 +1,10 @@
package de.ellpeck.naturesaura.blocks.tiles; package de.ellpeck.naturesaura.blocks.tiles;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.recipes.TreeRitualRecipe;
import de.ellpeck.naturesaura.blocks.multi.Multiblocks; import de.ellpeck.naturesaura.blocks.multi.Multiblocks;
import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticleStream; import de.ellpeck.naturesaura.packet.PacketParticleStream;
import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.packet.PacketParticles;
import de.ellpeck.naturesaura.recipes.TreeRitualRecipe;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.LeavesBlock; import net.minecraft.block.LeavesBlock;
@ -16,7 +15,6 @@ import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tags.BlockTags; import net.minecraft.tags.BlockTags;
import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvents; import net.minecraft.util.SoundEvents;

View file

@ -1,8 +1,6 @@
package de.ellpeck.naturesaura.blocks.tiles.render; package de.ellpeck.naturesaura.blocks.tiles.render;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.IVertexBuilder; import com.mojang.blaze3d.vertex.IVertexBuilder;
import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.aura.type.IAuraType; import de.ellpeck.naturesaura.api.aura.type.IAuraType;

View file

@ -4,7 +4,6 @@ import com.mojang.blaze3d.matrix.MatrixStack;
import de.ellpeck.naturesaura.blocks.tiles.TileEntityWoodStand; import de.ellpeck.naturesaura.blocks.tiles.TileEntityWoodStand;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.RenderTypeLookup;
import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;

View file

@ -15,9 +15,11 @@ import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUseContext; import net.minecraft.item.ItemUseContext;
import net.minecraft.tags.ITag; import net.minecraft.tags.ITag;
import net.minecraft.tags.Tag;
import net.minecraft.util.*; import net.minecraft.util.*;
import net.minecraft.util.math.*; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.Chunk;

View file

@ -9,7 +9,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tags.ITag; import net.minecraft.tags.ITag;
import net.minecraft.tags.ItemTags; import net.minecraft.tags.ItemTags;
import net.minecraft.tags.Tag;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
@ -17,13 +16,11 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.AttachCapabilitiesEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.InterModComms;
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import top.theillusivec4.curios.api.CuriosCapability; import top.theillusivec4.curios.api.CuriosCapability;
import top.theillusivec4.curios.api.SlotTypeMessage; import top.theillusivec4.curios.api.SlotTypeMessage;
import top.theillusivec4.curios.api.SlotTypePreset;
import top.theillusivec4.curios.api.type.capability.ICurio; import top.theillusivec4.curios.api.type.capability.ICurio;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;

View file

@ -6,7 +6,6 @@ import de.ellpeck.naturesaura.enchant.ModEnchantments;
import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.TickEvent;
import net.minecraftforge.fml.DeferredWorkQueue; import net.minecraftforge.fml.DeferredWorkQueue;
import quarris.enchantability.api.EnchantabilityApi; import quarris.enchantability.api.EnchantabilityApi;
import quarris.enchantability.api.EnchantabilityApi.IInternals;
import java.util.Collections; import java.util.Collections;

View file

@ -2,10 +2,8 @@ package de.ellpeck.naturesaura.compat.jei;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.recipes.AltarRecipe;
import de.ellpeck.naturesaura.blocks.ModBlocks; import de.ellpeck.naturesaura.blocks.ModBlocks;
import de.ellpeck.naturesaura.items.ItemAuraBottle; import de.ellpeck.naturesaura.recipes.AltarRecipe;
import de.ellpeck.naturesaura.items.ModItems;
import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.gui.drawable.IDrawable;

View file

@ -8,23 +8,18 @@ import de.ellpeck.naturesaura.api.multiblock.Matcher;
import de.ellpeck.naturesaura.compat.ICompat; import de.ellpeck.naturesaura.compat.ICompat;
import de.ellpeck.naturesaura.data.ItemTagProvider; import de.ellpeck.naturesaura.data.ItemTagProvider;
import de.ellpeck.naturesaura.events.ClientEvents; import de.ellpeck.naturesaura.events.ClientEvents;
import de.ellpeck.naturesaura.recipes.ModRecipe;
import de.ellpeck.naturesaura.recipes.ModRecipes;
import de.ellpeck.naturesaura.renderers.SupporterFancyHandler; import de.ellpeck.naturesaura.renderers.SupporterFancyHandler;
import de.ellpeck.naturesaura.renderers.SupporterFancyHandler.FancyInfo; import de.ellpeck.naturesaura.renderers.SupporterFancyHandler.FancyInfo;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.gui.AbstractGui;
import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.IRecipeType;
import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.Ingredient;
import net.minecraft.item.crafting.RecipeManager; import net.minecraft.item.crafting.RecipeManager;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.StringTextComponent;
import net.minecraft.util.text.Style; import net.minecraft.util.text.Style;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
@ -37,7 +32,8 @@ import vazkii.patchouli.api.PatchouliAPI;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.Month; import java.time.Month;
import java.util.*; import java.util.Arrays;
import java.util.Collections;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class PatchouliCompat implements ICompat { public class PatchouliCompat implements ICompat {

View file

@ -1,14 +1,10 @@
package de.ellpeck.naturesaura.compat.patchouli; package de.ellpeck.naturesaura.compat.patchouli;
import de.ellpeck.naturesaura.recipes.AltarRecipe; import de.ellpeck.naturesaura.recipes.AltarRecipe;
import de.ellpeck.naturesaura.items.ItemAuraBottle;
import de.ellpeck.naturesaura.items.ModItems;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.Ingredient;
import vazkii.patchouli.api.IComponentProcessor; import vazkii.patchouli.api.IComponentProcessor;
import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.IVariable;
import vazkii.patchouli.api.IVariableProvider; import vazkii.patchouli.api.IVariableProvider;
import vazkii.patchouli.api.PatchouliAPI;
public class ProcessorAltar implements IComponentProcessor { public class ProcessorAltar implements IComponentProcessor {

View file

@ -1,13 +1,11 @@
package de.ellpeck.naturesaura.compat.patchouli; package de.ellpeck.naturesaura.compat.patchouli;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.recipes.AnimalSpawnerRecipe; import de.ellpeck.naturesaura.recipes.AnimalSpawnerRecipe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.SpawnEggItem; import net.minecraft.item.SpawnEggItem;
import vazkii.patchouli.api.IComponentProcessor; import vazkii.patchouli.api.IComponentProcessor;
import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.IVariable;
import vazkii.patchouli.api.IVariableProvider; import vazkii.patchouli.api.IVariableProvider;
import vazkii.patchouli.api.PatchouliAPI;
public class ProcessorAnimalSpawner implements IComponentProcessor { public class ProcessorAnimalSpawner implements IComponentProcessor {

View file

@ -1,11 +1,9 @@
package de.ellpeck.naturesaura.compat.patchouli; package de.ellpeck.naturesaura.compat.patchouli;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.recipes.OfferingRecipe; import de.ellpeck.naturesaura.recipes.OfferingRecipe;
import vazkii.patchouli.api.IComponentProcessor; import vazkii.patchouli.api.IComponentProcessor;
import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.IVariable;
import vazkii.patchouli.api.IVariableProvider; import vazkii.patchouli.api.IVariableProvider;
import vazkii.patchouli.api.PatchouliAPI;
public class ProcessorOffering implements IComponentProcessor { public class ProcessorOffering implements IComponentProcessor {

View file

@ -1,11 +1,9 @@
package de.ellpeck.naturesaura.compat.patchouli; package de.ellpeck.naturesaura.compat.patchouli;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.recipes.TreeRitualRecipe; import de.ellpeck.naturesaura.recipes.TreeRitualRecipe;
import vazkii.patchouli.api.IComponentProcessor; import vazkii.patchouli.api.IComponentProcessor;
import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.IVariable;
import vazkii.patchouli.api.IVariableProvider; import vazkii.patchouli.api.IVariableProvider;
import vazkii.patchouli.api.PatchouliAPI;
public class ProcessorTreeRitual implements IComponentProcessor { public class ProcessorTreeRitual implements IComponentProcessor {

View file

@ -9,7 +9,6 @@ import net.minecraft.item.Item;
import net.minecraft.tags.BlockTags; import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ITag; import net.minecraft.tags.ITag;
import net.minecraft.tags.ItemTags; import net.minecraft.tags.ItemTags;
import net.minecraft.tags.Tag;
import net.minecraftforge.common.Tags; import net.minecraftforge.common.Tags;
import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.common.data.ExistingFileHelper;

View file

@ -17,7 +17,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.fml.network.NetworkHooks;
public class EntityStructureFinder extends EyeOfEnderEntity { public class EntityStructureFinder extends EyeOfEnderEntity {

View file

@ -13,7 +13,6 @@ import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.math.vector.Vector3f;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;

View file

@ -10,17 +10,13 @@ import net.minecraft.block.material.Material;
import net.minecraft.util.Direction.Axis; import net.minecraft.util.Direction.Axis;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.MutableBoundingBox;
import net.minecraft.world.ISeedReader; import net.minecraft.world.ISeedReader;
import net.minecraft.world.IWorldWriter;
import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.ChunkGenerator;
import net.minecraft.world.gen.IWorldGenerationReader; import net.minecraft.world.gen.IWorldGenerationReader;
import net.minecraft.world.gen.feature.BaseTreeFeatureConfig; import net.minecraft.world.gen.feature.BaseTreeFeatureConfig;
import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.TreeFeature;
import java.util.Random; import java.util.Random;
import java.util.Set;
public class WorldGenAncientTree extends Feature<BaseTreeFeatureConfig> { public class WorldGenAncientTree extends Feature<BaseTreeFeatureConfig> {

View file

@ -8,8 +8,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.world.ISeedReader; import net.minecraft.world.ISeedReader;
import net.minecraft.world.IWorld;
import net.minecraft.world.World;
import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.ChunkGenerator;
import net.minecraft.world.gen.Heightmap; import net.minecraft.world.gen.Heightmap;
import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Feature;

View file

@ -1,6 +1,5 @@
package de.ellpeck.naturesaura.items; package de.ellpeck.naturesaura.items;
import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk; import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.api.aura.type.IAuraType; import de.ellpeck.naturesaura.api.aura.type.IAuraType;

View file

@ -2,7 +2,6 @@ package de.ellpeck.naturesaura.items;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack;
import de.ellpeck.naturesaura.Helper; import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.container.IAuraContainer; import de.ellpeck.naturesaura.api.aura.container.IAuraContainer;
import de.ellpeck.naturesaura.api.aura.container.ItemAuraContainer; import de.ellpeck.naturesaura.api.aura.container.ItemAuraContainer;

View file

@ -1,14 +1,10 @@
package de.ellpeck.naturesaura.items; package de.ellpeck.naturesaura.items;
import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.misc.IWorldData;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ElytraItem; import net.minecraft.item.ElytraItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.util.text.*; import net.minecraft.util.text.*;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
@ -17,7 +13,6 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import java.lang.ref.WeakReference;
import java.util.List; import java.util.List;
public class ItemBreakPrevention extends ItemImpl { public class ItemBreakPrevention extends ItemImpl {

View file

@ -1,6 +1,5 @@
package de.ellpeck.naturesaura.items; package de.ellpeck.naturesaura.items;
import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.entity.EntitySpawnPlacementRegistry; import net.minecraft.entity.EntitySpawnPlacementRegistry;

View file

@ -1,6 +1,5 @@
package de.ellpeck.naturesaura.items; package de.ellpeck.naturesaura.items;
import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.data.ItemModelGenerator; import de.ellpeck.naturesaura.data.ItemModelGenerator;
import de.ellpeck.naturesaura.misc.ColoredBlockHelper; import de.ellpeck.naturesaura.misc.ColoredBlockHelper;

View file

@ -1,7 +1,6 @@
package de.ellpeck.naturesaura.items; package de.ellpeck.naturesaura.items;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack;
import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.render.ITrinketItem; import de.ellpeck.naturesaura.api.render.ITrinketItem;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.IRenderTypeBuffer;

View file

@ -1,6 +1,5 @@
package de.ellpeck.naturesaura.items; package de.ellpeck.naturesaura.items;
import de.ellpeck.naturesaura.NaturesAura;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;

View file

@ -1,6 +1,5 @@
package de.ellpeck.naturesaura.items; package de.ellpeck.naturesaura.items;
import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.blocks.BlockGoldenLeaves; import de.ellpeck.naturesaura.blocks.BlockGoldenLeaves;
import de.ellpeck.naturesaura.reg.IColorProvidingItem; import de.ellpeck.naturesaura.reg.IColorProvidingItem;
import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.renderer.color.IItemColor;

View file

@ -1,6 +1,5 @@
package de.ellpeck.naturesaura.items; package de.ellpeck.naturesaura.items;
import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.entities.EntityMoverMinecart; import de.ellpeck.naturesaura.entities.EntityMoverMinecart;
import de.ellpeck.naturesaura.entities.ModEntities; import de.ellpeck.naturesaura.entities.ModEntities;
import net.minecraft.block.AbstractRailBlock; import net.minecraft.block.AbstractRailBlock;

View file

@ -1,6 +1,5 @@
package de.ellpeck.naturesaura.items; package de.ellpeck.naturesaura.items;
import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.multiblock.IMultiblock; import de.ellpeck.naturesaura.api.multiblock.IMultiblock;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;

View file

@ -1,21 +1,15 @@
package de.ellpeck.naturesaura.items; package de.ellpeck.naturesaura.items;
import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.MobSpawnerTileEntity;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import net.minecraft.util.ActionResultType; import net.minecraft.util.ActionResultType;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.items.CapabilityItemHandler;
public class ItemNetheriteFinder extends ItemImpl { public class ItemNetheriteFinder extends ItemImpl {
public ItemNetheriteFinder() { public ItemNetheriteFinder() {

View file

@ -1,7 +1,6 @@
package de.ellpeck.naturesaura.items; package de.ellpeck.naturesaura.items;
import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk; import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketHandler;
import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.packet.PacketParticles;
@ -10,11 +9,9 @@ import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.passive.TameableEntity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.entity.player.SpawnLocationHelper;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.particles.ParticleTypes; import net.minecraft.particles.ParticleTypes;
import net.minecraft.util.ActionResultType; import net.minecraft.util.ActionResultType;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;

View file

@ -10,7 +10,10 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUseContext; import net.minecraft.item.ItemUseContext;
import net.minecraft.util.*; import net.minecraft.util.ActionResult;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.world.World; import net.minecraft.world.World;

View file

@ -1,7 +1,6 @@
package de.ellpeck.naturesaura.items; package de.ellpeck.naturesaura.items;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack;
import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.render.ITrinketItem; import de.ellpeck.naturesaura.api.render.ITrinketItem;
import de.ellpeck.naturesaura.items.tools.ItemArmor; import de.ellpeck.naturesaura.items.tools.ItemArmor;

View file

@ -11,7 +11,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.gen.feature.structure.Structure; import net.minecraft.world.gen.feature.structure.Structure;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.storage.ServerWorldInfo;
public class ItemStructureFinder extends ItemImpl { public class ItemStructureFinder extends ItemImpl {
private final Structure structureName; private final Structure structureName;

View file

@ -16,7 +16,6 @@ import net.minecraft.item.*;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectInstance;
import net.minecraft.potion.Effects; import net.minecraft.potion.Effects;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.TickEvent;
import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent;
@ -25,7 +24,10 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ForgeRegistries;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.*; import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class ItemArmor extends ArmorItem implements IModItem { public class ItemArmor extends ArmorItem implements IModItem {

View file

@ -9,20 +9,14 @@ import de.ellpeck.naturesaura.reg.IModItem;
import de.ellpeck.naturesaura.reg.ModRegistry; import de.ellpeck.naturesaura.reg.ModRegistry;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.BushBlock; import net.minecraft.block.BushBlock;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemEntity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.*; import net.minecraft.item.*;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.ActionResultType; import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.capabilities.ICapabilityProvider;
import javax.annotation.Nullable; import javax.annotation.Nullable;

View file

@ -5,7 +5,6 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.network.NetworkRegistry; import net.minecraftforge.fml.network.NetworkRegistry;
import net.minecraftforge.fml.network.PacketDistributor; import net.minecraftforge.fml.network.PacketDistributor;

View file

@ -8,8 +8,6 @@ import de.ellpeck.naturesaura.entities.EntityStructureFinder;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.network.PacketBuffer; import net.minecraft.network.PacketBuffer;
import net.minecraft.particles.ItemParticleData; import net.minecraft.particles.ItemParticleData;
import net.minecraft.particles.ParticleTypes; import net.minecraft.particles.ParticleTypes;

View file

@ -6,14 +6,12 @@ import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.type.IAuraType; import de.ellpeck.naturesaura.api.aura.type.IAuraType;
import de.ellpeck.naturesaura.items.ItemAuraBottle; import de.ellpeck.naturesaura.items.ItemAuraBottle;
import de.ellpeck.naturesaura.items.ModItems; import de.ellpeck.naturesaura.items.ModItems;
import net.minecraft.data.IFinishedRecipe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.IRecipeSerializer;
import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.IRecipeType;
import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.Ingredient;
import net.minecraft.network.PacketBuffer; import net.minecraft.network.PacketBuffer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TranslationTextComponent;
import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.registries.ForgeRegistryEntry; import net.minecraftforge.registries.ForgeRegistryEntry;

View file

@ -1,11 +1,9 @@
package de.ellpeck.naturesaura.recipes; package de.ellpeck.naturesaura.recipes;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
import net.minecraft.entity.MobEntity;
import net.minecraft.entity.SpawnReason; import net.minecraft.entity.SpawnReason;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.IRecipeSerializer;
@ -14,10 +12,8 @@ import net.minecraft.item.crafting.Ingredient;
import net.minecraft.network.PacketBuffer; import net.minecraft.network.PacketBuffer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.storage.ServerWorldInfo;
import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.ForgeRegistryEntry; import net.minecraftforge.registries.ForgeRegistryEntry;

View file

@ -1,10 +1,7 @@
package de.ellpeck.naturesaura.recipes; package de.ellpeck.naturesaura.recipes;
import com.google.gson.JsonObject;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.IRecipeSerializer;
import net.minecraft.item.crafting.IRecipeType;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.items.wrapper.RecipeWrapper; import net.minecraftforge.items.wrapper.RecipeWrapper;

View file

@ -8,7 +8,6 @@ import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.misc.WeatherType; import de.ellpeck.naturesaura.api.misc.WeatherType;
import de.ellpeck.naturesaura.api.misc.WeightedOre; import de.ellpeck.naturesaura.api.misc.WeightedOre;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.client.resources.ReloadListener;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Items; import net.minecraft.item.Items;
@ -20,11 +19,8 @@ import net.minecraft.nbt.INBT;
import net.minecraft.nbt.NBTDynamicOps; import net.minecraft.nbt.NBTDynamicOps;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import net.minecraftforge.common.Tags;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistry;
import java.util.Arrays;
import java.util.List; import java.util.List;
public final class ModRecipes { public final class ModRecipes {

View file

@ -1,6 +1,5 @@
package de.ellpeck.naturesaura.recipes; package de.ellpeck.naturesaura.recipes;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

View file

@ -1,7 +1,6 @@
package de.ellpeck.naturesaura.reg; package de.ellpeck.naturesaura.reg;
import de.ellpeck.naturesaura.Helper; import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.ModConfig;
import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.api.misc.IWorldData; import de.ellpeck.naturesaura.api.misc.IWorldData;
import de.ellpeck.naturesaura.blocks.*; import de.ellpeck.naturesaura.blocks.*;

View file

@ -20,8 +20,6 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import top.theillusivec4.curios.api.CuriosApi; import top.theillusivec4.curios.api.CuriosApi;
import top.theillusivec4.curios.api.type.capability.ICuriosItemHandler;
import top.theillusivec4.curios.api.type.inventory.ICurioStacksHandler;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;

View file

@ -12,12 +12,30 @@
"from": [3, 0, 3], "from": [3, 0, 3],
"to": [13, 1, 13], "to": [13, 1, 13],
"faces": { "faces": {
"north": {"uv": [0, 0, 10, 1], "texture": "#0"}, "north": {
"east": {"uv": [0, 0, 10, 1], "texture": "#0"}, "uv": [0, 0, 10, 1],
"south": {"uv": [0, 0, 10, 1], "texture": "#0"}, "texture": "#0"
"west": {"uv": [0, 0, 10, 1], "texture": "#0"}, },
"up": {"uv": [0, 0, 10, 10], "texture": "#0"}, "east": {
"down": {"uv": [0, 0, 10, 10], "texture": "#0"} "uv": [0, 0, 10, 1],
"texture": "#0"
},
"south": {
"uv": [0, 0, 10, 1],
"texture": "#0"
},
"west": {
"uv": [0, 0, 10, 1],
"texture": "#0"
},
"up": {
"uv": [0, 0, 10, 10],
"texture": "#0"
},
"down": {
"uv": [0, 0, 10, 10],
"texture": "#0"
}
} }
}, },
{ {
@ -25,12 +43,30 @@
"from": [4, 1, 4], "from": [4, 1, 4],
"to": [12, 2, 12], "to": [12, 2, 12],
"faces": { "faces": {
"north": {"uv": [0, 0, 8, 1], "texture": "#0"}, "north": {
"east": {"uv": [0, 0, 8, 1], "texture": "#0"}, "uv": [0, 0, 8, 1],
"south": {"uv": [0, 0, 8, 1], "texture": "#0"}, "texture": "#0"
"west": {"uv": [0, 0, 8, 1], "texture": "#0"}, },
"up": {"uv": [0, 0, 8, 8], "texture": "#0"}, "east": {
"down": {"uv": [0, 0, 8, 8], "texture": "#0"} "uv": [0, 0, 8, 1],
"texture": "#0"
},
"south": {
"uv": [0, 0, 8, 1],
"texture": "#0"
},
"west": {
"uv": [0, 0, 8, 1],
"texture": "#0"
},
"up": {
"uv": [0, 0, 8, 8],
"texture": "#0"
},
"down": {
"uv": [0, 0, 8, 8],
"texture": "#0"
}
} }
}, },
{ {
@ -38,12 +74,30 @@
"from": [6, 2, 6], "from": [6, 2, 6],
"to": [10, 7, 10], "to": [10, 7, 10],
"faces": { "faces": {
"north": {"uv": [0, 0, 4, 5], "texture": "#0"}, "north": {
"east": {"uv": [0, 0, 4, 5], "texture": "#0"}, "uv": [0, 0, 4, 5],
"south": {"uv": [0, 0, 4, 5], "texture": "#0"}, "texture": "#0"
"west": {"uv": [0, 0, 4, 5], "texture": "#0"}, },
"up": {"uv": [0, 0, 4, 4], "texture": "#0"}, "east": {
"down": {"uv": [0, 0, 4, 4], "texture": "#0"} "uv": [0, 0, 4, 5],
"texture": "#0"
},
"south": {
"uv": [0, 0, 4, 5],
"texture": "#0"
},
"west": {
"uv": [0, 0, 4, 5],
"texture": "#0"
},
"up": {
"uv": [0, 0, 4, 4],
"texture": "#0"
},
"down": {
"uv": [0, 0, 4, 4],
"texture": "#0"
}
} }
}, },
{ {
@ -51,12 +105,30 @@
"from": [5, 7, 5], "from": [5, 7, 5],
"to": [11, 13, 11], "to": [11, 13, 11],
"faces": { "faces": {
"north": {"uv": [0, 0, 6, 6], "texture": "#1"}, "north": {
"east": {"uv": [0, 0, 6, 6], "texture": "#1"}, "uv": [0, 0, 6, 6],
"south": {"uv": [0, 0, 6, 6], "texture": "#1"}, "texture": "#1"
"west": {"uv": [0, 0, 6, 6], "texture": "#1"}, },
"up": {"uv": [6, 0, 12, 6], "texture": "#1"}, "east": {
"down": {"uv": [6, 0, 12, 6], "texture": "#1"} "uv": [0, 0, 6, 6],
"texture": "#1"
},
"south": {
"uv": [0, 0, 6, 6],
"texture": "#1"
},
"west": {
"uv": [0, 0, 6, 6],
"texture": "#1"
},
"up": {
"uv": [6, 0, 12, 6],
"texture": "#1"
},
"down": {
"uv": [6, 0, 12, 6],
"texture": "#1"
}
} }
} }
] ]

View file

@ -13,124 +13,287 @@
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [16, 1, 16], "to": [16, 1, 16],
"faces": { "faces": {
"north": {"uv": [0, 0, 16, 1], "texture": "#0"}, "north": {
"east": {"uv": [0, 0, 16, 1], "texture": "#0"}, "uv": [0, 0, 16, 1],
"south": {"uv": [0, 0, 16, 1], "texture": "#0"}, "texture": "#0"
"west": {"uv": [0, 0, 16, 1], "texture": "#0"}, },
"up": {"uv": [0, 0, 16, 16], "texture": "#0"}, "east": {
"down": {"uv": [0, 0, 16, 16], "texture": "#0"} "uv": [0, 0, 16, 1],
"texture": "#0"
},
"south": {
"uv": [0, 0, 16, 1],
"texture": "#0"
},
"west": {
"uv": [0, 0, 16, 1],
"texture": "#0"
},
"up": {
"uv": [0, 0, 16, 16],
"texture": "#0"
},
"down": {
"uv": [0, 0, 16, 16],
"texture": "#0"
}
} }
}, },
{ {
"from": [2, 14, 2], "from": [2, 14, 2],
"to": [14, 15, 14], "to": [14, 15, 14],
"faces": { "faces": {
"up": {"uv": [2, 2, 14, 14], "texture": "#1"}, "up": {
"down": {"uv": [2, 2, 14, 14], "texture": "#1"} "uv": [2, 2, 14, 14],
"texture": "#1"
},
"down": {
"uv": [2, 2, 14, 14],
"texture": "#1"
}
} }
}, },
{ {
"from": [2, 1, 1], "from": [2, 1, 1],
"to": [14, 15, 2], "to": [14, 15, 2],
"faces": { "faces": {
"north": {"uv": [2, 1, 14, 15], "texture": "#1"}, "north": {
"east": {"uv": [2, 1, 3, 15], "texture": "#1"}, "uv": [2, 1, 14, 15],
"west": {"uv": [2, 1, 3, 15], "texture": "#1"}, "texture": "#1"
"up": {"uv": [2, 1, 14, 2], "texture": "#1"} },
"east": {
"uv": [2, 1, 3, 15],
"texture": "#1"
},
"west": {
"uv": [2, 1, 3, 15],
"texture": "#1"
},
"up": {
"uv": [2, 1, 14, 2],
"texture": "#1"
}
} }
}, },
{ {
"from": [2, 1, 14], "from": [2, 1, 14],
"to": [14, 15, 15], "to": [14, 15, 15],
"faces": { "faces": {
"east": {"uv": [2, 1, 3, 15], "texture": "#1"}, "east": {
"south": {"uv": [2, 1, 14, 15], "texture": "#1"}, "uv": [2, 1, 3, 15],
"west": {"uv": [2, 1, 3, 15], "texture": "#1"}, "texture": "#1"
"up": {"uv": [2, 1, 14, 2], "texture": "#1"} },
"south": {
"uv": [2, 1, 14, 15],
"texture": "#1"
},
"west": {
"uv": [2, 1, 3, 15],
"texture": "#1"
},
"up": {
"uv": [2, 1, 14, 2],
"texture": "#1"
}
} }
}, },
{ {
"from": [1, 1, 1], "from": [1, 1, 1],
"to": [2, 15, 15], "to": [2, 15, 15],
"faces": { "faces": {
"north": {"uv": [1, 1, 2, 15], "texture": "#1"}, "north": {
"south": {"uv": [1, 1, 2, 15], "texture": "#1"}, "uv": [1, 1, 2, 15],
"west": {"uv": [1, 1, 15, 15], "texture": "#1"}, "texture": "#1"
"up": {"uv": [1, 1, 2, 15], "texture": "#1"} },
"south": {
"uv": [1, 1, 2, 15],
"texture": "#1"
},
"west": {
"uv": [1, 1, 15, 15],
"texture": "#1"
},
"up": {
"uv": [1, 1, 2, 15],
"texture": "#1"
}
} }
}, },
{ {
"from": [14, 1, 1], "from": [14, 1, 1],
"to": [15, 15, 15], "to": [15, 15, 15],
"faces": { "faces": {
"north": {"uv": [1, 1, 2, 15], "texture": "#1"}, "north": {
"east": {"uv": [1, 1, 15, 15], "texture": "#1"}, "uv": [1, 1, 2, 15],
"south": {"uv": [1, 1, 2, 15], "texture": "#1"}, "texture": "#1"
"up": {"uv": [1, 1, 2, 15], "texture": "#1"} },
"east": {
"uv": [1, 1, 15, 15],
"texture": "#1"
},
"south": {
"uv": [1, 1, 2, 15],
"texture": "#1"
},
"up": {
"uv": [1, 1, 2, 15],
"texture": "#1"
}
} }
}, },
{ {
"from": [4, 1, 4], "from": [4, 1, 4],
"to": [12, 2, 12], "to": [12, 2, 12],
"faces": { "faces": {
"north": {"uv": [0, 0, 8, 1], "texture": "#2"}, "north": {
"east": {"uv": [0, 0, 8, 1], "texture": "#2"}, "uv": [0, 0, 8, 1],
"south": {"uv": [0, 0, 8, 1], "texture": "#2"}, "texture": "#2"
"west": {"uv": [0, 0, 8, 1], "texture": "#2"}, },
"up": {"uv": [1, 1, 9, 9], "texture": "#2"}, "east": {
"down": {"uv": [1, 1, 9, 9], "texture": "#2"} "uv": [0, 0, 8, 1],
"texture": "#2"
},
"south": {
"uv": [0, 0, 8, 1],
"texture": "#2"
},
"west": {
"uv": [0, 0, 8, 1],
"texture": "#2"
},
"up": {
"uv": [1, 1, 9, 9],
"texture": "#2"
},
"down": {
"uv": [1, 1, 9, 9],
"texture": "#2"
}
} }
}, },
{ {
"from": [3, 2, 4], "from": [3, 2, 4],
"to": [4, 9, 12], "to": [4, 9, 12],
"faces": { "faces": {
"north": {"uv": [0, 0, 1, 7], "texture": "#2"}, "north": {
"east": {"uv": [1, 1, 9, 8], "texture": "#2"}, "uv": [0, 0, 1, 7],
"south": {"uv": [0, 0, 1, 7], "texture": "#2"}, "texture": "#2"
"west": {"uv": [1, 1, 9, 8], "texture": "#2"}, },
"up": {"uv": [0, 0, 1, 8], "texture": "#2"}, "east": {
"down": {"uv": [0, 0, 1, 8], "texture": "#2"} "uv": [1, 1, 9, 8],
"texture": "#2"
},
"south": {
"uv": [0, 0, 1, 7],
"texture": "#2"
},
"west": {
"uv": [1, 1, 9, 8],
"texture": "#2"
},
"up": {
"uv": [0, 0, 1, 8],
"texture": "#2"
},
"down": {
"uv": [0, 0, 1, 8],
"texture": "#2"
}
} }
}, },
{ {
"from": [12, 2, 4], "from": [12, 2, 4],
"to": [13, 9, 12], "to": [13, 9, 12],
"faces": { "faces": {
"north": {"uv": [0, 0, 1, 7], "texture": "#2"}, "north": {
"east": {"uv": [1, 1, 9, 8], "texture": "#2"}, "uv": [0, 0, 1, 7],
"south": {"uv": [0, 0, 1, 7], "texture": "#2"}, "texture": "#2"
"west": {"uv": [1, 1, 9, 8], "texture": "#2"}, },
"up": {"uv": [0, 0, 1, 8], "texture": "#2"}, "east": {
"down": {"uv": [0, 0, 1, 8], "texture": "#2"} "uv": [1, 1, 9, 8],
"texture": "#2"
},
"south": {
"uv": [0, 0, 1, 7],
"texture": "#2"
},
"west": {
"uv": [1, 1, 9, 8],
"texture": "#2"
},
"up": {
"uv": [0, 0, 1, 8],
"texture": "#2"
},
"down": {
"uv": [0, 0, 1, 8],
"texture": "#2"
}
} }
}, },
{ {
"from": [4, 2, 3], "from": [4, 2, 3],
"to": [12, 9, 4], "to": [12, 9, 4],
"faces": { "faces": {
"north": {"uv": [1, 1, 9, 8], "texture": "#2"}, "north": {
"east": {"uv": [0, 0, 1, 7], "texture": "#2"}, "uv": [1, 1, 9, 8],
"south": {"uv": [1, 1, 9, 8], "texture": "#2"}, "texture": "#2"
"west": {"uv": [0, 0, 1, 7], "texture": "#2"}, },
"up": {"uv": [0, 0, 8, 1], "texture": "#2"}, "east": {
"down": {"uv": [0, 0, 8, 1], "texture": "#2"} "uv": [0, 0, 1, 7],
"texture": "#2"
},
"south": {
"uv": [1, 1, 9, 8],
"texture": "#2"
},
"west": {
"uv": [0, 0, 1, 7],
"texture": "#2"
},
"up": {
"uv": [0, 0, 8, 1],
"texture": "#2"
},
"down": {
"uv": [0, 0, 8, 1],
"texture": "#2"
}
} }
}, },
{ {
"from": [4, 2, 12], "from": [4, 2, 12],
"to": [12, 9, 13], "to": [12, 9, 13],
"faces": { "faces": {
"north": {"uv": [1, 1, 9, 8], "texture": "#2"}, "north": {
"east": {"uv": [0, 0, 1, 7], "texture": "#2"}, "uv": [1, 1, 9, 8],
"south": {"uv": [1, 1, 9, 8], "texture": "#2"}, "texture": "#2"
"west": {"uv": [0, 0, 1, 7], "texture": "#2"}, },
"up": {"uv": [0, 0, 8, 1], "texture": "#2"}, "east": {
"down": {"uv": [0, 0, 8, 1], "texture": "#2"} "uv": [0, 0, 1, 7],
"texture": "#2"
},
"south": {
"uv": [1, 1, 9, 8],
"texture": "#2"
},
"west": {
"uv": [0, 0, 1, 7],
"texture": "#2"
},
"up": {
"uv": [0, 0, 8, 1],
"texture": "#2"
},
"down": {
"uv": [0, 0, 8, 1],
"texture": "#2"
}
} }
} }
], ],
"groups": [0, "groups": [
0,
{ {
"name": "glass", "name": "glass",
"origin": [8, 8, 8], "origin": [8, 8, 8],

View file

@ -13,12 +13,30 @@
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [16, 3, 16], "to": [16, 3, 16],
"faces": { "faces": {
"north": {"uv": [0, 6, 16, 9], "texture": "#0"}, "north": {
"east": {"uv": [0, 6, 16, 9], "texture": "#0"}, "uv": [0, 6, 16, 9],
"south": {"uv": [0, 6, 16, 9], "texture": "#0"}, "texture": "#0"
"west": {"uv": [0, 6, 16, 9], "texture": "#0"}, },
"up": {"uv": [0, 0, 16, 16], "texture": "#1"}, "east": {
"down": {"uv": [0, 0, 16, 16], "texture": "#1"} "uv": [0, 6, 16, 9],
"texture": "#0"
},
"south": {
"uv": [0, 6, 16, 9],
"texture": "#0"
},
"west": {
"uv": [0, 6, 16, 9],
"texture": "#0"
},
"up": {
"uv": [0, 0, 16, 16],
"texture": "#1"
},
"down": {
"uv": [0, 0, 16, 16],
"texture": "#1"
}
} }
}, },
{ {
@ -26,12 +44,30 @@
"from": [1, 3, 1], "from": [1, 3, 1],
"to": [15, 5, 15], "to": [15, 5, 15],
"faces": { "faces": {
"north": {"uv": [1, 13, 15, 15], "texture": "#0"}, "north": {
"east": {"uv": [1, 13, 15, 15], "texture": "#0"}, "uv": [1, 13, 15, 15],
"south": {"uv": [1, 13, 15, 15], "texture": "#0"}, "texture": "#0"
"west": {"uv": [1, 13, 15, 15], "texture": "#0"}, },
"up": {"uv": [1, 1, 15, 15], "texture": "#1"}, "east": {
"down": {"uv": [1, 1, 15, 15], "texture": "#1"} "uv": [1, 13, 15, 15],
"texture": "#0"
},
"south": {
"uv": [1, 13, 15, 15],
"texture": "#0"
},
"west": {
"uv": [1, 13, 15, 15],
"texture": "#0"
},
"up": {
"uv": [1, 1, 15, 15],
"texture": "#1"
},
"down": {
"uv": [1, 1, 15, 15],
"texture": "#1"
}
} }
}, },
{ {
@ -39,12 +75,30 @@
"from": [1, 5, 3], "from": [1, 5, 3],
"to": [15, 9, 13], "to": [15, 9, 13],
"faces": { "faces": {
"north": {"uv": [1, 11, 15, 15], "texture": "#2"}, "north": {
"east": {"uv": [3, 11, 13, 15], "texture": "#0"}, "uv": [1, 11, 15, 15],
"south": {"uv": [1, 11, 15, 15], "texture": "#2"}, "texture": "#2"
"west": {"uv": [3, 11, 13, 15], "texture": "#0"}, },
"up": {"uv": [1, 3, 15, 13], "texture": "#1"}, "east": {
"down": {"uv": [1, 3, 15, 13], "texture": "#1"} "uv": [3, 11, 13, 15],
"texture": "#0"
},
"south": {
"uv": [1, 11, 15, 15],
"texture": "#2"
},
"west": {
"uv": [3, 11, 13, 15],
"texture": "#0"
},
"up": {
"uv": [1, 3, 15, 13],
"texture": "#1"
},
"down": {
"uv": [1, 3, 15, 13],
"texture": "#1"
}
} }
}, },
{ {
@ -52,12 +106,30 @@
"from": [1, 9, 3], "from": [1, 9, 3],
"to": [15, 16, 5], "to": [15, 16, 5],
"faces": { "faces": {
"north": {"uv": [1, 4, 15, 11], "texture": "#2"}, "north": {
"east": {"uv": [1, 4, 3, 11], "texture": "#0"}, "uv": [1, 4, 15, 11],
"south": {"uv": [1, 4, 15, 11], "texture": "#0"}, "texture": "#2"
"west": {"uv": [1, 4, 3, 11], "texture": "#0"}, },
"up": {"uv": [1, 2, 15, 4], "texture": "#1"}, "east": {
"down": {"uv": [1, 2, 15, 4], "texture": "#1"} "uv": [1, 4, 3, 11],
"texture": "#0"
},
"south": {
"uv": [1, 4, 15, 11],
"texture": "#0"
},
"west": {
"uv": [1, 4, 3, 11],
"texture": "#0"
},
"up": {
"uv": [1, 2, 15, 4],
"texture": "#1"
},
"down": {
"uv": [1, 2, 15, 4],
"texture": "#1"
}
} }
}, },
{ {
@ -65,12 +137,30 @@
"from": [1, 9, 11], "from": [1, 9, 11],
"to": [15, 16, 13], "to": [15, 16, 13],
"faces": { "faces": {
"north": {"uv": [1, 4, 15, 11], "texture": "#0"}, "north": {
"east": {"uv": [1, 4, 3, 11], "texture": "#0"}, "uv": [1, 4, 15, 11],
"south": {"uv": [1, 4, 15, 11], "texture": "#2"}, "texture": "#0"
"west": {"uv": [1, 4, 3, 11], "texture": "#0"}, },
"up": {"uv": [1, 2, 15, 4], "texture": "#1"}, "east": {
"down": {"uv": [1, 2, 15, 4], "texture": "#1"} "uv": [1, 4, 3, 11],
"texture": "#0"
},
"south": {
"uv": [1, 4, 15, 11],
"texture": "#2"
},
"west": {
"uv": [1, 4, 3, 11],
"texture": "#0"
},
"up": {
"uv": [1, 2, 15, 4],
"texture": "#1"
},
"down": {
"uv": [1, 2, 15, 4],
"texture": "#1"
}
} }
}, },
{ {
@ -78,12 +168,30 @@
"from": [1, 9, 5], "from": [1, 9, 5],
"to": [3, 16, 11], "to": [3, 16, 11],
"faces": { "faces": {
"north": {"uv": [1, 4, 3, 11], "texture": "#0"}, "north": {
"east": {"uv": [1, 4, 7, 11], "texture": "#0"}, "uv": [1, 4, 3, 11],
"south": {"uv": [1, 4, 3, 11], "texture": "#0"}, "texture": "#0"
"west": {"uv": [1, 4, 7, 11], "texture": "#0"}, },
"up": {"uv": [1, 2, 3, 8], "texture": "#1"}, "east": {
"down": {"uv": [1, 2, 3, 8], "texture": "#1"} "uv": [1, 4, 7, 11],
"texture": "#0"
},
"south": {
"uv": [1, 4, 3, 11],
"texture": "#0"
},
"west": {
"uv": [1, 4, 7, 11],
"texture": "#0"
},
"up": {
"uv": [1, 2, 3, 8],
"texture": "#1"
},
"down": {
"uv": [1, 2, 3, 8],
"texture": "#1"
}
} }
}, },
{ {
@ -91,12 +199,30 @@
"from": [13, 9, 5], "from": [13, 9, 5],
"to": [15, 16, 11], "to": [15, 16, 11],
"faces": { "faces": {
"north": {"uv": [1, 4, 3, 11], "texture": "#0"}, "north": {
"east": {"uv": [1, 4, 7, 11], "texture": "#0"}, "uv": [1, 4, 3, 11],
"south": {"uv": [1, 4, 3, 11], "texture": "#0"}, "texture": "#0"
"west": {"uv": [1, 4, 7, 11], "texture": "#0"}, },
"up": {"uv": [1, 2, 3, 8], "texture": "#1"}, "east": {
"down": {"uv": [1, 2, 3, 8], "texture": "#1"} "uv": [1, 4, 7, 11],
"texture": "#0"
},
"south": {
"uv": [1, 4, 3, 11],
"texture": "#0"
},
"west": {
"uv": [1, 4, 7, 11],
"texture": "#0"
},
"up": {
"uv": [1, 2, 3, 8],
"texture": "#1"
},
"down": {
"uv": [1, 2, 3, 8],
"texture": "#1"
}
} }
} }
] ]

View file

@ -7,26 +7,82 @@
"water": "naturesaura:block/spring_water" "water": "naturesaura:block/spring_water"
}, },
"elements": [ "elements": [
{ "from": [ 0, 0, 0 ], {
"from": [0, 0, 0],
"to": [16, 16, 16], "to": [16, 16, 16],
"faces": { "faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#frame", "cullface": "down" }, "down": {
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#frame", "cullface": "up" }, "uv": [0, 0, 16, 16],
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#frame", "cullface": "north" }, "texture": "#frame",
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#frame", "cullface": "south" }, "cullface": "down"
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#frame", "cullface": "west" }, },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#frame", "cullface": "east" } "up": {
"uv": [0, 0, 16, 16],
"texture": "#frame",
"cullface": "up"
},
"north": {
"uv": [0, 0, 16, 16],
"texture": "#frame",
"cullface": "north"
},
"south": {
"uv": [0, 0, 16, 16],
"texture": "#frame",
"cullface": "south"
},
"west": {
"uv": [0, 0, 16, 16],
"texture": "#frame",
"cullface": "west"
},
"east": {
"uv": [0, 0, 16, 16],
"texture": "#frame",
"cullface": "east"
}
} }
}, },
{ "from": [ 0, 0, 0 ], {
"from": [0, 0, 0],
"to": [16, 16, 16], "to": [16, 16, 16],
"faces": { "faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#water", "tintindex": 0, "cullface": "down" }, "down": {
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#water", "tintindex": 0, "cullface": "up" }, "uv": [0, 0, 16, 16],
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#water", "tintindex": 0, "cullface": "north" }, "texture": "#water",
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#water", "tintindex": 0, "cullface": "south" }, "tintindex": 0,
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#water", "tintindex": 0, "cullface": "west" }, "cullface": "down"
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#water", "tintindex": 0, "cullface": "east" } },
"up": {
"uv": [0, 0, 16, 16],
"texture": "#water",
"tintindex": 0,
"cullface": "up"
},
"north": {
"uv": [0, 0, 16, 16],
"texture": "#water",
"tintindex": 0,
"cullface": "north"
},
"south": {
"uv": [0, 0, 16, 16],
"texture": "#water",
"tintindex": 0,
"cullface": "south"
},
"west": {
"uv": [0, 0, 16, 16],
"texture": "#water",
"tintindex": 0,
"cullface": "west"
},
"east": {
"uv": [0, 0, 16, 16],
"texture": "#water",
"tintindex": 0,
"cullface": "east"
}
} }
} }
] ]