diff --git a/SpongeAPI b/SpongeAPI index 791f2622159..57f6e547568 160000 --- a/SpongeAPI +++ b/SpongeAPI @@ -1 +1 @@ -Subproject commit 791f2622159aeaccb068dc83fa2607fbc3e99073 +Subproject commit 57f6e547568916f767a3c2a8124ddc66c2332488 diff --git a/src/main/java/org/spongepowered/common/data/provider/block/state/BlockData.java b/src/main/java/org/spongepowered/common/data/provider/block/state/BlockData.java index d7e0eeedf47..9d7066fdf5a 100644 --- a/src/main/java/org/spongepowered/common/data/provider/block/state/BlockData.java +++ b/src/main/java/org/spongepowered/common/data/provider/block/state/BlockData.java @@ -108,6 +108,8 @@ public static void register(final DataProviderRegistrator registrator) { return MatterTypes.SOLID.get(); } }) + .create(Keys.BURNABLE) + .get(BlockBehaviour.BlockStateBase::ignitedByLava) // TODO state above .create(Keys.REPRESENTED_INSTRUMENT) .get(h -> (InstrumentType) (Object) h.instrument()); diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/state/EnumPropertyMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/state/EnumPropertyMixin_API.java index a9987b40b60..10103ef0c6c 100644 --- a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/state/EnumPropertyMixin_API.java +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/state/EnumPropertyMixin_API.java @@ -25,10 +25,11 @@ package org.spongepowered.common.mixin.api.minecraft.state; import net.minecraft.world.level.block.state.properties.EnumProperty; +import org.spongepowered.api.data.type.StringRepresentable; import org.spongepowered.api.state.EnumStateProperty; import org.spongepowered.asm.mixin.Mixin; @Mixin(value = EnumProperty.class) -public abstract class EnumPropertyMixin_API> extends PropertyMixin_API implements EnumStateProperty { +public abstract class EnumPropertyMixin_API & StringRepresentable> extends PropertyMixin_API implements EnumStateProperty { } diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/util/StringRepresentableMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/util/StringRepresentableMixin_API.java new file mode 100644 index 00000000000..f569c5eec40 --- /dev/null +++ b/src/mixins/java/org/spongepowered/common/mixin/api/minecraft/util/StringRepresentableMixin_API.java @@ -0,0 +1,16 @@ +package org.spongepowered.common.mixin.api.minecraft.util; + +import net.minecraft.util.StringRepresentable; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(StringRepresentable.class) +public interface StringRepresentableMixin_API extends org.spongepowered.api.data.type.StringRepresentable { + + @Shadow String shadow$getSerializedName(); + + @Override + default String serializationString() { + return this.shadow$getSerializedName(); + } +} diff --git a/src/mixins/resources/mixins.sponge.api.json b/src/mixins/resources/mixins.sponge.api.json index 86773c75159..c1a833481d3 100644 --- a/src/mixins/resources/mixins.sponge.api.json +++ b/src/mixins/resources/mixins.sponge.api.json @@ -79,6 +79,7 @@ "minecraft.stats.StatTypeMixin_API", "minecraft.tags.TagKeyMixin_API", "minecraft.util.RandomSourceMixin_API", + "minecraft.util.StringRepresentableMixin_API", "minecraft.world.DifficultyMixin_API", "minecraft.world.InteractionHandMixin_API", "minecraft.world.IWorldGenerationBaseReaderMixin_API",