diff --git a/gradle.properties b/gradle.properties index 4f08a75b..6efd90ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ neo_version=26.1.2.99 mod_id=cakesticklib mod_name=CakeStickLib mod_license=Ora Et Labora License -mod_version=1.17.4 +mod_version=1.17.4-hotfix1 mod_group_id=com.devdyna.cakestick mod_authors=DevDyna mod_description=A standalone port of JustDynaThings and Synergy API to unify most of the code diff --git a/src/generated/resources/data/cakesticklib/tags/item/legacy_stone_slabs.json b/src/generated/resources/data/cakesticklib/tags/item/legacy_stone_slabs.json new file mode 100644 index 00000000..dc3ddc12 --- /dev/null +++ b/src/generated/resources/data/cakesticklib/tags/item/legacy_stone_slabs.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:stone_slab", + "minecraft:diorite_slab", + "minecraft:andesite_slab", + "minecraft:granite_slab" + ] +} \ No newline at end of file diff --git a/src/main/java/com/devdyna/cakesticklib/api/templates/EffectItem.java b/src/main/java/com/devdyna/cakesticklib/api/templates/EffectItem.java index 6508b7da..fb944424 100644 --- a/src/main/java/com/devdyna/cakesticklib/api/templates/EffectItem.java +++ b/src/main/java/com/devdyna/cakesticklib/api/templates/EffectItem.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.function.Function; import com.devdyna.cakesticklib.api.utils.ColorUtils; @@ -31,12 +30,15 @@ public EffectItem(Properties p, List effects) { public static class Builder { private final List list = new ArrayList<>(); - private Properties p = new Properties(); + private final Properties p; private FoodProperties food; - public Builder properties(Function f) { - this.p = f.apply(p); - return this; + public Builder(Properties p){ + this.p = p; + } + + public static Builder of(Properties p){ + return new Builder(p); } public Builder food(FoodProperties food) { diff --git a/src/main/java/com/devdyna/cakesticklib/setup/datagen/server/DataItemTag.java b/src/main/java/com/devdyna/cakesticklib/setup/datagen/server/DataItemTag.java index 5d8416b4..bd445621 100644 --- a/src/main/java/com/devdyna/cakesticklib/setup/datagen/server/DataItemTag.java +++ b/src/main/java/com/devdyna/cakesticklib/setup/datagen/server/DataItemTag.java @@ -309,6 +309,9 @@ protected void addTags(Provider p) { tag(LibTags.Items.MODERN_STONES).add(Items.DEEPSLATE, Items.TUFF); + tag(LibTags.Items.LEGACY_STONE_SLABS).add(Items.STONE_SLAB, Items.DIORITE_SLAB, Items.ANDESITE_SLAB, + Items.GRANITE_SLAB); + } } diff --git a/src/main/java/com/devdyna/cakesticklib/setup/registry/LibTags.java b/src/main/java/com/devdyna/cakesticklib/setup/registry/LibTags.java index 2e2dfa19..187adcdf 100644 --- a/src/main/java/com/devdyna/cakesticklib/setup/registry/LibTags.java +++ b/src/main/java/com/devdyna/cakesticklib/setup/registry/LibTags.java @@ -152,6 +152,7 @@ public static void register(IEventBus bus) { // stones pre-1.17 (overworld) public static final TagKey LEGACY_STONES = RegistryUtils.tagItem(MODULE_ID, "legacy_stones"); + public static final TagKey LEGACY_STONE_SLABS = RegistryUtils.tagItem(MODULE_ID, "legacy_stone_slabs"); // only stones post-1.17 public static final TagKey MODERN_STONES = RegistryUtils.tagItem(MODULE_ID, "modern_stones");