Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-12-22 11:29:23 +01:00
Code Issues Projects Releases Wiki Activity

Added Crops block-tag to Canola/Flax/Rice, Closes #1471

Browse source
This commit is contained in:
Flanks255 2024-12-12 19:37:39 -06:00
parent c10862ce02
commit 9689b4c1fc
8 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -2,6 +2,7 @@
* Fixed the Drill dye recipes not functioning.
* Fixed the name of the first drill speed augment.
* Fixed the farmer not funneling seeds back to the seed slots.
* Added crops block-tag to Canola/Flax/Rice
# 1.3.11+mc1.21.1
* Fixed Farmer not playing well with non-vanilla farmland.

3
src/generated/resources/.cache/70af3238de42da66beb5f354425347f373dca837
View file

@ -1,4 +1,4 @@
// 1.21.1 2024-11-06T14:57:14.1896533 Block Tags
// 1.21.1 2024-12-12T19:35:44.7724352 Block Tags
8665de82dd3d3a1351ce58f78108214f359104b0 data/actuallyadditions/tags/block/mineable/aio.json
f7dc293929a2176bc6e428c765f6bf49fbeccdb5 data/actuallyadditions/tags/block/mineable/drill.json
3ce233e27b4d7db10e2d4832602ef5b2a57f9a65 data/c/tags/block/ores.json
@ -17,6 +17,7 @@ fb95ac8041521e1d2879f6fcb652266dcd9e0fb1 data/c/tags/block/storage_blocks/empowe
148cd937543fd58b196403c18839b2698bf87fdf data/c/tags/block/storage_blocks/palis_crystal.json
b9aa28a54d47054ba5653bec2f20e0a675ab5120 data/c/tags/block/storage_blocks/restonia_crystal.json
fb4f349bc6fd89f26ef2ba72a9236f05eefd8ea2 data/c/tags/block/storage_blocks/void_crystal.json
cf5b58cdf67335da2f86915674ea666c48d05faa data/minecraft/tags/block/crops.json
8dbaf9b7bd6774bc7c01a47a72b8a7fdaee51f87 data/minecraft/tags/block/mineable/axe.json
32191fe399bac5ad4136ff1a0b3c0b4699b30b1c data/minecraft/tags/block/mineable/pickaxe.json
fab721a4fe7ece1d0e019ce36c4d2862f70ee53b data/minecraft/tags/block/needs_stone_tool.json

4
src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246
View file

@ -1,4 +1,4 @@
// 1.21.1 2024-12-06T21:14:51.7296768 Item Recipes
// 1.21.1 2024-12-12T19:35:44.7684353 Item Recipes
14bd5bc2ee3e84b6f3a3181c0e0efd40df5f1d84 data/actuallyadditions/recipe/advanced_coil.json
955aad6c1def123a6adbaeabb13faa6eedce847f data/actuallyadditions/recipe/advanced_leaf_blower.json
97e7ba64f5054b030f4e49615dc4212a28ca9be1 data/actuallyadditions/recipe/basic_coil.json
@ -130,7 +130,7 @@ b5bcd0457a68e28d37312f1a1e94a106d3b6f038 data/actuallyadditions/recipe/ring_of_g
8e0ac0d696ff3ecd1ef43122707b8f131bba3fbf data/actuallyadditions/recipe/ring_of_magnetizing.json
f31206c1d67ddc93e41d13f24d54e8d6b5913348 data/actuallyadditions/recipe/single_battery.json
9504d2a8e3cb536cf865e8385a013743a0d615d0 data/actuallyadditions/recipe/stone_aiot.json
bd83fca2a318f4b513a38310e4b3d26f87ab9439 data/actuallyadditions/recipe/tagged_slime_block.json
60c12e23e3e20d5909c87fd74bd4e1ce16e6fd74 data/actuallyadditions/recipe/tagged_slime_block.json
685c36302163f912fd6979181f9c07fdc21e317a data/actuallyadditions/recipe/tagged_sticky_piston.json
b40274260097d19ae4f925e31982d8bfad3acd84 data/actuallyadditions/recipe/teleport_staff.json
b0e94b90682d5224dd995c15b26d6df50fd78dd6 data/actuallyadditions/recipe/tiny_to_charcoal.json

2
src/generated/resources/data/actuallyadditions/recipe/tagged_slime_block.json
View file

@ -3,7 +3,7 @@
"category": "misc",
"key": {
"R": {
"tag": "c:slimeballs"
"tag": "c:slime_balls"
}
},
"pattern": [

7
src/generated/resources/data/minecraft/tags/block/crops.json Normal file
View file

@ -0,0 +1,7 @@
{
"values": [
"actuallyadditions:canola",
"actuallyadditions:flax",
"actuallyadditions:rice"
]
}

14
src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java
View file

@ -205,6 +205,12 @@ public class BlockTagsGenerator extends BlockTagsProvider {
BlockTags.MINEABLE_WITH_SHOVEL
);
tag(BlockTags.CROPS).add(
ActuallyBlocks.CANOLA.get(),
ActuallyBlocks.FLAX.get(),
ActuallyBlocks.RICE.get()
);
this.tag(ActuallyTags.Blocks.ORES_BLACK_QUARTZ).add(ActuallyBlocks.BLACK_QUARTZ_ORE.get());
this.tag(Tags.Blocks.ORES).addTags(ActuallyTags.Blocks.ORES_BLACK_QUARTZ);
this.tag(Tags.Blocks.ORES_IN_GROUND_STONE).add(ActuallyBlocks.BLACK_QUARTZ_ORE.get());
@ -223,14 +229,6 @@ public class BlockTagsGenerator extends BlockTagsProvider {
this.tag(ActuallyTags.Blocks.STORAGE_BLOCKS_EMPOWERED_ENORI_CRYSTAL).add(ActuallyBlocks.EMPOWERED_ENORI_CRYSTAL.get());
}
// /**
// * Resolves a Path for the location to save the given tag.
// */
// @Override
// protected Path getPath(ResourceLocation id) {
// return this.generator.getOutputFolder().resolve("data/" + id.getNamespace() + "/tags/blocks/" + id.getPath() + ".json");
// }
/**
* Gets a name for this provider, to use in logging.
*/

1
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FermentingRecipe.java
View file

@ -21,6 +21,7 @@ import java.util.Optional;
public class FermentingRecipe implements Recipe<RecipeInput> {
public static final String NAME = "fermenting";
//TODO change input from FluidStack to Neo:FluidIngredient
private final FluidStack input;
private final FluidStack output;
private final int time;

1
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/LiquidFuelRecipe.java
View file

@ -18,6 +18,7 @@ import javax.annotation.Nonnull;
public class LiquidFuelRecipe implements Recipe<RecipeInput> {
public static String NAME = "liquid_fuel";
//TODO 1.22 change from FluidStack to Neo:FluidIngredient
private FluidStack fuel;
private int burnTime;
private int totalEnergy;