From 1f4fad2badf1bfec3df7b7a824c73d1a91d37f2e Mon Sep 17 00:00:00 2001 From: LilBroCodes Date: Tue, 30 Dec 2025 15:12:51 +0100 Subject: [PATCH 1/2] Add support for all versions between 1.20.1 and 1.21.4 --- Version Notes.txt | 1 + build.gradle.kts | 13 ++++ gradle.properties | 2 - settings.gradle.kts | 5 +- .../api/v1/datafix/DataFixerRegistry.java | 5 +- .../v1/datagen/ComposerLanguageProvider.java | 22 ++++--- .../api/v1/datagen/ComposerModelProvider.java | 14 ++--- .../manager/ItemStackDataManager.java | 4 +- .../composite/ComposerCompositeEvents.java | 2 +- .../api/v1/item/AbstractProgressItem.java | 10 +-- .../item/settings/ComposerItemSettings.java | 6 +- .../component/SoulboundComponent.java | 6 +- .../DeferredDataComponentTypeRegistry.java | 13 ++-- .../registry/lazy/DeferredEntityRegistry.java | 5 +- .../registry/lazy/DeferredItemRegistry.java | 6 +- .../lazy/DeferredParticleRegistry.java | 12 ++-- .../registry/lazy/DeferredPotionRegistry.java | 22 +++---- .../registry/lazy/DeferredSoundRegistry.java | 6 +- .../v1/registry/util/BrewingRecipeUtils.java | 4 +- .../api/v1/render/ParticleRenderer.java | 10 +-- .../api/v1/toast/SimpleToast.java | 4 +- .../api/v1/tooltips/DynamicTooltip.java | 12 ++-- .../api/v1/util/AdvancementManager.java | 2 +- .../api/v1/util/builder/ListBuilder.java | 62 ------------------- .../v1/util/misc/TranslatableSoundEvent.java | 2 +- .../internal/ComposerReloaded.java | 2 +- .../internal/block/PlushBlock.java | 27 ++++---- .../block/entity/PlushBlockEntity.java | 8 +-- .../internal/cca/ModCardinalComponents.java | 2 +- .../cca/entity/TargetedBlockComponent.java | 8 +-- .../cca/entity/TargetedEntityComponent.java | 6 +- .../client/config/ComposerConfig.java | 16 ++++- .../PlushBlockEntityRenderer.java | 2 +- .../internal/command/FeatureCommand.java | 12 ++-- .../data/assets/ModLanguageProvider.java | 9 +-- .../data/data/ModBlockLootTableProvider.java | 2 +- .../internal/data/data/ModRecipeProvider.java | 27 ++++++-- .../networking/ClearToastsPayload.java | 10 +-- .../networking/NotifyToastPayload.java | 10 +-- .../networking/ScrollActionPayload.java | 10 +-- .../networking/SimpleToastPayload.java | 10 +-- .../networking/TargetBlockPayload.java | 10 +-- .../networking/TargetEntityPayload.java | 10 +-- .../handler/ClearToastsHandler.java | 6 +- .../handler/NotifyToastHandler.java | 6 +- .../handler/ScrollActionHandler.java | 6 +- .../handler/SimpleToastHandler.java | 6 +- .../handler/TargetBlockHandler.java | 6 +- .../handler/TargetEntityHandler.java | 6 +- .../registry/ModDataComponentTypes.java | 22 ++++--- .../internal/registry/ModRegistries.java | 2 +- .../mixin/impl/datafix/ItemStackMixin.java | 4 +- .../impl/duped_binds/RecolorKeybindMixin.java | 4 +- .../impl/dynamic_tooltips/ItemStackMixin.java | 51 +++++++++++++-- .../impl/local/CampfireBlockEntityMixin.java | 4 +- .../mixin/impl/render/GameRendererMixin.java | 4 +- .../impl/scroll/PlayerInventoryMixin.java | 20 +++--- .../mixin/impl/soul_binding/ItemMixin.java | 4 +- .../impl/soul_binding/PlayerEntityMixin.java | 2 +- .../mixin/impl/velora/ParticleRenderHook.java | 11 ++-- versions/1.20.4/gradle.properties | 12 ++++ .../src/main/resources/1.20.4.accesswidener | 5 ++ .../composer_reloaded/models/item/plush.json | 3 + versions/1.20.6/gradle.properties | 12 ++++ .../src/main/resources/1.20.6.accesswidener | 3 + .../composer_reloaded/models/item/plush.json | 3 + versions/1.21.3/gradle.properties | 12 ++++ .../src/main/resources/1.21.3.accesswidener | 2 + .../composer_reloaded/models/item/plush.json | 3 + versions/1.21/gradle.properties | 12 ++++ .../src/main/resources/1.21.accesswidener | 3 + .../composer_reloaded/models/item/plush.json | 3 + 72 files changed, 395 insertions(+), 273 deletions(-) create mode 100644 Version Notes.txt delete mode 100644 src/main/java/org/lilbrocodes/composer_reloaded/api/v1/util/builder/ListBuilder.java create mode 100644 versions/1.20.4/gradle.properties create mode 100644 versions/1.20.4/src/main/resources/1.20.4.accesswidener create mode 100644 versions/1.20.4/src/main/resources/assets/composer_reloaded/models/item/plush.json create mode 100644 versions/1.20.6/gradle.properties create mode 100644 versions/1.20.6/src/main/resources/1.20.6.accesswidener create mode 100644 versions/1.20.6/src/main/resources/assets/composer_reloaded/models/item/plush.json create mode 100644 versions/1.21.3/gradle.properties create mode 100644 versions/1.21.3/src/main/resources/1.21.3.accesswidener create mode 100644 versions/1.21.3/src/main/resources/assets/composer_reloaded/models/item/plush.json create mode 100644 versions/1.21/gradle.properties create mode 100644 versions/1.21/src/main/resources/1.21.accesswidener create mode 100644 versions/1.21/src/main/resources/assets/composer_reloaded/models/item/plush.json diff --git a/Version Notes.txt b/Version Notes.txt new file mode 100644 index 0000000..ef3bc12 --- /dev/null +++ b/Version Notes.txt @@ -0,0 +1 @@ +CCA Switched from onyxstudios to ladysnake on version 6.0.0, or mc 1.20.5+6. \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 92d26ef..469ffef 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,6 +46,19 @@ repositories { strictMaven("https://maven.ladysnake.org/releases", "Ladysnake") strictMaven("https://maven.fzzyhmstrs.me/", "FZZY Maven") strictMaven("https://maven.terraformersmc.com/", "Terraformers") + strictMaven("https://maven.nucleoid.xyz/", "Nucleoid") +} + +subprojects { + tasks.withType().configureEach { + enabled = false + } +} + +project(":1.21.4") { + tasks.withType().configureEach { + enabled = true + } } dependencies { diff --git a/gradle.properties b/gradle.properties index ec847e1..8a8ea3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,8 +8,6 @@ mod.id=composer_reloaded mod.archives_base_name=composer-reloaded mod.name=Composer Reloaded -deps.fabric_loader=0.17.3 - publish.modrinth=WJ1ahCDP junit_version=6.0.1 diff --git a/settings.gradle.kts b/settings.gradle.kts index e59a54a..f87b4ea 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,9 +14,8 @@ plugins { stonecutter { create(rootProject) { - // See https://stonecutter.kikugie.dev/wiki/start/#choosing-minecraft-versions - versions("1.20.1", "1.21.4") - vcsVersion = "1.20.1" + versions("1.20.1", "1.20.4", "1.20.6", "1.21", "1.21.3", "1.21.4") + vcsVersion = "1.21.4" } } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datafix/DataFixerRegistry.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datafix/DataFixerRegistry.java index 344a7cf..cb77fcb 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datafix/DataFixerRegistry.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datafix/DataFixerRegistry.java @@ -9,7 +9,7 @@ import java.util.Optional; -//? minecraft: >=1.21.4 { +//? minecraft: >=1.20.6 { import org.lilbrocodes.composer_reloaded.api.v1.datafix.impl.SimpleItemFixer; import static org.lilbrocodes.composer_reloaded.internal.ComposerReloaded.LOGGER; //? } @@ -17,8 +17,9 @@ public class DataFixerRegistry { public static final AbstractPseudoRegistry ITEM = new AbstractPseudoRegistry.Impl<>() { @Override + @SuppressWarnings("unchecked") public Item register(Identifier id, Item value) { - //? if minecraft: >=1.21.4 + //? if minecraft: >=1.20.6 if (value instanceof SimpleItemFixer simple && simple.copyNbt()) LOGGER.warn("Copying raw NBT in a simple data fixer does not work on 1.21.4. Consider using a custom data fixer to copy components manually, or disable copyNbt!"); return super.register(id, value); } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datagen/ComposerLanguageProvider.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datagen/ComposerLanguageProvider.java index 81d5dad..c6b6e3f 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datagen/ComposerLanguageProvider.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datagen/ComposerLanguageProvider.java @@ -18,7 +18,7 @@ import org.lilbrocodes.composer_reloaded.api.v1.registry.lazy.feature.Feature; import org.lilbrocodes.composer_reloaded.api.v1.util.misc.Translatable; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import org.lilbrocodes.composer_reloaded.api.v1.util.misc.TranslatableSoundEvent; *///? } else { import net.minecraft.registry.RegistryWrapper; @@ -32,7 +32,7 @@ public abstract class ComposerLanguageProvider extends FabricLanguageProvider { protected TranslationBuilder builder; - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*protected ComposerLanguageProvider(FabricDataOutput dataOutput) { super(dataOutput); } @@ -42,14 +42,14 @@ protected ComposerLanguageProvider(FabricDataOutput dataOutput, CompletableFutur } //?} - //? if minecraft: <=1.20.1 + //? if minecraft: <=1.20.4 //@Override public void generateTranslations(TranslationBuilder translationBuilder) { this.builder = translationBuilder; generate(); } - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { @Override public void generateTranslations(RegistryWrapper.WrapperLookup wrapperLookup, TranslationBuilder translationBuilder) { generateTranslations(translationBuilder); @@ -94,14 +94,14 @@ public & EnumTranslatable> void enumTranslatable(Class enu for (int i = 0; i < constants.length; i++) add("%s.%s".formatted(prefix, constants[i].name()), values[i]); } - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*public void sound(TranslatableSoundEvent sound, String value) { add(sound, value); } *///?} public void sound(SoundEvent sound, String value) { - add(sound./*? if minecraft: >=1.21.4 { */id/*?} else {*//*getId*//*? }*/(), value); + add(sound./*? if minecraft: >=1.21.3 { */id/*?} else {*//*getId*//*? }*/(), value); } public void add(Translatable translatable, String value) { @@ -150,7 +150,7 @@ public void entity(EntityType entityType, String value) { builder.add(entityType, value); } - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*public void enchantment(Enchantment enchantment, String value) { builder.add(enchantment, value); } @@ -158,6 +158,14 @@ public void entity(EntityType entityType, String value) { public void attribute(EntityAttribute entityAttribute, String value) { builder.add(entityAttribute, value); } + *///?} else if minecraft: <=1.20.6 { + /*public void enchantment(Enchantment enchantment, String value) { + builder.add(enchantment, value); + } + + public void attribute(RegistryEntry entityAttribute, String value) { + builder.add(entityAttribute, value); + } *///?} else { public void enchantment(RegistryKey enchantment, String value) { builder.addEnchantment(enchantment, value); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datagen/ComposerModelProvider.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datagen/ComposerModelProvider.java index 7fc4526..ec158ec 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datagen/ComposerModelProvider.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datagen/ComposerModelProvider.java @@ -15,7 +15,7 @@ import java.util.function.Function; import java.util.function.Supplier; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.21.3 { /*import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.minecraft.data.client.BlockStateModelGenerator; import net.minecraft.data.client.BlockStateSupplier; @@ -24,7 +24,7 @@ import net.minecraft.util.Identifier; import java.util.HashSet; import java.util.Set; -*///? } else if minecraft: >=1.21.4 { +*///? } else { import java.util.List; import java.util.Objects; import java.util.stream.Stream; @@ -42,7 +42,7 @@ import net.minecraft.client.data.*; //? } -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.21.3 { /*public abstract class ComposerModelProvider implements DataProvider { private final DataOutput.PathResolver blockstatesPathResolver; private final DataOutput.PathResolver modelsPathResolver; @@ -150,7 +150,7 @@ public static class ModelSuppliers implements BiConsumer supplier = this.modelSuppliers.put(identifier, modelSupplier); if (supplier != null) { - throw new IllegalStateException("Duplicate model definition for " + String.valueOf(identifier)); + throw new IllegalStateException("Duplicate model definition for " + identifier); } } @@ -171,7 +171,7 @@ public void accept(BlockStateSupplier blockStateSupplier) { Block block = blockStateSupplier.getBlock(); BlockStateSupplier blockStateSupplier2 = this.blockStateSuppliers.put(block, blockStateSupplier); if (blockStateSupplier2 != null) { - throw new IllegalStateException("Duplicate blockstate definition for " + String.valueOf(block)); + throw new IllegalStateException("Duplicate blockstate definition for " + block); } } @@ -201,9 +201,9 @@ public void accept(Item item, ItemModel.Unbaked model) { } private void accept(Item item, ItemAsset asset) { - ItemAsset itemAsset = (ItemAsset)this.itemAssets.put(item, asset); + ItemAsset itemAsset = this.itemAssets.put(item, asset); if (itemAsset != null) { - throw new IllegalStateException("Duplicate item model definition for " + String.valueOf(item)); + throw new IllegalStateException("Duplicate item model definition for " + item); } } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/easytags/manager/ItemStackDataManager.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/easytags/manager/ItemStackDataManager.java index 1693456..3abe199 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/easytags/manager/ItemStackDataManager.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/easytags/manager/ItemStackDataManager.java @@ -56,7 +56,7 @@ public static T get(NbtCompound tag, Class clazz) { * @return an instance of the requested data type, or null no data is present */ public static T get(ItemStack stack, Class clazz) { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*return get(stack.getOrCreateNbt(), clazz); *///? } else { return null; // TODO: Implement this to work with the new system @@ -74,7 +74,7 @@ public static T get(ItemStack stack, Class clazz) { * @param the type of the data */ public static > void save(ItemStack stack, T data) { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*NbtCompound root = stack.getOrCreateNbt(); save(root, data); stack.setNbt(root); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/events/composite/ComposerCompositeEvents.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/events/composite/ComposerCompositeEvents.java index 959cb35..f9d498a 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/events/composite/ComposerCompositeEvents.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/events/composite/ComposerCompositeEvents.java @@ -75,7 +75,7 @@ public Builder sound(Identifier id) { } public Builder sound(SoundEvent sound) { - return this.sound(sound./*? if minecraft: <=1.20.1 { *//*getId*//*? } else {*/id/*?}*/()); + return this.sound(sound./*? if minecraft: <=1.21 { *//*getId*//*? } else {*/id/*?}*/()); } public Builder sound(RegistryEntry.Reference sound) { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/item/AbstractProgressItem.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/item/AbstractProgressItem.java index 46d2a62..4bf4ce1 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/item/AbstractProgressItem.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/item/AbstractProgressItem.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; -//? if minecraft: >=1.21.4 +//? if minecraft: >=1.20.6 import static org.lilbrocodes.composer_reloaded.internal.registry.ModDataComponentTypes.STEPS; /** @@ -19,7 +19,7 @@ */ @SuppressWarnings("EmptyMethod") public abstract class AbstractProgressItem extends Item { - //? if minecraft: <=1.20.1 + //? if minecraft: <=1.20.4 //private static final String STEP_KEY = "Step"; private final int maxSteps; @@ -56,10 +56,10 @@ protected void onFinishProcess(ItemStack stack, World world, PlayerEntity player } /** Returns the current step stored in the item's NBT. */ - //? if minecraft: >=1.21.4 + //? if minecraft: >=1.20.6 @SuppressWarnings("DataFlowIssue") public static int getStep(ItemStack stack) { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*return stack.getOrCreateNbt().getInt(STEP_KEY); *///? } else { return stack.contains(STEPS) ? stack.get(STEPS) : 0; @@ -68,7 +68,7 @@ public static int getStep(ItemStack stack) { /** Sets the current step in the item's NBT. */ public static void setStep(ItemStack stack, int value) { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*stack.getOrCreateNbt().putInt(STEP_KEY, value); *///? } else { stack.set(STEPS, value); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/item/settings/ComposerItemSettings.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/item/settings/ComposerItemSettings.java index b63f578..f8d0671 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/item/settings/ComposerItemSettings.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/item/settings/ComposerItemSettings.java @@ -2,17 +2,17 @@ import net.minecraft.item.Item; -//? if minecraft: >=1.21.4 +//? if minecraft: >=1.20.6 import org.lilbrocodes.composer_reloaded.internal.registry.ModDataComponentTypes; public class ComposerItemSettings extends Item.Settings { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*public boolean soulbound = false; public boolean soulboundCanDrop = false; *///? } public ComposerItemSettings soulbound(boolean canDrop) { - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { component(ModDataComponentTypes.SOULBOUND, true); component(ModDataComponentTypes.SOULBOUND_CAN_DROP, canDrop); //? } else { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/item/settings/component/SoulboundComponent.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/item/settings/component/SoulboundComponent.java index eaf3967..49dc02f 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/item/settings/component/SoulboundComponent.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/item/settings/component/SoulboundComponent.java @@ -3,7 +3,7 @@ import net.minecraft.item.ItemStack; import java.util.Objects; -//? if minecraft: >=1.21.4 { +//? if minecraft: >=1.20.6 { import org.lilbrocodes.composer_reloaded.internal.registry.ModDataComponentTypes; //? } else { /*import org.lilbrocodes.composer_reloaded.mixin.accessor.ItemMethodAccessor; @@ -13,7 +13,7 @@ public class SoulboundComponent { public static boolean isSoulbound(ItemStack stack) { if (stack == null || stack.isEmpty()) return false; - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { return stack.contains(ModDataComponentTypes.SOULBOUND) && Objects.requireNonNull(stack.get(ModDataComponentTypes.SOULBOUND)); //?} else { /*ItemMethodAccessor settings = ItemMethodAccessor.get(stack); @@ -24,7 +24,7 @@ public static boolean isSoulbound(ItemStack stack) { public static boolean canDropSoulbound(ItemStack stack) { if (stack == null || stack.isEmpty()) return false; - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { return stack.contains(ModDataComponentTypes.SOULBOUND_CAN_DROP) ? Objects.requireNonNull(stack.get(ModDataComponentTypes.SOULBOUND_CAN_DROP)) : true; //?} else { /*ItemMethodAccessor settings = ItemMethodAccessor.get(stack); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredDataComponentTypeRegistry.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredDataComponentTypeRegistry.java index d480d3d..6f5d87c 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredDataComponentTypeRegistry.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredDataComponentTypeRegistry.java @@ -1,7 +1,12 @@ package org.lilbrocodes.composer_reloaded.api.v1.registry.lazy; -//? if minecraft: >=1.21.4 { +//? if minecraft: >= 1.21 { import net.minecraft.component.ComponentType; +//? } else if minecraft: >=1.20.6 { +/*import net.minecraft.component.DataComponentType; + *///? } + +//? if minecraft: >=1.20.6 { import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; @@ -13,12 +18,12 @@ public DeferredDataComponentTypeRegistry(String modId) { super(modId); } - public ComponentType register(String name, UnaryOperator> handler) { + public /*? minecraft: >=1.21 {*/ComponentType/*? } else {*//*DataComponentType*//*? }*/ register(String name, UnaryOperator=1.21 {*/ComponentType/*? } else {*//*DataComponentType*//*? }*/.Builder> handler) { return Registry.register( Registries.DATA_COMPONENT_TYPE, Identifier.of(modId, name), - handler.apply(ComponentType.builder()).build() + handler.apply(/*? minecraft: >=1.21 {*/ComponentType/*? } else {*//*DataComponentType*//*? }*/.builder()).build() ); } } -//? } +//? } \ No newline at end of file diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredEntityRegistry.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredEntityRegistry.java index bf7cebc..8e20eec 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredEntityRegistry.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredEntityRegistry.java @@ -7,7 +7,7 @@ import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; -//? minecraft: >=1.21.4 { +//? minecraft: >=1.21.3 { import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; //? } @@ -22,7 +22,8 @@ public EntityType register(String name, EntityType type return Registry.register(Registries.ENTITY_TYPE, id, type); } + @SuppressWarnings("deprecation") public EntityType register(String name, FabricEntityTypeBuilder builder) { - return register(name, builder.build(/*? if minecraft: >=1.21.4 { */RegistryKey.of(RegistryKeys.ENTITY_TYPE, Identifier.of(modId, name))/*?}*/)); + return register(name, builder.build(/*? if minecraft: >=1.21.3 { */RegistryKey.of(RegistryKeys.ENTITY_TYPE, Identifier.of(modId, name))/*?}*/)); } } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredItemRegistry.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredItemRegistry.java index b8eac14..3ffc929 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredItemRegistry.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredItemRegistry.java @@ -15,7 +15,7 @@ import java.util.function.Function; import java.util.function.UnaryOperator; -//? if minecraft: >=1.21.4 +//? if minecraft: >=1.20.6 import net.minecraft.registry.RegistryKeys; import org.lilbrocodes.composer_reloaded.api.v1.item.settings.ComposerItemSettings; @@ -30,13 +30,13 @@ public DeferredItemRegistry(String modId, RegistryKey itemGroupKey) { this.itemGroupKey = itemGroupKey; } - //? if minecraft: >=1.21.4 + //? if minecraft: >=1.21.3 @SuppressWarnings("unchecked") public I register(String name, Function provider, Provider settingsSupplier, boolean addToGroup) { Identifier id = Identifier.of(modId, name); S settings = settingsSupplier.provide(); - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.21.3 { settings = (S) settings.registryKey(RegistryKey.of(RegistryKeys.ITEM, id)); //? } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredParticleRegistry.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredParticleRegistry.java index a1d7a18..f0880fc 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredParticleRegistry.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredParticleRegistry.java @@ -7,10 +7,10 @@ import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; -//? if minecraft: >=1.21.4 { - import net.minecraft.network.RegistryByteBuf; - import net.minecraft.network.codec.PacketCodec; - import com.mojang.serialization.MapCodec; +//? if minecraft: >=1.20.6 { +import net.minecraft.network.RegistryByteBuf; +import net.minecraft.network.codec.PacketCodec; +import com.mojang.serialization.MapCodec; //?} else { /*import com.mojang.serialization.Codec; *///?} @@ -20,7 +20,7 @@ public DeferredParticleRegistry(String modId) { super(modId); } - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { public ParticleType register( String name, MapCodec codec, PacketCodec packetCodec) { @@ -40,7 +40,7 @@ public PacketCodec getPacketCodec() { } //?} - //? if minecraft: <=1.20.1{ + //? if minecraft: <=1.20.4{ /*public ParticleType register( String name, Codec codec, diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredPotionRegistry.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredPotionRegistry.java index 97bf3c1..2275650 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredPotionRegistry.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredPotionRegistry.java @@ -9,7 +9,7 @@ import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; -//? minecraft: >=1.21.4 +//? minecraft: >=1.20.6 import net.minecraft.registry.entry.RegistryEntry; public class DeferredPotionRegistry extends EmptyDeferredRegistry { @@ -23,14 +23,14 @@ public T register(String name, T potion) { @SuppressWarnings("UnusedReturnValue") public Potion register(String name, StatusEffectInstance... effects) { - return register(name, new Potion(/*? if minecraft: >=1.21.4 { */name, /*?}*/ effects)); + return register(name, new Potion(/*? if minecraft: >=1.21 { */name, /*?}*/ effects)); } - public static StatusEffectInstance effect(/*? if minecraft: <=1.20.1 { *//*StatusEffect*//*? } else {*/RegistryEntry/*?}*/ type, int duration) { + public static StatusEffectInstance effect(/*? if minecraft: <=1.20.4 { *//*StatusEffect*//*? } else {*/RegistryEntry/*?}*/ type, int duration) { return new StatusEffectInstance(type, duration); } - public static StatusEffectInstance effect(/*? if minecraft: <=1.20.1 { *//*StatusEffect*//*? } else {*/RegistryEntry/*?}*/ type, int duration, int amplifier) { + public static StatusEffectInstance effect(/*? if minecraft: <=1.20.4 { *//*StatusEffect*//*? } else {*/RegistryEntry/*?}*/ type, int duration, int amplifier) { return new StatusEffectInstance(type, duration, amplifier); } @@ -61,23 +61,23 @@ public Potion register(String name, RegistryKey key, Potion potion) { } public Potion registerEmpty(String name) { - return register(name, new Potion(/*? if minecraft: >=1.21.4 { */name/*?}*/)); + return register(name, new Potion(/*? if minecraft: >=1.21.3 { */name/*?}*/)); } public Potion registerWater(String name) { - return register(name, new Potion(/*? if minecraft: >=1.21.4 { */name/*?}*/)); + return register(name, new Potion(/*? if minecraft: >=1.21.3 { */name/*?}*/)); } - public static Potion of(/*? if minecraft: <=1.20.1 { *//*StatusEffect*//*? } else {*/RegistryEntry/*?}*/ type, int duration) { - return new Potion(/*? if minecraft: >=1.21.4 { */"", /*?}*/new StatusEffectInstance(type, duration)); + public static Potion of(/*? if minecraft: <=1.20.4 { *//*StatusEffect*//*? } else {*/RegistryEntry/*?}*/ type, int duration) { + return new Potion(/*? if minecraft: >=1.21.3 { */"", /*?}*/new StatusEffectInstance(type, duration)); } - public static Potion of(/*? if minecraft: <=1.20.1 { *//*StatusEffect*//*? } else {*/RegistryEntry/*?}*/ type, int duration, int amplifier) { - return new Potion(/*? if minecraft: >=1.21.4 { */"", /*?}*/new StatusEffectInstance(type, duration, amplifier)); + public static Potion of(/*? if minecraft: <=1.20.4 { *//*StatusEffect*//*? } else {*/RegistryEntry/*?}*/ type, int duration, int amplifier) { + return new Potion(/*? if minecraft: >=1.21.3 { */"", /*?}*/new StatusEffectInstance(type, duration, amplifier)); } public Potion multi(String name, StatusEffectInstance... effects) { - return register(name, new Potion(/*? if minecraft: >=1.21.4 { */name, /*?}*/ effects)); + return register(name, new Potion(/*? if minecraft: >=1.21.3 { */name, /*?}*/ effects)); } } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredSoundRegistry.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredSoundRegistry.java index 28b5738..c9c8c5e 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredSoundRegistry.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredSoundRegistry.java @@ -5,7 +5,7 @@ import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; -//? if minecraft: <=1.20.1 +//? if minecraft: <=1.21 //import org.lilbrocodes.composer_reloaded.api.v1.util.misc.TranslatableSoundEvent; public class DeferredSoundRegistry extends EmptyDeferredRegistry { @@ -15,10 +15,10 @@ public DeferredSoundRegistry(String modId) { public SoundEvent register(String name) { SoundEvent soundEvent = SoundEvent.of(Identifier.of(modId, name)); - return Registry.register(Registries.SOUND_EVENT, /*? if minecraft: <=1.20.1 { */ /*soundEvent.getId() *//*? } else {*/soundEvent.id()/*?}*/, soundEvent); + return Registry.register(Registries.SOUND_EVENT, /*? if minecraft: <=1.21 { */ /*soundEvent.getId() *//*? } else {*/soundEvent.id()/*?}*/, soundEvent); } - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.21 { /*public TranslatableSoundEvent register(String name, String translation) { return register(name, modId, translation); } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/util/BrewingRecipeUtils.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/util/BrewingRecipeUtils.java index 839a093..ddb7770 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/util/BrewingRecipeUtils.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/util/BrewingRecipeUtils.java @@ -7,14 +7,14 @@ import net.minecraft.recipe.BrewingRecipeRegistry; import net.minecraft.recipe.Ingredient; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.minecraft.registry.tag.TagKey; *///? } else { import net.minecraft.registry.entry.RegistryEntry; //?} public class BrewingRecipeUtils { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*public static void register(Potion input, Item item, Potion output) { BrewingRecipeRegistry.registerPotionRecipe(input, item, output); } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/render/ParticleRenderer.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/render/ParticleRenderer.java index fb2a339..11abc48 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/render/ParticleRenderer.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/render/ParticleRenderer.java @@ -5,7 +5,7 @@ import org.lilbrocodes.composer_reloaded.api.v1.util.Vec2; import org.lilbrocodes.composer_reloaded.api.v1.velora.particle.SimpleParticle; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.6 { /*import com.mojang.blaze3d.systems.RenderSystem; import java.util.List; *///?} @@ -39,7 +39,7 @@ private static void renderCircle(Vec2 center, double radius, int color) { } private static void renderQuad(Vec2 center, double size, double rotation, int color) { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.6 { /*RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); RenderSystem.setShader(GameRenderer::getPositionColorProgram); @@ -107,7 +107,7 @@ private static Vec2 rotateVec(Vec2 v, double angle) { * If someone wants to fix this, please do as I have no clue how to do so. */ private static void drawTriangle(Vec2 v1, Vec2 v2, Vec2 v3, int color) { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.6 { /*double cross = (v2.x - v1.x) * (v3.y - v1.y) - (v2.y - v1.y) * (v3.x - v1.x); boolean ccw = cross > 0; @@ -142,7 +142,7 @@ private static void drawTriangle(Vec2 v1, Vec2 v2, Vec2 v3, int color) { } public static void renderTexturedQuad(Identifier texture, Vec2 center, double size, double rotation, int color) { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.6 { /*RenderSystem.setShaderTexture(0, texture); RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); @@ -197,7 +197,7 @@ public static void renderAnimatedQuad( int frameIndex, int totalFrames ) { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.6 { /*RenderSystem.setShaderTexture(0, texture); RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/toast/SimpleToast.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/toast/SimpleToast.java index 47d760b..7e69f78 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/toast/SimpleToast.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/toast/SimpleToast.java @@ -10,7 +10,7 @@ import java.util.List; -//? if minecraft: >= 1.21.4 +//? if minecraft: >= 1.21.3 import net.minecraft.client.render.RenderLayer; public class SimpleToast extends AbstractToast { @@ -81,7 +81,7 @@ private void drawIcon(DrawContext ctx) { int x = -MAX_WIDTH / 2 - 5; int y = -ICON_SIZE / 2; - ctx.drawTexture(/*? minecraft: >=1.21.4 { */RenderLayer::getGuiTextured, /*?}*/ iconTexture, x, y, 0, 0, ICON_SIZE, ICON_SIZE, ICON_SIZE, ICON_SIZE); + ctx.drawTexture(/*? minecraft: >=1.21.3 { */RenderLayer::getGuiTextured, /*?}*/ iconTexture, x, y, 0, 0, ICON_SIZE, ICON_SIZE, ICON_SIZE, ICON_SIZE); } private void drawBox(DrawContext ctx) { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/tooltips/DynamicTooltip.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/tooltips/DynamicTooltip.java index d68b75c..13e99ed 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/tooltips/DynamicTooltip.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/tooltips/DynamicTooltip.java @@ -44,31 +44,33 @@ enum Location { AFTER_NAME, AFTER_MAP_ID, AFTER_ITEM_TOOLTIP, - //? if minecraft: >=1.21.4 + //? if minecraft: >=1.21 AFTER_JUKEBOX_PLAYABLE, AFTER_TRIM, - //? if minecraft: >=1.21.4 + //? if minecraft: >=1.20.6 AFTER_STORED_ENCHANTMENTS, AFTER_ENCHANTMENTS, AFTER_DYED_COLOR, AFTER_LORE, AFTER_ATTRIBUTE_MODIFIERS, AFTER_UNBREAKABLE, - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.21 { AFTER_OMINOUS_BOTTLE_AMPLIFIER, AFTER_SUSPICIOUS_STEW_EFFECTS, + //? } + //? if minecraft: >=1.20.6 { AFTER_CAN_BREAK, AFTER_CAN_PLACE_ON, //? } AFTER_DURABILITY, AFTER_ITEM_ID, - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { AFTER_COMPONENTS, //? } else { /*AFTER_TAGS, *///? } AFTER_DISABLED_TEXT, - //? if minecraft: >=1.21.4 + //? if minecraft: >=1.21 AFTER_OPERATOR_WARNINGS, TAIL, diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/util/AdvancementManager.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/util/AdvancementManager.java index c0d68e9..59b6287 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/util/AdvancementManager.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/util/AdvancementManager.java @@ -8,7 +8,7 @@ import java.util.Objects; -//? if minecraft: >=1.21.4 { +//? if minecraft: >=1.20.4 { import net.minecraft.advancement.AdvancementEntry; //? } else { /*import net.minecraft.advancement.Advancement; diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/util/builder/ListBuilder.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/util/builder/ListBuilder.java deleted file mode 100644 index ebb3e62..0000000 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/util/builder/ListBuilder.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.lilbrocodes.composer_reloaded.api.v1.util.builder; - -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -public class ListBuilder { - private final List emptyDefaults; - private List list = new ArrayList<>(); - private final B parent; - - public ListBuilder(B parent) { - this(parent, new ArrayList<>()); - } - - public ListBuilder(B parent, List emptyDefaults) { - this.emptyDefaults = emptyDefaults; - this.parent = parent; - } - - public ListBuilder push(V elem) { - list.add(elem); - return this; - } - - @SafeVarargs - public final ListBuilder push(V... elements) { - list.addAll(Arrays.stream(elements).toList()); - return this; - } - - public ListBuilder pop() { - if (!list.isEmpty()) list.remove(list.size() - 1); - return this; - } - - public ListBuilder clear() { - list.clear(); - return this; - } - - public B end() { - return parent; - } - - public List build() { - return new ArrayList<>(list.isEmpty() ? emptyDefaults : list); - } - - public V[] toArray(Class clazz) { - List built = build(); - @SuppressWarnings("unchecked") - V[] arr = (V[]) Array.newInstance(clazz, built.size()); - return built.toArray(arr); - } - - public ListBuilder set(List list) { - this.list = list; - return this; - } -} diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/util/misc/TranslatableSoundEvent.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/util/misc/TranslatableSoundEvent.java index d6bdb29..cb29180 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/util/misc/TranslatableSoundEvent.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/util/misc/TranslatableSoundEvent.java @@ -1,6 +1,6 @@ package org.lilbrocodes.composer_reloaded.api.v1.util.misc; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.21 { /*import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/ComposerReloaded.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/ComposerReloaded.java index 53f3120..313dd52 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/ComposerReloaded.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/ComposerReloaded.java @@ -76,7 +76,7 @@ public void onInitialize() { ModBlocks.initialize(); ModItems.initialize(); - //? if minecraft: >=1.21.4 + //? if minecraft: >=1.20.6 ModDataComponentTypes.initialize(); ComposerConfig.initialize(); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/block/PlushBlock.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/block/PlushBlock.java index 5e37b14..3888e89 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/block/PlushBlock.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/block/PlushBlock.java @@ -29,30 +29,35 @@ import org.lilbrocodes.composer_reloaded.internal.registry.ModSounds; import org.lilbrocodes.composer_reloaded.internal.registry.ModStatistics; -//? if minecraft: <=1.20.1 { +//? if minecraft: >=1.21 +import net.minecraft.state.property.EnumProperty; + +//? if minecraft: <=1.21 { /*import net.minecraft.world.WorldAccess; import net.minecraft.state.property.DirectionProperty; -import net.minecraft.util.Hand; *///? } else { -import net.minecraft.state.property.EnumProperty; import net.minecraft.world.WorldView; import net.minecraft.world.tick.ScheduledTickView; import net.minecraft.util.math.random.Random; +//? } + +//? if minecraft: >=1.20.4 import com.mojang.serialization.MapCodec; -//?} -//? if minecraft: <=1.20.1 -//@SuppressWarnings("deprecation") +//? if minecraft: <=1.20.4 { +/*import net.minecraft.util.Hand; +@SuppressWarnings("deprecation") +*///? } public class PlushBlock extends BlockWithEntity implements Waterloggable { public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; - public static final /*? if minecraft: <=1.20.1 { *//*DirectionProperty*//*? } else {*/ EnumProperty /*?}*/ FACING = Properties.HORIZONTAL_FACING; + public static final /*? if minecraft: <=1.20.6 { *//*DirectionProperty*//*? } else {*/ EnumProperty /*?}*/ FACING = Properties.HORIZONTAL_FACING; private static final VoxelShape SHAPE = createCuboidShape(3.0, 0.0, 3.0, 13.0, 15.0, 13.0); public PlushBlock(Settings settings) { super(settings); } - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.4 { @Override protected MapCodec getCodec() { return BlockWithEntity.createCodec(PlushBlock::new); @@ -60,7 +65,7 @@ protected MapCodec getCodec() { //?} public BlockRenderType getRenderType(BlockState state) { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.6 { /*return BlockRenderType.ENTITYBLOCK_ANIMATED; *///? } else { return BlockRenderType.INVISIBLE; @@ -82,7 +87,7 @@ protected void spawnBreakParticles(World world, PlayerEntity player, BlockPos po @Override - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*public ActionResult onUse(BlockState state, @NotNull World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { *///? } else { protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) { @@ -144,7 +149,7 @@ protected void appendProperties(StateManager.@NotNull Builder } @Override - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.21 { /*public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { if (state.get(WATERLOGGED)) world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/block/entity/PlushBlockEntity.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/block/entity/PlushBlockEntity.java index 0f464e0..32e45a7 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/block/entity/PlushBlockEntity.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/block/entity/PlushBlockEntity.java @@ -41,12 +41,12 @@ public void squish(int squash) { } @Override - protected void writeNbt(@NotNull NbtCompound nbt /*? if minecraft: >= 1.21.4 { */, RegistryWrapper.WrapperLookup registries /*?}*/) { + protected void writeNbt(@NotNull NbtCompound nbt /*? if minecraft: >= 1.20.6 { */, RegistryWrapper.WrapperLookup registries /*?}*/) { nbt.putDouble("squash", this.squash); } @Override - public void readNbt(@NotNull NbtCompound nbt /*? if minecraft: >= 1.21.4 { */, RegistryWrapper.WrapperLookup registries /*?}*/) { + public void readNbt(@NotNull NbtCompound nbt /*? if minecraft: >= 1.20.6 { */, RegistryWrapper.WrapperLookup registries /*?}*/) { this.squash = nbt.getDouble("squash"); } @@ -56,7 +56,7 @@ public void readNbt(@NotNull NbtCompound nbt /*? if minecraft: >= 1.21.4 { */, R } @Override - public NbtCompound toInitialChunkDataNbt( /*? if minecraft: >= 1.21.4 { */RegistryWrapper.WrapperLookup registries /*?}*/) { - return this.createNbt( /*? if minecraft: >= 1.21.4 { */registries /*?}*/); + public NbtCompound toInitialChunkDataNbt( /*? if minecraft: >= 1.20.6 { */RegistryWrapper.WrapperLookup registries /*?}*/) { + return this.createNbt( /*? if minecraft: >= 1.20.6 { */registries /*?}*/); } } \ No newline at end of file diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/cca/ModCardinalComponents.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/cca/ModCardinalComponents.java index 2077506..b1a576d 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/cca/ModCardinalComponents.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/cca/ModCardinalComponents.java @@ -5,7 +5,7 @@ import org.lilbrocodes.composer_reloaded.internal.cca.entity.TargetedBlockComponent; import org.lilbrocodes.composer_reloaded.internal.cca.entity.TargetedEntityComponent; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import dev.onyxstudios.cca.api.v3.component.ComponentKey; import dev.onyxstudios.cca.api.v3.component.ComponentRegistry; import dev.onyxstudios.cca.api.v3.entity.EntityComponentFactoryRegistry; diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/cca/entity/TargetedBlockComponent.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/cca/entity/TargetedBlockComponent.java index 30b40c8..aab4900 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/cca/entity/TargetedBlockComponent.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/cca/entity/TargetedBlockComponent.java @@ -9,7 +9,7 @@ import static org.lilbrocodes.composer_reloaded.internal.registry.ModFeatures.TargetSynchronization.*; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import dev.onyxstudios.cca.api.v3.component.sync.AutoSyncedComponent; import dev.onyxstudios.cca.api.v3.component.tick.ServerTickingComponent; *///? } else { @@ -48,12 +48,12 @@ public int getTicks() { return ticks; } - public void readFromNbt(NbtCompound tag /*? if minecraft: >= 1.21.4 { */, RegistryWrapper.WrapperLookup registries /*?}*/) { - this.pos = /*? if minecraft: >= 1.21.4 { */NbtHelper.toBlockPos(tag, POS_KEY).orElse(null)/*? } else {*//*tag.contains(POS_KEY) ? NbtHelper.toBlockPos(tag.getCompound(POS_KEY)) : null*//*?}*/; + public void readFromNbt(NbtCompound tag /*? if minecraft: >= 1.20.6 { */, RegistryWrapper.WrapperLookup registries /*?}*/) { + this.pos = /*? if minecraft: >= 1.20.6 { */NbtHelper.toBlockPos(tag, POS_KEY).orElse(null)/*? } else {*//*tag.contains(POS_KEY) ? NbtHelper.toBlockPos(tag.getCompound(POS_KEY)) : null*//*?}*/; ticks = tag.getInt(TICKS_KEY); } - public void writeToNbt(NbtCompound tag /*? if minecraft: >= 1.21.4 { */, RegistryWrapper.WrapperLookup registries /*?}*/) { + public void writeToNbt(NbtCompound tag /*? if minecraft: >= 1.20.6 { */, RegistryWrapper.WrapperLookup registries /*?}*/) { if (this.pos != null) { tag.put(POS_KEY, NbtHelper.fromBlockPos(pos)); } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/cca/entity/TargetedEntityComponent.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/cca/entity/TargetedEntityComponent.java index b721bd2..f3cb218 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/cca/entity/TargetedEntityComponent.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/cca/entity/TargetedEntityComponent.java @@ -11,7 +11,7 @@ import static org.lilbrocodes.composer_reloaded.internal.registry.ModFeatures.TargetSynchronization.*; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import dev.onyxstudios.cca.api.v3.component.sync.AutoSyncedComponent; import dev.onyxstudios.cca.api.v3.component.tick.ServerTickingComponent; *///? } else { @@ -56,7 +56,7 @@ public void serverTick() { } @Override - public void writeToNbt(NbtCompound nbtCompound /*? if minecraft: >= 1.21.4 { */, RegistryWrapper.WrapperLookup registries /*?}*/) { + public void writeToNbt(NbtCompound nbtCompound /*? if minecraft: >= 1.20.6 { */, RegistryWrapper.WrapperLookup registries /*?}*/) { if (this.uuid != null) { nbtCompound.put(UUID_KEY, NbtHelper.fromUuid(uuid)); } @@ -64,7 +64,7 @@ public void writeToNbt(NbtCompound nbtCompound /*? if minecraft: >= 1.21.4 { */, } @Override - public void readFromNbt(NbtCompound tag /*? if minecraft: >= 1.21.4 { */, RegistryWrapper.WrapperLookup registries /*?}*/) { + public void readFromNbt(NbtCompound tag /*? if minecraft: >= 1.20.6 { */, RegistryWrapper.WrapperLookup registries /*?}*/) { if (tag.contains(UUID_KEY)) { this.uuid = tag.contains(UUID_KEY) ? NbtHelper.toUuid(Objects.requireNonNull(tag.get(UUID_KEY))) : null; } else { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/client/config/ComposerConfig.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/client/config/ComposerConfig.java index 8d412c3..15327bd 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/client/config/ComposerConfig.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/client/config/ComposerConfig.java @@ -1,15 +1,18 @@ package org.lilbrocodes.composer_reloaded.internal.client.config; import me.fzzyhmstrs.fzzy_config.api.ConfigApiJava; -import me.fzzyhmstrs.fzzy_config.api.FileType; import me.fzzyhmstrs.fzzy_config.api.RegisterType; -import me.fzzyhmstrs.fzzy_config.api.SaveType; import me.fzzyhmstrs.fzzy_config.config.Config; import me.fzzyhmstrs.fzzy_config.util.EnumTranslatable; import me.fzzyhmstrs.fzzy_config.validation.number.ValidatedInt; import org.jetbrains.annotations.NotNull; import org.lilbrocodes.composer_reloaded.internal.ComposerReloaded; +//? if minecraft: <=1.20.1 || >=1.21 { +import me.fzzyhmstrs.fzzy_config.api.FileType; +import me.fzzyhmstrs.fzzy_config.api.SaveType; +//? } + @SuppressWarnings("CanBeFinal") public class ComposerConfig extends Config { public ComposerConfig() { @@ -23,6 +26,7 @@ public int defaultPermLevel() { return 0; } + //? if minecraft: <=1.20.1 || >=1.21 { @Override public @NotNull FileType fileType() { return FileType.JSONC; @@ -32,11 +36,17 @@ public int defaultPermLevel() { public @NotNull SaveType saveType() { return SaveType.SEPARATE; } + //? } + //? if minecraft: <=1.20.1 || >=1.21 @Name("Rainbow Effect on Duplicate Keybinds") - public boolean rainbowDuplicateKeybinds = false; + public boolean rainbowEffectOnDuplicateKeybinds = false; + + //? if minecraft: <=1.20.1 || >=1.21 @Name("Rainbow Effect Speed") public ValidatedInt rainbowEffectSpeed = new ValidatedInt(3, 10, 1); + + //? if minecraft: <=1.20.1 || >=1.21 @Name("Allow Duplicate Keybinds") public BindsMode allowDuplicateKeybinds = BindsMode.MC_AND_CM; diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/client/render/block_entity/PlushBlockEntityRenderer.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/client/render/block_entity/PlushBlockEntityRenderer.java index 1177b84..ba44004 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/client/render/block_entity/PlushBlockEntityRenderer.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/client/render/block_entity/PlushBlockEntityRenderer.java @@ -34,7 +34,7 @@ public void render(@NotNull T entity, float tickDelta, @NotNull MatrixStack matr matrices.translate(-0.5, 0, -0.5); var state = entity.getCachedState(); var bakedModel = this.renderManager.getModel(state); - ((BlockRenderManagerAccessor) this.renderManager).composer$getModelRenderer().render(matrices.peek(), vertexConsumers.getBuffer(RenderLayers.getEntityBlockLayer(state/*? if minecraft: <=1.20.1 { *//*, false*//*?}*/)), state, bakedModel, 0xFF, 0xFF, 0xFF, light, overlay); + ((BlockRenderManagerAccessor) this.renderManager).composer$getModelRenderer().render(matrices.peek(), vertexConsumers.getBuffer(RenderLayers.getEntityBlockLayer(state/*? if minecraft: <=1.21 { *//*, false*//*?}*/)), state, bakedModel, 0xFF, 0xFF, 0xFF, light, overlay); matrices.pop(); } } \ No newline at end of file diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/command/FeatureCommand.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/command/FeatureCommand.java index d73b24e..00464fe 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/command/FeatureCommand.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/command/FeatureCommand.java @@ -76,11 +76,11 @@ private int enable(CommandContext ctx) { FeatureState state = ServerHolder.features(); if (ComposerFeatures.getInstance().featureMissing(id)) { - return error(ctx, Text.translatable("composer_reloaded.feature.missing", id/*? if minecraft: >=1.21.4 {*/.toString()/*?}*/)); + return error(ctx, Text.translatable("composer_reloaded.feature.missing", id.toString())); } state.setEnabled(id.toString(), true); - return success(ctx, Text.translatable("composer_reloaded.feature.enable", id/*? if minecraft: >=1.21.4 {*/.toString()/*?}*/) + return success(ctx, Text.translatable("composer_reloaded.feature.enable", id.toString()) ); } @@ -89,12 +89,12 @@ private int disable(CommandContext ctx) { FeatureState state = ServerHolder.features(); if (ComposerFeatures.getInstance().featureMissing(id)) { - return error(ctx, Text.translatable("composer_reloaded.feature.missing", id/*? if minecraft: >=1.21.4 {*/.toString()/*?}*/) + return error(ctx, Text.translatable("composer_reloaded.feature.missing", id.toString()) ); } state.setEnabled(id.toString(), false); - return highlight(ctx, Text.translatable("composer_reloaded.feature.disable", id/*? if minecraft: >=1.21.4 {*/.toString()/*?}*/) + return highlight(ctx, Text.translatable("composer_reloaded.feature.disable", id.toString()) ); } @@ -104,7 +104,7 @@ private int describe(CommandContext ctx) { FeatureHandle handle = ComposerFeatures.get(id); if (f.featureMissing(id) || handle == null) { - return error(ctx, Text.translatable("composer_reloaded.feature.missing", id/*? if minecraft: >=1.21.4 {*/.toString()/*?}*/)); + return error(ctx, Text.translatable("composer_reloaded.feature.missing", id.toString())); } String key = handle.getTranslationKey(); @@ -116,7 +116,7 @@ private int status(CommandContext ctx) { FeatureHandle handle = ComposerFeatures.get(id); if (handle == null) { - return error(ctx, Text.translatable("composer_reloaded.feature.missing", id/*? if minecraft: >=1.21.4 {*/.toString()/*?}*/) + return error(ctx, Text.translatable("composer_reloaded.feature.missing", id.toString()) ); } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/assets/ModLanguageProvider.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/assets/ModLanguageProvider.java index b748443..eacad1c 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/assets/ModLanguageProvider.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/assets/ModLanguageProvider.java @@ -5,18 +5,15 @@ import org.lilbrocodes.composer_reloaded.internal.client.config.ComposerConfig; import org.lilbrocodes.composer_reloaded.internal.registry.*; -//? minecraft: >=1.21.4 { +//? minecraft: >=1.20.6 { import net.minecraft.registry.RegistryWrapper; import java.util.concurrent.CompletableFuture; //? } import static org.lilbrocodes.composer_reloaded.internal.registry.ModFeatures.TargetSynchronization.*; -//? if minecraft: <=1.20.1 -//import net.minecraft.sound.SoundEvent; - public class ModLanguageProvider extends ComposerLanguageProvider { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*public ModLanguageProvider(FabricDataOutput output) { super(output); } @@ -41,7 +38,7 @@ public void generate() { "All" ); - sound(/*? if minecraft: <=1.20.1 {*//*(SoundEvent)*//*?}*/ ModSounds.LILBRO_SQUISH, "Plush Booped"); + sound(ModSounds.LILBRO_SQUISH, "Plush Booped"); feature(ENTITY, "Synchronizes players' target entities to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods."); feature(BLOCK, "Synchronizes players' target blocks to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods."); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/data/ModBlockLootTableProvider.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/data/ModBlockLootTableProvider.java index 4198b74..facab3f 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/data/ModBlockLootTableProvider.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/data/ModBlockLootTableProvider.java @@ -8,7 +8,7 @@ import java.util.concurrent.CompletableFuture; public class ModBlockLootTableProvider extends FabricBlockLootTableProvider { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*public ModBlockLootTableProvider(FabricDataOutput dataOutput) { super(dataOutput); } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/data/ModRecipeProvider.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/data/ModRecipeProvider.java index 0beb630..3af127a 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/data/ModRecipeProvider.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/data/ModRecipeProvider.java @@ -12,23 +12,36 @@ //? if minecraft: <=1.20.1 { /*import net.minecraft.data.server.recipe.CookingRecipeJsonBuilder; -import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; +import net.minecraft.data.server.recipe.RecipeJsonProvider; import java.util.function.Consumer; +*///? } else if minecraft: <=1.21.3 { +/*import net.minecraft.data.server.recipe.CookingRecipeJsonBuilder; +import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; + +import net.minecraft.data.server.recipe.RecipeExporter; +import net.minecraft.registry.RegistryWrapper; + +import java.util.concurrent.CompletableFuture; *///? } else { import net.minecraft.data.recipe.CookingRecipeJsonBuilder; -import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; import net.minecraft.data.recipe.RecipeExporter; -import net.minecraft.data.recipe.RecipeGenerator; import net.minecraft.data.recipe.ShapedRecipeJsonBuilder; import java.util.concurrent.CompletableFuture; +import net.minecraft.data.recipe.RecipeGenerator; //?} +//? if minecraft: =1.21.3 +//import net.minecraft.data.server.recipe.RecipeGenerator; + +//? if minecraft: >=1.21.3 +import net.minecraft.registry.RegistryKeys; + public class ModRecipeProvider extends FabricRecipeProvider { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*public ModRecipeProvider(FabricDataOutput output) { super(output); } @@ -46,10 +59,12 @@ public String getName() { @Override //? if minecraft: <=1.20.1 { /*public void generate(Consumer exporter) { + *///? } else if minecraft: <1.21.3 { + /*public void generate(RecipeExporter exporter) { *///? } else { protected RecipeGenerator getRecipeGenerator(RegistryWrapper.WrapperLookup registryLookup, RecipeExporter exporter) { //?} - //? minecraft: >=1.21.4 { + //? minecraft: >=1.21.3 { return new RecipeGenerator(registryLookup, exporter) { @Override public void generate() { @@ -75,7 +90,7 @@ public void generate() { 10 ).criterion("has_plush", items(PLUSHIE)).offerTo(exporter, "cook_plush"); - //? if minecraft: >= 1.21.4 { + //? if minecraft: >= 1.21.3 { }}; //? } } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/ClearToastsPayload.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/ClearToastsPayload.java index b32b960..fab01e1 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/ClearToastsPayload.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/ClearToastsPayload.java @@ -8,7 +8,7 @@ import org.lilbrocodes.composer_reloaded.internal.ComposerReloaded; import org.lilbrocodes.composer_reloaded.internal.networking.handler.ClearToastsHandler; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.fabricmc.fabric.api.networking.v1.FabricPacket; import net.fabricmc.fabric.api.networking.v1.PacketType; import org.lilbrocodes.composer_reloaded.internal.networking.handler.ScrollActionHandler; @@ -19,11 +19,11 @@ //? } public record ClearToastsPayload() - implements /*? if minecraft: <=1.20.1 { *//*FabricPacket*//*? } else {*/CustomPayload/*?}*/ { + implements /*? if minecraft: <=1.20.4 { *//*FabricPacket*//*? } else {*/CustomPayload/*?}*/ { public static final Identifier oID = ComposerReloaded.identify("clear_toasts_s2c"); - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*public static final Identifier ID = oID; @Override @@ -36,7 +36,7 @@ public ClearToastsPayload(PacketByteBuf ignored) { } *///?} - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*private static final PacketType TYPE = PacketType.create(oID, ClearToastsPayload::new); @Override @@ -54,7 +54,7 @@ public CustomPayload.Id getId() { @Environment(EnvType.CLIENT) public static void registerHandler() { - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { PayloadTypeRegistry.playS2C().register(ID, CODEC); ClientPlayNetworking.registerGlobalReceiver(ID, new ClearToastsHandler()); //?} else { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/NotifyToastPayload.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/NotifyToastPayload.java index 8cf6389..507129c 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/NotifyToastPayload.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/NotifyToastPayload.java @@ -9,7 +9,7 @@ import org.lilbrocodes.composer_reloaded.internal.ComposerReloaded; import org.lilbrocodes.composer_reloaded.internal.networking.handler.NotifyToastHandler; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.fabricmc.fabric.api.networking.v1.FabricPacket; import net.fabricmc.fabric.api.networking.v1.PacketType; *///? } else { @@ -19,7 +19,7 @@ //? } public record NotifyToastPayload(String message, ToastManager.Corner corner, int backgroundColor, int borderColor) - implements /*? if minecraft: <=1.20.1 { *//*FabricPacket*//*? } else {*/CustomPayload/*?}*/ { + implements /*? if minecraft: <=1.20.4 { *//*FabricPacket*//*? } else {*/CustomPayload/*?}*/ { public static final Identifier oID = ComposerReloaded.identify("notify_toast_s2c"); private NotifyToastPayload(PacketByteBuf buf) { @@ -31,7 +31,7 @@ private NotifyToastPayload(PacketByteBuf buf) { ); } - //? if minecraft: <= 1.20.1 { + //? if minecraft: <= 1.20.4 { /*public static final Identifier ID = oID; @Override @@ -43,7 +43,7 @@ public void write(PacketByteBuf buf) { buf.writeInt(borderColor); } - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*private static final PacketType TYPE = PacketType.create(oID, NotifyToastPayload::new); @Override public PacketType getType() { @@ -60,7 +60,7 @@ public CustomPayload.Id getId() { @Environment(EnvType.CLIENT) public static void registerHandler() { - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { PayloadTypeRegistry.playS2C().register(ID, CODEC); ClientPlayNetworking.registerGlobalReceiver(ID, new NotifyToastHandler()); //?} else { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/ScrollActionPayload.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/ScrollActionPayload.java index 511cd7f..7c14423 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/ScrollActionPayload.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/ScrollActionPayload.java @@ -6,7 +6,7 @@ import org.lilbrocodes.composer_reloaded.internal.ComposerReloaded; import org.lilbrocodes.composer_reloaded.internal.networking.handler.ScrollActionHandler; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.fabricmc.fabric.api.networking.v1.FabricPacket; import net.fabricmc.fabric.api.networking.v1.PacketType; *///? } else { @@ -16,14 +16,14 @@ //? } public record ScrollActionPayload(Identifier channel, double scrollAmount) - implements /*? if minecraft: <=1.20.1 { *//*FabricPacket*//*? } else {*/CustomPayload/*?}*/ { + implements /*? if minecraft: <=1.20.4 { *//*FabricPacket*//*? } else {*/CustomPayload/*?}*/ { public static final Identifier oID = ComposerReloaded.identify("scroll_action_c2s"); private ScrollActionPayload(PacketByteBuf buf) { this(buf.readIdentifier(), buf.readDouble()); } - //? if minecraft: <= 1.20.1 { + //? if minecraft: <= 1.20.4 { /*public static final Identifier ID = oID; @Override @@ -33,7 +33,7 @@ public void write(PacketByteBuf buf) { buf.writeDouble(scrollAmount); } - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*private static final PacketType TYPE = PacketType.create(ID, ScrollActionPayload::new); @Override public PacketType getType() { @@ -49,7 +49,7 @@ public CustomPayload.Id getId() { //? } public static void registerHandler() { - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { PayloadTypeRegistry.playC2S().register(ID, CODEC); ServerPlayNetworking.registerGlobalReceiver(ID, new ScrollActionHandler()); //?} else { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/SimpleToastPayload.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/SimpleToastPayload.java index e62af6a..b437b8d 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/SimpleToastPayload.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/SimpleToastPayload.java @@ -9,7 +9,7 @@ import org.lilbrocodes.composer_reloaded.internal.ComposerReloaded; import org.lilbrocodes.composer_reloaded.internal.networking.handler.SimpleToastHandler; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.fabricmc.fabric.api.networking.v1.FabricPacket; import net.fabricmc.fabric.api.networking.v1.PacketType; *///? } else { @@ -19,14 +19,14 @@ //? } public record SimpleToastPayload(Identifier iconTexture, String message, ToastManager.Corner corner, int backgroundColor, int borderColor) - implements /*? if minecraft: <=1.20.1 { *//*FabricPacket*//*? } else {*/CustomPayload/*?}*/ { + implements /*? if minecraft: <=1.20.4 { *//*FabricPacket*//*? } else {*/CustomPayload/*?}*/ { public static final Identifier oID = ComposerReloaded.identify("basic_toast_s2c"); private SimpleToastPayload(PacketByteBuf buf) { this(buf.readIdentifier(), buf.readString(), buf.readEnumConstant(ToastManager.Corner.class), buf.readInt(), buf.readInt()); } - //? if minecraft: <= 1.20.1 { + //? if minecraft: <= 1.20.4 { /*public static final Identifier ID = oID; @Override @@ -39,7 +39,7 @@ public void write(PacketByteBuf buf) { buf.writeInt(borderColor); } - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*private static final PacketType TYPE = PacketType.create(ID, SimpleToastPayload::new); @Override public PacketType getType() { @@ -56,7 +56,7 @@ public CustomPayload.Id getId() { @Environment(EnvType.CLIENT) public static void registerHandler() { - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { PayloadTypeRegistry.playS2C().register(ID, CODEC); ClientPlayNetworking.registerGlobalReceiver(ID, new SimpleToastHandler()); //?} else { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/TargetBlockPayload.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/TargetBlockPayload.java index 93cf440..af61bd1 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/TargetBlockPayload.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/TargetBlockPayload.java @@ -7,7 +7,7 @@ import org.lilbrocodes.composer_reloaded.internal.ComposerReloaded; import org.lilbrocodes.composer_reloaded.internal.networking.handler.TargetBlockHandler; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.fabricmc.fabric.api.networking.v1.FabricPacket; import net.fabricmc.fabric.api.networking.v1.PacketType; *///? } else { @@ -17,14 +17,14 @@ //? } public record TargetBlockPayload(BlockPos pos) - implements /*? if minecraft: <=1.20.1 { *//*FabricPacket*//*? } else {*/CustomPayload/*?}*/ { + implements /*? if minecraft: <=1.20.4 { *//*FabricPacket*//*? } else {*/CustomPayload/*?}*/ { public static final Identifier oID = ComposerReloaded.identify("target_block_c2s"); private TargetBlockPayload(PacketByteBuf buf) { this(buf.readBlockPos()); } - //? if minecraft: <= 1.20.1 { + //? if minecraft: <= 1.20.4 { /*public static final Identifier ID = oID; @Override @@ -33,7 +33,7 @@ public void write(PacketByteBuf buf) { buf.writeBlockPos(pos); } - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*private static final PacketType TYPE = PacketType.create(ID, TargetBlockPayload::new); @Override public PacketType getType() { @@ -49,7 +49,7 @@ public CustomPayload.Id getId() { //? } public static void registerHandler() { - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { PayloadTypeRegistry.playC2S().register(ID, CODEC); ServerPlayNetworking.registerGlobalReceiver(ID, new TargetBlockHandler()); //?} else { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/TargetEntityPayload.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/TargetEntityPayload.java index 5e6a764..708f63d 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/TargetEntityPayload.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/TargetEntityPayload.java @@ -8,7 +8,7 @@ import java.util.UUID; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.fabricmc.fabric.api.networking.v1.FabricPacket; import net.fabricmc.fabric.api.networking.v1.PacketType; *///? } else { @@ -18,14 +18,14 @@ //? } public record TargetEntityPayload(UUID uuid) - implements /*? if minecraft: <=1.20.1 { *//*FabricPacket*//*? } else {*/CustomPayload/*?}*/ { + implements /*? if minecraft: <=1.20.4 { *//*FabricPacket*//*? } else {*/CustomPayload/*?}*/ { public static final Identifier oID = ComposerReloaded.identify("target_entity_c2s"); private TargetEntityPayload(PacketByteBuf buf) { this(buf.readUuid()); } - //? if minecraft: <= 1.20.1 { + //? if minecraft: <= 1.20.4 { /*public static final Identifier ID = oID; @Override @@ -34,7 +34,7 @@ public void write(PacketByteBuf buf) { buf.writeUuid(uuid); } - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*private static final PacketType TYPE = PacketType.create(ID, TargetEntityPayload::new); @Override public PacketType getType() { @@ -50,7 +50,7 @@ public CustomPayload.Id getId() { //? } public static void registerHandler() { - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { PayloadTypeRegistry.playC2S().register(ID, CODEC); ServerPlayNetworking.registerGlobalReceiver(ID, new TargetEntityHandler()); //?} else { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/ClearToastsHandler.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/ClearToastsHandler.java index 5c70c6a..3c6ed48 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/ClearToastsHandler.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/ClearToastsHandler.java @@ -4,18 +4,18 @@ import org.lilbrocodes.composer_reloaded.api.v1.toast.ToastManager; import org.lilbrocodes.composer_reloaded.internal.networking.ClearToastsPayload; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.client.network.ClientPlayerEntity; *///? } -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*public class ClearToastsHandler implements ClientPlayNetworking.PlayPacketHandler { *///?} else { public class ClearToastsHandler implements ClientPlayNetworking.PlayPayloadHandler { //?} @Override - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*public void receive(ClearToastsPayload payload, ClientPlayerEntity player, PacketSender sender) { *///? } else { public void receive(ClearToastsPayload payload, ClientPlayNetworking.Context context) { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/NotifyToastHandler.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/NotifyToastHandler.java index 4dbb682..9d4b960 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/NotifyToastHandler.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/NotifyToastHandler.java @@ -5,18 +5,18 @@ import org.lilbrocodes.composer_reloaded.api.v1.toast.ToastManager; import org.lilbrocodes.composer_reloaded.internal.networking.NotifyToastPayload; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.client.network.ClientPlayerEntity; *///? } -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*public class NotifyToastHandler implements ClientPlayNetworking.PlayPacketHandler { *///?} else { public class NotifyToastHandler implements ClientPlayNetworking.PlayPayloadHandler { //?} @Override - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*public void receive(NotifyToastPayload payload, ClientPlayerEntity player, PacketSender sender) { *///? } else { public void receive(NotifyToastPayload payload, ClientPlayNetworking.Context context) { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/ScrollActionHandler.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/ScrollActionHandler.java index 0b9330d..e174127 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/ScrollActionHandler.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/ScrollActionHandler.java @@ -8,12 +8,12 @@ import java.util.List; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.server.network.ServerPlayerEntity; *///? } -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*public class ScrollActionHandler implements ServerPlayNetworking.PlayPacketHandler { *///?} else { public class ScrollActionHandler implements ServerPlayNetworking.PlayPayloadHandler { @@ -24,7 +24,7 @@ public class ScrollActionHandler implements ServerPlayNetworking.PlayPayloadHand ServerScrollEvents.LOW_PRIORITY ); - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*@Override public void receive(ScrollActionPayload payload, ServerPlayerEntity player, PacketSender sender) { for (Event event : priorities) diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/SimpleToastHandler.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/SimpleToastHandler.java index de2cbfa..ce5cebf 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/SimpleToastHandler.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/SimpleToastHandler.java @@ -5,18 +5,18 @@ import org.lilbrocodes.composer_reloaded.api.v1.toast.ToastManager; import org.lilbrocodes.composer_reloaded.internal.networking.SimpleToastPayload; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.client.network.ClientPlayerEntity; *///? } -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*public class SimpleToastHandler implements ClientPlayNetworking.PlayPacketHandler { *///?} else { public class SimpleToastHandler implements ClientPlayNetworking.PlayPayloadHandler { //?} @Override - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*public void receive(SimpleToastPayload payload, ClientPlayerEntity player, PacketSender sender) { *///? } else { public void receive(SimpleToastPayload payload, ClientPlayNetworking.Context context) { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/TargetBlockHandler.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/TargetBlockHandler.java index 313ad5e..d1ec4d8 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/TargetBlockHandler.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/TargetBlockHandler.java @@ -4,17 +4,17 @@ import org.lilbrocodes.composer_reloaded.internal.cca.ModCardinalComponents; import org.lilbrocodes.composer_reloaded.internal.networking.TargetBlockPayload; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.server.network.ServerPlayerEntity; *///?} -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*public class TargetBlockHandler implements ServerPlayNetworking.PlayPacketHandler { *///?} else { public class TargetBlockHandler implements ServerPlayNetworking.PlayPayloadHandler { //?} - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*@Override public void receive(TargetBlockPayload payload, ServerPlayerEntity player, PacketSender sender) { ModCardinalComponents.TARGETED_BLOCK.get(player).setPos(payload.pos()); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/TargetEntityHandler.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/TargetEntityHandler.java index c433c7c..6214885 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/TargetEntityHandler.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/networking/handler/TargetEntityHandler.java @@ -4,18 +4,18 @@ import org.lilbrocodes.composer_reloaded.internal.cca.ModCardinalComponents; import org.lilbrocodes.composer_reloaded.internal.networking.TargetEntityPayload; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.server.network.ServerPlayerEntity; *///?} -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*public class TargetEntityHandler implements ServerPlayNetworking.PlayPacketHandler { *///?} else { public class TargetEntityHandler implements ServerPlayNetworking.PlayPayloadHandler { //?} - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*@Override public void receive(TargetEntityPayload payload, ServerPlayerEntity player, PacketSender sender) { ModCardinalComponents.TARGETED_ENTITY.get(player).setUuid(payload.uuid()); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/registry/ModDataComponentTypes.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/registry/ModDataComponentTypes.java index 9b7f5ac..bd3fed9 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/registry/ModDataComponentTypes.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/registry/ModDataComponentTypes.java @@ -1,8 +1,14 @@ package org.lilbrocodes.composer_reloaded.internal.registry; -//? if minecraft: >=1.21.4 { -import com.mojang.serialization.Codec; + +//? if minecraft: >= 1.21 { import net.minecraft.component.ComponentType; +//? } else if minecraft: >=1.20.6 { +/*import net.minecraft.component.DataComponentType; +*///? } + +//? if minecraft: >=1.20.6 { +import com.mojang.serialization.Codec; import net.minecraft.network.codec.PacketCodecs; import net.minecraft.util.dynamic.Codecs; import org.lilbrocodes.composer_reloaded.api.v1.registry.lazy.DeferredDataComponentTypeRegistry; @@ -11,23 +17,23 @@ public class ModDataComponentTypes { private static final DeferredDataComponentTypeRegistry REGISTRY = new DeferredDataComponentTypeRegistry(ComposerReloaded.MOD_ID); - public static final ComponentType STEPS = REGISTRY.register( + public static final /*? minecraft: >=1.21 {*/ComponentType/*? } else {*//*DataComponentType*//*? }*/ STEPS = REGISTRY.register( "steps", - builder -> builder.codec(Codecs.NON_NEGATIVE_INT).packetCodec(PacketCodecs.INTEGER) + builder -> builder.codec(Codecs./*? minecraft: >=1.21.3 {*/NON_NEGATIVE_INT/*? } else {*//*NONNEGATIVE_INT*//*? }*/).packetCodec(PacketCodecs.INTEGER) ); - public static final ComponentType SOULBOUND = REGISTRY.register( + public static final /*? minecraft: >=1.21 {*/ComponentType/*? } else {*//*DataComponentType*//*? }*/ SOULBOUND = REGISTRY.register( "soulbound", builder -> builder .codec(Codec.BOOL) - .packetCodec(PacketCodecs.BOOLEAN) + .packetCodec(PacketCodecs./*? minecraft: >=1.21.4 {*/BOOLEAN/*? } else {*//*BOOL*//*? }*/) ); - public static final ComponentType SOULBOUND_CAN_DROP = REGISTRY.register( + public static final /*? minecraft: >=1.21 {*/ComponentType/*? } else {*//*DataComponentType*//*? }*/ SOULBOUND_CAN_DROP = REGISTRY.register( "soulbound_can_drop", builder -> builder .codec(Codec.BOOL) - .packetCodec(PacketCodecs.BOOLEAN) + .packetCodec(PacketCodecs./*? minecraft: >=1.21.4 {*/BOOLEAN/*? } else {*//*BOOL*//*? }*/) ); public static void initialize() { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/registry/ModRegistries.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/registry/ModRegistries.java index f804430..7383a44 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/registry/ModRegistries.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/registry/ModRegistries.java @@ -16,6 +16,6 @@ public static void initialize() { builder.addRegistry(COMPOSER_ADVANCEMENT_KEY, PredicateVoid::nil); RegistryWrapper.WrapperLookup lookup = builder.createWrapperLookup(DynamicRegistryManager.EMPTY); - COMPOSER_ADVANCEMENTS = lookup./*? if minecraft: <=1.20.1 { *//*getWrapperOrThrow*//*?} else {*/getOrThrow/*?}*/(COMPOSER_ADVANCEMENT_KEY); + COMPOSER_ADVANCEMENTS = lookup./*? if minecraft: <=1.21 { *//*getWrapperOrThrow*//*?} else {*/getOrThrow/*?}*/(COMPOSER_ADVANCEMENT_KEY); } } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/datafix/ItemStackMixin.java b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/datafix/ItemStackMixin.java index 357fab6..2bde01b 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/datafix/ItemStackMixin.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/datafix/ItemStackMixin.java @@ -11,12 +11,12 @@ import java.util.Optional; -//? if minecraft: >=1.21.4 +//? if minecraft: >=1.20.6 import net.minecraft.registry.RegistryWrapper; @Mixin(ItemStack.class) public class ItemStackMixin { - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*@Inject(method = "fromNbt", at = @At(value = "RETURN", ordinal = 1), cancellable = true) private static void composerReloaded$runDataFixers(NbtCompound tag, CallbackInfoReturnable cir) { if (tag.contains("id", NbtElement.STRING_TYPE)) { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/duped_binds/RecolorKeybindMixin.java b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/duped_binds/RecolorKeybindMixin.java index 0f1f781..a9452bb 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/duped_binds/RecolorKeybindMixin.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/duped_binds/RecolorKeybindMixin.java @@ -30,7 +30,7 @@ public abstract class RecolorKeybindMixin { if (BindTracker.bindAllowed(binding)) { RainbowColor.stepColor(); this.update(); - return ComposerConfig.INSTANCE.rainbowDuplicateKeybinds ? + return ComposerConfig.INSTANCE.rainbowEffectOnDuplicateKeybinds ? RainbowColor.currentColor : Formatting.AQUA.getColorValue() == null ? 0xFF000000 : Formatting.AQUA.getColorValue(); } else { @@ -42,7 +42,7 @@ public abstract class RecolorKeybindMixin { private Text flowed_combat$updateBindingColor(Text value) { if (!ComposerReloaded.dupedBinds()) return value; if (BindTracker.bindAllowed(binding)) { - return ComposerConfig.INSTANCE.rainbowDuplicateKeybinds ? + return ComposerConfig.INSTANCE.rainbowEffectOnDuplicateKeybinds ? binding.getBoundKeyLocalizedText().copy().setStyle(Style.EMPTY.withColor(RainbowColor.currentColor)) : binding.getBoundKeyLocalizedText().copy().formatted(Formatting.AQUA); } else { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/dynamic_tooltips/ItemStackMixin.java b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/dynamic_tooltips/ItemStackMixin.java index 219d3a5..b727558 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/dynamic_tooltips/ItemStackMixin.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/dynamic_tooltips/ItemStackMixin.java @@ -15,18 +15,25 @@ import java.util.List; -//? minecraft: >=1.21.4 + +//? minecraft: >=1.20.6 <1.21 { +/*import net.minecraft.client.item.TooltipType; +*///? } else if minecraft: >=1.21 { import net.minecraft.item.tooltip.TooltipType; +//? } + +//? minecraft: >=1.20.6 import org.jetbrains.annotations.Nullable; -import net.minecraft.item.Item; +import net.minecraft.item.Item; @Mixin(ItemStack.class) public abstract class ItemStackMixin { @Shadow public abstract ItemStack copy(); - //? if minecraft: >=1.21.4 { + //? if minecraft: >=1.20.6 { + @SuppressWarnings("DiscouragedShift") @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z", shift = At.Shift.BEFORE, ordinal = 0)) private void composer$append$0(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, HEAD); @@ -42,37 +49,63 @@ public abstract class ItemStackMixin { appendRegistered(copy(), list, AFTER_MAP_ID); } + //? if minecraft: >=1.21 { @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/Item;appendTooltip(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/List;Lnet/minecraft/item/tooltip/TooltipType;)V", shift = At.Shift.AFTER)) + //? } else { + /*@Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/Item;appendTooltip(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/List;Lnet/minecraft/client/item/TooltipType;)V", shift = At.Shift.AFTER)) + *///? } private void composer$append$3(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, AFTER_ITEM_TOOLTIP); } + //? if minecraft: >=1.21 { @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/ComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/item/tooltip/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 0)) private void composer$append$4(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, AFTER_JUKEBOX_PLAYABLE); } + //? } + //? if minecraft: >=1.21 { @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/ComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/item/tooltip/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 1)) + //? } else { + /*@Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/DataComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/client/item/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 0)) + *///? } private void composer$append$5(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, AFTER_TRIM); } + //? if minecraft: >=1.21 { @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/ComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/item/tooltip/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 2)) + //? } else { + /*@Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/DataComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/client/item/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 1)) + *///? } private void composer$append$6(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, AFTER_STORED_ENCHANTMENTS); } + //? if minecraft: >=1.21 { @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/ComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/item/tooltip/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 3)) + //? } else { + /*@Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/DataComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/client/item/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 2)) + *///? } private void composer$append$7(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, AFTER_ENCHANTMENTS); } + //? if minecraft: >=1.21 { @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/ComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/item/tooltip/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 4)) + //? } else { + /*@Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/DataComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/client/item/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 3)) + *///? } private void composer$append$8(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, AFTER_DYED_COLOR); } + //? if minecraft: >=1.21 { @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/ComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/item/tooltip/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 5)) + //? } else { + /*@Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/DataComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/client/item/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 4)) + *///? } private void composer$append$9(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, AFTER_LORE); } @@ -82,20 +115,28 @@ public abstract class ItemStackMixin { appendRegistered(copy(), list, AFTER_ATTRIBUTE_MODIFIERS); } + //? if minecraft: >=1.21 { @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/ComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/item/tooltip/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 6)) + //? } else { + /*@Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/DataComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/client/item/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 5)) + *///? } private void composer$append$11(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, AFTER_UNBREAKABLE); } + //? if minecraft: >=1.21.3 { @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/ComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/item/tooltip/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 7)) private void composer$append$12(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, AFTER_OMINOUS_BOTTLE_AMPLIFIER); } + //? } + //? if minecraft: >=1.21.3 { @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;appendTooltip(Lnet/minecraft/component/ComponentType;Lnet/minecraft/item/Item$TooltipContext;Ljava/util/function/Consumer;Lnet/minecraft/item/tooltip/TooltipType;)V", shift = At.Shift.AFTER, ordinal = 8)) private void composer$append$13(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, AFTER_SUSPICIOUS_STEW_EFFECTS); } + //? } @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/BlockPredicatesChecker;addTooltips(Ljava/util/function/Consumer;)V", shift = At.Shift.AFTER, ordinal = 0)) private void composer$append$14(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { @@ -127,15 +168,17 @@ public abstract class ItemStackMixin { appendRegistered(copy(), list, AFTER_DISABLED_TEXT); } + //? if minecraft: >=1.21.3 { @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Ljava/util/List;addAll(Ljava/util/Collection;)Z", shift = At.Shift.AFTER)) private void composer$append$20(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, AFTER_OPERATOR_WARNINGS); } + //? } @Inject(method = "getTooltip", at = @At(value = "RETURN", ordinal = 1), cancellable = true) private void composer$append$21(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir) { List r = cir.getReturnValue(); - appendRegistered(copy(), r, AFTER_OPERATOR_WARNINGS); + appendRegistered(copy(), r, TAIL); cir.setReturnValue(r); } //? } else { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/local/CampfireBlockEntityMixin.java b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/local/CampfireBlockEntityMixin.java index 720d6fb..1288b7f 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/local/CampfireBlockEntityMixin.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/local/CampfireBlockEntityMixin.java @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -//? if minecraft: >=1.21.4 { +//? if minecraft: >=1.21.3 { import net.minecraft.recipe.CampfireCookingRecipe; import net.minecraft.recipe.ServerRecipeManager; import net.minecraft.recipe.input.SingleStackRecipeInput; @@ -21,7 +21,7 @@ @Mixin(CampfireBlockEntity.class) public abstract class CampfireBlockEntityMixin { @Inject(method = "litServerTick", at = @At("HEAD"), cancellable = true) - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.21 { /*private static void composer$explodePlushies(World world, BlockPos pos, BlockState state, CampfireBlockEntity campfire, CallbackInfo ci) { *///? } else { private static void composer$explodePlushies(ServerWorld world, BlockPos pos, BlockState state, CampfireBlockEntity campfire, ServerRecipeManager.MatchGetter recipeMatchGetter, CallbackInfo ci) { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/render/GameRendererMixin.java b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/render/GameRendererMixin.java index 920d066..db61540 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/render/GameRendererMixin.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/render/GameRendererMixin.java @@ -9,13 +9,13 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -//? minecraft: >=1.21.4 +//? minecraft: >=1.21 import net.minecraft.client.render.RenderTickCounter; @Mixin(GameRenderer.class) public class GameRendererMixin { @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/toast/ToastManager;draw(Lnet/minecraft/client/gui/DrawContext;)V", shift = At.Shift.AFTER)) - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.6 { /*public void composerReloaded$renderToasts(float tickDelta, long startTime, boolean tick, CallbackInfo ci, @Local DrawContext drawContext) { *///? } else { public void composerReloaded$renderToasts(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci, @Local DrawContext drawContext) { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/scroll/PlayerInventoryMixin.java b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/scroll/PlayerInventoryMixin.java index 3dd1045..74bbbf8 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/scroll/PlayerInventoryMixin.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/scroll/PlayerInventoryMixin.java @@ -1,9 +1,6 @@ package org.lilbrocodes.composer_reloaded.mixin.impl.scroll; import net.fabricmc.fabric.api.event.Event; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import org.lilbrocodes.composer_reloaded.api.v1.events.ClientScrollEvents; @@ -11,12 +8,18 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.util.List; +//? if minecraft: <=1.21 { +/*import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.network.ClientPlayerEntity; +import net.minecraft.client.world.ClientWorld; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +*///? } + @Mixin(PlayerInventory.class) public class PlayerInventoryMixin { @Shadow @@ -29,8 +32,8 @@ public class PlayerInventoryMixin { ClientScrollEvents.LOW_PRIORITY ); - //? if minecraft: <=1.20.1 - //@Inject(method = "scrollInHotbar", at = @At("HEAD"), cancellable = true) + //? if minecraft: <=1.21 { + /*@Inject(method = "scrollInHotbar", at = @At("HEAD"), cancellable = true) public void composer_reloaded$triggerActions(double scrollAmount, CallbackInfo ci) { MinecraftClient client = MinecraftClient.getInstance(); ClientWorld world = client.world; @@ -43,4 +46,5 @@ public class PlayerInventoryMixin { } } } + *///? } } diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/soul_binding/ItemMixin.java b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/soul_binding/ItemMixin.java index a5811d2..4be9e50 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/soul_binding/ItemMixin.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/soul_binding/ItemMixin.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; -//? if minecraft: <=1.20.1 { +//? if minecraft: <=1.20.4 { /*import org.lilbrocodes.composer_reloaded.api.v1.item.settings.ComposerItemSettings; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -18,7 +18,7 @@ public class ItemMixin implements ItemMethodAccessor { @Unique private boolean soulbound = false; @Unique private boolean soulboundCanDrop = false; - //? if minecraft: <=1.20.1 { + //? if minecraft: <=1.20.4 { /*@Inject(method = "", at = @At("TAIL")) private void composerReloaded$settingsImpl(Item.Settings settings, CallbackInfo ci) { if (settings instanceof ComposerItemSettings c) { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/soul_binding/PlayerEntityMixin.java b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/soul_binding/PlayerEntityMixin.java index b9160f7..5b4a181 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/soul_binding/PlayerEntityMixin.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/soul_binding/PlayerEntityMixin.java @@ -23,7 +23,7 @@ @Mixin(PlayerEntity.class) public class PlayerEntityMixin { - @Shadow @Final /*? if minecraft: <=1.20.1 {*//*private *//*?}*/PlayerInventory inventory; + @Shadow @Final /*? if minecraft: <=1.20.4 {*//*private *//*?}*/PlayerInventory inventory; @Inject(method = "dropInventory", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;vanishCursedItems()V"), cancellable = true) public void composerReloaded$keepSoulboundItems(/*? if minecraft: >=1.21.4 {*/ServerWorld world, /*?}*/CallbackInfo ci) { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/velora/ParticleRenderHook.java b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/velora/ParticleRenderHook.java index b4cf96c..e59c688 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/velora/ParticleRenderHook.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/velora/ParticleRenderHook.java @@ -12,19 +12,22 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -//? minecraft: >=1.21.4 +//? minecraft: >=1.21 import net.minecraft.client.render.RenderTickCounter; @Mixin(GameRenderer.class) public class ParticleRenderHook { @Shadow @Final - /*? minecraft: >=1.21.4 {*/private/*?}*/ MinecraftClient client; + /*? minecraft: >=1.21.3 {*/private/*?}*/ MinecraftClient client; - //? minecraft: <= 1.20.1 { + //? minecraft: <= 1.20.6 { /*@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V", ordinal = 1)) public void velora$renderParticles(float tickDelta, long startTime, boolean tick, CallbackInfo ci, @Local DrawContext drawContext) { - *///?} else { + *///?} else if minecraft: <=1.21 { + /*@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;draw()V")) + public void velora$renderParticles(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci, @Local DrawContext drawContext) { + *///? } else { @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;draw()V", ordinal = 1)) public void velora$renderParticles(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci, @Local DrawContext drawContext) { //?} diff --git a/versions/1.20.4/gradle.properties b/versions/1.20.4/gradle.properties new file mode 100644 index 0000000..028af9d --- /dev/null +++ b/versions/1.20.4/gradle.properties @@ -0,0 +1,12 @@ +deps.fabric_api=0.97.3+1.20.4 +deps.fabric_loader=0.18.4 +deps.yarn=1.20.4+build.3 +deps.cca=5.4.0 +deps.cca_source=dev.onyxstudios +deps.fzzy=0.5.9+1.20.4 + +r.deps.mod_menu=9.2.0 + +mod.mc_dep=>=1.20.4 <=1.20.5 +mod.mc_title=1.20.4 +mod.mc_targets=1.20.4 1.20.5 \ No newline at end of file diff --git a/versions/1.20.4/src/main/resources/1.20.4.accesswidener b/versions/1.20.4/src/main/resources/1.20.4.accesswidener new file mode 100644 index 0000000..1893bab --- /dev/null +++ b/versions/1.20.4/src/main/resources/1.20.4.accesswidener @@ -0,0 +1,5 @@ +accessWidener v2 named +accessible method net/minecraft/sound/SoundEvent (Lnet/minecraft/util/Identifier;FZ)V +accessible field net/minecraft/recipe/BrewingRecipeRegistry POTION_RECIPES Ljava/util/List; +accessible class net/minecraft/recipe/BrewingRecipeRegistry$Recipe +accessible field net/minecraft/client/option/KeyBinding timesPressed I \ No newline at end of file diff --git a/versions/1.20.4/src/main/resources/assets/composer_reloaded/models/item/plush.json b/versions/1.20.4/src/main/resources/assets/composer_reloaded/models/item/plush.json new file mode 100644 index 0000000..bf1a9e7 --- /dev/null +++ b/versions/1.20.4/src/main/resources/assets/composer_reloaded/models/item/plush.json @@ -0,0 +1,3 @@ +{ + "parent": "composer_reloaded:block/plush" +} \ No newline at end of file diff --git a/versions/1.20.6/gradle.properties b/versions/1.20.6/gradle.properties new file mode 100644 index 0000000..bde07d5 --- /dev/null +++ b/versions/1.20.6/gradle.properties @@ -0,0 +1,12 @@ +deps.fabric_api=0.100.8+1.20.6 +deps.fabric_loader=0.18.4 +deps.yarn=1.20.6+build.3 +deps.cca=6.0.0 +deps.cca_source=org.ladysnake +deps.fzzy=0.5.9+1.20.6 + +r.deps.mod_menu=10.0.0 + +mod.mc_dep=>=1.20.6 <=1.20.7 +mod.mc_title=1.20.6 +mod.mc_targets=1.20.6 1.20.7 \ No newline at end of file diff --git a/versions/1.20.6/src/main/resources/1.20.6.accesswidener b/versions/1.20.6/src/main/resources/1.20.6.accesswidener new file mode 100644 index 0000000..c3cca38 --- /dev/null +++ b/versions/1.20.6/src/main/resources/1.20.6.accesswidener @@ -0,0 +1,3 @@ +accessWidener v2 named +accessible method net/minecraft/sound/SoundEvent (Lnet/minecraft/util/Identifier;FZ)V +accessible field net/minecraft/client/option/KeyBinding timesPressed I \ No newline at end of file diff --git a/versions/1.20.6/src/main/resources/assets/composer_reloaded/models/item/plush.json b/versions/1.20.6/src/main/resources/assets/composer_reloaded/models/item/plush.json new file mode 100644 index 0000000..bf1a9e7 --- /dev/null +++ b/versions/1.20.6/src/main/resources/assets/composer_reloaded/models/item/plush.json @@ -0,0 +1,3 @@ +{ + "parent": "composer_reloaded:block/plush" +} \ No newline at end of file diff --git a/versions/1.21.3/gradle.properties b/versions/1.21.3/gradle.properties new file mode 100644 index 0000000..2727821 --- /dev/null +++ b/versions/1.21.3/gradle.properties @@ -0,0 +1,12 @@ +deps.fabric_api=0.114.1+1.21.3 +deps.fabric_loader=0.18.4 +deps.yarn=1.21.3+build.2 +deps.cca=6.2.2 +deps.cca_source=org.ladysnake +deps.fzzy=0.7.4-fix1+1.21.3 + +r.deps.mod_menu=12.0.0 + +mod.mc_dep=>=1.21.2 <=1.21.3 +mod.mc_title=1.21.3 +mod.mc_targets=1.21.2 1.21.3 \ No newline at end of file diff --git a/versions/1.21.3/src/main/resources/1.21.3.accesswidener b/versions/1.21.3/src/main/resources/1.21.3.accesswidener new file mode 100644 index 0000000..0e9e4fd --- /dev/null +++ b/versions/1.21.3/src/main/resources/1.21.3.accesswidener @@ -0,0 +1,2 @@ +accessWidener v2 named +accessible field net/minecraft/client/option/KeyBinding timesPressed I \ No newline at end of file diff --git a/versions/1.21.3/src/main/resources/assets/composer_reloaded/models/item/plush.json b/versions/1.21.3/src/main/resources/assets/composer_reloaded/models/item/plush.json new file mode 100644 index 0000000..bf1a9e7 --- /dev/null +++ b/versions/1.21.3/src/main/resources/assets/composer_reloaded/models/item/plush.json @@ -0,0 +1,3 @@ +{ + "parent": "composer_reloaded:block/plush" +} \ No newline at end of file diff --git a/versions/1.21/gradle.properties b/versions/1.21/gradle.properties new file mode 100644 index 0000000..c75822d --- /dev/null +++ b/versions/1.21/gradle.properties @@ -0,0 +1,12 @@ +deps.fabric_api=0.102.0+1.21 +deps.fabric_loader=0.18.4 +deps.yarn=1.21+build.9 +deps.cca=6.1.2 +deps.cca_source=org.ladysnake +deps.fzzy=0.7.4-fix1+1.21 + +r.deps.mod_menu=11.0.3 + +mod.mc_dep=>=1.21 <=1.21.1 +mod.mc_title=1.21 +mod.mc_targets=1.21 1.21.1 \ No newline at end of file diff --git a/versions/1.21/src/main/resources/1.21.accesswidener b/versions/1.21/src/main/resources/1.21.accesswidener new file mode 100644 index 0000000..c3cca38 --- /dev/null +++ b/versions/1.21/src/main/resources/1.21.accesswidener @@ -0,0 +1,3 @@ +accessWidener v2 named +accessible method net/minecraft/sound/SoundEvent (Lnet/minecraft/util/Identifier;FZ)V +accessible field net/minecraft/client/option/KeyBinding timesPressed I \ No newline at end of file diff --git a/versions/1.21/src/main/resources/assets/composer_reloaded/models/item/plush.json b/versions/1.21/src/main/resources/assets/composer_reloaded/models/item/plush.json new file mode 100644 index 0000000..bf1a9e7 --- /dev/null +++ b/versions/1.21/src/main/resources/assets/composer_reloaded/models/item/plush.json @@ -0,0 +1,3 @@ +{ + "parent": "composer_reloaded:block/plush" +} \ No newline at end of file From 4d714c5de61ec0ccaa66a6bbb6e6490c258f3b21 Mon Sep 17 00:00:00 2001 From: LilBroCodes Date: Tue, 30 Dec 2025 15:56:42 +0100 Subject: [PATCH 2/2] Run datagen + add shell projects for versions up until latest (1.21.11) --- .../v1/datagen/ComposerLanguageProvider.java | 2 +- .../registry/lazy/DeferredBlockRegistry.java | 4 +- .../data/assets/ModLanguageProvider.java | 2 +- .../internal/registry/ModItems.java | 2 +- .../impl/dynamic_tooltips/ItemStackMixin.java | 2 +- .../553958537e20b3ec990cb86e59b177ad46c627b4 | 2 +- .../6ac05e3237e7afd24c65f4abf865e1819e788c59 | 4 +- .../7d8eac79c06c2c994d16be9c4a185619533dba23 | 2 +- .../assets/composer_reloaded/lang/en_us.json | 6 +-- .../553958537e20b3ec990cb86e59b177ad46c627b4 | 5 ++ .../6ac05e3237e7afd24c65f4abf865e1819e788c59 | 2 + .../7d8eac79c06c2c994d16be9c4a185619533dba23 | 2 + .../assets/composer_reloaded/lang/en_us.json | 30 ++++++++++++ .../recipes/decorations/plush.json | 49 +++++++++++++++++++ .../advancements/recipes/misc/cook_plush.json | 34 +++++++++++++ .../loot_tables/blocks/plush.json | 20 ++++++++ .../composer_reloaded/recipes/cook_plush.json | 10 ++++ .../data/composer_reloaded/recipes/plush.json | 26 ++++++++++ .../6ac05e3237e7afd24c65f4abf865e1819e788c59 | 2 + .../74c922e001cf9ef8e36984b68b340d18e0dcec89 | 5 ++ .../7d8eac79c06c2c994d16be9c4a185619533dba23 | 2 + .../assets/composer_reloaded/lang/en_us.json | 30 ++++++++++++ .../recipes/decorations/plush.json | 41 ++++++++++++++++ .../advancements/recipes/misc/cook_plush.json | 32 ++++++++++++ .../loot_tables/blocks/plush.json | 20 ++++++++ .../composer_reloaded/recipes/cook_plush.json | 12 +++++ .../data/composer_reloaded/recipes/plush.json | 27 ++++++++++ versions/1.21.10/gradle.properties | 12 +++++ .../src/main/resources/1.21.10.accesswidener | 6 +++ .../assets/composer_reloaded/items/plush.json | 6 +++ versions/1.21.11/gradle.properties | 12 +++++ .../src/main/resources/1.21.11.accesswidener | 6 +++ .../assets/composer_reloaded/items/plush.json | 6 +++ .../6ac05e3237e7afd24c65f4abf865e1819e788c59 | 2 + .../74c922e001cf9ef8e36984b68b340d18e0dcec89 | 5 ++ .../7d8eac79c06c2c994d16be9c4a185619533dba23 | 2 + .../assets/composer_reloaded/lang/en_us.json | 30 ++++++++++++ .../recipes/decorations/plush.json | 41 ++++++++++++++++ .../advancement/recipes/misc/cook_plush.json | 32 ++++++++++++ .../loot_table/blocks/plush.json | 20 ++++++++ .../composer_reloaded/recipe/cook_plush.json | 10 ++++ .../data/composer_reloaded/recipe/plush.json | 19 +++++++ .../6ac05e3237e7afd24c65f4abf865e1819e788c59 | 2 +- .../assets/composer_reloaded/lang/en_us.json | 4 +- versions/1.21.5/gradle.properties | 12 +++++ .../src/main/resources/1.21.5.accesswidener | 6 +++ .../assets/composer_reloaded/items/plush.json | 6 +++ versions/1.21.6/gradle.properties | 12 +++++ .../src/main/resources/1.21.6.accesswidener | 6 +++ .../assets/composer_reloaded/items/plush.json | 6 +++ versions/1.21.9/gradle.properties | 12 +++++ .../src/main/resources/1.21.9.accesswidener | 6 +++ .../assets/composer_reloaded/items/plush.json | 6 +++ .../6ac05e3237e7afd24c65f4abf865e1819e788c59 | 2 + .../74c922e001cf9ef8e36984b68b340d18e0dcec89 | 5 ++ .../7d8eac79c06c2c994d16be9c4a185619533dba23 | 2 + .../assets/composer_reloaded/lang/en_us.json | 30 ++++++++++++ .../recipes/decorations/plush.json | 41 ++++++++++++++++ .../advancement/recipes/misc/cook_plush.json | 32 ++++++++++++ .../loot_table/blocks/plush.json | 20 ++++++++ .../composer_reloaded/recipe/cook_plush.json | 12 +++++ .../data/composer_reloaded/recipe/plush.json | 27 ++++++++++ 62 files changed, 817 insertions(+), 16 deletions(-) create mode 100644 versions/1.20.4/src/main/generated/.cache/553958537e20b3ec990cb86e59b177ad46c627b4 create mode 100644 versions/1.20.4/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 create mode 100644 versions/1.20.4/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 create mode 100644 versions/1.20.4/src/main/generated/assets/composer_reloaded/lang/en_us.json create mode 100644 versions/1.20.4/src/main/generated/data/composer_reloaded/advancements/recipes/decorations/plush.json create mode 100644 versions/1.20.4/src/main/generated/data/composer_reloaded/advancements/recipes/misc/cook_plush.json create mode 100644 versions/1.20.4/src/main/generated/data/composer_reloaded/loot_tables/blocks/plush.json create mode 100644 versions/1.20.4/src/main/generated/data/composer_reloaded/recipes/cook_plush.json create mode 100644 versions/1.20.4/src/main/generated/data/composer_reloaded/recipes/plush.json create mode 100644 versions/1.20.6/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 create mode 100644 versions/1.20.6/src/main/generated/.cache/74c922e001cf9ef8e36984b68b340d18e0dcec89 create mode 100644 versions/1.20.6/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 create mode 100644 versions/1.20.6/src/main/generated/assets/composer_reloaded/lang/en_us.json create mode 100644 versions/1.20.6/src/main/generated/data/composer_reloaded/advancements/recipes/decorations/plush.json create mode 100644 versions/1.20.6/src/main/generated/data/composer_reloaded/advancements/recipes/misc/cook_plush.json create mode 100644 versions/1.20.6/src/main/generated/data/composer_reloaded/loot_tables/blocks/plush.json create mode 100644 versions/1.20.6/src/main/generated/data/composer_reloaded/recipes/cook_plush.json create mode 100644 versions/1.20.6/src/main/generated/data/composer_reloaded/recipes/plush.json create mode 100644 versions/1.21.10/gradle.properties create mode 100644 versions/1.21.10/src/main/resources/1.21.10.accesswidener create mode 100644 versions/1.21.10/src/main/resources/assets/composer_reloaded/items/plush.json create mode 100644 versions/1.21.11/gradle.properties create mode 100644 versions/1.21.11/src/main/resources/1.21.11.accesswidener create mode 100644 versions/1.21.11/src/main/resources/assets/composer_reloaded/items/plush.json create mode 100644 versions/1.21.3/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 create mode 100644 versions/1.21.3/src/main/generated/.cache/74c922e001cf9ef8e36984b68b340d18e0dcec89 create mode 100644 versions/1.21.3/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 create mode 100644 versions/1.21.3/src/main/generated/assets/composer_reloaded/lang/en_us.json create mode 100644 versions/1.21.3/src/main/generated/data/composer_reloaded/advancement/recipes/decorations/plush.json create mode 100644 versions/1.21.3/src/main/generated/data/composer_reloaded/advancement/recipes/misc/cook_plush.json create mode 100644 versions/1.21.3/src/main/generated/data/composer_reloaded/loot_table/blocks/plush.json create mode 100644 versions/1.21.3/src/main/generated/data/composer_reloaded/recipe/cook_plush.json create mode 100644 versions/1.21.3/src/main/generated/data/composer_reloaded/recipe/plush.json create mode 100644 versions/1.21.5/gradle.properties create mode 100644 versions/1.21.5/src/main/resources/1.21.5.accesswidener create mode 100644 versions/1.21.5/src/main/resources/assets/composer_reloaded/items/plush.json create mode 100644 versions/1.21.6/gradle.properties create mode 100644 versions/1.21.6/src/main/resources/1.21.6.accesswidener create mode 100644 versions/1.21.6/src/main/resources/assets/composer_reloaded/items/plush.json create mode 100644 versions/1.21.9/gradle.properties create mode 100644 versions/1.21.9/src/main/resources/1.21.9.accesswidener create mode 100644 versions/1.21.9/src/main/resources/assets/composer_reloaded/items/plush.json create mode 100644 versions/1.21/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 create mode 100644 versions/1.21/src/main/generated/.cache/74c922e001cf9ef8e36984b68b340d18e0dcec89 create mode 100644 versions/1.21/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 create mode 100644 versions/1.21/src/main/generated/assets/composer_reloaded/lang/en_us.json create mode 100644 versions/1.21/src/main/generated/data/composer_reloaded/advancement/recipes/decorations/plush.json create mode 100644 versions/1.21/src/main/generated/data/composer_reloaded/advancement/recipes/misc/cook_plush.json create mode 100644 versions/1.21/src/main/generated/data/composer_reloaded/loot_table/blocks/plush.json create mode 100644 versions/1.21/src/main/generated/data/composer_reloaded/recipe/cook_plush.json create mode 100644 versions/1.21/src/main/generated/data/composer_reloaded/recipe/plush.json diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datagen/ComposerLanguageProvider.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datagen/ComposerLanguageProvider.java index c6b6e3f..84b4544 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datagen/ComposerLanguageProvider.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/datagen/ComposerLanguageProvider.java @@ -67,7 +67,7 @@ public String suffix() { // Custom public void feature(FeatureHandle feature, String translation) { - if (feature.id() != null) add(feature.getTranslationKey("feature.description"), translation); + if (feature.id() != null) add(feature.getTranslationKey(), translation); } public void feature(Feature feature, String translation) { diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredBlockRegistry.java b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredBlockRegistry.java index 9131a3e..ba5ab3a 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredBlockRegistry.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/api/v1/registry/lazy/DeferredBlockRegistry.java @@ -7,7 +7,7 @@ import net.minecraft.util.Identifier; import java.util.function.UnaryOperator; -//? if minecraft: >=1.21.4 { +//? if minecraft: >=1.21.3 { import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; @@ -23,7 +23,7 @@ public T register(String name, T block) { } public T register(String name, BlockProvider newBlock, AbstractBlock.Settings settings) { - //? minecraft: >=1.21.4 { + //? minecraft: >=1.21.3 { return register(name, newBlock.provide(settings.registryKey(RegistryKey.of(RegistryKeys.BLOCK, Identifier.of(modId, name))))); //? } else { /*return register(name, newBlock.provide(settings)); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/assets/ModLanguageProvider.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/assets/ModLanguageProvider.java index eacad1c..ee02e41 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/assets/ModLanguageProvider.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/data/assets/ModLanguageProvider.java @@ -26,7 +26,7 @@ public ModLanguageProvider(FabricDataOutput output, CompletableFuture=1.21.4 + //? if minecraft: >=1.21.3 item(ModBlocks.PLUSH, "LilBro Plush"); stat(ModStatistics.PLUSH_BOOP, "LilBro Plushies Booped"); group(ModItemGroups.COMPOSER, "Composer's Silly Little Additions"); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/internal/registry/ModItems.java b/src/main/java/org/lilbrocodes/composer_reloaded/internal/registry/ModItems.java index 0f673a9..cbadad4 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/internal/registry/ModItems.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/internal/registry/ModItems.java @@ -8,7 +8,7 @@ public class ModItems { private static final DeferredItemRegistry REGISTRY = new DeferredItemRegistry(ComposerReloaded.MOD_ID, ModItemGroups.COMPOSER); - public static final BlockItem PLUSHIE = REGISTRY.register(ModBlocks.PLUSH, "plush", () -> new ComposerItemSettings().soulbound(false)); + public static final BlockItem PLUSHIE = REGISTRY.register(ModBlocks.PLUSH, "plush", () -> new ComposerItemSettings().soulbound(true)); public static void initialize() { REGISTRY.finalizeRegistration(); diff --git a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/dynamic_tooltips/ItemStackMixin.java b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/dynamic_tooltips/ItemStackMixin.java index b727558..2469d95 100644 --- a/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/dynamic_tooltips/ItemStackMixin.java +++ b/src/main/java/org/lilbrocodes/composer_reloaded/mixin/impl/dynamic_tooltips/ItemStackMixin.java @@ -168,7 +168,7 @@ public abstract class ItemStackMixin { appendRegistered(copy(), list, AFTER_DISABLED_TEXT); } - //? if minecraft: >=1.21.3 { + //? if minecraft: >=1.21.4 { @Inject(method = "getTooltip", at = @At(value = "INVOKE", target = "Ljava/util/List;addAll(Ljava/util/Collection;)Z", shift = At.Shift.AFTER)) private void composer$append$20(Item.TooltipContext context, @Nullable PlayerEntity player, TooltipType type, CallbackInfoReturnable> cir, @Local List list) { appendRegistered(copy(), list, AFTER_OPERATOR_WARNINGS); diff --git a/versions/1.20.1/src/main/generated/.cache/553958537e20b3ec990cb86e59b177ad46c627b4 b/versions/1.20.1/src/main/generated/.cache/553958537e20b3ec990cb86e59b177ad46c627b4 index b8e849b..8c4a34b 100644 --- a/versions/1.20.1/src/main/generated/.cache/553958537e20b3ec990cb86e59b177ad46c627b4 +++ b/versions/1.20.1/src/main/generated/.cache/553958537e20b3ec990cb86e59b177ad46c627b4 @@ -1,4 +1,4 @@ -// 1.20.1 2025-12-27T10:34:40.284365318 Composer Reloaded/Recipes +// 1.20.1 2025-12-30T15:41:49.540631386 Composer Reloaded/Recipes 159eca9a3b8f1fcb0406d6e7a23c34d20498f2e9 data/composer_reloaded/recipes/cook_plush.json ca2d21fbd4318288a724b55ce1eb4ec5a6221048 data/composer_reloaded/advancements/recipes/misc/cook_plush.json 73f1980810144d70e34cd0e406394e3e77d0b8c2 data/composer_reloaded/advancements/recipes/decorations/plush.json diff --git a/versions/1.20.1/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 b/versions/1.20.1/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 index c1cc358..5ce3da5 100644 --- a/versions/1.20.1/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 +++ b/versions/1.20.1/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 @@ -1,2 +1,2 @@ -// 1.20.1 2025-12-27T10:34:40.282819187 Composer Reloaded/Language (en_us) -da93d9ba55a885057b3606861dd9fbf1e9609f0c assets/composer_reloaded/lang/en_us.json +// 1.20.1 2025-12-30T15:41:49.540180226 Composer Reloaded/Language (en_us) +38b46183886c9cfabf133b4dbddf5698924e86b7 assets/composer_reloaded/lang/en_us.json diff --git a/versions/1.20.1/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 b/versions/1.20.1/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 index 47a8315..9755aa9 100644 --- a/versions/1.20.1/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 +++ b/versions/1.20.1/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 @@ -1,2 +1,2 @@ -// 1.20.1 2025-12-27T10:34:40.284867427 Composer Reloaded/Block Loot Tables +// 1.20.1 2025-12-30T15:41:49.540870627 Composer Reloaded/Block Loot Tables 6b3f2c9174b4871334a081ea3c7d3579a0b3eff2 data/composer_reloaded/loot_tables/blocks/plush.json diff --git a/versions/1.20.1/src/main/generated/assets/composer_reloaded/lang/en_us.json b/versions/1.20.1/src/main/generated/assets/composer_reloaded/lang/en_us.json index 5b923ae..c14b82a 100644 --- a/versions/1.20.1/src/main/generated/assets/composer_reloaded/lang/en_us.json +++ b/versions/1.20.1/src/main/generated/assets/composer_reloaded/lang/en_us.json @@ -9,7 +9,7 @@ "composer_reloaded.feature.enable": "Enabled feature %s", "composer_reloaded.feature.missing": "Unknown feature %s", "composer_reloaded.feature.prefix": "Composer Features", - "composer_reloaded.lilbro_squish": "Plush Booped", + "composer_reloaded.squish": "Plush Booped", "composer_reloaded.toast.cleared_all": "Successfully cleared all toasts.", "composer_reloaded.toast.cleared_for_player": "Cleared toasts for %s.", "composer_reloaded.toast.invalid_icon_texture": "Invalid identifier for icon texture.", @@ -23,8 +23,8 @@ "composer_reloaded.tooltips.soulbound.droppable": "This item is droppable when soulbound", "composer_reloaded.tooltips.soulbound.droppable.not": "This item is not droppable when soulbound", "composer_reloaded.tooltips.soulbound.not": "This item is not soulbound", - "feature.description.feature.description.composer_reloaded.target_synchronization.block": "Synchronizes players' target blocks to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", - "feature.description.feature.description.composer_reloaded.target_synchronization.entity": "Synchronizes players' target entities to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", + "feature.description.composer_reloaded.target_synchronization.block": "Synchronizes players' target blocks to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", + "feature.description.composer_reloaded.target_synchronization.entity": "Synchronizes players' target entities to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", "itemGroup.composer": "Composer's Silly Little Additions", "stat.composer_reloaded.boop_plush": "LilBro Plushies Booped" } \ No newline at end of file diff --git a/versions/1.20.4/src/main/generated/.cache/553958537e20b3ec990cb86e59b177ad46c627b4 b/versions/1.20.4/src/main/generated/.cache/553958537e20b3ec990cb86e59b177ad46c627b4 new file mode 100644 index 0000000..a4ed8f1 --- /dev/null +++ b/versions/1.20.4/src/main/generated/.cache/553958537e20b3ec990cb86e59b177ad46c627b4 @@ -0,0 +1,5 @@ +// 1.20.4 2025-12-30T15:41:47.903978354 Composer Reloaded/Recipes +7df20c2d81c24da1ddf31045bf026026feada87a data/composer_reloaded/recipes/cook_plush.json +883e5b4456f8e7770025e82e792efa2fc996f8ba data/composer_reloaded/recipes/plush.json +3a533397db5d1af790131d0d9b70fcf2f524f5f1 data/composer_reloaded/advancements/recipes/decorations/plush.json +9515db2601bfe713de7f933522f0eb5c87c350de data/composer_reloaded/advancements/recipes/misc/cook_plush.json diff --git a/versions/1.20.4/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 b/versions/1.20.4/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 new file mode 100644 index 0000000..6d456cb --- /dev/null +++ b/versions/1.20.4/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 @@ -0,0 +1,2 @@ +// 1.20.4 2025-12-30T15:41:47.901940114 Composer Reloaded/Language (en_us) +5f98140902e70c265db7561dd81921de0dd1b1b0 assets/composer_reloaded/lang/en_us.json diff --git a/versions/1.20.4/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 b/versions/1.20.4/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 new file mode 100644 index 0000000..75f9a25 --- /dev/null +++ b/versions/1.20.4/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 @@ -0,0 +1,2 @@ +// 1.20.4 2025-12-30T15:41:47.909885542 Composer Reloaded/Block Loot Tables +6b3f2c9174b4871334a081ea3c7d3579a0b3eff2 data/composer_reloaded/loot_tables/blocks/plush.json diff --git a/versions/1.20.4/src/main/generated/assets/composer_reloaded/lang/en_us.json b/versions/1.20.4/src/main/generated/assets/composer_reloaded/lang/en_us.json new file mode 100644 index 0000000..823c292 --- /dev/null +++ b/versions/1.20.4/src/main/generated/assets/composer_reloaded/lang/en_us.json @@ -0,0 +1,30 @@ +{ + "block.composer_reloaded.plush": "LilBro Plush", + "composer_reloaded.binds_mode.ALL": "All", + "composer_reloaded.binds_mode.MC_AND_CM": "Vanilla & Mods that use Composer", + "composer_reloaded.binds_mode.NONE": "None", + "composer_reloaded.dynamic_tooltips.hidden": "Press %s to show %s", + "composer_reloaded.feature.description.missing": "No description was provided.", + "composer_reloaded.feature.disable": "Disabled feature %s", + "composer_reloaded.feature.enable": "Enabled feature %s", + "composer_reloaded.feature.missing": "Unknown feature %s", + "composer_reloaded.feature.prefix": "Composer Features", + "composer_reloaded.lilbro_squish": "Plush Booped", + "composer_reloaded.toast.cleared_all": "Successfully cleared all toasts.", + "composer_reloaded.toast.cleared_for_player": "Cleared toasts for %s.", + "composer_reloaded.toast.invalid_icon_texture": "Invalid identifier for icon texture.", + "composer_reloaded.toast.no_players_found": "No players found.", + "composer_reloaded.toast.player_not_found": "Player not found.", + "composer_reloaded.toast.prefix": "Composer Toasts", + "composer_reloaded.toast.sent_notify": "Sent notify toast: %s\n | Background color: %s\n | Border color: %s", + "composer_reloaded.toast.sent_simple": "Sent toast: %s\n | Icon texture: %s\n | Background color: %s\n | Border color: %s", + "composer_reloaded.tooltips.soulbound": "This item is soulbound", + "composer_reloaded.tooltips.soulbound.details": "binding details", + "composer_reloaded.tooltips.soulbound.droppable": "This item is droppable when soulbound", + "composer_reloaded.tooltips.soulbound.droppable.not": "This item is not droppable when soulbound", + "composer_reloaded.tooltips.soulbound.not": "This item is not soulbound", + "feature.description.composer_reloaded.target_synchronization.block": "Synchronizes players' target blocks to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", + "feature.description.composer_reloaded.target_synchronization.entity": "Synchronizes players' target entities to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", + "itemGroup.composer": "Composer's Silly Little Additions", + "stat.composer_reloaded.boop_plush": "LilBro Plushies Booped" +} \ No newline at end of file diff --git a/versions/1.20.4/src/main/generated/data/composer_reloaded/advancements/recipes/decorations/plush.json b/versions/1.20.4/src/main/generated/data/composer_reloaded/advancements/recipes/decorations/plush.json new file mode 100644 index 0000000..6d492c2 --- /dev/null +++ b/versions/1.20.4/src/main/generated/data/composer_reloaded/advancements/recipes/decorations/plush.json @@ -0,0 +1,49 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "composer_reloaded:plush" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wool": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:black_wool" + ] + }, + { + "items": [ + "minecraft:purple_wool" + ] + }, + { + "items": [ + "minecraft:white_wool" + ] + }, + { + "items": [ + "minecraft:brown_wool" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wool" + ] + ], + "rewards": { + "recipes": [ + "composer_reloaded:plush" + ] + } +} \ No newline at end of file diff --git a/versions/1.20.4/src/main/generated/data/composer_reloaded/advancements/recipes/misc/cook_plush.json b/versions/1.20.4/src/main/generated/data/composer_reloaded/advancements/recipes/misc/cook_plush.json new file mode 100644 index 0000000..47a9b31 --- /dev/null +++ b/versions/1.20.4/src/main/generated/data/composer_reloaded/advancements/recipes/misc/cook_plush.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plush": { + "conditions": { + "items": [ + { + "items": [ + "composer_reloaded:plush" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cook_plush" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plush" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cook_plush" + ] + } +} \ No newline at end of file diff --git a/versions/1.20.4/src/main/generated/data/composer_reloaded/loot_tables/blocks/plush.json b/versions/1.20.4/src/main/generated/data/composer_reloaded/loot_tables/blocks/plush.json new file mode 100644 index 0000000..450129d --- /dev/null +++ b/versions/1.20.4/src/main/generated/data/composer_reloaded/loot_tables/blocks/plush.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "composer_reloaded:plush" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/versions/1.20.4/src/main/generated/data/composer_reloaded/recipes/cook_plush.json b/versions/1.20.4/src/main/generated/data/composer_reloaded/recipes/cook_plush.json new file mode 100644 index 0000000..eaaa5bc --- /dev/null +++ b/versions/1.20.4/src/main/generated/data/composer_reloaded/recipes/cook_plush.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:campfire_cooking", + "category": "food", + "cookingtime": 10, + "experience": 0.0, + "ingredient": { + "item": "composer_reloaded:plush" + }, + "result": "composer_reloaded:plush" +} \ No newline at end of file diff --git a/versions/1.20.4/src/main/generated/data/composer_reloaded/recipes/plush.json b/versions/1.20.4/src/main/generated/data/composer_reloaded/recipes/plush.json new file mode 100644 index 0000000..300b8a6 --- /dev/null +++ b/versions/1.20.4/src/main/generated/data/composer_reloaded/recipes/plush.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": { + "item": "minecraft:black_wool" + }, + "N": { + "item": "minecraft:brown_wool" + }, + "P": { + "item": "minecraft:purple_wool" + }, + "W": { + "item": "minecraft:white_wool" + } + }, + "pattern": [ + "WBW", + "NBP", + "P N" + ], + "result": { + "item": "composer_reloaded:plush" + } +} \ No newline at end of file diff --git a/versions/1.20.6/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 b/versions/1.20.6/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 new file mode 100644 index 0000000..2d4632a --- /dev/null +++ b/versions/1.20.6/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 @@ -0,0 +1,2 @@ +// 1.20.6 2025-12-30T15:41:49.139403429 Composer Reloaded/Language (en_us) +5f98140902e70c265db7561dd81921de0dd1b1b0 assets/composer_reloaded/lang/en_us.json diff --git a/versions/1.20.6/src/main/generated/.cache/74c922e001cf9ef8e36984b68b340d18e0dcec89 b/versions/1.20.6/src/main/generated/.cache/74c922e001cf9ef8e36984b68b340d18e0dcec89 new file mode 100644 index 0000000..f8c4d30 --- /dev/null +++ b/versions/1.20.6/src/main/generated/.cache/74c922e001cf9ef8e36984b68b340d18e0dcec89 @@ -0,0 +1,5 @@ +// 1.20.6 2025-12-30T15:41:49.14031195 Composer Reloaded/Composer Recipes +86aeb9c6921880c759c1c2d14df4289a426d491a data/composer_reloaded/recipes/cook_plush.json +042918b0c187435bc873fc4c5af07ac32f27432f data/composer_reloaded/recipes/plush.json +5aad70b052ea057d364d2f24b51c28b22bb5c12e data/composer_reloaded/advancements/recipes/misc/cook_plush.json +a86830a5fa73fd8b63fdad0a32181a7ccf9d7ae2 data/composer_reloaded/advancements/recipes/decorations/plush.json diff --git a/versions/1.20.6/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 b/versions/1.20.6/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 new file mode 100644 index 0000000..85aa9d0 --- /dev/null +++ b/versions/1.20.6/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 @@ -0,0 +1,2 @@ +// 1.20.6 2025-12-30T15:41:49.140735969 Composer Reloaded/Block Loot Tables +6b3f2c9174b4871334a081ea3c7d3579a0b3eff2 data/composer_reloaded/loot_tables/blocks/plush.json diff --git a/versions/1.20.6/src/main/generated/assets/composer_reloaded/lang/en_us.json b/versions/1.20.6/src/main/generated/assets/composer_reloaded/lang/en_us.json new file mode 100644 index 0000000..823c292 --- /dev/null +++ b/versions/1.20.6/src/main/generated/assets/composer_reloaded/lang/en_us.json @@ -0,0 +1,30 @@ +{ + "block.composer_reloaded.plush": "LilBro Plush", + "composer_reloaded.binds_mode.ALL": "All", + "composer_reloaded.binds_mode.MC_AND_CM": "Vanilla & Mods that use Composer", + "composer_reloaded.binds_mode.NONE": "None", + "composer_reloaded.dynamic_tooltips.hidden": "Press %s to show %s", + "composer_reloaded.feature.description.missing": "No description was provided.", + "composer_reloaded.feature.disable": "Disabled feature %s", + "composer_reloaded.feature.enable": "Enabled feature %s", + "composer_reloaded.feature.missing": "Unknown feature %s", + "composer_reloaded.feature.prefix": "Composer Features", + "composer_reloaded.lilbro_squish": "Plush Booped", + "composer_reloaded.toast.cleared_all": "Successfully cleared all toasts.", + "composer_reloaded.toast.cleared_for_player": "Cleared toasts for %s.", + "composer_reloaded.toast.invalid_icon_texture": "Invalid identifier for icon texture.", + "composer_reloaded.toast.no_players_found": "No players found.", + "composer_reloaded.toast.player_not_found": "Player not found.", + "composer_reloaded.toast.prefix": "Composer Toasts", + "composer_reloaded.toast.sent_notify": "Sent notify toast: %s\n | Background color: %s\n | Border color: %s", + "composer_reloaded.toast.sent_simple": "Sent toast: %s\n | Icon texture: %s\n | Background color: %s\n | Border color: %s", + "composer_reloaded.tooltips.soulbound": "This item is soulbound", + "composer_reloaded.tooltips.soulbound.details": "binding details", + "composer_reloaded.tooltips.soulbound.droppable": "This item is droppable when soulbound", + "composer_reloaded.tooltips.soulbound.droppable.not": "This item is not droppable when soulbound", + "composer_reloaded.tooltips.soulbound.not": "This item is not soulbound", + "feature.description.composer_reloaded.target_synchronization.block": "Synchronizes players' target blocks to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", + "feature.description.composer_reloaded.target_synchronization.entity": "Synchronizes players' target entities to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", + "itemGroup.composer": "Composer's Silly Little Additions", + "stat.composer_reloaded.boop_plush": "LilBro Plushies Booped" +} \ No newline at end of file diff --git a/versions/1.20.6/src/main/generated/data/composer_reloaded/advancements/recipes/decorations/plush.json b/versions/1.20.6/src/main/generated/data/composer_reloaded/advancements/recipes/decorations/plush.json new file mode 100644 index 0000000..00e0dac --- /dev/null +++ b/versions/1.20.6/src/main/generated/data/composer_reloaded/advancements/recipes/decorations/plush.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "composer_reloaded:plush" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wool": { + "conditions": { + "items": [ + { + "items": "minecraft:black_wool" + }, + { + "items": "minecraft:purple_wool" + }, + { + "items": "minecraft:white_wool" + }, + { + "items": "minecraft:brown_wool" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wool" + ] + ], + "rewards": { + "recipes": [ + "composer_reloaded:plush" + ] + } +} \ No newline at end of file diff --git a/versions/1.20.6/src/main/generated/data/composer_reloaded/advancements/recipes/misc/cook_plush.json b/versions/1.20.6/src/main/generated/data/composer_reloaded/advancements/recipes/misc/cook_plush.json new file mode 100644 index 0000000..f1d35e5 --- /dev/null +++ b/versions/1.20.6/src/main/generated/data/composer_reloaded/advancements/recipes/misc/cook_plush.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plush": { + "conditions": { + "items": [ + { + "items": "composer_reloaded:plush" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cook_plush" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plush" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cook_plush" + ] + } +} \ No newline at end of file diff --git a/versions/1.20.6/src/main/generated/data/composer_reloaded/loot_tables/blocks/plush.json b/versions/1.20.6/src/main/generated/data/composer_reloaded/loot_tables/blocks/plush.json new file mode 100644 index 0000000..450129d --- /dev/null +++ b/versions/1.20.6/src/main/generated/data/composer_reloaded/loot_tables/blocks/plush.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "composer_reloaded:plush" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/versions/1.20.6/src/main/generated/data/composer_reloaded/recipes/cook_plush.json b/versions/1.20.6/src/main/generated/data/composer_reloaded/recipes/cook_plush.json new file mode 100644 index 0000000..ac55777 --- /dev/null +++ b/versions/1.20.6/src/main/generated/data/composer_reloaded/recipes/cook_plush.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:campfire_cooking", + "category": "food", + "cookingtime": 10, + "experience": 0.0, + "ingredient": { + "item": "composer_reloaded:plush" + }, + "result": { + "id": "composer_reloaded:plush" + } +} \ No newline at end of file diff --git a/versions/1.20.6/src/main/generated/data/composer_reloaded/recipes/plush.json b/versions/1.20.6/src/main/generated/data/composer_reloaded/recipes/plush.json new file mode 100644 index 0000000..ac84c09 --- /dev/null +++ b/versions/1.20.6/src/main/generated/data/composer_reloaded/recipes/plush.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": { + "item": "minecraft:black_wool" + }, + "N": { + "item": "minecraft:brown_wool" + }, + "P": { + "item": "minecraft:purple_wool" + }, + "W": { + "item": "minecraft:white_wool" + } + }, + "pattern": [ + "WBW", + "NBP", + "P N" + ], + "result": { + "count": 1, + "id": "composer_reloaded:plush" + } +} \ No newline at end of file diff --git a/versions/1.21.10/gradle.properties b/versions/1.21.10/gradle.properties new file mode 100644 index 0000000..e0a1e81 --- /dev/null +++ b/versions/1.21.10/gradle.properties @@ -0,0 +1,12 @@ +deps.fabric_api=0.138.4+1.21.10 +deps.fabric_loader=0.18.4 +deps.yarn=1.21.10+build.3 +deps.cca=7.2.0 +deps.cca_source=org.ladysnake +deps.fzzy=0.7.4-fix2+1.21.9 + +r.deps.mod_menu=16.0.0-rc.2 + +mod.mc_dep=1.21.10 +mod.mc_title=1.21.10 +mod.mc_targets=1.21.10 \ No newline at end of file diff --git a/versions/1.21.10/src/main/resources/1.21.10.accesswidener b/versions/1.21.10/src/main/resources/1.21.10.accesswidener new file mode 100644 index 0000000..0384ab1 --- /dev/null +++ b/versions/1.21.10/src/main/resources/1.21.10.accesswidener @@ -0,0 +1,6 @@ +accessWidener v2 named +accessible method net/minecraft/util/Identifier (Ljava/lang/String;Ljava/lang/String;)V +accessible field net/minecraft/client/option/KeyBinding timesPressed I +accessible class net/minecraft/client/data/ModelProvider$BlockStateSuppliers +accessible class net/minecraft/client/data/ModelProvider$ItemAssets +accessible class net/minecraft/client/data/ModelProvider$ModelSuppliers \ No newline at end of file diff --git a/versions/1.21.10/src/main/resources/assets/composer_reloaded/items/plush.json b/versions/1.21.10/src/main/resources/assets/composer_reloaded/items/plush.json new file mode 100644 index 0000000..c6e374e --- /dev/null +++ b/versions/1.21.10/src/main/resources/assets/composer_reloaded/items/plush.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "composer_reloaded:block/plush" + } +} \ No newline at end of file diff --git a/versions/1.21.11/gradle.properties b/versions/1.21.11/gradle.properties new file mode 100644 index 0000000..ca2a5b0 --- /dev/null +++ b/versions/1.21.11/gradle.properties @@ -0,0 +1,12 @@ +deps.fabric_api=0.140.2+1.21.11 +deps.fabric_loader=0.18.4 +deps.yarn=1.21.11+build.3 +deps.cca=7.3.0 +deps.cca_source=org.ladysnake +deps.fzzy=0.7.4-fix2+1.21.11 + +r.deps.mod_menu=17.0.0-beta.1 + +mod.mc_dep=1.21.11 +mod.mc_title=1.21.11 +mod.mc_targets=1.21.11 \ No newline at end of file diff --git a/versions/1.21.11/src/main/resources/1.21.11.accesswidener b/versions/1.21.11/src/main/resources/1.21.11.accesswidener new file mode 100644 index 0000000..0384ab1 --- /dev/null +++ b/versions/1.21.11/src/main/resources/1.21.11.accesswidener @@ -0,0 +1,6 @@ +accessWidener v2 named +accessible method net/minecraft/util/Identifier (Ljava/lang/String;Ljava/lang/String;)V +accessible field net/minecraft/client/option/KeyBinding timesPressed I +accessible class net/minecraft/client/data/ModelProvider$BlockStateSuppliers +accessible class net/minecraft/client/data/ModelProvider$ItemAssets +accessible class net/minecraft/client/data/ModelProvider$ModelSuppliers \ No newline at end of file diff --git a/versions/1.21.11/src/main/resources/assets/composer_reloaded/items/plush.json b/versions/1.21.11/src/main/resources/assets/composer_reloaded/items/plush.json new file mode 100644 index 0000000..c6e374e --- /dev/null +++ b/versions/1.21.11/src/main/resources/assets/composer_reloaded/items/plush.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "composer_reloaded:block/plush" + } +} \ No newline at end of file diff --git a/versions/1.21.3/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 b/versions/1.21.3/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 new file mode 100644 index 0000000..c374652 --- /dev/null +++ b/versions/1.21.3/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 @@ -0,0 +1,2 @@ +// 1.21.3 2025-12-30T15:41:48.750690528 Composer Reloaded/Language (en_us) +5f98140902e70c265db7561dd81921de0dd1b1b0 assets/composer_reloaded/lang/en_us.json diff --git a/versions/1.21.3/src/main/generated/.cache/74c922e001cf9ef8e36984b68b340d18e0dcec89 b/versions/1.21.3/src/main/generated/.cache/74c922e001cf9ef8e36984b68b340d18e0dcec89 new file mode 100644 index 0000000..b50bab9 --- /dev/null +++ b/versions/1.21.3/src/main/generated/.cache/74c922e001cf9ef8e36984b68b340d18e0dcec89 @@ -0,0 +1,5 @@ +// 1.21.3 2025-12-30T15:41:48.753291989 Composer Reloaded/Composer Recipes +3f81e6f2affd72e5246cc8569d4e26981da55493 data/composer_reloaded/recipe/cook_plush.json +a9fd31f4c78f387345eabe232669265decbf65d0 data/composer_reloaded/recipe/plush.json +a86830a5fa73fd8b63fdad0a32181a7ccf9d7ae2 data/composer_reloaded/advancement/recipes/decorations/plush.json +5aad70b052ea057d364d2f24b51c28b22bb5c12e data/composer_reloaded/advancement/recipes/misc/cook_plush.json diff --git a/versions/1.21.3/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 b/versions/1.21.3/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 new file mode 100644 index 0000000..1fd0d50 --- /dev/null +++ b/versions/1.21.3/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 @@ -0,0 +1,2 @@ +// 1.21.3 2025-12-30T15:41:48.753795758 Composer Reloaded/Block Loot Tables +6b3f2c9174b4871334a081ea3c7d3579a0b3eff2 data/composer_reloaded/loot_table/blocks/plush.json diff --git a/versions/1.21.3/src/main/generated/assets/composer_reloaded/lang/en_us.json b/versions/1.21.3/src/main/generated/assets/composer_reloaded/lang/en_us.json new file mode 100644 index 0000000..823c292 --- /dev/null +++ b/versions/1.21.3/src/main/generated/assets/composer_reloaded/lang/en_us.json @@ -0,0 +1,30 @@ +{ + "block.composer_reloaded.plush": "LilBro Plush", + "composer_reloaded.binds_mode.ALL": "All", + "composer_reloaded.binds_mode.MC_AND_CM": "Vanilla & Mods that use Composer", + "composer_reloaded.binds_mode.NONE": "None", + "composer_reloaded.dynamic_tooltips.hidden": "Press %s to show %s", + "composer_reloaded.feature.description.missing": "No description was provided.", + "composer_reloaded.feature.disable": "Disabled feature %s", + "composer_reloaded.feature.enable": "Enabled feature %s", + "composer_reloaded.feature.missing": "Unknown feature %s", + "composer_reloaded.feature.prefix": "Composer Features", + "composer_reloaded.lilbro_squish": "Plush Booped", + "composer_reloaded.toast.cleared_all": "Successfully cleared all toasts.", + "composer_reloaded.toast.cleared_for_player": "Cleared toasts for %s.", + "composer_reloaded.toast.invalid_icon_texture": "Invalid identifier for icon texture.", + "composer_reloaded.toast.no_players_found": "No players found.", + "composer_reloaded.toast.player_not_found": "Player not found.", + "composer_reloaded.toast.prefix": "Composer Toasts", + "composer_reloaded.toast.sent_notify": "Sent notify toast: %s\n | Background color: %s\n | Border color: %s", + "composer_reloaded.toast.sent_simple": "Sent toast: %s\n | Icon texture: %s\n | Background color: %s\n | Border color: %s", + "composer_reloaded.tooltips.soulbound": "This item is soulbound", + "composer_reloaded.tooltips.soulbound.details": "binding details", + "composer_reloaded.tooltips.soulbound.droppable": "This item is droppable when soulbound", + "composer_reloaded.tooltips.soulbound.droppable.not": "This item is not droppable when soulbound", + "composer_reloaded.tooltips.soulbound.not": "This item is not soulbound", + "feature.description.composer_reloaded.target_synchronization.block": "Synchronizes players' target blocks to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", + "feature.description.composer_reloaded.target_synchronization.entity": "Synchronizes players' target entities to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", + "itemGroup.composer": "Composer's Silly Little Additions", + "stat.composer_reloaded.boop_plush": "LilBro Plushies Booped" +} \ No newline at end of file diff --git a/versions/1.21.3/src/main/generated/data/composer_reloaded/advancement/recipes/decorations/plush.json b/versions/1.21.3/src/main/generated/data/composer_reloaded/advancement/recipes/decorations/plush.json new file mode 100644 index 0000000..00e0dac --- /dev/null +++ b/versions/1.21.3/src/main/generated/data/composer_reloaded/advancement/recipes/decorations/plush.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "composer_reloaded:plush" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wool": { + "conditions": { + "items": [ + { + "items": "minecraft:black_wool" + }, + { + "items": "minecraft:purple_wool" + }, + { + "items": "minecraft:white_wool" + }, + { + "items": "minecraft:brown_wool" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wool" + ] + ], + "rewards": { + "recipes": [ + "composer_reloaded:plush" + ] + } +} \ No newline at end of file diff --git a/versions/1.21.3/src/main/generated/data/composer_reloaded/advancement/recipes/misc/cook_plush.json b/versions/1.21.3/src/main/generated/data/composer_reloaded/advancement/recipes/misc/cook_plush.json new file mode 100644 index 0000000..f1d35e5 --- /dev/null +++ b/versions/1.21.3/src/main/generated/data/composer_reloaded/advancement/recipes/misc/cook_plush.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plush": { + "conditions": { + "items": [ + { + "items": "composer_reloaded:plush" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cook_plush" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plush" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cook_plush" + ] + } +} \ No newline at end of file diff --git a/versions/1.21.3/src/main/generated/data/composer_reloaded/loot_table/blocks/plush.json b/versions/1.21.3/src/main/generated/data/composer_reloaded/loot_table/blocks/plush.json new file mode 100644 index 0000000..450129d --- /dev/null +++ b/versions/1.21.3/src/main/generated/data/composer_reloaded/loot_table/blocks/plush.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "composer_reloaded:plush" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/versions/1.21.3/src/main/generated/data/composer_reloaded/recipe/cook_plush.json b/versions/1.21.3/src/main/generated/data/composer_reloaded/recipe/cook_plush.json new file mode 100644 index 0000000..194eb07 --- /dev/null +++ b/versions/1.21.3/src/main/generated/data/composer_reloaded/recipe/cook_plush.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:campfire_cooking", + "category": "food", + "cookingtime": 10, + "experience": 0.0, + "ingredient": "composer_reloaded:plush", + "result": { + "id": "composer_reloaded:plush" + } +} \ No newline at end of file diff --git a/versions/1.21.3/src/main/generated/data/composer_reloaded/recipe/plush.json b/versions/1.21.3/src/main/generated/data/composer_reloaded/recipe/plush.json new file mode 100644 index 0000000..2ad99f0 --- /dev/null +++ b/versions/1.21.3/src/main/generated/data/composer_reloaded/recipe/plush.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "minecraft:black_wool", + "N": "minecraft:brown_wool", + "P": "minecraft:purple_wool", + "W": "minecraft:white_wool" + }, + "pattern": [ + "WBW", + "NBP", + "P N" + ], + "result": { + "count": 1, + "id": "composer_reloaded:plush" + } +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 b/versions/1.21.4/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 index 9be046a..2195393 100644 --- a/versions/1.21.4/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 +++ b/versions/1.21.4/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 @@ -1,2 +1,2 @@ // 1.21.4 -999999999-01-01T00:00:00 Composer Reloaded/Language (en_us) -2de2b3c827cb2f0c82b999264ae34ee858e7d665 assets/composer_reloaded/lang/en_us.json +b7e24b4e2b2f399167e251c389ce1cab76be97a7 assets/composer_reloaded/lang/en_us.json diff --git a/versions/1.21.4/src/main/generated/assets/composer_reloaded/lang/en_us.json b/versions/1.21.4/src/main/generated/assets/composer_reloaded/lang/en_us.json index 5f0388a..7ed4a2b 100644 --- a/versions/1.21.4/src/main/generated/assets/composer_reloaded/lang/en_us.json +++ b/versions/1.21.4/src/main/generated/assets/composer_reloaded/lang/en_us.json @@ -23,8 +23,8 @@ "composer_reloaded.tooltips.soulbound.droppable": "This item is droppable when soulbound", "composer_reloaded.tooltips.soulbound.droppable.not": "This item is not droppable when soulbound", "composer_reloaded.tooltips.soulbound.not": "This item is not soulbound", - "feature.description.feature.description.composer_reloaded.target_synchronization.block": "Synchronizes players' target blocks to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", - "feature.description.feature.description.composer_reloaded.target_synchronization.entity": "Synchronizes players' target entities to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", + "feature.description.composer_reloaded.target_synchronization.block": "Synchronizes players' target blocks to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", + "feature.description.composer_reloaded.target_synchronization.entity": "Synchronizes players' target entities to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", "item.composer_reloaded.plush": "LilBro Plush", "itemGroup.composer": "Composer's Silly Little Additions", "stat.composer_reloaded.boop_plush": "LilBro Plushies Booped" diff --git a/versions/1.21.5/gradle.properties b/versions/1.21.5/gradle.properties new file mode 100644 index 0000000..28674f1 --- /dev/null +++ b/versions/1.21.5/gradle.properties @@ -0,0 +1,12 @@ +deps.fabric_api=0.128.2+1.21.5 +deps.fabric_loader=0.18.4 +deps.yarn=1.21.5+build.1 +deps.cca=6.3.1 +deps.cca_source=org.ladysnake +deps.fzzy=0.7.4-fix1+1.21.5 + +r.deps.mod_menu=14.0.0 + +mod.mc_dep=1.21.5 +mod.mc_title=1.21.5 +mod.mc_targets=1.21.5 \ No newline at end of file diff --git a/versions/1.21.5/src/main/resources/1.21.5.accesswidener b/versions/1.21.5/src/main/resources/1.21.5.accesswidener new file mode 100644 index 0000000..0384ab1 --- /dev/null +++ b/versions/1.21.5/src/main/resources/1.21.5.accesswidener @@ -0,0 +1,6 @@ +accessWidener v2 named +accessible method net/minecraft/util/Identifier (Ljava/lang/String;Ljava/lang/String;)V +accessible field net/minecraft/client/option/KeyBinding timesPressed I +accessible class net/minecraft/client/data/ModelProvider$BlockStateSuppliers +accessible class net/minecraft/client/data/ModelProvider$ItemAssets +accessible class net/minecraft/client/data/ModelProvider$ModelSuppliers \ No newline at end of file diff --git a/versions/1.21.5/src/main/resources/assets/composer_reloaded/items/plush.json b/versions/1.21.5/src/main/resources/assets/composer_reloaded/items/plush.json new file mode 100644 index 0000000..c6e374e --- /dev/null +++ b/versions/1.21.5/src/main/resources/assets/composer_reloaded/items/plush.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "composer_reloaded:block/plush" + } +} \ No newline at end of file diff --git a/versions/1.21.6/gradle.properties b/versions/1.21.6/gradle.properties new file mode 100644 index 0000000..a012111 --- /dev/null +++ b/versions/1.21.6/gradle.properties @@ -0,0 +1,12 @@ +deps.fabric_api=0.128.2+1.21.6 +deps.fabric_loader=0.18.4 +deps.yarn=1.21.6+build.1 +deps.cca=7.0.0-beta.1 +deps.cca_source=org.ladysnake +deps.fzzy=0.7.4-fix1+1.21.6 + +r.deps.mod_menu=15.0.0 + +mod.mc_dep=>=1.21.6 <=1.21.8 +mod.mc_title=1.21.6 +mod.mc_targets=1.21.6 1.21.7 1.21.8 \ No newline at end of file diff --git a/versions/1.21.6/src/main/resources/1.21.6.accesswidener b/versions/1.21.6/src/main/resources/1.21.6.accesswidener new file mode 100644 index 0000000..0384ab1 --- /dev/null +++ b/versions/1.21.6/src/main/resources/1.21.6.accesswidener @@ -0,0 +1,6 @@ +accessWidener v2 named +accessible method net/minecraft/util/Identifier (Ljava/lang/String;Ljava/lang/String;)V +accessible field net/minecraft/client/option/KeyBinding timesPressed I +accessible class net/minecraft/client/data/ModelProvider$BlockStateSuppliers +accessible class net/minecraft/client/data/ModelProvider$ItemAssets +accessible class net/minecraft/client/data/ModelProvider$ModelSuppliers \ No newline at end of file diff --git a/versions/1.21.6/src/main/resources/assets/composer_reloaded/items/plush.json b/versions/1.21.6/src/main/resources/assets/composer_reloaded/items/plush.json new file mode 100644 index 0000000..c6e374e --- /dev/null +++ b/versions/1.21.6/src/main/resources/assets/composer_reloaded/items/plush.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "composer_reloaded:block/plush" + } +} \ No newline at end of file diff --git a/versions/1.21.9/gradle.properties b/versions/1.21.9/gradle.properties new file mode 100644 index 0000000..3016a76 --- /dev/null +++ b/versions/1.21.9/gradle.properties @@ -0,0 +1,12 @@ +deps.fabric_api=0.134.1+1.21.9 +deps.fabric_loader=0.18.4 +deps.yarn=1.21.9+build.1 +deps.cca=7.1.0-beta.1 +deps.cca_source=org.ladysnake +deps.fzzy=0.7.4-fix2+1.21.9 + +r.deps.mod_menu=16.0.0-rc.2 + +mod.mc_dep=1.21.9 +mod.mc_title=1.21.9 +mod.mc_targets=1.21.9 \ No newline at end of file diff --git a/versions/1.21.9/src/main/resources/1.21.9.accesswidener b/versions/1.21.9/src/main/resources/1.21.9.accesswidener new file mode 100644 index 0000000..0384ab1 --- /dev/null +++ b/versions/1.21.9/src/main/resources/1.21.9.accesswidener @@ -0,0 +1,6 @@ +accessWidener v2 named +accessible method net/minecraft/util/Identifier (Ljava/lang/String;Ljava/lang/String;)V +accessible field net/minecraft/client/option/KeyBinding timesPressed I +accessible class net/minecraft/client/data/ModelProvider$BlockStateSuppliers +accessible class net/minecraft/client/data/ModelProvider$ItemAssets +accessible class net/minecraft/client/data/ModelProvider$ModelSuppliers \ No newline at end of file diff --git a/versions/1.21.9/src/main/resources/assets/composer_reloaded/items/plush.json b/versions/1.21.9/src/main/resources/assets/composer_reloaded/items/plush.json new file mode 100644 index 0000000..c6e374e --- /dev/null +++ b/versions/1.21.9/src/main/resources/assets/composer_reloaded/items/plush.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "composer_reloaded:block/plush" + } +} \ No newline at end of file diff --git a/versions/1.21/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 b/versions/1.21/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 new file mode 100644 index 0000000..fa2a1f7 --- /dev/null +++ b/versions/1.21/src/main/generated/.cache/6ac05e3237e7afd24c65f4abf865e1819e788c59 @@ -0,0 +1,2 @@ +// 1.21 2025-12-30T15:41:48.468964593 Composer Reloaded/Language (en_us) +5f98140902e70c265db7561dd81921de0dd1b1b0 assets/composer_reloaded/lang/en_us.json diff --git a/versions/1.21/src/main/generated/.cache/74c922e001cf9ef8e36984b68b340d18e0dcec89 b/versions/1.21/src/main/generated/.cache/74c922e001cf9ef8e36984b68b340d18e0dcec89 new file mode 100644 index 0000000..6569b09 --- /dev/null +++ b/versions/1.21/src/main/generated/.cache/74c922e001cf9ef8e36984b68b340d18e0dcec89 @@ -0,0 +1,5 @@ +// 1.21 2025-12-30T15:41:48.469861273 Composer Reloaded/Composer Recipes +86aeb9c6921880c759c1c2d14df4289a426d491a data/composer_reloaded/recipe/cook_plush.json +a86830a5fa73fd8b63fdad0a32181a7ccf9d7ae2 data/composer_reloaded/advancement/recipes/decorations/plush.json +042918b0c187435bc873fc4c5af07ac32f27432f data/composer_reloaded/recipe/plush.json +5aad70b052ea057d364d2f24b51c28b22bb5c12e data/composer_reloaded/advancement/recipes/misc/cook_plush.json diff --git a/versions/1.21/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 b/versions/1.21/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 new file mode 100644 index 0000000..ad2ac41 --- /dev/null +++ b/versions/1.21/src/main/generated/.cache/7d8eac79c06c2c994d16be9c4a185619533dba23 @@ -0,0 +1,2 @@ +// 1.21 2025-12-30T15:41:48.470309798 Composer Reloaded/Block Loot Tables +6b3f2c9174b4871334a081ea3c7d3579a0b3eff2 data/composer_reloaded/loot_table/blocks/plush.json diff --git a/versions/1.21/src/main/generated/assets/composer_reloaded/lang/en_us.json b/versions/1.21/src/main/generated/assets/composer_reloaded/lang/en_us.json new file mode 100644 index 0000000..823c292 --- /dev/null +++ b/versions/1.21/src/main/generated/assets/composer_reloaded/lang/en_us.json @@ -0,0 +1,30 @@ +{ + "block.composer_reloaded.plush": "LilBro Plush", + "composer_reloaded.binds_mode.ALL": "All", + "composer_reloaded.binds_mode.MC_AND_CM": "Vanilla & Mods that use Composer", + "composer_reloaded.binds_mode.NONE": "None", + "composer_reloaded.dynamic_tooltips.hidden": "Press %s to show %s", + "composer_reloaded.feature.description.missing": "No description was provided.", + "composer_reloaded.feature.disable": "Disabled feature %s", + "composer_reloaded.feature.enable": "Enabled feature %s", + "composer_reloaded.feature.missing": "Unknown feature %s", + "composer_reloaded.feature.prefix": "Composer Features", + "composer_reloaded.lilbro_squish": "Plush Booped", + "composer_reloaded.toast.cleared_all": "Successfully cleared all toasts.", + "composer_reloaded.toast.cleared_for_player": "Cleared toasts for %s.", + "composer_reloaded.toast.invalid_icon_texture": "Invalid identifier for icon texture.", + "composer_reloaded.toast.no_players_found": "No players found.", + "composer_reloaded.toast.player_not_found": "Player not found.", + "composer_reloaded.toast.prefix": "Composer Toasts", + "composer_reloaded.toast.sent_notify": "Sent notify toast: %s\n | Background color: %s\n | Border color: %s", + "composer_reloaded.toast.sent_simple": "Sent toast: %s\n | Icon texture: %s\n | Background color: %s\n | Border color: %s", + "composer_reloaded.tooltips.soulbound": "This item is soulbound", + "composer_reloaded.tooltips.soulbound.details": "binding details", + "composer_reloaded.tooltips.soulbound.droppable": "This item is droppable when soulbound", + "composer_reloaded.tooltips.soulbound.droppable.not": "This item is not droppable when soulbound", + "composer_reloaded.tooltips.soulbound.not": "This item is not soulbound", + "feature.description.composer_reloaded.target_synchronization.block": "Synchronizes players' target blocks to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", + "feature.description.composer_reloaded.target_synchronization.entity": "Synchronizes players' target entities to the client. Frequency controls how often (in ticks) updates are sent. Changing this or disabling it may break other mods.", + "itemGroup.composer": "Composer's Silly Little Additions", + "stat.composer_reloaded.boop_plush": "LilBro Plushies Booped" +} \ No newline at end of file diff --git a/versions/1.21/src/main/generated/data/composer_reloaded/advancement/recipes/decorations/plush.json b/versions/1.21/src/main/generated/data/composer_reloaded/advancement/recipes/decorations/plush.json new file mode 100644 index 0000000..00e0dac --- /dev/null +++ b/versions/1.21/src/main/generated/data/composer_reloaded/advancement/recipes/decorations/plush.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "composer_reloaded:plush" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wool": { + "conditions": { + "items": [ + { + "items": "minecraft:black_wool" + }, + { + "items": "minecraft:purple_wool" + }, + { + "items": "minecraft:white_wool" + }, + { + "items": "minecraft:brown_wool" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wool" + ] + ], + "rewards": { + "recipes": [ + "composer_reloaded:plush" + ] + } +} \ No newline at end of file diff --git a/versions/1.21/src/main/generated/data/composer_reloaded/advancement/recipes/misc/cook_plush.json b/versions/1.21/src/main/generated/data/composer_reloaded/advancement/recipes/misc/cook_plush.json new file mode 100644 index 0000000..f1d35e5 --- /dev/null +++ b/versions/1.21/src/main/generated/data/composer_reloaded/advancement/recipes/misc/cook_plush.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plush": { + "conditions": { + "items": [ + { + "items": "composer_reloaded:plush" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cook_plush" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plush" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cook_plush" + ] + } +} \ No newline at end of file diff --git a/versions/1.21/src/main/generated/data/composer_reloaded/loot_table/blocks/plush.json b/versions/1.21/src/main/generated/data/composer_reloaded/loot_table/blocks/plush.json new file mode 100644 index 0000000..450129d --- /dev/null +++ b/versions/1.21/src/main/generated/data/composer_reloaded/loot_table/blocks/plush.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "composer_reloaded:plush" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/versions/1.21/src/main/generated/data/composer_reloaded/recipe/cook_plush.json b/versions/1.21/src/main/generated/data/composer_reloaded/recipe/cook_plush.json new file mode 100644 index 0000000..ac55777 --- /dev/null +++ b/versions/1.21/src/main/generated/data/composer_reloaded/recipe/cook_plush.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:campfire_cooking", + "category": "food", + "cookingtime": 10, + "experience": 0.0, + "ingredient": { + "item": "composer_reloaded:plush" + }, + "result": { + "id": "composer_reloaded:plush" + } +} \ No newline at end of file diff --git a/versions/1.21/src/main/generated/data/composer_reloaded/recipe/plush.json b/versions/1.21/src/main/generated/data/composer_reloaded/recipe/plush.json new file mode 100644 index 0000000..ac84c09 --- /dev/null +++ b/versions/1.21/src/main/generated/data/composer_reloaded/recipe/plush.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": { + "item": "minecraft:black_wool" + }, + "N": { + "item": "minecraft:brown_wool" + }, + "P": { + "item": "minecraft:purple_wool" + }, + "W": { + "item": "minecraft:white_wool" + } + }, + "pattern": [ + "WBW", + "NBP", + "P N" + ], + "result": { + "count": 1, + "id": "composer_reloaded:plush" + } +} \ No newline at end of file