diff --git a/gradle.properties b/gradle.properties index 622c0bc..a7e79f8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.15.1 # Mod Properties - mod_version = 1.20.4.8 + mod_version = 1.20.4.9 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java index a30954c..d2d62c9 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blockentity/EmptyLavaHoarderBlockEntity.java @@ -32,7 +32,9 @@ public class EmptyLavaHoarderBlockEntity extends BlockEntity { world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.RAW_COPPER, new Random().nextInt(count)))); world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.OBSIDIAN, new Random().nextInt(count + 2)))); world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.LAPIS_LAZULI, new Random().nextInt(count + 1)))); - world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(QuickieItems.SULPHOR, new Random().nextInt(count - 1)))); + if (count > 1) { + world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(QuickieItems.SULPHOR, new Random().nextInt(count - 1)))); + } } /** diff --git a/src/main/resources/assets/quickiefabric/blockstates/canolaplant.json b/src/main/resources/assets/quickiefabric/blockstates/canolaplant.json index 4445594..4a78b2c 100644 --- a/src/main/resources/assets/quickiefabric/blockstates/canolaplant.json +++ b/src/main/resources/assets/quickiefabric/blockstates/canolaplant.json @@ -2,11 +2,11 @@ "variants": { "age=0": { "model": "quickiefabric:block/canolaplant0" }, "age=1": { "model": "quickiefabric:block/canolaplant1" }, - "age=2": { "model": "quickiefabric:block/canolaplant1" }, - "age=3": { "model": "quickiefabric:block/canolaplant2" }, - "age=4": { "model": "quickiefabric:block/canolaplant2" }, - "age=5": { "model": "quickiefabric:block/canolaplant2" }, - "age=6": { "model": "quickiefabric:block/canolaplant3" }, - "age=7": { "model": "quickiefabric:block/canolaplant4" } + "age=2": { "model": "quickiefabric:block/canolaplant2" }, + "age=3": { "model": "quickiefabric:block/canolaplant3" }, + "age=4": { "model": "quickiefabric:block/canolaplant4" }, + "age=5": { "model": "quickiefabric:block/canolaplant5" }, + "age=6": { "model": "quickiefabric:block/canolaplant6" }, + "age=7": { "model": "quickiefabric:block/canolaplant7" } } } \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/canolaplant5.json b/src/main/resources/assets/quickiefabric/models/block/canolaplant5.json new file mode 100644 index 0000000..5581eed --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/canolaplant5.json @@ -0,0 +1,6 @@ +{ + "parent":"block/cross", + "textures":{ + "cross":"quickiefabric:block/canolaplant5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/canolaplant6.json b/src/main/resources/assets/quickiefabric/models/block/canolaplant6.json new file mode 100644 index 0000000..22e6ba0 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/canolaplant6.json @@ -0,0 +1,6 @@ +{ + "parent":"block/cross", + "textures":{ + "cross":"quickiefabric:block/canolaplant6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/block/canolaplant7.json b/src/main/resources/assets/quickiefabric/models/block/canolaplant7.json new file mode 100644 index 0000000..abe50cf --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/canolaplant7.json @@ -0,0 +1,6 @@ +{ + "parent":"block/cross", + "textures":{ + "cross":"quickiefabric:block/canolaplant7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/textures/block/canolaplant1.png b/src/main/resources/assets/quickiefabric/textures/block/canolaplant1.png index 568009c..0849b41 100644 Binary files a/src/main/resources/assets/quickiefabric/textures/block/canolaplant1.png and b/src/main/resources/assets/quickiefabric/textures/block/canolaplant1.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/block/canolaplant2.png b/src/main/resources/assets/quickiefabric/textures/block/canolaplant2.png index a6a8832..568009c 100644 Binary files a/src/main/resources/assets/quickiefabric/textures/block/canolaplant2.png and b/src/main/resources/assets/quickiefabric/textures/block/canolaplant2.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/block/canolaplant3.png b/src/main/resources/assets/quickiefabric/textures/block/canolaplant3.png index f416130..5df1b33 100644 Binary files a/src/main/resources/assets/quickiefabric/textures/block/canolaplant3.png and b/src/main/resources/assets/quickiefabric/textures/block/canolaplant3.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/block/canolaplant4.png b/src/main/resources/assets/quickiefabric/textures/block/canolaplant4.png index 5dc4f71..577b32b 100644 Binary files a/src/main/resources/assets/quickiefabric/textures/block/canolaplant4.png and b/src/main/resources/assets/quickiefabric/textures/block/canolaplant4.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/block/canolaplant5.png b/src/main/resources/assets/quickiefabric/textures/block/canolaplant5.png new file mode 100644 index 0000000..ac625ca Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/canolaplant5.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/block/canolaplant6.png b/src/main/resources/assets/quickiefabric/textures/block/canolaplant6.png new file mode 100644 index 0000000..a60e7fe Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/canolaplant6.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/block/canolaplant7.png b/src/main/resources/assets/quickiefabric/textures/block/canolaplant7.png new file mode 100644 index 0000000..8bf076a Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/canolaplant7.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/item/canolaseed.png b/src/main/resources/assets/quickiefabric/textures/item/canolaseed.png index 1b0851c..e1ef6ed 100644 Binary files a/src/main/resources/assets/quickiefabric/textures/item/canolaseed.png and b/src/main/resources/assets/quickiefabric/textures/item/canolaseed.png differ