diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b01da52..0a3288a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: matrix: # Use these Java versions java: [ - 21, # Current Java LTS + 25, # Current Java LTS ] runs-on: ubuntu-22.04 steps: @@ -30,7 +30,7 @@ jobs: - name: build run: ./gradlew build - name: capture build artifacts - if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java + if: ${{ matrix.java == '25' }} # Only upload artifacts built from latest java uses: actions/upload-artifact@v4 with: name: Artifacts diff --git a/build.gradle b/build.gradle index 9f2ddb2..fbdd0a9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'net.fabricmc.fabric-loom-remap' version '1.14-SNAPSHOT' + id 'net.fabricmc.fabric-loom' version "${loom_version}" id 'maven-publish' } @@ -23,21 +23,27 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings loom.officialMojangMappings() - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + implementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" if (Boolean.valueOf(project.dependencies_enabled)) { - modApi("me.shedaniel.cloth:cloth-config-fabric:21.11.151") { + api("me.shedaniel.cloth:cloth-config-fabric:21.11.151") { exclude(group: "net.fabricmc.fabric-api") } include "me.shedaniel.cloth:cloth-config-fabric:21.11.151" - modApi "com.terraformersmc:modmenu:17.0.0-alpha.1" + api "com.terraformersmc:modmenu:17.0.0-alpha.1" } + implementation files( + "${rootProject.projectDir}/deps/vanillaoptionsapi-1.0.0.jar", + "${rootProject.projectDir}/deps/vanillaoptionsapi-1.0.0-sources.jar" + ) + + // include "${rootProject.projectDir}\\deps\\vanillaoptionsapi-1.0.0.jar" + implementation 'com.electronwill.night-config:json:3.6.6' } @@ -51,7 +57,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 21 + it.options.release = 25 } java { @@ -60,8 +66,8 @@ java { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 } jar { diff --git a/deps/vanillaoptionsapi-1.0.0-sources.jar b/deps/vanillaoptionsapi-1.0.0-sources.jar new file mode 100644 index 0000000..435d292 Binary files /dev/null and b/deps/vanillaoptionsapi-1.0.0-sources.jar differ diff --git a/deps/vanillaoptionsapi-1.0.0.jar b/deps/vanillaoptionsapi-1.0.0.jar new file mode 100644 index 0000000..8ef957b Binary files /dev/null and b/deps/vanillaoptionsapi-1.0.0.jar differ diff --git a/gradle.properties b/gradle.properties index 470fce9..ffe024c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.11 -yarn_mappings=1.21.11+build.1 -loader_version=0.18.1 +minecraft_version=26.1-snapshot-11 +loader_version=0.18.4 +loom_version=1.15-SNAPSHOT # Mod Properties -mod_version=1.5.0 -maven_group=embin.strangeitems +mod_version=1.6.0-beta.1 +maven_group=embinmc.mod archives_base_name=strangeitems # Dependencies -fabric_version=0.139.4+1.21.11 +fabric_version=0.143.11+26.1 -dependencies_enabled=true \ No newline at end of file +dependencies_enabled=false \ No newline at end of file diff --git a/src/main/java/embin/strangeitems/ModMenuIntegration.java b/src/main/java/embin/strangeitems/ModMenuIntegration.java deleted file mode 100644 index 32c5d97..0000000 --- a/src/main/java/embin/strangeitems/ModMenuIntegration.java +++ /dev/null @@ -1,12 +0,0 @@ -package embin.strangeitems; - -import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import com.terraformersmc.modmenu.api.ModMenuApi; -import embin.strangeitems.client.config.ConfigScreen; - -public class ModMenuIntegration implements ModMenuApi { - @Override - public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> ConfigScreen.configBuilder(parent).build(); - } -} diff --git a/src/main/java/embin/strangeitems/client/StrangeItemsClient.java b/src/main/java/embin/strangeitems/client/StrangeItemsClient.java deleted file mode 100644 index 2ad281c..0000000 --- a/src/main/java/embin/strangeitems/client/StrangeItemsClient.java +++ /dev/null @@ -1,58 +0,0 @@ -package embin.strangeitems.client; - -import com.mojang.blaze3d.platform.InputConstants; -import embin.strangeitems.client.config.StrangeConfig; -import embin.strangeitems.client.debug.TrackerListScreen; -import embin.strangeitems.util.Id; -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; -import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; -import net.minecraft.client.KeyMapping; -import org.lwjgl.glfw.GLFW; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class StrangeItemsClient implements ClientModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger("strangeitems/client"); - public static final KeyMapping.Category STRANGEKEYS = KeyMapping.Category.register(Id.of("keys")); - - private static KeyMapping keybind(String translation, int key) { - return new KeyMapping( - "key.strangeitems." + translation, - InputConstants.Type.KEYSYM, - key, - STRANGEKEYS - ); - } - - private static KeyMapping vanillaKeybind(String translation, int key) { - return KeyBindingHelper.registerKeyBinding(new KeyMapping( - "key.strangeitems." + translation, - InputConstants.Type.KEYSYM, - key, - STRANGEKEYS - )); - } - - public static KeyMapping show_tracker_ids = vanillaKeybind("show_tracker_ids", GLFW.GLFW_KEY_COMMA); - public static KeyMapping show_blocks_mined = vanillaKeybind("show_blocks_mined", GLFW.GLFW_KEY_Z); - public static KeyMapping show_times_dropped = vanillaKeybind("show_times_dropped", GLFW.GLFW_KEY_RIGHT_ALT); - public static KeyMapping show_mobs_killed = vanillaKeybind("show_mobs_killed", GLFW.GLFW_KEY_LEFT_ALT); - public static KeyMapping show_time_in_dimensions = vanillaKeybind("show_time_in_dimension", GLFW.GLFW_KEY_GRAVE_ACCENT); - public static KeyMapping SHOW_SHOTS_HIT = vanillaKeybind("show_shots_hit", GLFW.GLFW_KEY_RIGHT_SHIFT); - - public static KeyMapping DEBUG_LIST_TRACKERS = vanillaKeybind("debug_list_trackers", GLFW.GLFW_KEY_KP_DIVIDE); - - @Override - public void onInitializeClient() { - - ClientTickEvents.END_CLIENT_TICK.register(Id.of("debug_list_trackers"), client -> { - while (DEBUG_LIST_TRACKERS.consumeClick()) { - client.setScreen(new TrackerListScreen(client.screen)); - } - }); - - LOGGER.info("Reading config..."); - StrangeConfig.readConfig(); - } -} diff --git a/src/main/java/embin/strangeitems/mixin/EnchantmentMixin.java b/src/main/java/embin/strangeitems/mixin/EnchantmentMixin.java deleted file mode 100644 index bc275e3..0000000 --- a/src/main/java/embin/strangeitems/mixin/EnchantmentMixin.java +++ /dev/null @@ -1,19 +0,0 @@ -package embin.strangeitems.mixin; - -import net.minecraft.core.Holder; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.enchantment.Enchantment; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(Enchantment.class) -public class EnchantmentMixin { - @Inject(method = "getFullname", at = @At(value = "RETURN"), cancellable = true) - private static void addSpaceToEnchantName(Holder enchantment, int level, CallbackInfoReturnable cir) { - MutableComponent new_text = Component.literal(" ").append(cir.getReturnValue()); - cir.setReturnValue(new_text); - } -} diff --git a/src/main/java/embin/strangeitems/mixin/ExampleMixin.java b/src/main/java/embin/strangeitems/mixin/ExampleMixin.java deleted file mode 100644 index c9bdc19..0000000 --- a/src/main/java/embin/strangeitems/mixin/ExampleMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package embin.strangeitems.mixin; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.Level; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -@Mixin(Level.class) -public class ExampleMixin { - - /** - * @author Embin - * @reason Test - */ - @Overwrite - private static boolean isInWorldBoundsHorizontal(BlockPos pos) { - return true; - } - - /** - * @author Embin - * @reason Test - */ - @Overwrite - private static boolean isOutsideSpawnableHeight(int y) { - return false; - } -} \ No newline at end of file diff --git a/src/main/java/embinmc/mod/strangeitems/CollectorsTransformRecipe.java b/src/main/java/embinmc/mod/strangeitems/CollectorsTransformRecipe.java new file mode 100644 index 0000000..ec4c62a --- /dev/null +++ b/src/main/java/embinmc/mod/strangeitems/CollectorsTransformRecipe.java @@ -0,0 +1,90 @@ +package embinmc.mod.strangeitems; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import embinmc.mod.strangeitems.util.StrangeUtil; +import net.minecraft.core.component.DataComponents; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.item.crafting.SimpleSmithingRecipe; +import net.minecraft.world.item.crafting.SmithingRecipeInput; +import net.minecraft.world.item.crafting.PlacementInfo; +import net.minecraft.world.level.Level; +import org.jspecify.annotations.NonNull; + +import java.util.List; +import java.util.Optional; + +public class CollectorsTransformRecipe extends SimpleSmithingRecipe { + private final Ingredient target, transformer; + + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(c -> c.group( + Recipe.CommonInfo.MAP_CODEC.forGetter(o -> o.commonInfo), + Ingredient.CODEC.fieldOf("target").forGetter(o -> o.target), + Ingredient.CODEC.fieldOf("transformer").forGetter(o -> o.transformer) + ).apply(c, CollectorsTransformRecipe::new)); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + Recipe.CommonInfo.STREAM_CODEC, + o -> o.commonInfo, + Ingredient.CONTENTS_STREAM_CODEC, + o -> o.target, + Ingredient.CONTENTS_STREAM_CODEC, + o -> o.transformer, + CollectorsTransformRecipe::new + ); + public static final RecipeSerializer SERIALIZER = new RecipeSerializer<>(CODEC, STREAM_CODEC); + + protected CollectorsTransformRecipe(CommonInfo commonInfo, Ingredient target, Ingredient transformer) { + super(commonInfo); + this.target = target; + this.transformer = transformer; + } + + @Override + public @NonNull ItemStack assemble(SmithingRecipeInput input) { + // dont override "custom data" component, modify it instead + ItemStack itemStack = new ItemStack(input.base().typeHolder(), input.base().count(), input.base().getComponentsPatch()); + itemStack.update(DataComponents.CUSTOM_DATA, CustomData.EMPTY, cd -> cd.update(nbt -> nbt.putBoolean(StrangeUtil.COLLECTORS_ITEM_TAG, true))); + return itemStack; + } + + @Override + public boolean matches(@NonNull SmithingRecipeInput input, @NonNull Level level) { + // require base and addition items to be the same + return super.matches(input, level) && input.base().getItem() == input.addition().getItem(); + } + + @Override + public @NonNull RecipeSerializer getSerializer() { + return CollectorsTransformRecipe.SERIALIZER; + } + + @Override + public @NonNull Optional templateIngredient() { + return Optional.of(this.transformer); + } + + @Override + public @NonNull Ingredient baseIngredient() { + return this.target; + } + + @Override + public @NonNull Optional additionIngredient() { + return Optional.of(this.target); + } + + @Override + protected @NonNull PlacementInfo createPlacementInfo() { + return PlacementInfo.create(List.of( + this.transformer, + this.target, + this.target + )); + } +} diff --git a/src/main/java/embinmc/mod/strangeitems/ModMenuIntegration.java b/src/main/java/embinmc/mod/strangeitems/ModMenuIntegration.java new file mode 100644 index 0000000..52ba459 --- /dev/null +++ b/src/main/java/embinmc/mod/strangeitems/ModMenuIntegration.java @@ -0,0 +1,11 @@ +package embinmc.mod.strangeitems; + +// import com.terraformersmc.modmenu.api.ConfigScreenFactory; +// import com.terraformersmc.modmenu.api.ModMenuApi; + +public class ModMenuIntegration /*implements ModMenuApi*/ { + // @Override + // public ConfigScreenFactory getModConfigScreenFactory() { + // return parent -> ConfigScreen.configBuilder(parent).build(); + // } +} diff --git a/src/main/java/embin/strangeitems/SIRegisteredEvents.java b/src/main/java/embinmc/mod/strangeitems/SIRegisteredEvents.java similarity index 93% rename from src/main/java/embin/strangeitems/SIRegisteredEvents.java rename to src/main/java/embinmc/mod/strangeitems/SIRegisteredEvents.java index 2c95c71..e83b5ad 100644 --- a/src/main/java/embin/strangeitems/SIRegisteredEvents.java +++ b/src/main/java/embinmc/mod/strangeitems/SIRegisteredEvents.java @@ -1,8 +1,8 @@ -package embin.strangeitems; +package embinmc.mod.strangeitems; -import embin.strangeitems.event.ServerPlayerEvents; -import embin.strangeitems.tracker.Trackers; -import embin.strangeitems.util.Id; +import embinmc.mod.strangeitems.event.ServerPlayerEvents; +import embinmc.mod.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.util.Id; import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.Identifier; diff --git a/src/main/java/embin/strangeitems/StrangeItems.java b/src/main/java/embinmc/mod/strangeitems/StrangeItems.java similarity index 74% rename from src/main/java/embin/strangeitems/StrangeItems.java rename to src/main/java/embinmc/mod/strangeitems/StrangeItems.java index 32b5c97..8bd37b1 100644 --- a/src/main/java/embin/strangeitems/StrangeItems.java +++ b/src/main/java/embinmc/mod/strangeitems/StrangeItems.java @@ -1,9 +1,11 @@ -package embin.strangeitems; +package embinmc.mod.strangeitems; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.util.Id; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.event.lifecycle.v1.*; import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,6 +26,7 @@ public void onInitialize() { StrangeItemsComponents.init(); SIRegisteredEvents.registerEvents(); + Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, Id.of("smithing_collectors"), CollectorsTransformRecipe.SERIALIZER); LOGGER.info("These items... they're strange..."); //StrangeItems.LOGGER.info("Reading config..."); diff --git a/src/main/java/embin/strangeitems/StrangeItemsComponents.java b/src/main/java/embinmc/mod/strangeitems/StrangeItemsComponents.java similarity index 92% rename from src/main/java/embin/strangeitems/StrangeItemsComponents.java rename to src/main/java/embinmc/mod/strangeitems/StrangeItemsComponents.java index f242115..233ece8 100644 --- a/src/main/java/embin/strangeitems/StrangeItemsComponents.java +++ b/src/main/java/embinmc/mod/strangeitems/StrangeItemsComponents.java @@ -1,6 +1,6 @@ -package embin.strangeitems; +package embinmc.mod.strangeitems; -import embin.strangeitems.util.Id; +import embinmc.mod.strangeitems.util.Id; import net.minecraft.core.Registry; import net.minecraft.core.component.DataComponentType; import net.minecraft.core.registries.BuiltInRegistries; @@ -16,6 +16,7 @@ public class StrangeItemsComponents { ); */ + @Deprecated public static final DataComponentType COLLECTORS_ITEM = Registry.register( BuiltInRegistries.DATA_COMPONENT_TYPE, Id.of("strangeitems:collectors_item"), @@ -25,6 +26,7 @@ public class StrangeItemsComponents { /** * Items with this component will have every registered tracker on them and will increment them accordingly if they're capable of doing so. */ + @Deprecated public static final DataComponentType HAS_ALL_TRACKERS = Registry.register( BuiltInRegistries.DATA_COMPONENT_TYPE, Id.of("strangeitems:has_all_trackers"), diff --git a/src/main/java/embin/strangeitems/StrangeRegistries.java b/src/main/java/embinmc/mod/strangeitems/StrangeRegistries.java similarity index 79% rename from src/main/java/embin/strangeitems/StrangeRegistries.java rename to src/main/java/embinmc/mod/strangeitems/StrangeRegistries.java index eb64927..b9abea7 100644 --- a/src/main/java/embin/strangeitems/StrangeRegistries.java +++ b/src/main/java/embinmc/mod/strangeitems/StrangeRegistries.java @@ -1,7 +1,7 @@ -package embin.strangeitems; +package embinmc.mod.strangeitems; -import embin.strangeitems.tracker.Tracker; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Tracker; +import embinmc.mod.strangeitems.tracker.Trackers; import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder; import net.fabricmc.fabric.api.event.registry.RegistryAttribute; import net.minecraft.core.Registry; @@ -12,7 +12,7 @@ public class StrangeRegistries { * Registry containing all registered trackers. * @see Trackers */ - public static final Registry TRACKER = FabricRegistryBuilder.createSimple( + public static final Registry TRACKER = FabricRegistryBuilder.create( StrangeRegistryKeys.TRACKER ).attribute(RegistryAttribute.OPTIONAL).buildAndRegister(); diff --git a/src/main/java/embin/strangeitems/StrangeRegistryKeys.java b/src/main/java/embinmc/mod/strangeitems/StrangeRegistryKeys.java similarity index 73% rename from src/main/java/embin/strangeitems/StrangeRegistryKeys.java rename to src/main/java/embinmc/mod/strangeitems/StrangeRegistryKeys.java index 222eafe..6d741e0 100644 --- a/src/main/java/embin/strangeitems/StrangeRegistryKeys.java +++ b/src/main/java/embinmc/mod/strangeitems/StrangeRegistryKeys.java @@ -1,9 +1,9 @@ -package embin.strangeitems; +package embinmc.mod.strangeitems; -import embin.strangeitems.tracker.MapTracker; -import embin.strangeitems.tracker.TimestampTracker; -import embin.strangeitems.tracker.Tracker; -import embin.strangeitems.util.Id; +import embinmc.mod.strangeitems.tracker.MapTracker; +import embinmc.mod.strangeitems.tracker.TimestampTracker; +import embinmc.mod.strangeitems.tracker.Tracker; +import embinmc.mod.strangeitems.util.Id; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; diff --git a/src/main/java/embinmc/mod/strangeitems/client/StrangeItemsClient.java b/src/main/java/embinmc/mod/strangeitems/client/StrangeItemsClient.java new file mode 100644 index 0000000..b5a2135 --- /dev/null +++ b/src/main/java/embinmc/mod/strangeitems/client/StrangeItemsClient.java @@ -0,0 +1,79 @@ +package embinmc.mod.strangeitems.client; + +import com.mojang.blaze3d.platform.InputConstants; +import com.mojang.brigadier.Command; +import embinmc.mod.strangeitems.StrangeItems; +import embinmc.mod.strangeitems.client.config.StrangeConfig; +import embinmc.mod.strangeitems.client.debug.TrackerListScreen; +import embinmc.mod.strangeitems.util.Id; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; +import net.fabricmc.fabric.api.client.command.v2.ClientCommands; +import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper; +import net.minecraft.client.KeyMapping; +import net.minecraft.core.component.DataComponentMap; +import net.minecraft.core.component.DataComponents; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.network.chat.Component; +import org.lwjgl.glfw.GLFW; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class StrangeItemsClient implements ClientModInitializer { + public static final Logger LOGGER = LoggerFactory.getLogger("strangeitems/client"); + public static final KeyMapping.Category STRANGEKEYS = KeyMapping.Category.register(Id.of("keys")); + + private static KeyMapping keybind(String translation, int key) { + return new KeyMapping( + "key.strangeitems." + translation, + InputConstants.Type.KEYSYM, + key, + STRANGEKEYS + ); + } + + private static KeyMapping vanillaKeybind(String translation, int key) { + return KeyMappingHelper.registerKeyMapping(new KeyMapping( + "key.strangeitems." + translation, + InputConstants.Type.KEYSYM, + key, + STRANGEKEYS + )); + } + + public static KeyMapping show_tracker_ids = vanillaKeybind("show_tracker_ids", InputConstants.KEY_COMMA); + public static KeyMapping show_blocks_mined = vanillaKeybind("show_blocks_mined", InputConstants.KEY_Z); + public static KeyMapping show_times_dropped = vanillaKeybind("show_times_dropped", InputConstants.KEY_RALT); + public static KeyMapping show_mobs_killed = vanillaKeybind("show_mobs_killed", InputConstants.KEY_LALT); + public static KeyMapping show_time_in_dimensions = vanillaKeybind("show_time_in_dimension", InputConstants.KEY_LALT); + public static KeyMapping SHOW_SHOTS_HIT = vanillaKeybind("show_shots_hit", InputConstants.KEY_RSHIFT); + + public static KeyMapping DEBUG_LIST_TRACKERS = vanillaKeybind("debug_list_trackers", GLFW.GLFW_KEY_KP_DIVIDE); + + @Override + public void onInitializeClient() { + + ClientTickEvents.END_CLIENT_TICK.register(Id.of("debug_list_trackers"), client -> { + while (DEBUG_LIST_TRACKERS.consumeClick()) { + client.setScreen(new TrackerListScreen(client.screen)); + } + }); + StrangeOptions.initalize(); + + LOGGER.info("Reading config..."); + StrangeConfig.readConfig(); + + ClientCommandRegistrationCallback.EVENT.register((commandDispatcher, commandBuildContext) -> { + commandDispatcher.register(ClientCommands.literal("strangeitems:debug_listComponents").executes(context -> { + FabricClientCommandSource source = context.getSource(); + source.sendFeedback(Component.literal(DataComponentMap.builder().addAll(source.getPlayer().getActiveItem().getComponents().filter(dct -> { + String namespace = BuiltInRegistries.DATA_COMPONENT_TYPE.getKey(dct).getNamespace(); + return namespace.equals(StrangeItems.MOD_ID) || dct == DataComponents.CUSTOM_DATA; + })).build().toString())); + return Command.SINGLE_SUCCESS; + })); + }); + } +} diff --git a/src/main/java/embinmc/mod/strangeitems/client/StrangeOptions.java b/src/main/java/embinmc/mod/strangeitems/client/StrangeOptions.java new file mode 100644 index 0000000..4be2db6 --- /dev/null +++ b/src/main/java/embinmc/mod/strangeitems/client/StrangeOptions.java @@ -0,0 +1,49 @@ +package embinmc.mod.strangeitems.client; + +import embinmc.mod.strangeitems.util.Id; +import embinmc.mod.optionsapi.OptionsMenuLocation; +import embinmc.mod.optionsapi.VanillaOptionsAPI; +import net.minecraft.client.OptionInstance; +import net.minecraft.network.chat.Component; + +import java.util.function.Supplier; + +public class StrangeOptions { + static final int UNLIMITED_POINT = 51; + private static final OptionInstance MAP_ELEMEMT_LIMIT = new OptionInstance<>( + "options.strangeitems.map_element_limit", OptionInstance.noTooltip(), + (caption, value) -> { + String key = "options.strangeitems.map_element_limit.unlimited"; + Component valStr = (value >= UNLIMITED_POINT ? Component.translatable(key) : Component.literal(String.valueOf(value))); + return caption.copy().append(": ").append(valStr); + }, + new OptionInstance.IntRange(3, UNLIMITED_POINT, true), 8, num -> {} + ); + private static final OptionInstance SHOW_TRACKERS_IN_TOOLTIP = OptionInstance.createBoolean("options.strangeitems.show_trackers_in_tooltip", true); + + private static void register(String id, Supplier> supplier) { + VanillaOptionsAPI.register(Id.of(id), OptionsMenuLocation.NONE, supplier); + } + + public static void initalize() { + register("map_element_limit", StrangeOptions::mapElementLimitOption); + register("show_trackers_in_tooltip", StrangeOptions::showTrackersInTooltipOption); + } + + public static OptionInstance mapElementLimitOption() { + return StrangeOptions.MAP_ELEMEMT_LIMIT; + } + + public static int mapElementLimit() { + int val = StrangeOptions.MAP_ELEMEMT_LIMIT.get(); + return val >= UNLIMITED_POINT ? 512 : val; + } + + public static OptionInstance showTrackersInTooltipOption() { + return StrangeOptions.SHOW_TRACKERS_IN_TOOLTIP; + } + + public static boolean showTrackersInTooltip() { + return StrangeOptions.SHOW_TRACKERS_IN_TOOLTIP.get(); + } +} diff --git a/src/main/java/embin/strangeitems/client/config/ConfigScreen.java b/src/main/java/embinmc/mod/strangeitems/client/config/ConfigScreen.java similarity index 91% rename from src/main/java/embin/strangeitems/client/config/ConfigScreen.java rename to src/main/java/embinmc/mod/strangeitems/client/config/ConfigScreen.java index f6c3520..85d35b8 100644 --- a/src/main/java/embin/strangeitems/client/config/ConfigScreen.java +++ b/src/main/java/embinmc/mod/strangeitems/client/config/ConfigScreen.java @@ -1,14 +1,15 @@ -package embin.strangeitems.client.config; +package embinmc.mod.strangeitems.client.config; -import me.shedaniel.clothconfig2.api.ConfigBuilder; -import me.shedaniel.clothconfig2.api.ConfigCategory; -import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; +// import me.shedaniel.clothconfig2.api.ConfigBuilder; +// import me.shedaniel.clothconfig2.api.ConfigCategory; +// import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; public class ConfigScreen { private ConfigScreen() {} + /* public static ConfigBuilder configBuilder(final Screen parent) { final ConfigBuilder builder = ConfigBuilder.create() .setParentScreen(parent) @@ -53,4 +54,5 @@ public static ConfigBuilder configBuilder(final Screen parent) { builder.setSavingRunnable(StrangeConfig::saveConfig); return builder; } + */ } diff --git a/src/main/java/embin/strangeitems/client/config/HiddenTrackers.java b/src/main/java/embinmc/mod/strangeitems/client/config/HiddenTrackers.java similarity index 87% rename from src/main/java/embin/strangeitems/client/config/HiddenTrackers.java rename to src/main/java/embinmc/mod/strangeitems/client/config/HiddenTrackers.java index 155c4e8..0624a46 100644 --- a/src/main/java/embin/strangeitems/client/config/HiddenTrackers.java +++ b/src/main/java/embinmc/mod/strangeitems/client/config/HiddenTrackers.java @@ -1,9 +1,9 @@ -package embin.strangeitems.client.config; +package embinmc.mod.strangeitems.client.config; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import embin.strangeitems.StrangeRegistries; -import embin.strangeitems.tracker.Tracker; +import embinmc.mod.strangeitems.StrangeRegistries; +import embinmc.mod.strangeitems.tracker.Tracker; import java.util.List; import net.minecraft.core.Holder; import net.minecraft.core.registries.BuiltInRegistries; @@ -17,7 +17,7 @@ public record HiddenTrackers(List conditions) { ); public boolean shouldShowForItem(ItemStack item, Tracker tracker) { - return this.shouldShowForItem(BuiltInRegistries.ITEM.wrapAsHolder(item.getItem()), StrangeRegistries.TRACKER.wrapAsHolder(tracker)); + return this.shouldShowForItem(item.typeHolder(), StrangeRegistries.TRACKER.wrapAsHolder(tracker)); } public boolean shouldShowForItem(Holder item, Holder tracker) { diff --git a/src/main/java/embin/strangeitems/client/config/StrangeConfig.java b/src/main/java/embinmc/mod/strangeitems/client/config/StrangeConfig.java similarity index 98% rename from src/main/java/embin/strangeitems/client/config/StrangeConfig.java rename to src/main/java/embinmc/mod/strangeitems/client/config/StrangeConfig.java index 98e46cf..0e1d218 100644 --- a/src/main/java/embin/strangeitems/client/config/StrangeConfig.java +++ b/src/main/java/embinmc/mod/strangeitems/client/config/StrangeConfig.java @@ -1,4 +1,4 @@ -package embin.strangeitems.client.config; +package embinmc.mod.strangeitems.client.config; import com.google.gson.*; import com.google.gson.internal.Streams; @@ -6,7 +6,7 @@ import com.google.gson.stream.JsonWriter; import com.mojang.serialization.DataResult; import com.mojang.serialization.JsonOps; -import embin.strangeitems.client.StrangeItemsClient; +import embinmc.mod.strangeitems.client.StrangeItemsClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/embin/strangeitems/client/debug/TrackerListScreen.java b/src/main/java/embinmc/mod/strangeitems/client/debug/TrackerListScreen.java similarity index 94% rename from src/main/java/embin/strangeitems/client/debug/TrackerListScreen.java rename to src/main/java/embinmc/mod/strangeitems/client/debug/TrackerListScreen.java index 280590d..85b4ef2 100644 --- a/src/main/java/embin/strangeitems/client/debug/TrackerListScreen.java +++ b/src/main/java/embinmc/mod/strangeitems/client/debug/TrackerListScreen.java @@ -1,4 +1,4 @@ -package embin.strangeitems.client.debug; +package embinmc.mod.strangeitems.client.debug; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; diff --git a/src/main/java/embin/strangeitems/client/debug/TrackerListWidget.java b/src/main/java/embinmc/mod/strangeitems/client/debug/TrackerListWidget.java similarity index 94% rename from src/main/java/embin/strangeitems/client/debug/TrackerListWidget.java rename to src/main/java/embinmc/mod/strangeitems/client/debug/TrackerListWidget.java index 9de73e3..c4636e9 100644 --- a/src/main/java/embin/strangeitems/client/debug/TrackerListWidget.java +++ b/src/main/java/embinmc/mod/strangeitems/client/debug/TrackerListWidget.java @@ -1,7 +1,7 @@ -package embin.strangeitems.client.debug; +package embinmc.mod.strangeitems.client.debug; -import embin.strangeitems.StrangeRegistries; -import embin.strangeitems.tracker.Tracker; +import embinmc.mod.strangeitems.StrangeRegistries; +import embinmc.mod.strangeitems.tracker.Tracker; import java.util.List; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; diff --git a/src/main/java/embin/strangeitems/event/ServerPlayerEvents.java b/src/main/java/embinmc/mod/strangeitems/event/ServerPlayerEvents.java similarity index 97% rename from src/main/java/embin/strangeitems/event/ServerPlayerEvents.java rename to src/main/java/embinmc/mod/strangeitems/event/ServerPlayerEvents.java index d2d02c2..12d9151 100644 --- a/src/main/java/embin/strangeitems/event/ServerPlayerEvents.java +++ b/src/main/java/embinmc/mod/strangeitems/event/ServerPlayerEvents.java @@ -1,4 +1,4 @@ -package embin.strangeitems.event; +package embinmc.mod.strangeitems.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/src/main/java/embinmc/mod/strangeitems/event/TrackerEvents.java b/src/main/java/embinmc/mod/strangeitems/event/TrackerEvents.java new file mode 100644 index 0000000..822e30f --- /dev/null +++ b/src/main/java/embinmc/mod/strangeitems/event/TrackerEvents.java @@ -0,0 +1,48 @@ +package embinmc.mod.strangeitems.event; + +import embinmc.mod.strangeitems.tracker.Tracker; +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.nbt.Tag; +import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; + +public final class TrackerEvents { + private TrackerEvents() {} + + public static final Event<@NotNull OnAppend> ON_APPEND = EventFactory.createArrayBacked(OnAppend.class, listeners -> (tracker, itemStack, increaseAmount) -> { + for (OnAppend listener : listeners) { + boolean result = listener.onAppend(tracker, itemStack, increaseAmount); + if (!result) return false; + } + return true; + }); + + public static final Event<@NotNull WriteInt> WRITE_INT = EventFactory.createArrayBacked(WriteInt.class, listeners -> (tracker, itemStack, val) -> { + for (WriteInt listener : listeners) { + boolean result = listener.writeInt(tracker, itemStack, val); + if (!result) return false; + } + return true; + }); + + public static final Event<@NotNull WriteNbt> WRITE_NBT = EventFactory.createArrayBacked(WriteNbt.class, listeners -> (tracker, itemStack, val) -> { + for (WriteNbt listener : listeners) { + boolean result = listener.writeNbt(tracker, itemStack, val); + if (!result) return false; + } + return true; + }); + + public interface OnAppend { + boolean onAppend(Tracker tracker, ItemStack itemStack, int increaseAmount); + } + + public interface WriteInt { + boolean writeInt(Tracker tracker, ItemStack itemStack, int val); + } + + public interface WriteNbt { + boolean writeNbt(Tracker tracker, ItemStack itemStack, Tag val); + } +} diff --git a/src/main/java/embin/strangeitems/mixin/AbstractArrowMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/AbstractArrowMixin.java similarity index 92% rename from src/main/java/embin/strangeitems/mixin/AbstractArrowMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/AbstractArrowMixin.java index 6f01e65..c6ca8b5 100644 --- a/src/main/java/embin/strangeitems/mixin/AbstractArrowMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/AbstractArrowMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.Identifier; import net.minecraft.world.entity.projectile.arrow.AbstractArrow; diff --git a/src/main/java/embin/strangeitems/mixin/ArmadilloMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/ArmadilloMixin.java similarity index 92% rename from src/main/java/embin/strangeitems/mixin/ArmadilloMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/ArmadilloMixin.java index c4bbae3..6e6bba2 100644 --- a/src/main/java/embin/strangeitems/mixin/ArmadilloMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/ArmadilloMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.animal.armadillo.Armadillo; diff --git a/src/main/java/embin/strangeitems/mixin/AxeMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/AxeMixin.java similarity index 91% rename from src/main/java/embin/strangeitems/mixin/AxeMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/AxeMixin.java index 65f7996..d680d03 100644 --- a/src/main/java/embin/strangeitems/mixin/AxeMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/AxeMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.AxeItem; import net.minecraft.world.item.context.UseOnContext; diff --git a/src/main/java/embin/strangeitems/mixin/BowMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/BowMixin.java similarity index 90% rename from src/main/java/embin/strangeitems/mixin/BowMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/BowMixin.java index 15954d8..228d44b 100644 --- a/src/main/java/embin/strangeitems/mixin/BowMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/BowMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.BowItem; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/embin/strangeitems/mixin/BrushMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/BrushMixin.java similarity index 90% rename from src/main/java/embin/strangeitems/mixin/BrushMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/BrushMixin.java index cc789d8..bfa1811 100644 --- a/src/main/java/embin/strangeitems/mixin/BrushMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/BrushMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.BrushItem; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/embin/strangeitems/mixin/CollectorsMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/CollectorsMixin.java similarity index 86% rename from src/main/java/embin/strangeitems/mixin/CollectorsMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/CollectorsMixin.java index 60b8613..2bf4948 100644 --- a/src/main/java/embin/strangeitems/mixin/CollectorsMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/CollectorsMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.StrangeItemsComponents; +import embinmc.mod.strangeitems.util.StrangeUtil; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiGraphics; @@ -22,7 +22,7 @@ public class CollectorsMixin { shift = At.Shift.BEFORE ), method = "renderSelectedItemName", locals = LocalCapture.CAPTURE_FAILHARD) private void adjust_color_for_collectors(GuiGraphics context, CallbackInfo ci, MutableComponent mutableText) { - if (this.lastToolHighlight.has(StrangeItemsComponents.COLLECTORS_ITEM)) { + if (StrangeUtil.isCollectors(this.lastToolHighlight)) { mutableText.withStyle(ChatFormatting.DARK_RED); } } diff --git a/src/main/java/embin/strangeitems/mixin/CrossbowItemMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/CrossbowItemMixin.java similarity index 91% rename from src/main/java/embin/strangeitems/mixin/CrossbowItemMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/CrossbowItemMixin.java index d9291ca..b40cd41 100644 --- a/src/main/java/embin/strangeitems/mixin/CrossbowItemMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/CrossbowItemMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/embin/strangeitems/mixin/EquippableComponentMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/EquippableComponentMixin.java similarity index 81% rename from src/main/java/embin/strangeitems/mixin/EquippableComponentMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/EquippableComponentMixin.java index 00d7daf..9158f27 100644 --- a/src/main/java/embin/strangeitems/mixin/EquippableComponentMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/EquippableComponentMixin.java @@ -1,7 +1,7 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; -import embin.strangeitems.util.TrackerUtil; +import embinmc.mod.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.util.StrangeUtil; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -16,7 +16,7 @@ public class EquippableComponentMixin { @Inject(method = "swapWithEquipmentSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;awardStat(Lnet/minecraft/stats/Stat;)V")) public void equipMixin(ItemStack stack, Player player, CallbackInfoReturnable cir) { Equippable ec = (Equippable) (Object) this; - if (TrackerUtil.canSwap(stack, player.getItemBySlot(ec.slot()), player)) { + if (StrangeUtil.canSwap(stack, player.getItemBySlot(ec.slot()), player)) { Trackers.TIMES_EQUIPPED.appendTracker(stack, 1); } } diff --git a/src/main/java/embin/strangeitems/mixin/FishingBobberMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/FishingBobberMixin.java similarity index 91% rename from src/main/java/embin/strangeitems/mixin/FishingBobberMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/FishingBobberMixin.java index c61b619..67dfcaf 100644 --- a/src/main/java/embin/strangeitems/mixin/FishingBobberMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/FishingBobberMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.world.entity.projectile.FishingHook; import net.minecraft.world.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/embin/strangeitems/mixin/FishingRodMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/FishingRodMixin.java similarity index 93% rename from src/main/java/embin/strangeitems/mixin/FishingRodMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/FishingRodMixin.java index 51775f5..2897cca 100644 --- a/src/main/java/embin/strangeitems/mixin/FishingRodMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/FishingRodMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/embin/strangeitems/mixin/FlintAndSteelMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/FlintAndSteelMixin.java similarity index 95% rename from src/main/java/embin/strangeitems/mixin/FlintAndSteelMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/FlintAndSteelMixin.java index 206decb..2b6ea3a 100644 --- a/src/main/java/embin/strangeitems/mixin/FlintAndSteelMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/FlintAndSteelMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/embin/strangeitems/mixin/HoeMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/HoeMixin.java similarity index 91% rename from src/main/java/embin/strangeitems/mixin/HoeMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/HoeMixin.java index ac6b491..b7b80d2 100644 --- a/src/main/java/embin/strangeitems/mixin/HoeMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/HoeMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.HoeItem; import net.minecraft.world.item.context.UseOnContext; diff --git a/src/main/java/embinmc/mod/strangeitems/mixin/ItemEnchantmentsMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/ItemEnchantmentsMixin.java new file mode 100644 index 0000000..2e46072 --- /dev/null +++ b/src/main/java/embinmc/mod/strangeitems/mixin/ItemEnchantmentsMixin.java @@ -0,0 +1,43 @@ +package embinmc.mod.strangeitems.mixin; + +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import net.minecraft.ChatFormatting; +import net.minecraft.core.Holder; +import net.minecraft.core.component.DataComponentGetter; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.enchantment.Enchantment; +import net.minecraft.world.item.enchantment.ItemEnchantments; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +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.function.Consumer; + +@Mixin(ItemEnchantments.class) +public abstract class ItemEnchantmentsMixin { + + private @Shadow @Final Object2IntOpenHashMap> enchantments; + + @Inject(method = "addToTooltip", at = @At(value = "HEAD")) + private void addHeader(Item.TooltipContext context, Consumer consumer, TooltipFlag flag, DataComponentGetter components, CallbackInfo ci) { + if (!this.enchantments.isEmpty()) { + consumer.accept(Component.translatable("tooltip.strangeitems.enchantments").append(":").withStyle(ChatFormatting.GRAY)); + } + } + + @WrapOperation(method = "addToTooltip", at = @At(value = "INVOKE", target = "Ljava/util/function/Consumer;accept(Ljava/lang/Object;)V")) + private void addSpaceToEnchantName(Consumer instance, T t, Operation original) { + if (t instanceof Component input) { + String str = input.tryCollapseToString(); + if (str != null && !str.endsWith(":")) instance.accept(input); + else instance.accept(Component.literal(" ").append(input)); + } + } +} diff --git a/src/main/java/embin/strangeitems/mixin/ItemMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/ItemMixin.java similarity index 67% rename from src/main/java/embin/strangeitems/mixin/ItemMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/ItemMixin.java index 7c6247e..c846110 100644 --- a/src/main/java/embin/strangeitems/mixin/ItemMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/ItemMixin.java @@ -1,27 +1,28 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; import com.llamalad7.mixinextras.sugar.Local; -import embin.strangeitems.StrangeItemsComponents; -import embin.strangeitems.StrangeRegistries; -import embin.strangeitems.StrangeRegistryKeys; -import embin.strangeitems.client.config.StrangeConfig; -import embin.strangeitems.tracker.*; -import embin.strangeitems.util.TrackerUtil; +import embinmc.mod.strangeitems.StrangeItems; +import embinmc.mod.strangeitems.StrangeItemsComponents; +import embinmc.mod.strangeitems.StrangeRegistryKeys; +import embinmc.mod.strangeitems.client.StrangeOptions; +import embinmc.mod.strangeitems.client.config.StrangeConfig; +import embinmc.mod.strangeitems.tracker.*; +import embinmc.mod.strangeitems.util.StrangeUtil; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.level.Level; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; import java.util.List; import java.util.function.Consumer; import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.core.component.DataComponents; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Player; @@ -29,9 +30,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.component.TooltipDisplay; -import net.minecraft.world.item.enchantment.ItemEnchantments; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; @Mixin(ItemStack.class) public abstract class ItemMixin { @@ -39,9 +37,10 @@ public abstract class ItemMixin { ordinal = 0, shift = At.Shift.AFTER), method = "addDetailsToTooltip", cancellable = true) public void appendTooltipMixin(Item.TooltipContext context, TooltipDisplay displayComponent, Player player, TooltipFlag type, Consumer list, CallbackInfo ci) { ItemStack stack = (ItemStack)(Object) this; - if (stack.is(TrackerItemTags.CAN_TRACK_STATS) || stack.has(StrangeItemsComponents.HAS_ALL_TRACKERS)) { - for (Holder registryEntry : TrackerUtil.getTooltipOrder(context.registries(), StrangeRegistryKeys.TRACKER, TrackerTags.HAS_SPECIAL_TOOLTIP)) { - if (StrangeConfig.HIDDEN_TRACKERS.shouldShowForItem(stack.getItemHolder(), registryEntry)) { + if (!StrangeOptions.showTrackersInTooltip()) return; + if (stack.is(TrackerItemTags.CAN_TRACK_STATS) || StrangeUtil.hasAllTrackers(stack)) { + for (Holder registryEntry : StrangeUtil.getTooltipOrder(context.registries(), StrangeRegistryKeys.TRACKER, TrackerTags.HAS_SPECIAL_TOOLTIP)) { + if (StrangeConfig.HIDDEN_TRACKERS.shouldShowForItem(stack.typeHolder(), registryEntry)) { if (registryEntry.value() instanceof MapTracker mapTracker) { if (mapTracker.shouldShowTooltip(stack)) { mapTracker.appendTooltipMap(stack, list, ci, type); @@ -56,14 +55,14 @@ public void appendTooltipMixin(Item.TooltipContext context, TooltipDisplay displ } } } - TrackerUtil.addAllTrackerTooltips(context, list, stack); + StrangeUtil.addAllTrackerTooltips(context, list, stack); } } @Inject(at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z", ordinal = 0, shift = At.Shift.AFTER), method = "getTooltipLines") public void nameColorMixin(Item.TooltipContext context, Player player, TooltipFlag type, CallbackInfoReturnable> cir, @Local List list) { ItemStack stack = (ItemStack)(Object) this; - if (stack.has(StrangeItemsComponents.COLLECTORS_ITEM)) { + if (StrangeUtil.isCollectors(stack)) { list.removeLast(); MutableComponent item_name = (MutableComponent) stack.getHoverName(); MutableComponent name = Component.empty(); @@ -106,30 +105,28 @@ public void nameColorMixin(Item.TooltipContext context, Player player, TooltipFl */ } - @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;addToTooltip(Lnet/minecraft/core/component/DataComponentType;Lnet/minecraft/world/item/Item$TooltipContext;Lnet/minecraft/world/item/component/TooltipDisplay;Ljava/util/function/Consumer;Lnet/minecraft/world/item/TooltipFlag;)V", - ordinal = 15, shift = At.Shift.BEFORE), method = "addDetailsToTooltip") - public void enchantTooltipMixin(Item.TooltipContext context, TooltipDisplay displayComponent, Player player, TooltipFlag type, Consumer textConsumer, CallbackInfo ci) { - ItemStack stack = (ItemStack)(Object) this; - if (stack.isEnchanted() || !stack.getOrDefault(DataComponents.STORED_ENCHANTMENTS, ItemEnchantments.EMPTY).isEmpty()) { - textConsumer.accept(Component.translatable("tooltip.strangeitems.enchantments").append(":").withStyle(ChatFormatting.GRAY)); + @Inject(at = @At(value = "TAIL"), method = "inventoryTick") + public void fixTick(Level level, Entity owner, EquipmentSlot slot, CallbackInfo ci) { + if (!level.isClientSide()) { + ItemStack stack = (ItemStack)(Object) this; + if (stack.has(StrangeItemsComponents.COLLECTORS_ITEM)) { + stack.remove(StrangeItemsComponents.COLLECTORS_ITEM); + stack.update(DataComponents.CUSTOM_DATA, CustomData.EMPTY, cd -> cd.update(nbt -> nbt.putBoolean(StrangeUtil.COLLECTORS_ITEM_TAG, true))); + StrangeItems.LOGGER.info("Fixed collector's status of {}", stack); + } + if (stack.has(StrangeItemsComponents.HAS_ALL_TRACKERS)) { + stack.remove(StrangeItemsComponents.HAS_ALL_TRACKERS); + stack.update(DataComponents.CUSTOM_DATA, CustomData.EMPTY, cd -> cd.update(nbt -> nbt.putBoolean(StrangeUtil.HAS_ALL_TRACKERS_TAG, true))); + StrangeItems.LOGGER.info("Fixed full tracking status of {}", stack); + } } } - /** - * @author Embin - * @reason bleh - */ - @Overwrite() - public Component getHoverName() { + @Inject(method = "getHoverName", at = @At(value = "RETURN", ordinal = 1), cancellable = true) + public void collectorsName(CallbackInfoReturnable cir) { ItemStack stack = (ItemStack)(Object) this; - - Component text = stack.getCustomName(); - if (text != null) { - return text; - } - if (stack.has(StrangeItemsComponents.COLLECTORS_ITEM)) { - return Component.translatable("tooltip.strangeitems.collectors_item.item_name", stack.getItemName()); + if (StrangeUtil.isCollectors(stack)) { + cir.setReturnValue(Component.translatable("tooltip.strangeitems.collectors_item.item_name", cir.getReturnValue())); } - return stack.getItemName(); } } diff --git a/src/main/java/embin/strangeitems/mixin/KeyBindAccessor.java b/src/main/java/embinmc/mod/strangeitems/mixin/KeyBindAccessor.java similarity index 87% rename from src/main/java/embin/strangeitems/mixin/KeyBindAccessor.java rename to src/main/java/embinmc/mod/strangeitems/mixin/KeyBindAccessor.java index 61fb733..502b41e 100644 --- a/src/main/java/embin/strangeitems/mixin/KeyBindAccessor.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/KeyBindAccessor.java @@ -1,4 +1,4 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.client.KeyMapping; diff --git a/src/main/java/embin/strangeitems/mixin/LivingEntityMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/LivingEntityMixin.java similarity index 94% rename from src/main/java/embin/strangeitems/mixin/LivingEntityMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/LivingEntityMixin.java index b515959..090b1cc 100644 --- a/src/main/java/embin/strangeitems/mixin/LivingEntityMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/LivingEntityMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/embin/strangeitems/mixin/PlayerMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/PlayerMixin.java similarity index 97% rename from src/main/java/embin/strangeitems/mixin/PlayerMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/PlayerMixin.java index 87950ca..e59ee67 100644 --- a/src/main/java/embin/strangeitems/mixin/PlayerMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/PlayerMixin.java @@ -1,7 +1,7 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; import com.llamalad7.mixinextras.sugar.Local; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.util.Mth; import org.jetbrains.annotations.NotNull; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/embin/strangeitems/mixin/ServerPlayerMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/ServerPlayerMixin.java similarity index 91% rename from src/main/java/embin/strangeitems/mixin/ServerPlayerMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/ServerPlayerMixin.java index f863765..3d0986b 100644 --- a/src/main/java/embin/strangeitems/mixin/ServerPlayerMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/ServerPlayerMixin.java @@ -1,7 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.event.ServerPlayerEvents; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.event.ServerPlayerEvents; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.item.ItemEntity; diff --git a/src/main/java/embin/strangeitems/mixin/ShearsMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/ShearsMixin.java similarity index 94% rename from src/main/java/embin/strangeitems/mixin/ShearsMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/ShearsMixin.java index 32c1d7e..b40079d 100644 --- a/src/main/java/embin/strangeitems/mixin/ShearsMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/ShearsMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/embin/strangeitems/mixin/SheepMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/SheepMixin.java similarity index 92% rename from src/main/java/embin/strangeitems/mixin/SheepMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/SheepMixin.java index 5ba3929..9fbefa7 100644 --- a/src/main/java/embin/strangeitems/mixin/SheepMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/SheepMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.animal.sheep.Sheep; diff --git a/src/main/java/embin/strangeitems/mixin/ShovelMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/ShovelMixin.java similarity index 93% rename from src/main/java/embin/strangeitems/mixin/ShovelMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/ShovelMixin.java index b3356c4..347d720 100644 --- a/src/main/java/embin/strangeitems/mixin/ShovelMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/ShovelMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.ShovelItem; import net.minecraft.world.item.context.UseOnContext; diff --git a/src/main/java/embinmc/mod/strangeitems/mixin/SmithingScreenMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/SmithingScreenMixin.java new file mode 100644 index 0000000..9a3b4e7 --- /dev/null +++ b/src/main/java/embinmc/mod/strangeitems/mixin/SmithingScreenMixin.java @@ -0,0 +1,47 @@ +package embinmc.mod.strangeitems.mixin; + +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.inventory.ItemCombinerScreen; +import net.minecraft.client.gui.screens.inventory.SmithingScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.Identifier; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.SmithingMenu; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Desc; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Optional; +import java.util.function.Consumer; + +@SuppressWarnings({"unused", "OptionalUsedAsFieldOrParameterType"}) +@Mixin(SmithingScreen.class) +abstract class SmithingScreenMixin extends ItemCombinerScreen { + private SmithingScreenMixin(SmithingMenu menu, Inventory inventory, Component title, Identifier menuResource) { + super(menu, inventory, title, menuResource); + throw new UnsupportedOperationException(); + } + + @Redirect( + method = "renderOnboardingTooltips", + at = @At(value = "INVOKE", target = "Ljava/util/Optional;ifPresent(Ljava/util/function/Consumer;)V") + ) + private void giveDescription(Optional instance, Consumer action) { + if (this.hoveredSlot != null) { // check special case for if template item is an echo shard + ItemStack template = this.menu.getSlot(0).getItem(); + if (template.getItem() == Items.ECHO_SHARD && this.hoveredSlot.getItem().isEmpty()) { + if (this.hoveredSlot.index == 1) { + action.accept(Component.translatable("tooltip.strangeitems.smithing_collectors.base")); + return; + } else if (this.hoveredSlot.index == 2) { + action.accept(Component.translatable("tooltip.strangeitems.smithing_collectors.addition")); + return; + } + } + } + instance.ifPresent(action); // else, do vanilla code + } +} \ No newline at end of file diff --git a/src/main/java/embin/strangeitems/mixin/TridentMixin.java b/src/main/java/embinmc/mod/strangeitems/mixin/TridentMixin.java similarity index 91% rename from src/main/java/embin/strangeitems/mixin/TridentMixin.java rename to src/main/java/embinmc/mod/strangeitems/mixin/TridentMixin.java index b17c296..1735605 100644 --- a/src/main/java/embin/strangeitems/mixin/TridentMixin.java +++ b/src/main/java/embinmc/mod/strangeitems/mixin/TridentMixin.java @@ -1,6 +1,6 @@ -package embin.strangeitems.mixin; +package embinmc.mod.strangeitems.mixin; -import embin.strangeitems.tracker.Trackers; +import embinmc.mod.strangeitems.tracker.Trackers; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TridentItem; diff --git a/src/main/java/embin/strangeitems/tracker/MapTracker.java b/src/main/java/embinmc/mod/strangeitems/tracker/MapTracker.java similarity index 76% rename from src/main/java/embin/strangeitems/tracker/MapTracker.java rename to src/main/java/embinmc/mod/strangeitems/tracker/MapTracker.java index 98249e4..1595b42 100644 --- a/src/main/java/embin/strangeitems/tracker/MapTracker.java +++ b/src/main/java/embinmc/mod/strangeitems/tracker/MapTracker.java @@ -1,10 +1,14 @@ -package embin.strangeitems.tracker; +package embinmc.mod.strangeitems.tracker; -import embin.strangeitems.client.StrangeItemsClient; -import embin.strangeitems.client.config.StrangeConfig; -import embin.strangeitems.util.TrackerUtil; +import embinmc.mod.strangeitems.StrangeItems; +import embinmc.mod.strangeitems.client.StrangeItemsClient; +import embinmc.mod.strangeitems.client.StrangeOptions; +import embinmc.mod.strangeitems.client.config.StrangeConfig; +import embinmc.mod.strangeitems.util.StrangeUtil; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import java.util.HashMap; +import java.util.Map; import java.util.function.Consumer; import net.minecraft.ChatFormatting; import net.minecraft.client.KeyMapping; @@ -22,17 +26,12 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.component.CustomData; +// TODO: rewrite all this dog shit public class MapTracker extends Tracker { + private final Map idRedirects = HashMap.newHashMap(12); public String map_id; public String translation_prefix; - /** - * Maximum number of entries that can be shown for in-depth trackers. - * Ignored if certain conditions are met. - * @see TrackerUtil#isTooltipScrollInstalled() - */ - public int max_maps_shown = 8; - public MapTracker(String id, String translate_prefix, TagKey tag, StatFormatter stat_formatter) { super(id, tag); this.map_id = this.getId().toString() + "_map"; @@ -56,9 +55,15 @@ public void appendTracker(ItemStack stack, String key) { super.appendTracker(stack, 1); if (this.shouldTrack(stack) || this.stackHasTracker(stack)) { if (StrangeConfig.in_depth_tracking) { - int tracker_count = this.getTrackerValueNbt(stack).getInt(key).orElse(0) + 1; + String redirectedKey = this.idRedirects.getOrDefault(key, key); CompoundTag nbt = this.getTrackerValueNbt(stack).copy(); + boolean hasOldTag = nbt.contains(redirectedKey); // i dont know, man + int tracker_count = this.getTrackerValueNbt(stack).getIntOr(hasOldTag ? redirectedKey : key, 0) + 1; nbt.putInt(key, tracker_count); + if (hasOldTag && !redirectedKey.equals(key)) { + nbt.remove(redirectedKey); + StrangeItems.LOGGER.info("Redirected id {} to {}", key, redirectedKey); + } this.setTrackerValueNbt(stack, nbt); } } @@ -82,15 +87,15 @@ public void appendTooltipMap(ItemStack stack, Consumer tooltip, Callb this.appendTooltipNoSpace(stack, tooltip, type); CompoundTag nbtCompound = this.getTrackerValueNbt(stack); int index = 1; - for (String key : TrackerUtil.getSortedKeys(nbtCompound)) { - if (index <= this.max_maps_shown || TrackerUtil.isTooltipScrollInstalled()) { + for (String key : StrangeUtil.getSortedKeys(nbtCompound)) { + if (index <= StrangeOptions.mapElementLimit() || StrangeUtil.isTooltipScrollInstalled()) { String translation_key = Identifier.parse(key).toLanguageKey(this.translation_prefix); Component stat_text = Component.literal(this.getFormattedTrackerValueNbt(stack, key)).withStyle(ChatFormatting.YELLOW); MutableComponent tooltip_text = Component.literal(key); - if (Language.getInstance().has(translation_key) && !TrackerUtil.isKeyDown(StrangeItemsClient.show_tracker_ids)) { + if (Language.getInstance().has(translation_key) && !StrangeUtil.isKeyDown(StrangeItemsClient.show_tracker_ids)) { tooltip_text = Component.translatable(translation_key).withStyle(ChatFormatting.GRAY); } - if (TrackerUtil.isKeyDown(StrangeItemsClient.show_tracker_ids)) { + if (StrangeUtil.isKeyDown(StrangeItemsClient.show_tracker_ids)) { tooltip_text.withStyle(ChatFormatting.DARK_GRAY); } tooltip_text.append(Component.literal(": ").withStyle(ChatFormatting.GRAY)); @@ -98,10 +103,10 @@ public void appendTooltipMap(ItemStack stack, Consumer tooltip, Callb } index++; } - if (index > (this.max_maps_shown + 1) && !TrackerUtil.isTooltipScrollInstalled()) { - tooltip.accept(Component.translatable("tooltip.strangeitems.map_cutoff", index - (this.max_maps_shown + 1)).withStyle(ChatFormatting.ITALIC)); + if (index > (StrangeOptions.mapElementLimit() + 1) && !StrangeUtil.isTooltipScrollInstalled()) { + tooltip.accept(Component.translatable("tooltip.strangeitems.map_cutoff", index - (StrangeOptions.mapElementLimit() + 1)).withStyle(ChatFormatting.ITALIC)); } - TrackerUtil.addItemIdToTooltip(stack, tooltip, type); + StrangeUtil.addItemIdToTooltip(stack, tooltip, type); ci.cancel(); } } @@ -111,7 +116,7 @@ public String getFormattedTrackerValueNbt(ItemStack stack, String key) { } public boolean shouldShowTooltip(ItemStack stack) { - return this.stackHasTracker(stack) && TrackerUtil.isKeyDown(this.getKeybinding()) && StrangeConfig.in_depth_tracking && this.stackHasMapTracker(stack); + return this.stackHasTracker(stack) && StrangeUtil.isKeyDown(this.getKeybinding()) && StrangeConfig.in_depth_tracking && this.stackHasMapTracker(stack); } @Override @@ -135,4 +140,8 @@ public boolean stackHasMapTracker(ItemStack stack) { public KeyMapping getKeybinding() { return TrackerKeybindings.get_map_keybind(this); } + + public void addIdRedirect(Identifier target, Identifier replace) { + this.idRedirects.put(replace.toString(), target.toString()); + } } diff --git a/src/main/java/embin/strangeitems/tracker/TimestampTracker.java b/src/main/java/embinmc/mod/strangeitems/tracker/TimestampTracker.java similarity index 87% rename from src/main/java/embin/strangeitems/tracker/TimestampTracker.java rename to src/main/java/embinmc/mod/strangeitems/tracker/TimestampTracker.java index 8cca976..691dd0e 100644 --- a/src/main/java/embin/strangeitems/tracker/TimestampTracker.java +++ b/src/main/java/embinmc/mod/strangeitems/tracker/TimestampTracker.java @@ -1,7 +1,8 @@ -package embin.strangeitems.tracker; +package embinmc.mod.strangeitems.tracker; -import embin.strangeitems.client.config.StrangeConfig; -import embin.strangeitems.util.TrackerUtil; +import embinmc.mod.strangeitems.client.StrangeOptions; +import embinmc.mod.strangeitems.client.config.StrangeConfig; +import embinmc.mod.strangeitems.util.StrangeUtil; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.text.SimpleDateFormat; @@ -21,9 +22,9 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.component.CustomData; +// TODO: rewrite all this dog shit public class TimestampTracker extends Tracker { public String map_id; - public int max_entries_shown = 8; public TimestampTracker(String id) { super(id, TrackerItemTags.CAN_TRACK_STATS); this.map_id = this.getId().toString() + "_map"; @@ -51,13 +52,14 @@ public void setTrackerValueNbt(ItemStack stack, Tag value) { stack.update(DataComponents.CUSTOM_DATA, CustomData.EMPTY, comp -> comp.update(currentnbt -> currentnbt.put(this.map_id, value))); } + // why does this differ from maptracker public void append_tooltip_map(ItemStack stack, Consumer tooltip, CallbackInfo ci, TooltipFlag type) { if (this.shouldTrack(stack) && should_show_tooltip(stack)) { this.appendTooltipNoSpace(stack, tooltip, type); int size = this.getTrackerValueInt(stack) - 1; for (int i = size; i >= 0; i--) { String key = String.valueOf(i + 1); - if ((size - this.max_entries_shown) <= i || TrackerUtil.isTooltipScrollInstalled()) { + if ((size - StrangeOptions.mapElementLimit()) < i || StrangeUtil.isTooltipScrollInstalled()) { Component stat_text = Component.translatable("tooltip.strangeitems.unknown_value").withStyle(ChatFormatting.DARK_GRAY); if (this.getTrackerValueNbt(stack).contains(key)) { long tracker_value = this.getTrackerValueNbt(stack).getLong(key).orElse(0L); @@ -69,16 +71,16 @@ public void append_tooltip_map(ItemStack stack, Consumer tooltip, Cal tooltip.accept(Component.literal(" ").append(tooltip_text).append(stat_text)); } } - if (size >= (this.max_entries_shown + 1) && !TrackerUtil.isTooltipScrollInstalled()) { - tooltip.accept(Component.translatable("tooltip.strangeitems.map_cutoff", size - (this.max_entries_shown + 1)).withStyle(ChatFormatting.ITALIC)); + if (size >= StrangeOptions.mapElementLimit() && !StrangeUtil.isTooltipScrollInstalled()) { + tooltip.accept(Component.translatable("tooltip.strangeitems.map_cutoff", size - StrangeOptions.mapElementLimit() + 1).withStyle(ChatFormatting.ITALIC)); } - TrackerUtil.addItemIdToTooltip(stack, tooltip, type); + StrangeUtil.addItemIdToTooltip(stack, tooltip, type); ci.cancel(); } } public boolean should_show_tooltip(ItemStack stack) { - return this.stackHasTracker(stack) && TrackerUtil.isKeyDown(this.get_key()) && StrangeConfig.in_depth_tracking && this.stack_has_map_tracker(stack); + return this.stackHasTracker(stack) && StrangeUtil.isKeyDown(this.get_key()) && StrangeConfig.in_depth_tracking && this.stack_has_map_tracker(stack); } @Override diff --git a/src/main/java/embin/strangeitems/tracker/Tracker.java b/src/main/java/embinmc/mod/strangeitems/tracker/Tracker.java similarity index 89% rename from src/main/java/embin/strangeitems/tracker/Tracker.java rename to src/main/java/embinmc/mod/strangeitems/tracker/Tracker.java index 96b94fe..be668a0 100644 --- a/src/main/java/embin/strangeitems/tracker/Tracker.java +++ b/src/main/java/embinmc/mod/strangeitems/tracker/Tracker.java @@ -1,10 +1,11 @@ -package embin.strangeitems.tracker; - -import embin.strangeitems.StrangeItemsComponents; -import embin.strangeitems.StrangeRegistries; -import embin.strangeitems.client.StrangeItemsClient; -import embin.strangeitems.util.Id; -import embin.strangeitems.util.TrackerUtil; +package embinmc.mod.strangeitems.tracker; + +import embinmc.mod.strangeitems.StrangeItemsComponents; +import embinmc.mod.strangeitems.StrangeRegistries; +import embinmc.mod.strangeitems.client.StrangeItemsClient; +import embinmc.mod.strangeitems.event.TrackerEvents; +import embinmc.mod.strangeitems.util.Id; +import embinmc.mod.strangeitems.util.StrangeUtil; import net.minecraft.ChatFormatting; import net.minecraft.core.component.DataComponentType; import net.minecraft.core.component.DataComponents; @@ -28,7 +29,9 @@ /** * Base Tracker class */ +// TODO: rewrite all this dog shit public class Tracker { + // god this code is a mess private static final Logger LOGGER = LoggerFactory.getLogger(Tracker.class); public String id; @@ -61,10 +64,12 @@ public Tracker(String id, TagKey tag) { } public void setTrackerValueInt(ItemStack stack, int value) { + if (!TrackerEvents.WRITE_INT.invoker().writeInt(this, stack, value)) return; stack.update(DataComponents.CUSTOM_DATA, CustomData.EMPTY, comp -> comp.update(currentnbt -> currentnbt.putInt(this.toString(), value))); } public void setTrackerValueNbt(ItemStack stack, Tag value) { + if (!TrackerEvents.WRITE_NBT.invoker().writeNbt(this, stack, value)) return; stack.update(DataComponents.CUSTOM_DATA, CustomData.EMPTY, comp -> comp.update(currentnbt -> currentnbt.put(this.toString(), value))); } @@ -122,8 +127,10 @@ public CompoundTag getTrackerValueNbt(ItemStack stack) { */ public void appendTracker(ItemStack stack, int add_amount) { if (this.shouldTrack(stack)) { - int tracker_count = this.getTrackerValueInt(stack) + add_amount; - this.setTrackerValueInt(stack, tracker_count); + if (TrackerEvents.ON_APPEND.invoker().onAppend(this, stack, add_amount)) { + int tracker_count = this.getTrackerValueInt(stack) + add_amount; + this.setTrackerValueInt(stack, tracker_count); + } } } @@ -148,7 +155,7 @@ public void appendTooltip(ItemStack stack, Consumer tooltip) { } protected MutableComponent getNameForTooltip() { - if (TrackerUtil.isKeyDown(StrangeItemsClient.show_tracker_ids)) { + if (StrangeUtil.isKeyDown(StrangeItemsClient.show_tracker_ids)) { Identifier id = StrangeRegistries.TRACKER.getKey(this); if (id != null) { return Component.literal(id.toString()).withStyle(ChatFormatting.DARK_GRAY); diff --git a/src/main/java/embin/strangeitems/tracker/TrackerItemTags.java b/src/main/java/embinmc/mod/strangeitems/tracker/TrackerItemTags.java similarity index 97% rename from src/main/java/embin/strangeitems/tracker/TrackerItemTags.java rename to src/main/java/embinmc/mod/strangeitems/tracker/TrackerItemTags.java index 4410c9d..393a176 100644 --- a/src/main/java/embin/strangeitems/tracker/TrackerItemTags.java +++ b/src/main/java/embinmc/mod/strangeitems/tracker/TrackerItemTags.java @@ -1,6 +1,6 @@ -package embin.strangeitems.tracker; +package embinmc.mod.strangeitems.tracker; -import embin.strangeitems.util.Id; +import embinmc.mod.strangeitems.util.Id; import net.minecraft.core.registries.Registries; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; diff --git a/src/main/java/embin/strangeitems/tracker/TrackerKeybindings.java b/src/main/java/embinmc/mod/strangeitems/tracker/TrackerKeybindings.java similarity index 94% rename from src/main/java/embin/strangeitems/tracker/TrackerKeybindings.java rename to src/main/java/embinmc/mod/strangeitems/tracker/TrackerKeybindings.java index 50896d4..bf1b6e5 100644 --- a/src/main/java/embin/strangeitems/tracker/TrackerKeybindings.java +++ b/src/main/java/embinmc/mod/strangeitems/tracker/TrackerKeybindings.java @@ -1,8 +1,8 @@ -package embin.strangeitems.tracker; +package embinmc.mod.strangeitems.tracker; import com.mojang.blaze3d.platform.InputConstants; -import embin.strangeitems.StrangeItems; -import embin.strangeitems.client.StrangeItemsClient; +import embinmc.mod.strangeitems.StrangeItems; +import embinmc.mod.strangeitems.client.StrangeItemsClient; import net.minecraft.client.KeyMapping; import net.minecraft.util.Util; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/embin/strangeitems/tracker/TrackerTags.java b/src/main/java/embinmc/mod/strangeitems/tracker/TrackerTags.java similarity index 80% rename from src/main/java/embin/strangeitems/tracker/TrackerTags.java rename to src/main/java/embinmc/mod/strangeitems/tracker/TrackerTags.java index 80daeea..c1fb4ca 100644 --- a/src/main/java/embin/strangeitems/tracker/TrackerTags.java +++ b/src/main/java/embinmc/mod/strangeitems/tracker/TrackerTags.java @@ -1,7 +1,7 @@ -package embin.strangeitems.tracker; +package embinmc.mod.strangeitems.tracker; -import embin.strangeitems.StrangeRegistryKeys; -import embin.strangeitems.util.Id; +import embinmc.mod.strangeitems.StrangeRegistryKeys; +import embinmc.mod.strangeitems.util.Id; import net.minecraft.tags.TagKey; public class TrackerTags { diff --git a/src/main/java/embin/strangeitems/tracker/Trackers.java b/src/main/java/embinmc/mod/strangeitems/tracker/Trackers.java similarity index 85% rename from src/main/java/embin/strangeitems/tracker/Trackers.java rename to src/main/java/embinmc/mod/strangeitems/tracker/Trackers.java index 5b2f92e..2f5577d 100644 --- a/src/main/java/embin/strangeitems/tracker/Trackers.java +++ b/src/main/java/embinmc/mod/strangeitems/tracker/Trackers.java @@ -1,8 +1,8 @@ -package embin.strangeitems.tracker; +package embinmc.mod.strangeitems.tracker; -import embin.strangeitems.StrangeItems; -import embin.strangeitems.StrangeRegistries; -import embin.strangeitems.util.Id; +import embinmc.mod.strangeitems.StrangeItems; +import embinmc.mod.strangeitems.StrangeRegistries; +import embinmc.mod.strangeitems.util.Id; import net.minecraft.core.Registry; import net.minecraft.stats.StatFormatter; import net.minecraft.tags.TagKey; @@ -10,7 +10,6 @@ /** * Class containing all default registered trackers. - * Also contains methods to register trackers. */ public class Trackers { public static final MapTracker BLOCKS_MINED = registerMap("blocks_mined", "block", TrackerItemTags.TRACKER_BLOCKS_MINED); @@ -44,35 +43,35 @@ public class Trackers { public static final Tracker TIME_IN_LAVA = register("time_in_lava", TrackerItemTags.TRACKER_TIME_IN_LAVA, StatFormatter.TIME, 1); public static final MapTracker TIME_IN_DIMENSIONS = registerMap("time_in_dimensions", "dimension", TrackerItemTags.TRACKER_TIME_IN_DIMENSIONS, StatFormatter.TIME); - public static Tracker register(String id) { + private static Tracker register(String id) { return Registry.register(StrangeRegistries.TRACKER, Id.of(id), new Tracker(id, TrackerItemTags.CAN_TRACK_STATS)); } - public static Tracker register(String id, TagKey tag) { + private static Tracker register(String id, TagKey tag) { return Registry.register(StrangeRegistries.TRACKER, Id.of(id), new Tracker(id, tag)); } - public static Tracker register(String id, TagKey tag, StatFormatter stat_formatter, int m) { + private static Tracker register(String id, TagKey tag, StatFormatter stat_formatter, int m) { return Registry.register(StrangeRegistries.TRACKER, Id.of(id), new Tracker(id, tag, stat_formatter, m)); } - public static TimestampTracker registerTimestamp(String id) { + private static TimestampTracker registerTimestamp(String id) { return Registry.register(StrangeRegistries.TRACKER, Id.of(id), new TimestampTracker(id)); } - public static TimestampTracker registerTimestamp(String id, TagKey tag) { + private static TimestampTracker registerTimestamp(String id, TagKey tag) { return Registry.register(StrangeRegistries.TRACKER, Id.of(id), new TimestampTracker(id, tag)); } - public static MapTracker registerMap(String id, String prefix) { + private static MapTracker registerMap(String id, String prefix) { return Registry.register(StrangeRegistries.TRACKER, Id.of(id), new MapTracker(id, prefix)); } - public static MapTracker registerMap(String id, String prefix, TagKey tag) { + private static MapTracker registerMap(String id, String prefix, TagKey tag) { return Registry.register(StrangeRegistries.TRACKER, Id.of(id), new MapTracker(id, prefix, tag)); } - public static MapTracker registerMap(String id, String prefix, TagKey tag, StatFormatter stat_formatter) { + private static MapTracker registerMap(String id, String prefix, TagKey tag, StatFormatter stat_formatter) { return Registry.register(StrangeRegistries.TRACKER, Id.of(id), new MapTracker(id, prefix, tag, stat_formatter)); } diff --git a/src/main/java/embin/strangeitems/util/Id.java b/src/main/java/embinmc/mod/strangeitems/util/Id.java similarity index 89% rename from src/main/java/embin/strangeitems/util/Id.java rename to src/main/java/embinmc/mod/strangeitems/util/Id.java index 4f8e98b..7a85f0f 100644 --- a/src/main/java/embin/strangeitems/util/Id.java +++ b/src/main/java/embinmc/mod/strangeitems/util/Id.java @@ -1,6 +1,6 @@ -package embin.strangeitems.util; +package embinmc.mod.strangeitems.util; -import embin.strangeitems.StrangeItems; +import embinmc.mod.strangeitems.StrangeItems; import net.minecraft.resources.Identifier; public class Id { diff --git a/src/main/java/embin/strangeitems/util/TrackerUtil.java b/src/main/java/embinmc/mod/strangeitems/util/StrangeUtil.java similarity index 78% rename from src/main/java/embin/strangeitems/util/TrackerUtil.java rename to src/main/java/embinmc/mod/strangeitems/util/StrangeUtil.java index 7d1687f..2225d0a 100644 --- a/src/main/java/embin/strangeitems/util/TrackerUtil.java +++ b/src/main/java/embinmc/mod/strangeitems/util/StrangeUtil.java @@ -1,14 +1,17 @@ -package embin.strangeitems.util; +package embinmc.mod.strangeitems.util; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.platform.Window; -import embin.strangeitems.StrangeItems; -import embin.strangeitems.StrangeRegistries; -import embin.strangeitems.StrangeRegistryKeys; -import embin.strangeitems.client.config.StrangeConfig; -import embin.strangeitems.mixin.KeyBindAccessor; -import embin.strangeitems.tracker.Tracker; -import embin.strangeitems.tracker.TrackerTags; +import embinmc.mod.strangeitems.StrangeItems; +import embinmc.mod.strangeitems.StrangeItemsComponents; +import embinmc.mod.strangeitems.StrangeRegistries; +import embinmc.mod.strangeitems.StrangeRegistryKeys; +import embinmc.mod.strangeitems.client.config.StrangeConfig; +import embinmc.mod.strangeitems.mixin.KeyBindAccessor; +import embinmc.mod.strangeitems.tracker.Tracker; +import embinmc.mod.strangeitems.tracker.TrackerTags; +import net.minecraft.core.component.DataComponents; +import net.minecraft.world.item.component.CustomData; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -34,7 +37,9 @@ import net.minecraft.world.item.enchantment.EnchantmentEffectComponents; import net.minecraft.world.item.enchantment.EnchantmentHelper; -public class TrackerUtil { +public class StrangeUtil { + public static final String COLLECTORS_ITEM_TAG = Id.of("collectors_item").toString(); + public static final String HAS_ALL_TRACKERS_TAG = Id.of("has_all_trackers").toString(); /** * Gets the keys from an NBT Compound, sorted from the highest to lowest value. @@ -124,7 +129,7 @@ public static void addAllTrackerTooltips(Item.TooltipContext context, Consumer entryList = getTooltipOrder(context.registries(), StrangeRegistryKeys.TRACKER, TrackerTags.TOOLTIP_ORDER); for (Holder registryEntry : entryList) { - if (StrangeConfig.HIDDEN_TRACKERS.shouldShowForItem(stack.getItemHolder(), registryEntry)) { + if (StrangeConfig.HIDDEN_TRACKERS.shouldShowForItem(stack.typeHolder(), registryEntry)) { registryEntry.value().appendTooltip(stack, textConsumer); } } @@ -147,4 +152,18 @@ public static HolderSet getTooltipOrder(@Nullable HolderLookup.Provider } return HolderSet.direct(); } + + public static boolean isCollectors(ItemStack itemStack) { + if (itemStack.has(StrangeItemsComponents.COLLECTORS_ITEM)) return true; + if (!itemStack.has(DataComponents.CUSTOM_DATA)) return false; + CustomData data = itemStack.get(DataComponents.CUSTOM_DATA); + return data != null && data.copyTag().getBooleanOr(COLLECTORS_ITEM_TAG, false); + } + + public static boolean hasAllTrackers(ItemStack itemStack) { + if (itemStack.has(StrangeItemsComponents.HAS_ALL_TRACKERS)) return true; + if (!itemStack.has(DataComponents.CUSTOM_DATA)) return false; + CustomData data = itemStack.get(DataComponents.CUSTOM_DATA); + return data != null && data.copyTag().getBooleanOr(HAS_ALL_TRACKERS_TAG, false); + } } diff --git a/src/main/resources/assets/strangeitems/lang/en_us.json b/src/main/resources/assets/strangeitems/lang/en_us.json index 45f5e93..1c49f7b 100644 --- a/src/main/resources/assets/strangeitems/lang/en_us.json +++ b/src/main/resources/assets/strangeitems/lang/en_us.json @@ -4,6 +4,8 @@ "tooltip.strangeitems.map_cutoff": "and %s more...", "tooltip.strangeitems.collectors_item.item_name": "Collector's %1$s", "tooltip.strangeitems.collectors_item": "Collector's", + "tooltip.strangeitems.smithing_collectors.base": "Add an item you want to turn into a \"Collector's\" variant", + "tooltip.strangeitems.smithing_collectors.addition": "Add a copy of the inputted item", "tracker.strangeitems.blocks_mined":"Blocks Mined", "tracker.strangeitems.logs_stripped":"Blocks Stripped", @@ -67,5 +69,9 @@ "tag.item.strangeitems.trackers.time_in_lava": "Can Track \"Time Spent in Lava\"", "tag.item.strangeitems.trackers.distance_fallen": "Can Track \"Distance Fallen\"", "tag.item.strangeitems.trackers.logs_stripped": "Can Track \"Blocks Stripped\"", - "tag.item.strangeitems.trackers.sheep_sheared": "Can Track \"Sheep Sheared\"" + "tag.item.strangeitems.trackers.sheep_sheared": "Can Track \"Sheep Sheared\"", + + "options.strangeitems.map_element_limit": "Tracker Element Limit", + "options.strangeitems.map_element_limit.unlimited": "∞", + "options.strangeitems.show_trackers_in_tooltip": "Trackers Tooltip" } \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_black_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_black_bundle.json deleted file mode 100644 index 73fb662..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_black_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:black_bundle", - "addition": "minecraft:black_bundle", - "result": { - "id": "minecraft:black_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_blue_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_blue_bundle.json deleted file mode 100644 index b5de3c5..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_blue_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:blue_bundle", - "addition": "minecraft:blue_bundle", - "result": { - "id": "minecraft:blue_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_bow.json b/src/main/resources/data/strangeitems/recipe/collectors_bow.json deleted file mode 100644 index 09f1d44..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_bow.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:bow", - "addition": "minecraft:bow", - "result": { - "id": "minecraft:bow", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_brown_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_brown_bundle.json deleted file mode 100644 index 68df1ba..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_brown_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:brown_bundle", - "addition": "minecraft:brown_bundle", - "result": { - "id": "minecraft:brown_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_brush.json b/src/main/resources/data/strangeitems/recipe/collectors_brush.json deleted file mode 100644 index ff21c3d..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_brush.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:brush", - "addition": "minecraft:brush", - "result": { - "id": "minecraft:brush", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_bundle.json deleted file mode 100644 index c698269..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:bundle", - "addition": "minecraft:bundle", - "result": { - "id": "minecraft:bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_carrot_on_a_stick.json b/src/main/resources/data/strangeitems/recipe/collectors_carrot_on_a_stick.json deleted file mode 100644 index a514301..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_carrot_on_a_stick.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:carrot_on_a_stick", - "addition": "minecraft:carrot_on_a_stick", - "result": { - "id": "minecraft:carrot_on_a_stick", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_chainmail_boots.json b/src/main/resources/data/strangeitems/recipe/collectors_chainmail_boots.json deleted file mode 100644 index 05f73a5..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_chainmail_boots.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:chainmail_boots", - "addition": "minecraft:chainmail_boots", - "result": { - "id": "minecraft:chainmail_boots", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_chainmail_chestplate.json b/src/main/resources/data/strangeitems/recipe/collectors_chainmail_chestplate.json deleted file mode 100644 index 802e01b..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_chainmail_chestplate.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:chainmail_chestplate", - "addition": "minecraft:chainmail_chestplate", - "result": { - "id": "minecraft:chainmail_chestplate", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_chainmail_helmet.json b/src/main/resources/data/strangeitems/recipe/collectors_chainmail_helmet.json deleted file mode 100644 index 11d6c53..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_chainmail_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:chainmail_helmet", - "addition": "minecraft:chainmail_helmet", - "result": { - "id": "minecraft:chainmail_helmet", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_chainmail_leggings.json b/src/main/resources/data/strangeitems/recipe/collectors_chainmail_leggings.json deleted file mode 100644 index 7a9d6eb..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_chainmail_leggings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:chainmail_leggings", - "addition": "minecraft:chainmail_leggings", - "result": { - "id": "minecraft:chainmail_leggings", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_clock.json b/src/main/resources/data/strangeitems/recipe/collectors_clock.json deleted file mode 100644 index 28d9df8..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_clock.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:clock", - "addition": "minecraft:clock", - "result": { - "id": "minecraft:clock", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_compass.json b/src/main/resources/data/strangeitems/recipe/collectors_compass.json deleted file mode 100644 index 3028275..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_compass.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:compass", - "addition": "minecraft:compass", - "result": { - "id": "minecraft:compass", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_copper_axe.json b/src/main/resources/data/strangeitems/recipe/collectors_copper_axe.json deleted file mode 100644 index 39e4410..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_copper_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:copper_axe", - "addition": "minecraft:copper_axe", - "result": { - "id": "minecraft:copper_axe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_copper_boots.json b/src/main/resources/data/strangeitems/recipe/collectors_copper_boots.json deleted file mode 100644 index 5d1da4d..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_copper_boots.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:copper_boots", - "addition": "minecraft:copper_boots", - "result": { - "id": "minecraft:copper_boots", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_copper_chestplate.json b/src/main/resources/data/strangeitems/recipe/collectors_copper_chestplate.json deleted file mode 100644 index cbc61b7..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_copper_chestplate.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:copper_chestplate", - "addition": "minecraft:copper_chestplate", - "result": { - "id": "minecraft:copper_chestplate", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_copper_helmet.json b/src/main/resources/data/strangeitems/recipe/collectors_copper_helmet.json deleted file mode 100644 index 63df666..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_copper_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:copper_helmet", - "addition": "minecraft:copper_helmet", - "result": { - "id": "minecraft:copper_helmet", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_copper_hoe.json b/src/main/resources/data/strangeitems/recipe/collectors_copper_hoe.json deleted file mode 100644 index 283f830..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_copper_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:copper_hoe", - "addition": "minecraft:copper_hoe", - "result": { - "id": "minecraft:copper_hoe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_copper_horse_armor.json b/src/main/resources/data/strangeitems/recipe/collectors_copper_horse_armor.json deleted file mode 100644 index 98c712b..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_copper_horse_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:copper_horse_armor", - "addition": "minecraft:copper_horse_armor", - "result": { - "id": "minecraft:copper_horse_armor", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_copper_leggings.json b/src/main/resources/data/strangeitems/recipe/collectors_copper_leggings.json deleted file mode 100644 index 31d2ac8..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_copper_leggings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:copper_leggings", - "addition": "minecraft:copper_leggings", - "result": { - "id": "minecraft:copper_leggings", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_copper_nautilus_armor.json b/src/main/resources/data/strangeitems/recipe/collectors_copper_nautilus_armor.json deleted file mode 100644 index 1fc12a8..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_copper_nautilus_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:copper_nautilus_armor", - "addition": "minecraft:copper_nautilus_armor", - "result": { - "id": "minecraft:copper_nautilus_armor", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_copper_pickaxe.json b/src/main/resources/data/strangeitems/recipe/collectors_copper_pickaxe.json deleted file mode 100644 index 8ef8c84..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_copper_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:copper_pickaxe", - "addition": "minecraft:copper_pickaxe", - "result": { - "id": "minecraft:copper_pickaxe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_copper_shovel.json b/src/main/resources/data/strangeitems/recipe/collectors_copper_shovel.json deleted file mode 100644 index 521cd08..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_copper_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:copper_shovel", - "addition": "minecraft:copper_shovel", - "result": { - "id": "minecraft:copper_shovel", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_copper_spear.json b/src/main/resources/data/strangeitems/recipe/collectors_copper_spear.json deleted file mode 100644 index 0f6a697..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_copper_spear.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:copper_spear", - "addition": "minecraft:copper_spear", - "result": { - "id": "minecraft:copper_spear", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_copper_sword.json b/src/main/resources/data/strangeitems/recipe/collectors_copper_sword.json deleted file mode 100644 index 1cbf8db..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_copper_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:copper_sword", - "addition": "minecraft:copper_sword", - "result": { - "id": "minecraft:copper_sword", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_crossbow.json b/src/main/resources/data/strangeitems/recipe/collectors_crossbow.json deleted file mode 100644 index 19508fe..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_crossbow.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:crossbow", - "addition": "minecraft:crossbow", - "result": { - "id": "minecraft:crossbow", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_cyan_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_cyan_bundle.json deleted file mode 100644 index 9941952..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_cyan_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:cyan_bundle", - "addition": "minecraft:cyan_bundle", - "result": { - "id": "minecraft:cyan_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_diamond_axe.json b/src/main/resources/data/strangeitems/recipe/collectors_diamond_axe.json deleted file mode 100644 index 9022f96..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_diamond_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:diamond_axe", - "addition": "minecraft:diamond_axe", - "result": { - "id": "minecraft:diamond_axe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_diamond_boots.json b/src/main/resources/data/strangeitems/recipe/collectors_diamond_boots.json deleted file mode 100644 index b8a1a1f..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_diamond_boots.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:diamond_boots", - "addition": "minecraft:diamond_boots", - "result": { - "id": "minecraft:diamond_boots", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_diamond_chestplate.json b/src/main/resources/data/strangeitems/recipe/collectors_diamond_chestplate.json deleted file mode 100644 index 6a52084..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_diamond_chestplate.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:diamond_chestplate", - "addition": "minecraft:diamond_chestplate", - "result": { - "id": "minecraft:diamond_chestplate", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_diamond_helmet.json b/src/main/resources/data/strangeitems/recipe/collectors_diamond_helmet.json deleted file mode 100644 index 0369b09..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_diamond_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:diamond_helmet", - "addition": "minecraft:diamond_helmet", - "result": { - "id": "minecraft:diamond_helmet", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_diamond_hoe.json b/src/main/resources/data/strangeitems/recipe/collectors_diamond_hoe.json deleted file mode 100644 index e667a15..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_diamond_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:diamond_hoe", - "addition": "minecraft:diamond_hoe", - "result": { - "id": "minecraft:diamond_hoe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_diamond_horse_armor.json b/src/main/resources/data/strangeitems/recipe/collectors_diamond_horse_armor.json deleted file mode 100644 index a9abb28..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_diamond_horse_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:diamond_horse_armor", - "addition": "minecraft:diamond_horse_armor", - "result": { - "id": "minecraft:diamond_horse_armor", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_diamond_leggings.json b/src/main/resources/data/strangeitems/recipe/collectors_diamond_leggings.json deleted file mode 100644 index 460cb29..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_diamond_leggings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:diamond_leggings", - "addition": "minecraft:diamond_leggings", - "result": { - "id": "minecraft:diamond_leggings", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_diamond_nautilus_armor.json b/src/main/resources/data/strangeitems/recipe/collectors_diamond_nautilus_armor.json deleted file mode 100644 index 66fb38e..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_diamond_nautilus_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:diamond_nautilus_armor", - "addition": "minecraft:diamond_nautilus_armor", - "result": { - "id": "minecraft:diamond_nautilus_armor", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_diamond_pickaxe.json b/src/main/resources/data/strangeitems/recipe/collectors_diamond_pickaxe.json deleted file mode 100644 index a1a9e83..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_diamond_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:diamond_pickaxe", - "addition": "minecraft:diamond_pickaxe", - "result": { - "id": "minecraft:diamond_pickaxe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_diamond_shovel.json b/src/main/resources/data/strangeitems/recipe/collectors_diamond_shovel.json deleted file mode 100644 index 956f1c5..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_diamond_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:diamond_shovel", - "addition": "minecraft:diamond_shovel", - "result": { - "id": "minecraft:diamond_shovel", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_diamond_spear.json b/src/main/resources/data/strangeitems/recipe/collectors_diamond_spear.json deleted file mode 100644 index 200a24b..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_diamond_spear.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:diamond_spear", - "addition": "minecraft:diamond_spear", - "result": { - "id": "minecraft:diamond_spear", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_diamond_sword.json b/src/main/resources/data/strangeitems/recipe/collectors_diamond_sword.json deleted file mode 100644 index ded6f44..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_diamond_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:diamond_sword", - "addition": "minecraft:diamond_sword", - "result": { - "id": "minecraft:diamond_sword", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_dragon_egg.json b/src/main/resources/data/strangeitems/recipe/collectors_dragon_egg.json deleted file mode 100644 index ffbe9c4..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_dragon_egg.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:dragon_egg", - "addition": "minecraft:dragon_egg", - "result": { - "id": "minecraft:dragon_egg", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_elytra.json b/src/main/resources/data/strangeitems/recipe/collectors_elytra.json deleted file mode 100644 index 45e79ed..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_elytra.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:elytra", - "addition": "minecraft:elytra", - "result": { - "id": "minecraft:elytra", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_fishing_rod.json b/src/main/resources/data/strangeitems/recipe/collectors_fishing_rod.json deleted file mode 100644 index a7f39f1..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_fishing_rod.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:fishing_rod", - "addition": "minecraft:fishing_rod", - "result": { - "id": "minecraft:fishing_rod", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_flint_and_steel.json b/src/main/resources/data/strangeitems/recipe/collectors_flint_and_steel.json deleted file mode 100644 index 2fd3f12..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_flint_and_steel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:flint_and_steel", - "addition": "minecraft:flint_and_steel", - "result": { - "id": "minecraft:flint_and_steel", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_goat_horn.json b/src/main/resources/data/strangeitems/recipe/collectors_goat_horn.json deleted file mode 100644 index 5d1cffe..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_goat_horn.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:goat_horn", - "addition": "minecraft:goat_horn", - "result": { - "id": "minecraft:goat_horn", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_golden_axe.json b/src/main/resources/data/strangeitems/recipe/collectors_golden_axe.json deleted file mode 100644 index 15ca124..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_golden_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:golden_axe", - "addition": "minecraft:golden_axe", - "result": { - "id": "minecraft:golden_axe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_golden_boots.json b/src/main/resources/data/strangeitems/recipe/collectors_golden_boots.json deleted file mode 100644 index 04280f4..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_golden_boots.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:golden_boots", - "addition": "minecraft:golden_boots", - "result": { - "id": "minecraft:golden_boots", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_golden_chestplate.json b/src/main/resources/data/strangeitems/recipe/collectors_golden_chestplate.json deleted file mode 100644 index 8d3f616..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_golden_chestplate.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:golden_chestplate", - "addition": "minecraft:golden_chestplate", - "result": { - "id": "minecraft:golden_chestplate", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_golden_helmet.json b/src/main/resources/data/strangeitems/recipe/collectors_golden_helmet.json deleted file mode 100644 index ed4d9a7..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_golden_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:golden_helmet", - "addition": "minecraft:golden_helmet", - "result": { - "id": "minecraft:golden_helmet", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_golden_hoe.json b/src/main/resources/data/strangeitems/recipe/collectors_golden_hoe.json deleted file mode 100644 index 6349ae2..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_golden_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:golden_hoe", - "addition": "minecraft:golden_hoe", - "result": { - "id": "minecraft:golden_hoe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_golden_horse_armor.json b/src/main/resources/data/strangeitems/recipe/collectors_golden_horse_armor.json deleted file mode 100644 index e41e2cb..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_golden_horse_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:golden_horse_armor", - "addition": "minecraft:golden_horse_armor", - "result": { - "id": "minecraft:golden_horse_armor", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_golden_leggings.json b/src/main/resources/data/strangeitems/recipe/collectors_golden_leggings.json deleted file mode 100644 index d1739ee..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_golden_leggings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:golden_leggings", - "addition": "minecraft:golden_leggings", - "result": { - "id": "minecraft:golden_leggings", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_golden_nautilus_armor.json b/src/main/resources/data/strangeitems/recipe/collectors_golden_nautilus_armor.json deleted file mode 100644 index 5428b95..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_golden_nautilus_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:golden_nautilus_armor", - "addition": "minecraft:golden_nautilus_armor", - "result": { - "id": "minecraft:golden_nautilus_armor", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_golden_pickaxe.json b/src/main/resources/data/strangeitems/recipe/collectors_golden_pickaxe.json deleted file mode 100644 index 26465a6..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_golden_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:golden_pickaxe", - "addition": "minecraft:golden_pickaxe", - "result": { - "id": "minecraft:golden_pickaxe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_golden_shovel.json b/src/main/resources/data/strangeitems/recipe/collectors_golden_shovel.json deleted file mode 100644 index 4d72cf7..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_golden_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:golden_shovel", - "addition": "minecraft:golden_shovel", - "result": { - "id": "minecraft:golden_shovel", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_golden_spear.json b/src/main/resources/data/strangeitems/recipe/collectors_golden_spear.json deleted file mode 100644 index c2fea50..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_golden_spear.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:golden_spear", - "addition": "minecraft:golden_spear", - "result": { - "id": "minecraft:golden_spear", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_golden_sword.json b/src/main/resources/data/strangeitems/recipe/collectors_golden_sword.json deleted file mode 100644 index 22a6950..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_golden_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:golden_sword", - "addition": "minecraft:golden_sword", - "result": { - "id": "minecraft:golden_sword", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_gray_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_gray_bundle.json deleted file mode 100644 index 8070bd7..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_gray_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:gray_bundle", - "addition": "minecraft:gray_bundle", - "result": { - "id": "minecraft:gray_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_green_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_green_bundle.json deleted file mode 100644 index f96a749..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_green_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:green_bundle", - "addition": "minecraft:green_bundle", - "result": { - "id": "minecraft:green_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_heavy_core.json b/src/main/resources/data/strangeitems/recipe/collectors_heavy_core.json deleted file mode 100644 index ffc8373..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_heavy_core.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:heavy_core", - "addition": "minecraft:heavy_core", - "result": { - "id": "minecraft:heavy_core", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_iron_axe.json b/src/main/resources/data/strangeitems/recipe/collectors_iron_axe.json deleted file mode 100644 index 879b0f3..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_iron_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:iron_axe", - "addition": "minecraft:iron_axe", - "result": { - "id": "minecraft:iron_axe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_iron_boots.json b/src/main/resources/data/strangeitems/recipe/collectors_iron_boots.json deleted file mode 100644 index b9d8c91..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_iron_boots.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:iron_boots", - "addition": "minecraft:iron_boots", - "result": { - "id": "minecraft:iron_boots", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_iron_chestplate.json b/src/main/resources/data/strangeitems/recipe/collectors_iron_chestplate.json deleted file mode 100644 index be665f7..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_iron_chestplate.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:iron_chestplate", - "addition": "minecraft:iron_chestplate", - "result": { - "id": "minecraft:iron_chestplate", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_iron_helmet.json b/src/main/resources/data/strangeitems/recipe/collectors_iron_helmet.json deleted file mode 100644 index bdf2431..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_iron_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:iron_helmet", - "addition": "minecraft:iron_helmet", - "result": { - "id": "minecraft:iron_helmet", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_iron_hoe.json b/src/main/resources/data/strangeitems/recipe/collectors_iron_hoe.json deleted file mode 100644 index 599b25e..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_iron_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:iron_hoe", - "addition": "minecraft:iron_hoe", - "result": { - "id": "minecraft:iron_hoe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_iron_horse_armor.json b/src/main/resources/data/strangeitems/recipe/collectors_iron_horse_armor.json deleted file mode 100644 index b4d19cd..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_iron_horse_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:iron_horse_armor", - "addition": "minecraft:iron_horse_armor", - "result": { - "id": "minecraft:iron_horse_armor", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_iron_leggings.json b/src/main/resources/data/strangeitems/recipe/collectors_iron_leggings.json deleted file mode 100644 index cc456a2..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_iron_leggings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:iron_leggings", - "addition": "minecraft:iron_leggings", - "result": { - "id": "minecraft:iron_leggings", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_iron_nautilus_armor.json b/src/main/resources/data/strangeitems/recipe/collectors_iron_nautilus_armor.json deleted file mode 100644 index 110c0cb..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_iron_nautilus_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:iron_nautilus_armor", - "addition": "minecraft:iron_nautilus_armor", - "result": { - "id": "minecraft:iron_nautilus_armor", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_iron_pickaxe.json b/src/main/resources/data/strangeitems/recipe/collectors_iron_pickaxe.json deleted file mode 100644 index eca5d55..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_iron_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:iron_pickaxe", - "addition": "minecraft:iron_pickaxe", - "result": { - "id": "minecraft:iron_pickaxe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_iron_shovel.json b/src/main/resources/data/strangeitems/recipe/collectors_iron_shovel.json deleted file mode 100644 index 0fc9463..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_iron_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:iron_shovel", - "addition": "minecraft:iron_shovel", - "result": { - "id": "minecraft:iron_shovel", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_iron_spear.json b/src/main/resources/data/strangeitems/recipe/collectors_iron_spear.json deleted file mode 100644 index 43681f4..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_iron_spear.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:iron_spear", - "addition": "minecraft:iron_spear", - "result": { - "id": "minecraft:iron_spear", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_iron_sword.json b/src/main/resources/data/strangeitems/recipe/collectors_iron_sword.json deleted file mode 100644 index 38d4e49..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_iron_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:iron_sword", - "addition": "minecraft:iron_sword", - "result": { - "id": "minecraft:iron_sword", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_item.json b/src/main/resources/data/strangeitems/recipe/collectors_item.json new file mode 100644 index 0000000..70df0b6 --- /dev/null +++ b/src/main/resources/data/strangeitems/recipe/collectors_item.json @@ -0,0 +1,5 @@ +{ + "type": "strangeitems:smithing_collectors", + "target": "#strangeitems:can_make_collectors_item", + "transformer": "minecraft:echo_shard" +} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_leather_boots.json b/src/main/resources/data/strangeitems/recipe/collectors_leather_boots.json deleted file mode 100644 index de53e35..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_leather_boots.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:leather_boots", - "addition": "minecraft:leather_boots", - "result": { - "id": "minecraft:leather_boots", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_leather_chestplate.json b/src/main/resources/data/strangeitems/recipe/collectors_leather_chestplate.json deleted file mode 100644 index 838d1fb..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_leather_chestplate.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:leather_chestplate", - "addition": "minecraft:leather_chestplate", - "result": { - "id": "minecraft:leather_chestplate", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_leather_helmet.json b/src/main/resources/data/strangeitems/recipe/collectors_leather_helmet.json deleted file mode 100644 index a2a6c39..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_leather_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:leather_helmet", - "addition": "minecraft:leather_helmet", - "result": { - "id": "minecraft:leather_helmet", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_leather_horse_armor.json b/src/main/resources/data/strangeitems/recipe/collectors_leather_horse_armor.json deleted file mode 100644 index da8ddae..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_leather_horse_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:leather_horse_armor", - "addition": "minecraft:leather_horse_armor", - "result": { - "id": "minecraft:leather_horse_armor", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_leather_leggings.json b/src/main/resources/data/strangeitems/recipe/collectors_leather_leggings.json deleted file mode 100644 index 363453a..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_leather_leggings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:leather_leggings", - "addition": "minecraft:leather_leggings", - "result": { - "id": "minecraft:leather_leggings", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_light_blue_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_light_blue_bundle.json deleted file mode 100644 index 4a751d0..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_light_blue_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:light_blue_bundle", - "addition": "minecraft:light_blue_bundle", - "result": { - "id": "minecraft:light_blue_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_light_gray_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_light_gray_bundle.json deleted file mode 100644 index 42b26f6..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_light_gray_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:light_gray_bundle", - "addition": "minecraft:light_gray_bundle", - "result": { - "id": "minecraft:light_gray_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_lime_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_lime_bundle.json deleted file mode 100644 index 86cbc44..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_lime_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:lime_bundle", - "addition": "minecraft:lime_bundle", - "result": { - "id": "minecraft:lime_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_mace.json b/src/main/resources/data/strangeitems/recipe/collectors_mace.json deleted file mode 100644 index 56980e5..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_mace.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:mace", - "addition": "minecraft:mace", - "result": { - "id": "minecraft:mace", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_magenta_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_magenta_bundle.json deleted file mode 100644 index e8b6336..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_magenta_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:magenta_bundle", - "addition": "minecraft:magenta_bundle", - "result": { - "id": "minecraft:magenta_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_11.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_11.json deleted file mode 100644 index 67e879d..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_11.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_11", - "addition": "minecraft:music_disc_11", - "result": { - "id": "minecraft:music_disc_11", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_13.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_13.json deleted file mode 100644 index 81b1de9..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_13.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_13", - "addition": "minecraft:music_disc_13", - "result": { - "id": "minecraft:music_disc_13", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_5.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_5.json deleted file mode 100644 index 529f7c2..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_5.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_5", - "addition": "minecraft:music_disc_5", - "result": { - "id": "minecraft:music_disc_5", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_blocks.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_blocks.json deleted file mode 100644 index 958413c..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_blocks.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_blocks", - "addition": "minecraft:music_disc_blocks", - "result": { - "id": "minecraft:music_disc_blocks", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_cat.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_cat.json deleted file mode 100644 index 6e899c3..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_cat.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_cat", - "addition": "minecraft:music_disc_cat", - "result": { - "id": "minecraft:music_disc_cat", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_chirp.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_chirp.json deleted file mode 100644 index 7cd425b..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_chirp.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_chirp", - "addition": "minecraft:music_disc_chirp", - "result": { - "id": "minecraft:music_disc_chirp", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_creator.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_creator.json deleted file mode 100644 index 3883ea1..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_creator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_creator", - "addition": "minecraft:music_disc_creator", - "result": { - "id": "minecraft:music_disc_creator", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_creator_music_box.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_creator_music_box.json deleted file mode 100644 index 7459ba3..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_creator_music_box.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_creator_music_box", - "addition": "minecraft:music_disc_creator_music_box", - "result": { - "id": "minecraft:music_disc_creator_music_box", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_far.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_far.json deleted file mode 100644 index 90a3e5d..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_far.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_far", - "addition": "minecraft:music_disc_far", - "result": { - "id": "minecraft:music_disc_far", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_lava_chicken.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_lava_chicken.json deleted file mode 100644 index 62ee777..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_lava_chicken.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_lava_chicken", - "addition": "minecraft:music_disc_lava_chicken", - "result": { - "id": "minecraft:music_disc_lava_chicken", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_mall.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_mall.json deleted file mode 100644 index 584d8d9..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_mall.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_mall", - "addition": "minecraft:music_disc_mall", - "result": { - "id": "minecraft:music_disc_mall", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_mellohi.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_mellohi.json deleted file mode 100644 index b674d5f..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_mellohi.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_mellohi", - "addition": "minecraft:music_disc_mellohi", - "result": { - "id": "minecraft:music_disc_mellohi", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_otherside.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_otherside.json deleted file mode 100644 index 98f6604..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_otherside.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_otherside", - "addition": "minecraft:music_disc_otherside", - "result": { - "id": "minecraft:music_disc_otherside", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_pigstep.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_pigstep.json deleted file mode 100644 index bc04782..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_pigstep.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_pigstep", - "addition": "minecraft:music_disc_pigstep", - "result": { - "id": "minecraft:music_disc_pigstep", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_precipice.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_precipice.json deleted file mode 100644 index 24a7eb8..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_precipice.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_precipice", - "addition": "minecraft:music_disc_precipice", - "result": { - "id": "minecraft:music_disc_precipice", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_relic.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_relic.json deleted file mode 100644 index f185dca..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_relic.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_relic", - "addition": "minecraft:music_disc_relic", - "result": { - "id": "minecraft:music_disc_relic", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_stal.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_stal.json deleted file mode 100644 index 4c4f076..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_stal.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_stal", - "addition": "minecraft:music_disc_stal", - "result": { - "id": "minecraft:music_disc_stal", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_strad.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_strad.json deleted file mode 100644 index dfddc5e..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_strad.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_strad", - "addition": "minecraft:music_disc_strad", - "result": { - "id": "minecraft:music_disc_strad", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_tears.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_tears.json deleted file mode 100644 index 7ad6f81..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_tears.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_tears", - "addition": "minecraft:music_disc_tears", - "result": { - "id": "minecraft:music_disc_tears", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_wait.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_wait.json deleted file mode 100644 index 154c7fa..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_wait.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_wait", - "addition": "minecraft:music_disc_wait", - "result": { - "id": "minecraft:music_disc_wait", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_ward.json b/src/main/resources/data/strangeitems/recipe/collectors_music_disc_ward.json deleted file mode 100644 index e1531e6..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_music_disc_ward.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:music_disc_ward", - "addition": "minecraft:music_disc_ward", - "result": { - "id": "minecraft:music_disc_ward", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_nether_star.json b/src/main/resources/data/strangeitems/recipe/collectors_nether_star.json deleted file mode 100644 index e87d4d8..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_nether_star.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:nether_star", - "addition": "minecraft:nether_star", - "result": { - "id": "minecraft:nether_star", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_netherite_axe.json b/src/main/resources/data/strangeitems/recipe/collectors_netherite_axe.json deleted file mode 100644 index cc70ef0..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_netherite_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:netherite_axe", - "addition": "minecraft:netherite_axe", - "result": { - "id": "minecraft:netherite_axe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_netherite_boots.json b/src/main/resources/data/strangeitems/recipe/collectors_netherite_boots.json deleted file mode 100644 index 5676f45..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_netherite_boots.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:netherite_boots", - "addition": "minecraft:netherite_boots", - "result": { - "id": "minecraft:netherite_boots", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_netherite_chestplate.json b/src/main/resources/data/strangeitems/recipe/collectors_netherite_chestplate.json deleted file mode 100644 index e6eaa2f..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_netherite_chestplate.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:netherite_chestplate", - "addition": "minecraft:netherite_chestplate", - "result": { - "id": "minecraft:netherite_chestplate", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_netherite_helmet.json b/src/main/resources/data/strangeitems/recipe/collectors_netherite_helmet.json deleted file mode 100644 index 64af7b1..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_netherite_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:netherite_helmet", - "addition": "minecraft:netherite_helmet", - "result": { - "id": "minecraft:netherite_helmet", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_netherite_hoe.json b/src/main/resources/data/strangeitems/recipe/collectors_netherite_hoe.json deleted file mode 100644 index bfdabd8..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_netherite_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:netherite_hoe", - "addition": "minecraft:netherite_hoe", - "result": { - "id": "minecraft:netherite_hoe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_netherite_horse_armor.json b/src/main/resources/data/strangeitems/recipe/collectors_netherite_horse_armor.json deleted file mode 100644 index ed55925..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_netherite_horse_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:netherite_horse_armor", - "addition": "minecraft:netherite_horse_armor", - "result": { - "id": "minecraft:netherite_horse_armor", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_netherite_leggings.json b/src/main/resources/data/strangeitems/recipe/collectors_netherite_leggings.json deleted file mode 100644 index 2890d26..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_netherite_leggings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:netherite_leggings", - "addition": "minecraft:netherite_leggings", - "result": { - "id": "minecraft:netherite_leggings", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_netherite_nautilus_armor.json b/src/main/resources/data/strangeitems/recipe/collectors_netherite_nautilus_armor.json deleted file mode 100644 index 164573a..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_netherite_nautilus_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:netherite_nautilus_armor", - "addition": "minecraft:netherite_nautilus_armor", - "result": { - "id": "minecraft:netherite_nautilus_armor", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_netherite_pickaxe.json b/src/main/resources/data/strangeitems/recipe/collectors_netherite_pickaxe.json deleted file mode 100644 index b769f04..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_netherite_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:netherite_pickaxe", - "addition": "minecraft:netherite_pickaxe", - "result": { - "id": "minecraft:netherite_pickaxe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_netherite_shovel.json b/src/main/resources/data/strangeitems/recipe/collectors_netherite_shovel.json deleted file mode 100644 index 63a1e5c..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_netherite_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:netherite_shovel", - "addition": "minecraft:netherite_shovel", - "result": { - "id": "minecraft:netherite_shovel", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_netherite_spear.json b/src/main/resources/data/strangeitems/recipe/collectors_netherite_spear.json deleted file mode 100644 index ae8bd54..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_netherite_spear.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:netherite_spear", - "addition": "minecraft:netherite_spear", - "result": { - "id": "minecraft:netherite_spear", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_netherite_sword.json b/src/main/resources/data/strangeitems/recipe/collectors_netherite_sword.json deleted file mode 100644 index f8fad3a..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_netherite_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:netherite_sword", - "addition": "minecraft:netherite_sword", - "result": { - "id": "minecraft:netherite_sword", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_orange_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_orange_bundle.json deleted file mode 100644 index 44378b3..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_orange_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:orange_bundle", - "addition": "minecraft:orange_bundle", - "result": { - "id": "minecraft:orange_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_pink_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_pink_bundle.json deleted file mode 100644 index 3a21ccd..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_pink_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:pink_bundle", - "addition": "minecraft:pink_bundle", - "result": { - "id": "minecraft:pink_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_purple_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_purple_bundle.json deleted file mode 100644 index 181a541..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_purple_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:purple_bundle", - "addition": "minecraft:purple_bundle", - "result": { - "id": "minecraft:purple_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_recovery_compass.json b/src/main/resources/data/strangeitems/recipe/collectors_recovery_compass.json deleted file mode 100644 index e28976d..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_recovery_compass.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:recovery_compass", - "addition": "minecraft:recovery_compass", - "result": { - "id": "minecraft:recovery_compass", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_red_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_red_bundle.json deleted file mode 100644 index fc26d33..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_red_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:red_bundle", - "addition": "minecraft:red_bundle", - "result": { - "id": "minecraft:red_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_saddle.json b/src/main/resources/data/strangeitems/recipe/collectors_saddle.json deleted file mode 100644 index 8389b4f..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_saddle.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "pattern": [ - "sss", - "ses", - "sss" - ], - "key": { - "s": "minecraft:saddle", - "e": "minecraft:echo_shard" - }, - "result": { - "id": "minecraft:saddle", - "count": 1, - "components": { - "strangeitems:collectors_item": {} - } - } -} diff --git a/src/main/resources/data/strangeitems/recipe/collectors_shears.json b/src/main/resources/data/strangeitems/recipe/collectors_shears.json deleted file mode 100644 index d63327b..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_shears.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:shears", - "addition": "minecraft:shears", - "result": { - "id": "minecraft:shears", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_shield.json b/src/main/resources/data/strangeitems/recipe/collectors_shield.json deleted file mode 100644 index 2de7895..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_shield.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:shield", - "addition": "minecraft:shield", - "result": { - "id": "minecraft:shield", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_spyglass.json b/src/main/resources/data/strangeitems/recipe/collectors_spyglass.json deleted file mode 100644 index 63d7f17..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_spyglass.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:spyglass", - "addition": "minecraft:spyglass", - "result": { - "id": "minecraft:spyglass", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_stone_axe.json b/src/main/resources/data/strangeitems/recipe/collectors_stone_axe.json deleted file mode 100644 index 0310d39..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_stone_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:stone_axe", - "addition": "minecraft:stone_axe", - "result": { - "id": "minecraft:stone_axe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_stone_hoe.json b/src/main/resources/data/strangeitems/recipe/collectors_stone_hoe.json deleted file mode 100644 index ea67172..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_stone_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:stone_hoe", - "addition": "minecraft:stone_hoe", - "result": { - "id": "minecraft:stone_hoe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_stone_pickaxe.json b/src/main/resources/data/strangeitems/recipe/collectors_stone_pickaxe.json deleted file mode 100644 index 91c4aa6..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_stone_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:stone_pickaxe", - "addition": "minecraft:stone_pickaxe", - "result": { - "id": "minecraft:stone_pickaxe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_stone_shovel.json b/src/main/resources/data/strangeitems/recipe/collectors_stone_shovel.json deleted file mode 100644 index a4a9d19..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_stone_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:stone_shovel", - "addition": "minecraft:stone_shovel", - "result": { - "id": "minecraft:stone_shovel", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_stone_spear.json b/src/main/resources/data/strangeitems/recipe/collectors_stone_spear.json deleted file mode 100644 index cbbd24c..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_stone_spear.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:stone_spear", - "addition": "minecraft:stone_spear", - "result": { - "id": "minecraft:stone_spear", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_stone_sword.json b/src/main/resources/data/strangeitems/recipe/collectors_stone_sword.json deleted file mode 100644 index dbfcac9..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_stone_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:stone_sword", - "addition": "minecraft:stone_sword", - "result": { - "id": "minecraft:stone_sword", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_totem_of_undying.json b/src/main/resources/data/strangeitems/recipe/collectors_totem_of_undying.json deleted file mode 100644 index 128dd25..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_totem_of_undying.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:totem_of_undying", - "addition": "minecraft:totem_of_undying", - "result": { - "id": "minecraft:totem_of_undying", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_trident.json b/src/main/resources/data/strangeitems/recipe/collectors_trident.json deleted file mode 100644 index b56676e..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_trident.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:trident", - "addition": "minecraft:trident", - "result": { - "id": "minecraft:trident", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_turtle_helmet.json b/src/main/resources/data/strangeitems/recipe/collectors_turtle_helmet.json deleted file mode 100644 index a8f800c..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_turtle_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:turtle_helmet", - "addition": "minecraft:turtle_helmet", - "result": { - "id": "minecraft:turtle_helmet", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_warped_fungus_on_a_stick.json b/src/main/resources/data/strangeitems/recipe/collectors_warped_fungus_on_a_stick.json deleted file mode 100644 index b69cd15..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_warped_fungus_on_a_stick.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:warped_fungus_on_a_stick", - "addition": "minecraft:warped_fungus_on_a_stick", - "result": { - "id": "minecraft:warped_fungus_on_a_stick", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_white_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_white_bundle.json deleted file mode 100644 index 2569aa9..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_white_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:white_bundle", - "addition": "minecraft:white_bundle", - "result": { - "id": "minecraft:white_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_wolf_armor.json b/src/main/resources/data/strangeitems/recipe/collectors_wolf_armor.json deleted file mode 100644 index f123c0c..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_wolf_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:wolf_armor", - "addition": "minecraft:wolf_armor", - "result": { - "id": "minecraft:wolf_armor", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_wooden_axe.json b/src/main/resources/data/strangeitems/recipe/collectors_wooden_axe.json deleted file mode 100644 index eac021a..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_wooden_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:wooden_axe", - "addition": "minecraft:wooden_axe", - "result": { - "id": "minecraft:wooden_axe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_wooden_hoe.json b/src/main/resources/data/strangeitems/recipe/collectors_wooden_hoe.json deleted file mode 100644 index 6beff57..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_wooden_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:wooden_hoe", - "addition": "minecraft:wooden_hoe", - "result": { - "id": "minecraft:wooden_hoe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_wooden_pickaxe.json b/src/main/resources/data/strangeitems/recipe/collectors_wooden_pickaxe.json deleted file mode 100644 index c23f7a3..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_wooden_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:wooden_pickaxe", - "addition": "minecraft:wooden_pickaxe", - "result": { - "id": "minecraft:wooden_pickaxe", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_wooden_shovel.json b/src/main/resources/data/strangeitems/recipe/collectors_wooden_shovel.json deleted file mode 100644 index 41b7de7..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_wooden_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:wooden_shovel", - "addition": "minecraft:wooden_shovel", - "result": { - "id": "minecraft:wooden_shovel", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_wooden_spear.json b/src/main/resources/data/strangeitems/recipe/collectors_wooden_spear.json deleted file mode 100644 index aedc076..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_wooden_spear.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:wooden_spear", - "addition": "minecraft:wooden_spear", - "result": { - "id": "minecraft:wooden_spear", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_wooden_sword.json b/src/main/resources/data/strangeitems/recipe/collectors_wooden_sword.json deleted file mode 100644 index 102bb7b..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_wooden_sword.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:wooden_sword", - "addition": "minecraft:wooden_sword", - "result": { - "id": "minecraft:wooden_sword", - "components": {} - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/recipe/collectors_yellow_bundle.json b/src/main/resources/data/strangeitems/recipe/collectors_yellow_bundle.json deleted file mode 100644 index 793dd80..0000000 --- a/src/main/resources/data/strangeitems/recipe/collectors_yellow_bundle.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "smithing_transform", - "template": "minecraft:echo_shard", - "base": "minecraft:yellow_bundle", - "addition": "minecraft:yellow_bundle", - "result": { - "id": "minecraft:yellow_bundle", - "components": { - "strangeitems:collectors_item": {} - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/strangeitems/tags/item/can_make_collectors_item.json b/src/main/resources/data/strangeitems/tags/item/can_make_collectors_item.json new file mode 100644 index 0000000..ae9cbd0 --- /dev/null +++ b/src/main/resources/data/strangeitems/tags/item/can_make_collectors_item.json @@ -0,0 +1,22 @@ +{ + "values":[ + "#strangeitems:can_track_stats", + "#minecraft:bundles", + "#minecraft:compasses", + "#minecraft:harnesses", + "#c:music_discs", + "#c:armors/horse", + "#c:armors/nautilus", + "#c:armors/wolf", + "#c:nether_stars", + "minecraft:carrot_on_a_stick", + "minecraft:warped_fungus_on_a_stick", + "minecraft:saddle", + "minecraft:spyglass", + "minecraft:shield", + "minecraft:heavy_core", + "minecraft:goat_horn", + "minecraft:totem_of_undying", + "minecraft:writable_book" + ] +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 15f3b40..fa2d183 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -18,18 +18,18 @@ "icon": "assets/strangeitems/icon.png", "environment": "*", "entrypoints": { - "main": ["embin.strangeitems.StrangeItems"], - "client": ["embin.strangeitems.client.StrangeItemsClient"], - "modmenu": ["embin.strangeitems.ModMenuIntegration"] + "main": ["embinmc.mod.strangeitems.StrangeItems"], + "client": ["embinmc.mod.strangeitems.client.StrangeItemsClient"], + "modmenu": ["embinmc.mod.strangeitems.ModMenuIntegration"] }, "accessWidener": "strangeitems.accesswidener", "mixins": [ "strangeitems.mixins.json" ], "depends": { - "fabricloader": ">=0.17.2", - "minecraft": ">=1.21.11-rc.1", - "java": ">=21", + "fabricloader": ">=0.18.4", + "minecraft": ">=26.1-alpha.10", + "java": ">=25", "fabric-registry-sync-v0": "*" }, "suggests": { diff --git a/src/main/resources/strangeitems.accesswidener b/src/main/resources/strangeitems.accesswidener index 28b3cc9..b32d84a 100644 --- a/src/main/resources/strangeitems.accesswidener +++ b/src/main/resources/strangeitems.accesswidener @@ -1,4 +1,4 @@ -accessWidener v2 named +accessWidener v2 official accessible field net/minecraft/registry/SimpleRegistry frozen Z accessible field net/minecraft/registry/Registries ROOT Lnet/minecraft/registry/MutableRegistry; \ No newline at end of file diff --git a/src/main/resources/strangeitems.mixins.json b/src/main/resources/strangeitems.mixins.json index b075de5..c411f6f 100644 --- a/src/main/resources/strangeitems.mixins.json +++ b/src/main/resources/strangeitems.mixins.json @@ -1,22 +1,20 @@ { "required": true, - "package": "embin.strangeitems.mixin", - "compatibilityLevel": "JAVA_21", + "package": "embinmc.mod.strangeitems.mixin", + "compatibilityLevel": "JAVA_25", "mixins": [ "AbstractArrowMixin", "ArmadilloMixin", "AxeMixin", "BowMixin", "BrushMixin", - "CollectorsMixin", "CrossbowItemMixin", - "EnchantmentMixin", "EquippableComponentMixin", - "ExampleMixin", "FishingBobberMixin", "FishingRodMixin", "FlintAndSteelMixin", "HoeMixin", + "ItemEnchantmentsMixin", "ItemMixin", "LivingEntityMixin", "PlayerMixin", @@ -30,6 +28,8 @@ "defaultRequire": 1 }, "client": [ - "KeyBindAccessor" + "KeyBindAccessor", + "SmithingScreenMixin", + "CollectorsMixin" ] } \ No newline at end of file