Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-11-25 20:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	build.gradle
#	src/main/java/de/ellpeck/naturesaura/compat/jei/AnimalSpawnerCategory.java
#	src/main/java/de/ellpeck/naturesaura/recipes/AnimalSpawnerRecipe.java
This commit is contained in:
Ell 2020-09-22 03:17:24 +02:00
commit 7c8c51cf4b
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityAnimalSpawner.java
View file

@ -57,7 +57,7 @@ public class TileEntityAnimalSpawner extends TileEntityImpl implements ITickable
this.time += 10; this.time += 10;
if (this.time >= this.currentRecipe.time) { if (this.time >= this.currentRecipe.time) {
Entity entity = this.currentRecipe.makeEntity(this.world, this.spawnX, this.pos.getY() + 1, this.spawnZ); Entity entity = this.currentRecipe.makeEntity(this.world, new BlockPos(this.spawnX, this.pos.getY() + 1, this.spawnZ));
this.world.addEntity(entity); this.world.addEntity(entity);
this.currentRecipe = null; this.currentRecipe = null;
@ -121,7 +121,8 @@ public class TileEntityAnimalSpawner extends TileEntityImpl implements ITickable
this.world.rand.nextFloat() + 0.5F); this.world.rand.nextFloat() + 0.5F);
if (this.entityClient == null) { if (this.entityClient == null) {
this.entityClient = this.currentRecipe.makeEntity(this.world, this.spawnX, this.pos.getY() + 1, this.spawnZ); this.entityClient = this.currentRecipe.makeEntity(this.world, BlockPos.ZERO);
this.entityClient.setPosition(this.spawnX, this.pos.getY() + 1, this.spawnZ);
} }
AxisAlignedBB bounds = this.entityClient.getBoundingBox(); AxisAlignedBB bounds = this.entityClient.getBoundingBox();
for (int i = this.world.rand.nextInt(5) + 5; i >= 0; i--) for (int i = this.world.rand.nextInt(5) + 5; i >= 0; i--)

2
src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntitySnowCreator.java
View file

@ -53,7 +53,7 @@ public class TileEntitySnowCreator extends TileEntityImpl implements ITickableTi
Fluid fluid = this.world.getFluidState(down).getFluid(); Fluid fluid = this.world.getFluidState(down).getFluid();
if (fluid == Fluids.WATER) { if (fluid == Fluids.WATER) {
this.world.setBlockState(down, Blocks.ICE.getDefaultState()); this.world.setBlockState(down, Blocks.ICE.getDefaultState());
} else if (Blocks.SNOW.getDefaultState().isValidPosition(this.world, pos) && this.world.getBlockState(pos).getBlock() != Blocks.SNOW) { } else if (Blocks.SNOW.getDefaultState().isValidPosition(this.world, pos) && this.world.getBlockState(pos).getBlock() != Blocks.SNOW && this.world.getBlockState(pos).getMaterial().isReplaceable()) {
this.world.setBlockState(pos, Blocks.SNOW.getDefaultState()); this.world.setBlockState(pos, Blocks.SNOW.getDefaultState());
if (this.snowmanCount < range / 2 && this.world.rand.nextFloat() >= 0.995F) { if (this.snowmanCount < range / 2 && this.world.rand.nextFloat() >= 0.995F) {

1
src/main/resources/data/naturesaura/patchouli_books/book/en_us/entries/using/snow_creator.json
View file

@ -3,7 +3,6 @@
"icon": "naturesaura:snow_creator", "icon": "naturesaura:snow_creator",
"category": "using", "category": "using",
"advancement": "naturesaura:sky_ingot", "advancement": "naturesaura:sky_ingot",
"flag": "naturesaura:chunk_loader",
"pages": [ "pages": [
{ {
"type": "text", "type": "text",