From c6b92c2ec082dd6d3956a716b374ed1ede2d2779 Mon Sep 17 00:00:00 2001 From: Tobias Nett Date: Thu, 19 Aug 2021 19:42:04 +0200 Subject: [PATCH] chore: adjust for Terasology/GrowingFlora#38 --- .../generator/HerbAGrowthDefinition.java | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/terasology/herbalism/generator/HerbAGrowthDefinition.java b/src/main/java/org/terasology/herbalism/generator/HerbAGrowthDefinition.java index bbe4873..9977f55 100644 --- a/src/main/java/org/terasology/herbalism/generator/HerbAGrowthDefinition.java +++ b/src/main/java/org/terasology/herbalism/generator/HerbAGrowthDefinition.java @@ -2,10 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.herbalism.generator; -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import org.joml.Vector3i; -import org.terasology.anotherWorld.LocalParameters; +import org.joml.Vector3ic; import org.terasology.engine.entitySystem.entity.EntityRef; import org.terasology.engine.registry.CoreRegistry; import org.terasology.engine.world.BlockEntityRegistry; @@ -32,18 +29,8 @@ public HerbAGrowthDefinition() { super(ID, Arrays.asList( new BlockUri("Alchemy:HerbGrowA"), new BlockUri("Alchemy:HerbGrownA"), new BlockUri("CoreAssets:DeadBush")), 50 * 1000, 200 * 1000, - new Predicate() { - @Override - public boolean apply(LocalParameters input) { - return input.getHumidity() > 0.2f && input.getTemperature() > 15f; - } - }, - new Function() { - @Override - public Float apply(LocalParameters input) { - return 0.2f * input.getHumidity(); - } - } + input -> input.getHumidity() > 0.2f && input.getTemperature() > 15f, + input -> 0.2f * input.getHumidity() ); } @@ -58,7 +45,7 @@ public Float apply(LocalParameters input) { * @param isLast Whether this is the last stage of herb plant growth. */ @Override - protected void replaceBlock(WorldProvider worldProvider, BlockManager blockManager, EntityRef plant, Vector3i position, BlockUri nextStage, boolean isLast) { + protected void replaceBlock(WorldProvider worldProvider, BlockManager blockManager, EntityRef plant, Vector3ic position, BlockUri nextStage, boolean isLast) { // If this is not the last stage of herb plant growth, continue as normal. Otherwise, just call the parent method. if (!isLast) { // We need to copy the genome between growth stages. Otherwise it will be lost upon replacing this block.