Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use "age" instead of "growth" #234

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use "age" instead of "growth" #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 1.10.2/src/main/java/com/rwtema/extrautils2/blocks/BlockEnderLilly.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

public class BlockEnderLilly extends XUBlockStatic implements IPlantable, IGrowable {
public static final EnumPlantType ender = EnumPlantType.getPlantType("ender");
public static final PropertyInteger GROWTH_STATE = PropertyInteger.create("growth", 0, 7);
public static final PropertyInteger GROWTH_STATE = PropertyInteger.create("age", 0, 7);
public static final HashSet<IBlockState> end_stone_states = Sets.newHashSet(Blocks.END_STONE.getBlockState().getValidStates());
public static final IMetaProperty<Boolean> READY_TO_GROW = new IMetaProperty.Wrap<Boolean>(PropertyBool.create("ready_to_grow"), false) {
@Override
Expand Down
2 changes: 1 addition & 1 deletion 1.10.2/src/main/java/com/rwtema/extrautils2/blocks/BlockRedOrchid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import java.util.Random;

public class BlockRedOrchid extends XUBlockStatic implements IPlantable, IGrowable {
public static final PropertyInteger GROWTH_STATE = PropertyInteger.create("growth", 0, 6);
public static final PropertyInteger GROWTH_STATE = PropertyInteger.create("age", 0, 6);
static float[] size_w = {1 / 16F, 1 / 16F, 2 / 16F, 3 / 16F, 3 / 16F, 4 / 16F, 5 / 16F};
static float[] size_h = {5 / 16F, 8 / 16F, 9 / 16F, 11 / 16F, 12 / 16F, 13 / 16F, 16 / 16F};
public final IBlockState FULLY_GROWN_STATE;
Expand Down
30 changes: 15 additions & 15 deletions 1.10.2/src/main/resources/assets/extrautils2/blockstates/model_locations.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ models/item/soundmuffler.json
# Ender Lilly
blockstates/enderlilly.json
variants={
growth=2
growth=3
growth=4
growth=5
growth=0
growth=1
growth=6
growth=7
age=2
age=3
age=4
age=5
age=0
age=1
age=6
age=7
}

models/item/enderlilly.json
Expand Down Expand Up @@ -159,13 +159,13 @@ models/item/compressednetherrack.json
# Red Orchid
blockstates/redorchid.json
variants={
growth=2
growth=3
growth=4
growth=5
growth=0
growth=1
growth=6
age=2
age=3
age=4
age=5
age=0
age=1
age=6
}

models/item/redorchid.json
Expand Down