diff --git a/build.gradle b/build.gradle index 7c97a86..4f96ace 100644 --- a/build.gradle +++ b/build.gradle @@ -1,33 +1,36 @@ -buildscript { - repositories { - maven { url = 'https://maven.minecraftforge.net' } - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - } -} plugins { id 'eclipse' + id 'idea' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' } -apply plugin: 'net.minecraftforge.gradle' import net.minecraftforge.gradle.common.tasks.SignJar version = "${mc_version}-${mod_version}" -group = 'jackyy.exchangers' -archivesBaseName = "${mod_name}" +group = "jackyy.${mod_id}" +base { + archivesName = jar_name +} java.toolchain.languageVersion = JavaLanguageVersion.of(17) println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" minecraft { - mappings channel: "${mappings_channel}", version: "${mappings_version}" + mappings channel: mappings_channel, version: mappings_version + copyIdeResources = true runs { - client { + configureEach { workingDirectory project.file('run') property 'forge.logging.markers', 'REGISTRIES' property 'forge.logging.console.level', 'debug' + mods { + "${mod_id}" { + source sourceSets.main + } + } + } + client { + property 'forge.enabledGameTestNamespaces', mod_id if (project.hasProperty('mcUUID')) { args '--uuid', project.getProperty('mcUUID') } @@ -37,45 +40,17 @@ minecraft { if (project.hasProperty('mcAccessToken')) { args '--accessToken', project.getProperty('mcAccessToken') } - property 'forge.enabledGameTestNamespaces', 'exchangers' - mods { - exchangers { - source sourceSets.main - } - } } server { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - property 'forge.enabledGameTestNamespaces', 'exchangers' - mods { - exchangers { - source sourceSets.main - } - } + property 'forge.enabledGameTestNamespaces', mod_id + args '--nogui' } gameTestServer { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - property 'forge.enabledGameTestNamespaces', 'exchangers' - mods { - exchangers { - source sourceSets.main - } - } + property 'forge.enabledGameTestNamespaces', mod_id } data { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - args '--mod', 'exchangers', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') - mods { - exchangers { - source sourceSets.main - } - } + workingDirectory project.file('run-data') + args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') } } } @@ -120,15 +95,31 @@ dependencies { //runtimeOnly fg.deobf("curse.maven:thermal_expansion-69163:") } +tasks.named('processResources', ProcessResources).configure { + var replaceProperties = [ + mc_version: mc_version, mc_version_range: mc_version_range, + forge_version: forge_version, forge_version_range: forge_version_range, + loader_version_range: loader_version_range, + mod_id: mod_id, mod_name: mod_name, jar_name: jar_name, + mod_license: mod_license, mod_version: mod_version, + mod_authors: mod_authors, mod_description: mod_description + ] + inputs.properties replaceProperties + + filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { + expand replaceProperties + [project: project] + } +} + jar { manifest { attributes([ - "Specification-Title": "${mod_name}", - "Specification-Version": "${project.mc_version}-${project.mod_version}", - "Specification-Vendor": "Jackyy", - "Implementation-Title": "${mod_name}", - "Implementation-Version": "${project.mc_version}-${project.mod_version}", - "Implementation-Vendor" :"Jackyy", + "Specification-Title": jar_name, + "Specification-Version": "${mc_version}-${mod_version}", + "Specification-Vendor": mod_authors, + "Implementation-Title": jar_name, + "Implementation-Version": "${mc_version}-${mod_version}", + "Implementation-Vendor": mod_authors, "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } @@ -138,27 +129,27 @@ tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' } -jar.finalizedBy('reobfJar') - task signJar(type: SignJar, dependsOn: jar) { keyStore = project.findProperty('keyStore') alias = project.findProperty('keyStoreAlias') storePass = project.findProperty('keyStorePass') keyPass = project.findProperty('keyStoreKeyPass') - inputFile = jar.archivePath - outputFile = jar.archivePath + inputFile = jar.archiveFile + outputFile = jar.archiveFile } build.dependsOn signJar +jar.finalizedBy('reobfJar') + task sourcesJar(type: Jar) { from sourceSets.main.allSource - classifier = 'sources' + archiveClassifier.set("sources") } task deobfJar(type: Jar) { from sourceSets.main.output - classifier = 'deobf' + archiveClassifier.set("deobf") } artifacts { diff --git a/gradle.properties b/gradle.properties index f9ba925..e03b2d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,20 @@ org.gradle.jvmargs=-Xmx4G + +mod_id=exchangers +jar_name=Exchangers mod_name=Exchangers + mc_version=1.19.4 -forge_version=45.0.64 -mod_version=3.3.2 +mc_version_range=[1.19.4,1.20) + +forge_version=45.1.14 +forge_version_range=[45,) +loader_version_range=[45,) + mappings_channel=official mappings_version=1.19.4 + +mod_version=3.4 +mod_license=Jacky's Minecraft Mods License +mod_authors=Jackyy, TurkeyDev +mod_description=Block Exchangers. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..943f0cb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..65dcd68 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..b291e98 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,13 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' +} diff --git a/src/main/java/jackyy/exchangers/Exchangers.java b/src/main/java/jackyy/exchangers/Exchangers.java index 27b0b05..95a979a 100644 --- a/src/main/java/jackyy/exchangers/Exchangers.java +++ b/src/main/java/jackyy/exchangers/Exchangers.java @@ -27,12 +27,6 @@ public Exchangers() { } private void commonSetup(final FMLCommonSetupEvent event) { - /* - TODO add Better With Mods integration back when possible - if (ModList.get().isLoaded(Reference.BWM)) { - MinecraftForge.EVENT_BUS.register(new BetterWithModsIntegration()); - } - */ MinecraftForge.EVENT_BUS.register(new CommonEventsHandler()); NetworkHandler.registerMessages(); } diff --git a/src/main/java/jackyy/exchangers/handler/ClientEventsHandler.java b/src/main/java/jackyy/exchangers/handler/ClientEventsHandler.java index 6430835..1e0daf8 100644 --- a/src/main/java/jackyy/exchangers/handler/ClientEventsHandler.java +++ b/src/main/java/jackyy/exchangers/handler/ClientEventsHandler.java @@ -22,6 +22,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; @@ -75,7 +76,7 @@ public void renderLevelStageEvent(RenderLevelStageEvent event) { BlockPos pos = mouseOverBlock.getBlockPos(); BlockState state = world.getBlockState(pos); ItemStack stack = player.getMainHandItem(); - if (!stack.isEmpty() && stack.getItem() instanceof ItemExchangerBase && stack.getTag() != null && !state.isAir()) { + if (!stack.isEmpty() && stack.getItem() instanceof ItemExchangerBase && stack.getTag() != null && !state.isAir() && !(state.getBlock() instanceof LiquidBlock)) { BlockState exState = NbtUtils.readBlockState(world.holderLookup(Registries.BLOCK), NBTHelper.getTag(stack).getCompound("blockstate")); float blockHardness = state.getDestroySpeed(world, pos); if (exState == state) { diff --git a/src/main/java/jackyy/exchangers/integration/BetterWithModsIntegration.java b/src/main/java/jackyy/exchangers/integration/BetterWithModsIntegration.java deleted file mode 100644 index 2fd15da..0000000 --- a/src/main/java/jackyy/exchangers/integration/BetterWithModsIntegration.java +++ /dev/null @@ -1,41 +0,0 @@ -package jackyy.exchangers.integration; - -/* -import betterwithmods.module.hardcore.world.strata.HCStrata; -import jackyy.exchangers.util.IExchanger; -import jackyy.exchangers.util.Reference; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -*/ - -public class BetterWithModsIntegration { - - /* - @SubscribeEvent @Deprecated - public void onPlace(BlockEvent.EntityPlaceEvent event) { - if (!(event.getEntity() instanceof PlayerEntity)) - return; - World world = event.getEntity().world; - BlockPos pos = event.getPos(); - BlockState state = event.getState(); - if (HCStrata.shouldStratify(world, state)) { - ItemStack stack = ((PlayerEntity) event.getEntity()).getHeldItemMainhand(); - int strata = HCStrata.getStratification(world, pos, world.getDimensionKey()).ordinal(); - if (stack.getItem() instanceof IExchanger && HCStrata.STATES.containsKey(event.getState())) { - int level = Math.max(1, ((IExchanger) stack.getItem()).getHarvestLevel()); - if (level <= strata) { - event.setCanceled(true); - ((PlayerEntity) event.getEntity()).sendStatusMessage(new TranslationTextComponent(Reference.MODID + "." + "error.event_cancelled_bwm"), false); - } - } - } - } - */ - -} diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemConductiveIronExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemConductiveIronExchanger.java deleted file mode 100644 index 25b6a46..0000000 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemConductiveIronExchanger.java +++ /dev/null @@ -1,50 +0,0 @@ -package jackyy.exchangers.item.enderio; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraftforge.fml.ModList; - -public class ItemConductiveIronExchanger extends ItemExchangerBasePowered { - - public ItemConductiveIronExchanger() { - super(new Properties().rarity(Reference.RARITY_TIER1)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.conductiveMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.conductivePerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.conductiveMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.conductiveMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.conductiveMaxRange.get(); - } - - @Override - public int getTier() { - return 1; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOModule.get() && ModList.get().isLoaded(Reference.EIO); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemDarkSteelExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemDarkSteelExchanger.java deleted file mode 100644 index 7070ec2..0000000 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemDarkSteelExchanger.java +++ /dev/null @@ -1,51 +0,0 @@ -package jackyy.exchangers.item.enderio; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemDarkSteelExchanger extends ItemExchangerBasePowered { - - public ItemDarkSteelExchanger() { - super(new Properties().rarity(Rarity.EPIC)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.darkSteelMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.darkSteelPerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.darkSteelMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.darkSteelMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.darkSteelMaxRange.get(); - } - - @Override - public int getTier() { - return 5; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOModule.get() && ModList.get().isLoaded(Reference.EIO); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT1.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT1.java deleted file mode 100644 index d8d441d..0000000 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT1.java +++ /dev/null @@ -1,19 +0,0 @@ -package jackyy.exchangers.item.enderio; - -import jackyy.exchangers.item.ItemCoreBase; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.Reference; -import net.minecraftforge.fml.ModList; - -public class ItemEIOExchangerCoreT1 extends ItemCoreBase { - - public ItemEIOExchangerCoreT1() { - super(new Properties().rarity(Reference.RARITY_TIER1)); - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOModule.get() && ModList.get().isLoaded(Reference.EIO); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT2.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT2.java deleted file mode 100644 index 3987fbc..0000000 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT2.java +++ /dev/null @@ -1,20 +0,0 @@ -package jackyy.exchangers.item.enderio; - -import jackyy.exchangers.item.ItemCoreBase; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemEIOExchangerCoreT2 extends ItemCoreBase { - - public ItemEIOExchangerCoreT2() { - super(new Properties().rarity(Rarity.RARE)); - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOModule.get() && ModList.get().isLoaded(Reference.EIO); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT3.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT3.java deleted file mode 100644 index dc0ee74..0000000 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemEIOExchangerCoreT3.java +++ /dev/null @@ -1,20 +0,0 @@ -package jackyy.exchangers.item.enderio; - -import jackyy.exchangers.item.ItemCoreBase; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemEIOExchangerCoreT3 extends ItemCoreBase { - - public ItemEIOExchangerCoreT3() { - super(new Properties().rarity(Rarity.EPIC)); - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOModule.get() && ModList.get().isLoaded(Reference.EIO); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemElectricalSteelExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemElectricalSteelExchanger.java deleted file mode 100644 index bbce087..0000000 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemElectricalSteelExchanger.java +++ /dev/null @@ -1,51 +0,0 @@ -package jackyy.exchangers.item.enderio; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemElectricalSteelExchanger extends ItemExchangerBasePowered { - - public ItemElectricalSteelExchanger() { - super(new Properties().rarity(Rarity.RARE)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.electricalSteelMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.electricalSteelPerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.electricalSteelMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.electricalSteelMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.electricalSteelMaxRange.get(); - } - - @Override - public int getTier() { - return 3; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOModule.get() && ModList.get().isLoaded(Reference.EIO); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEndSteelExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEndSteelExchanger.java deleted file mode 100644 index fd4713d..0000000 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemEndSteelExchanger.java +++ /dev/null @@ -1,51 +0,0 @@ -package jackyy.exchangers.item.enderio; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemEndSteelExchanger extends ItemExchangerBasePowered { - - public ItemEndSteelExchanger() { - super(new Properties().rarity(Rarity.EPIC)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.endSteelMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.endSteelPerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.endSteelMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.endSteelMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.endSteelMaxRange.get(); - } - - @Override - public int getTier() { - return 7; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOModule.get() && ModList.get().isLoaded(Reference.EIO); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemEnergeticExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemEnergeticExchanger.java deleted file mode 100644 index c1096c5..0000000 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemEnergeticExchanger.java +++ /dev/null @@ -1,51 +0,0 @@ -package jackyy.exchangers.item.enderio; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemEnergeticExchanger extends ItemExchangerBasePowered { - - public ItemEnergeticExchanger() { - super(new Properties().rarity(Rarity.RARE)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.energeticMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.energeticPerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.energeticMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.energeticMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.energeticMaxRange.get(); - } - - @Override - public int getTier() { - return 4; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOModule.get() && ModList.get().isLoaded(Reference.EIO); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemPulsatingIronExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemPulsatingIronExchanger.java deleted file mode 100644 index f4389b1..0000000 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemPulsatingIronExchanger.java +++ /dev/null @@ -1,50 +0,0 @@ -package jackyy.exchangers.item.enderio; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraftforge.fml.ModList; - -public class ItemPulsatingIronExchanger extends ItemExchangerBasePowered { - - public ItemPulsatingIronExchanger() { - super(new Properties().rarity(Reference.RARITY_TIER1)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.pulsatingMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.pulsatingPerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.pulsatingMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.pulsatingMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.pulsatingMaxRange.get(); - } - - @Override - public int getTier() { - return 2; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOModule.get() && ModList.get().isLoaded(Reference.EIO); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderio/ItemVibrantExchanger.java b/src/main/java/jackyy/exchangers/item/enderio/ItemVibrantExchanger.java deleted file mode 100644 index 5ed1a20..0000000 --- a/src/main/java/jackyy/exchangers/item/enderio/ItemVibrantExchanger.java +++ /dev/null @@ -1,51 +0,0 @@ -package jackyy.exchangers.item.enderio; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemVibrantExchanger extends ItemExchangerBasePowered { - - public ItemVibrantExchanger() { - super(new Properties().rarity(Rarity.EPIC)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.vibrantMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.vibrantPerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.vibrantMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.vibrantMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.vibrantMaxRange.get(); - } - - @Override - public int getTier() { - return 6; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOModule.get() && ModList.get().isLoaded(Reference.EIO); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemCrudeSteelExchanger.java b/src/main/java/jackyy/exchangers/item/enderioendergy/ItemCrudeSteelExchanger.java deleted file mode 100644 index f2a7fb4..0000000 --- a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemCrudeSteelExchanger.java +++ /dev/null @@ -1,50 +0,0 @@ -package jackyy.exchangers.item.enderioendergy; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraftforge.fml.ModList; - -public class ItemCrudeSteelExchanger extends ItemExchangerBasePowered { - - public ItemCrudeSteelExchanger() { - super(new Properties().rarity(Reference.RARITY_TIER1)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.crudeSteelMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.crudeSteelPerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.crudeSteelMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.crudeSteelMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.crudeSteelMaxRange.get(); - } - - @Override - public int getTier() { - return 1; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOEndergyModule.get() && ModList.get().isLoaded(Reference.EIO_ENDERGY); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemCrystallineExchanger.java b/src/main/java/jackyy/exchangers/item/enderioendergy/ItemCrystallineExchanger.java deleted file mode 100644 index 4ed8afa..0000000 --- a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemCrystallineExchanger.java +++ /dev/null @@ -1,51 +0,0 @@ -package jackyy.exchangers.item.enderioendergy; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemCrystallineExchanger extends ItemExchangerBasePowered { - - public ItemCrystallineExchanger() { - super(new Properties().rarity(Rarity.RARE)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.crystallineMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.crystallinePerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.crystallineMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.crystallineMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.crystallineMaxRange.get(); - } - - @Override - public int getTier() { - return 4; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOEndergyModule.get() && ModList.get().isLoaded(Reference.EIO_ENDERGY); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemEIOEndergyExchangerCoreT1.java b/src/main/java/jackyy/exchangers/item/enderioendergy/ItemEIOEndergyExchangerCoreT1.java deleted file mode 100644 index 91c4d3e..0000000 --- a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemEIOEndergyExchangerCoreT1.java +++ /dev/null @@ -1,19 +0,0 @@ -package jackyy.exchangers.item.enderioendergy; - -import jackyy.exchangers.item.ItemCoreBase; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.Reference; -import net.minecraftforge.fml.ModList; - -public class ItemEIOEndergyExchangerCoreT1 extends ItemCoreBase { - - public ItemEIOEndergyExchangerCoreT1() { - super(new Properties().rarity(Reference.RARITY_TIER1)); - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOEndergyModule.get() && ModList.get().isLoaded(Reference.EIO_ENDERGY); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemEIOEndergyExchangerCoreT2.java b/src/main/java/jackyy/exchangers/item/enderioendergy/ItemEIOEndergyExchangerCoreT2.java deleted file mode 100644 index 5c91d02..0000000 --- a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemEIOEndergyExchangerCoreT2.java +++ /dev/null @@ -1,20 +0,0 @@ -package jackyy.exchangers.item.enderioendergy; - -import jackyy.exchangers.item.ItemCoreBase; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemEIOEndergyExchangerCoreT2 extends ItemCoreBase { - - public ItemEIOEndergyExchangerCoreT2() { - super(new Properties().rarity(Rarity.RARE)); - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOEndergyModule.get() && ModList.get().isLoaded(Reference.EIO_ENDERGY); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemEIOEndergyExchangerCoreT3.java b/src/main/java/jackyy/exchangers/item/enderioendergy/ItemEIOEndergyExchangerCoreT3.java deleted file mode 100644 index ac09198..0000000 --- a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemEIOEndergyExchangerCoreT3.java +++ /dev/null @@ -1,20 +0,0 @@ -package jackyy.exchangers.item.enderioendergy; - -import jackyy.exchangers.item.ItemCoreBase; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemEIOEndergyExchangerCoreT3 extends ItemCoreBase { - - public ItemEIOEndergyExchangerCoreT3() { - super(new Properties().rarity(Rarity.EPIC)); - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOEndergyModule.get() && ModList.get().isLoaded(Reference.EIO_ENDERGY); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemEnergeticSilverExchanger.java b/src/main/java/jackyy/exchangers/item/enderioendergy/ItemEnergeticSilverExchanger.java deleted file mode 100644 index a144ec8..0000000 --- a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemEnergeticSilverExchanger.java +++ /dev/null @@ -1,50 +0,0 @@ -package jackyy.exchangers.item.enderioendergy; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraftforge.fml.ModList; - -public class ItemEnergeticSilverExchanger extends ItemExchangerBasePowered { - - public ItemEnergeticSilverExchanger() { - super(new Properties().rarity(Reference.RARITY_TIER1)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.energeticSilverMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.energeticSilverPerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.energeticSilverMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.energeticSilverMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.energeticSilverMaxRange.get(); - } - - @Override - public int getTier() { - return 2; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOEndergyModule.get() && ModList.get().isLoaded(Reference.EIO_ENDERGY); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemMelodicExchanger.java b/src/main/java/jackyy/exchangers/item/enderioendergy/ItemMelodicExchanger.java deleted file mode 100644 index 78a0c18..0000000 --- a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemMelodicExchanger.java +++ /dev/null @@ -1,51 +0,0 @@ -package jackyy.exchangers.item.enderioendergy; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemMelodicExchanger extends ItemExchangerBasePowered { - - public ItemMelodicExchanger() { - super(new Properties().rarity(Rarity.EPIC)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.melodicMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.melodicPerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.melodicMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.melodicMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.melodicMaxRange.get(); - } - - @Override - public int getTier() { - return 5; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOEndergyModule.get() && ModList.get().isLoaded(Reference.EIO_ENDERGY); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemStellarExchanger.java b/src/main/java/jackyy/exchangers/item/enderioendergy/ItemStellarExchanger.java deleted file mode 100644 index cd22f48..0000000 --- a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemStellarExchanger.java +++ /dev/null @@ -1,51 +0,0 @@ -package jackyy.exchangers.item.enderioendergy; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemStellarExchanger extends ItemExchangerBasePowered { - - public ItemStellarExchanger() { - super(new Properties().rarity(Rarity.EPIC)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.stellarMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.stellarPerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.stellarMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.stellarMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.stellarMaxRange.get(); - } - - @Override - public int getTier() { - return 6; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOEndergyModule.get() && ModList.get().isLoaded(Reference.EIO_ENDERGY); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemVividExchanger.java b/src/main/java/jackyy/exchangers/item/enderioendergy/ItemVividExchanger.java deleted file mode 100644 index fb48469..0000000 --- a/src/main/java/jackyy/exchangers/item/enderioendergy/ItemVividExchanger.java +++ /dev/null @@ -1,51 +0,0 @@ -package jackyy.exchangers.item.enderioendergy; - -import jackyy.exchangers.item.ItemExchangerBasePowered; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.DefaultValues; -import jackyy.exchangers.util.Reference; -import net.minecraft.world.item.Rarity; -import net.minecraftforge.fml.ModList; - -public class ItemVividExchanger extends ItemExchangerBasePowered { - - public ItemVividExchanger() { - super(new Properties().rarity(Rarity.RARE)); - } - - @Override - public int getMaxEnergy() { - return ModConfigs.CONFIG.vividMaxEnergy.get(); - } - - @Override - public int getPerBlockUse() { - return ModConfigs.CONFIG.vividPerBlockUse.get(); - } - - @Override - public String getHarvestLevel() { - return ModConfigs.CONFIG.vividMaxHarvestLevel.get(); - } - - @Override - public String getDefaultHarvestLevel() { - return DefaultValues.vividMaxHarvestLevel; - } - - @Override - public int getMaxRange() { - return ModConfigs.CONFIG.vividMaxRange.get(); - } - - @Override - public int getTier() { - return 3; - } - - @Override - public boolean checkLoaded() { - return ModConfigs.CONFIG.enderIOEndergyModule.get() && ModList.get().isLoaded(Reference.EIO_ENDERGY); - } - -} diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemAmethystExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemAmethystExchanger.java new file mode 100644 index 0000000..46987f1 --- /dev/null +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemAmethystExchanger.java @@ -0,0 +1,46 @@ +package jackyy.exchangers.item.vanilla; + +import jackyy.exchangers.item.ItemExchangerBase; +import jackyy.exchangers.registry.ModConfigs; +import jackyy.exchangers.util.DefaultValues; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraftforge.common.Tags; + +public class ItemAmethystExchanger extends ItemExchangerBase { + + public ItemAmethystExchanger() { + super(new Properties().durability(DefaultValues.amethystMaxDmg).rarity(Rarity.EPIC)); + } + + @Override + public String getHarvestLevel() { + return ModConfigs.CONFIG.amethystMaxHarvestLevel.get(); + } + + @Override + public String getDefaultHarvestLevel() { + return DefaultValues.amethystMaxHarvestLevel; + } + + @Override + public int getMaxRange() { + return ModConfigs.CONFIG.amethystMaxRange.get(); + } + + @Override + public int getTier() { + return 7; + } + + @Override + public boolean checkLoaded() { + return ModConfigs.CONFIG.vanillaModule.get(); + } + + @Override + public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { + return repair.is(Tags.Items.GEMS_AMETHYST); + } + +} diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemCopperExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemCopperExchanger.java new file mode 100644 index 0000000..0fef180 --- /dev/null +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemCopperExchanger.java @@ -0,0 +1,46 @@ +package jackyy.exchangers.item.vanilla; + +import jackyy.exchangers.item.ItemExchangerBase; +import jackyy.exchangers.registry.ModConfigs; +import jackyy.exchangers.util.DefaultValues; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraftforge.common.Tags; + +public class ItemCopperExchanger extends ItemExchangerBase { + + public ItemCopperExchanger() { + super(new Properties().durability(DefaultValues.copperMaxDmg).rarity(Rarity.RARE)); + } + + @Override + public String getHarvestLevel() { + return ModConfigs.CONFIG.copperMaxHarvestLevel.get(); + } + + @Override + public String getDefaultHarvestLevel() { + return DefaultValues.copperMaxHarvestLevel; + } + + @Override + public int getMaxRange() { + return ModConfigs.CONFIG.copperMaxRange.get(); + } + + @Override + public int getTier() { + return 3; + } + + @Override + public boolean checkLoaded() { + return ModConfigs.CONFIG.vanillaModule.get(); + } + + @Override + public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { + return repair.is(Tags.Items.INGOTS_COPPER); + } + +} diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemDiamondExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemDiamondExchanger.java index 0cc1cde..5e84dcc 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemDiamondExchanger.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemDiamondExchanger.java @@ -30,7 +30,7 @@ public int getMaxRange() { @Override public int getTier() { - return 5; + return 4; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemEmeraldExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemEmeraldExchanger.java index b5ab982..6fece38 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemEmeraldExchanger.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemEmeraldExchanger.java @@ -30,7 +30,7 @@ public int getMaxRange() { @Override public int getTier() { - return 6; + return 5; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemEndExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemEndExchanger.java index 0ac7b15..34e84b2 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemEndExchanger.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemEndExchanger.java @@ -31,7 +31,7 @@ public int getMaxRange() { @Override public int getTier() { - return 8; + return 9; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemIronExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemIronExchanger.java index 2ba5d1f..ef4a927 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemIronExchanger.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemIronExchanger.java @@ -30,7 +30,7 @@ public int getMaxRange() { @Override public int getTier() { - return 4; + return 3; } @Override diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemNetheriteExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemNetheriteExchanger.java new file mode 100644 index 0000000..43dbefe --- /dev/null +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemNetheriteExchanger.java @@ -0,0 +1,46 @@ +package jackyy.exchangers.item.vanilla; + +import jackyy.exchangers.item.ItemExchangerBase; +import jackyy.exchangers.registry.ModConfigs; +import jackyy.exchangers.util.DefaultValues; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraftforge.common.Tags; + +public class ItemNetheriteExchanger extends ItemExchangerBase { + + public ItemNetheriteExchanger() { + super(new Properties().durability(DefaultValues.netheriteMaxDmg).rarity(Rarity.EPIC)); + } + + @Override + public String getHarvestLevel() { + return ModConfigs.CONFIG.netheriteMaxHarvestLevel.get(); + } + + @Override + public String getDefaultHarvestLevel() { + return DefaultValues.netheriteMaxHarvestLevel; + } + + @Override + public int getMaxRange() { + return ModConfigs.CONFIG.netheriteMaxRange.get(); + } + + @Override + public int getTier() { + return 8; + } + + @Override + public boolean checkLoaded() { + return ModConfigs.CONFIG.vanillaModule.get(); + } + + @Override + public boolean isValidRepairItem(ItemStack toRepair, ItemStack repair) { + return repair.is(Tags.Items.INGOTS_NETHERITE); + } + +} diff --git a/src/main/java/jackyy/exchangers/item/vanilla/ItemObsidianExchanger.java b/src/main/java/jackyy/exchangers/item/vanilla/ItemObsidianExchanger.java index 28d0e3c..b712a30 100644 --- a/src/main/java/jackyy/exchangers/item/vanilla/ItemObsidianExchanger.java +++ b/src/main/java/jackyy/exchangers/item/vanilla/ItemObsidianExchanger.java @@ -30,7 +30,7 @@ public int getMaxRange() { @Override public int getTier() { - return 7; + return 6; } @Override diff --git a/src/main/java/jackyy/exchangers/registry/ModConfigs.java b/src/main/java/jackyy/exchangers/registry/ModConfigs.java index 998542b..a5f4fc5 100644 --- a/src/main/java/jackyy/exchangers/registry/ModConfigs.java +++ b/src/main/java/jackyy/exchangers/registry/ModConfigs.java @@ -11,8 +11,6 @@ public class ModConfigs { public static class CommonConfig { public final ForgeConfigSpec.BooleanValue vanillaModule; - public final ForgeConfigSpec.BooleanValue enderIOModule; - public final ForgeConfigSpec.BooleanValue enderIOEndergyModule; public final ForgeConfigSpec.BooleanValue thermalModule; public final ForgeConfigSpec.BooleanValue mekanismModule; public final ForgeConfigSpec.BooleanValue immersiveEngineeringModule; @@ -26,69 +24,21 @@ public static class CommonConfig { public final ForgeConfigSpec.IntValue goldenMaxRange; public final ForgeConfigSpec.ConfigValue ironMaxHarvestLevel; public final ForgeConfigSpec.IntValue ironMaxRange; + public final ForgeConfigSpec.ConfigValue copperMaxHarvestLevel; + public final ForgeConfigSpec.IntValue copperMaxRange; public final ForgeConfigSpec.ConfigValue diamondMaxHarvestLevel; public final ForgeConfigSpec.IntValue diamondMaxRange; public final ForgeConfigSpec.ConfigValue emeraldMaxHarvestLevel; public final ForgeConfigSpec.IntValue emeraldMaxRange; public final ForgeConfigSpec.ConfigValue obsidianMaxHarvestLevel; public final ForgeConfigSpec.IntValue obsidianMaxRange; + public final ForgeConfigSpec.ConfigValue amethystMaxHarvestLevel; + public final ForgeConfigSpec.IntValue amethystMaxRange; + public final ForgeConfigSpec.ConfigValue netheriteMaxHarvestLevel; + public final ForgeConfigSpec.IntValue netheriteMaxRange; public final ForgeConfigSpec.ConfigValue endMaxHarvestLevel; public final ForgeConfigSpec.IntValue endMaxRange; - public final ForgeConfigSpec.IntValue conductiveMaxEnergy; - public final ForgeConfigSpec.IntValue conductivePerBlockUse; - public final ForgeConfigSpec.ConfigValue conductiveMaxHarvestLevel; - public final ForgeConfigSpec.IntValue conductiveMaxRange; - public final ForgeConfigSpec.IntValue pulsatingMaxEnergy; - public final ForgeConfigSpec.IntValue pulsatingPerBlockUse; - public final ForgeConfigSpec.ConfigValue pulsatingMaxHarvestLevel; - public final ForgeConfigSpec.IntValue pulsatingMaxRange; - public final ForgeConfigSpec.IntValue electricalSteelMaxEnergy; - public final ForgeConfigSpec.IntValue electricalSteelPerBlockUse; - public final ForgeConfigSpec.ConfigValue electricalSteelMaxHarvestLevel; - public final ForgeConfigSpec.IntValue electricalSteelMaxRange; - public final ForgeConfigSpec.IntValue energeticMaxEnergy; - public final ForgeConfigSpec.IntValue energeticPerBlockUse; - public final ForgeConfigSpec.ConfigValue energeticMaxHarvestLevel; - public final ForgeConfigSpec.IntValue energeticMaxRange; - public final ForgeConfigSpec.IntValue darkSteelMaxEnergy; - public final ForgeConfigSpec.IntValue darkSteelPerBlockUse; - public final ForgeConfigSpec.ConfigValue darkSteelMaxHarvestLevel; - public final ForgeConfigSpec.IntValue darkSteelMaxRange; - public final ForgeConfigSpec.IntValue vibrantMaxEnergy; - public final ForgeConfigSpec.IntValue vibrantPerBlockUse; - public final ForgeConfigSpec.ConfigValue vibrantMaxHarvestLevel; - public final ForgeConfigSpec.IntValue vibrantMaxRange; - public final ForgeConfigSpec.IntValue endSteelMaxEnergy; - public final ForgeConfigSpec.IntValue endSteelPerBlockUse; - public final ForgeConfigSpec.ConfigValue endSteelMaxHarvestLevel; - public final ForgeConfigSpec.IntValue endSteelMaxRange; - - public final ForgeConfigSpec.IntValue crudeSteelMaxEnergy; - public final ForgeConfigSpec.IntValue crudeSteelPerBlockUse; - public final ForgeConfigSpec.ConfigValue crudeSteelMaxHarvestLevel; - public final ForgeConfigSpec.IntValue crudeSteelMaxRange; - public final ForgeConfigSpec.IntValue energeticSilverMaxEnergy; - public final ForgeConfigSpec.IntValue energeticSilverPerBlockUse; - public final ForgeConfigSpec.ConfigValue energeticSilverMaxHarvestLevel; - public final ForgeConfigSpec.IntValue energeticSilverMaxRange; - public final ForgeConfigSpec.IntValue vividMaxEnergy; - public final ForgeConfigSpec.IntValue vividPerBlockUse; - public final ForgeConfigSpec.ConfigValue vividMaxHarvestLevel; - public final ForgeConfigSpec.IntValue vividMaxRange; - public final ForgeConfigSpec.IntValue crystallineMaxEnergy; - public final ForgeConfigSpec.IntValue crystallinePerBlockUse; - public final ForgeConfigSpec.ConfigValue crystallineMaxHarvestLevel; - public final ForgeConfigSpec.IntValue crystallineMaxRange; - public final ForgeConfigSpec.IntValue melodicMaxEnergy; - public final ForgeConfigSpec.IntValue melodicPerBlockUse; - public final ForgeConfigSpec.ConfigValue melodicMaxHarvestLevel; - public final ForgeConfigSpec.IntValue melodicMaxRange; - public final ForgeConfigSpec.IntValue stellarMaxEnergy; - public final ForgeConfigSpec.IntValue stellarPerBlockUse; - public final ForgeConfigSpec.ConfigValue stellarMaxHarvestLevel; - public final ForgeConfigSpec.IntValue stellarMaxRange; - public final ForgeConfigSpec.IntValue leadstoneMaxEnergy; public final ForgeConfigSpec.IntValue leadstonePerBlockUse; public final ForgeConfigSpec.ConfigValue leadstoneMaxHarvestLevel; @@ -141,8 +91,6 @@ public static class CommonConfig { public final ForgeConfigSpec.IntValue hvMaxRange; public final ForgeConfigSpec.ConfigValue vanillaRecipesType; - public final ForgeConfigSpec.ConfigValue enderIORecipesType; - public final ForgeConfigSpec.ConfigValue enderIOEndergyRecipesType; public final ForgeConfigSpec.ConfigValue thermalRecipesType; public final ForgeConfigSpec.ConfigValue mekanismRecipesType; public final ForgeConfigSpec.ConfigValue immersiveEngineeringRecipesType; @@ -160,12 +108,6 @@ public static class CommonConfig { vanillaModule = builder .comment("If true, enables Vanilla-based exchangers.") .define("vanillaModule", DefaultValues.vanillaModule); - enderIOModule = builder - .comment("If true, enables Ender IO-based exchangers (Requires Ender IO to be installed).") - .define("enderIOModule", DefaultValues.enderIOModule); - enderIOEndergyModule = builder - .comment("If true, enables Ender IO Endergy-based exchangers (Requires Ender IO Endergy to be installed).") - .define("enderIOEndergyModule", DefaultValues.enderIOEndergyModule); thermalModule = builder .comment("If true, enables Thermal Series-based exchangers (Requires Thermal Foundation and Thermal Innovation to be installed).") .define("thermalModule", DefaultValues.thermalModule); @@ -229,6 +171,18 @@ public static class CommonConfig { .comment("Set the max range for Iron Exchanger") .defineInRange("ironExchangerMaxRange", DefaultValues.ironMaxRange, 0, 12); + copperMaxHarvestLevel = builder + .comment( + "Set the max harvest level for Copper Exchanger", + "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", + "For modded values, please check the tool tiers for the mod that you want to use", + "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" + ) + .define("copperExchangerMaxHarvestLevel", DefaultValues.copperMaxHarvestLevel); + copperMaxRange = builder + .comment("Set the max range for Copper Exchanger") + .defineInRange("copperExchangerMaxRange", DefaultValues.copperMaxRange, 0, 12); + diamondMaxHarvestLevel = builder .comment( "Set the max harvest level for Diamond Exchanger", @@ -265,255 +219,41 @@ public static class CommonConfig { .comment("Set the max range for Obsidian Exchanger") .defineInRange("obsidianExchangerMaxRange", DefaultValues.obsidianMaxRange, 0, 12); - endMaxHarvestLevel = builder + amethystMaxHarvestLevel = builder .comment( - "Set the max harvest level for End Exchanger", + "Set the max harvest level for Amethyst Exchanger", "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", "For modded values, please check the tool tiers for the mod that you want to use", "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" ) - .define("endExchangerMaxHarvestLevel", DefaultValues.endMaxHarvestLevel); - endMaxRange = builder - .comment("Set the max range for End Exchanger") - .defineInRange("endExchangerMaxRange", DefaultValues.endMaxRange, 0, 12); - builder.pop(); + .define("amethystExchangerMaxHarvestLevel", DefaultValues.amethystMaxHarvestLevel); + amethystMaxRange = builder + .comment("Set the max range for Amethyst Exchanger") + .defineInRange("amethystExchangerMaxRange", DefaultValues.amethystMaxRange, 0, 12); - builder.push("ender_io_tweaks"); - conductiveMaxEnergy = builder - .comment("Set the energy capacity for Conductive Iron Exchanger") - .defineInRange("conductiveIronExchangerMaxEnergy", DefaultValues.conductiveMaxEnergy, 1000, Integer.MAX_VALUE); - conductivePerBlockUse = builder - .comment("Set the energy consumption per block for Conductive Iron Exchanger") - .defineInRange("conductiveIronExchangerPerBlockUse", DefaultValues.conductivePerBlockUse, 1, Integer.MAX_VALUE); - conductiveMaxHarvestLevel = builder - .comment( - "Set the max harvest level for Conductive Iron Exchanger", - "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", - "For modded values, please check the tool tiers for the mod that you want to use", - "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" - ) - .define("conductiveIronExchangerMaxHarvestLevel", DefaultValues.conductiveMaxHarvestLevel); - conductiveMaxRange = builder - .comment("Set the max range for Conductive Iron Exchanger") - .defineInRange("conductiveIronExchangerMaxRange", DefaultValues.conductiveMaxRange, 0, 12); - - pulsatingMaxEnergy = builder - .comment("Set the energy capacity for Pulsating Iron Exchanger") - .defineInRange("pulsatingIronExchangerMaxEnergy", DefaultValues.pulsatingMaxEnergy, 1000, Integer.MAX_VALUE); - pulsatingPerBlockUse = builder - .comment("Set the energy consumption per block for Pulsating Iron Exchanger") - .defineInRange("pulsatingIronExchangerPerBlockUse", DefaultValues.pulsatingPerBlockUse, 1, Integer.MAX_VALUE); - pulsatingMaxHarvestLevel = builder - .comment( - "Set the max harvest level for Pulsating Iron Exchanger", - "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", - "For modded values, please check the tool tiers for the mod that you want to use", - "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" - ) - .define("pulsatingIronExchangerMaxHarvestLevel", DefaultValues.pulsatingMaxHarvestLevel); - pulsatingMaxRange = builder - .comment("Set the max range for Pulsating Iron Exchanger") - .defineInRange("pulsatingIronExchangerMaxRange", DefaultValues.pulsatingMaxRange, 0, 12); - - electricalSteelMaxEnergy = builder - .comment("Set the energy capacity for Electrical Steel Exchanger") - .defineInRange("electricalSteelExchangerMaxEnergy", DefaultValues.electricalSteelMaxEnergy, 1000, Integer.MAX_VALUE); - electricalSteelPerBlockUse = builder - .comment("Set the energy consumption per block for Electrical Steel Exchanger") - .defineInRange("electricalSteelExchangerPerBlockUse", DefaultValues.electricalSteelPerBlockUse, 1, Integer.MAX_VALUE); - electricalSteelMaxHarvestLevel = builder - .comment( - "Set the max harvest level for Electrical Steel Exchanger", - "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", - "For modded values, please check the tool tiers for the mod that you want to use", - "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" - ) - .define("electricalSteelExchangerMaxHarvestLevel", DefaultValues.electricalSteelMaxHarvestLevel); - electricalSteelMaxRange = builder - .comment("Set the max range for Electrical Steel Exchanger") - .defineInRange("electricalSteelExchangerMaxRange", DefaultValues.electricalSteelMaxRange, 0, 12); - - energeticMaxEnergy = builder - .comment("Set the energy capacity for Energetic Exchanger") - .defineInRange("energeticExchangerMaxEnergy", DefaultValues.energeticMaxEnergy, 1000, Integer.MAX_VALUE); - energeticPerBlockUse = builder - .comment("Set the energy consumption per block for Energetic Exchanger") - .defineInRange("energeticExchangerPerBlockUse", DefaultValues.energeticPerBlockUse, 1, Integer.MAX_VALUE); - energeticMaxHarvestLevel = builder - .comment( - "Set the max harvest level for Energetic Exchanger", - "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", - "For modded values, please check the tool tiers for the mod that you want to use", - "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" - ) - .define("energeticExchangerMaxHarvestLevel", DefaultValues.energeticMaxHarvestLevel); - energeticMaxRange = builder - .comment("Set the max range for Energetic Exchanger") - .defineInRange("energeticExchangerMaxRange", DefaultValues.energeticMaxRange, 0, 12); - - darkSteelMaxEnergy = builder - .comment("Set the energy capacity for Dark Steel Exchanger") - .defineInRange("darkSteelExchangerMaxEnergy", DefaultValues.darkSteelMaxEnergy, 1000, Integer.MAX_VALUE); - darkSteelPerBlockUse = builder - .comment("Set the energy consumption per block for Dark Steel Exchanger") - .defineInRange("darkSteelExchangerPerBlockUse", DefaultValues.darkSteelPerBlockUse, 1, Integer.MAX_VALUE); - darkSteelMaxHarvestLevel = builder - .comment( - "Set the max harvest level for Dark Steel Exchanger", - "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", - "For modded values, please check the tool tiers for the mod that you want to use", - "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" - ) - .define("darkSteelExchangerMaxHarvestLevel", DefaultValues.darkSteelMaxHarvestLevel); - darkSteelMaxRange = builder - .comment("Set the max range for Dark Steel Exchanger") - .defineInRange("darkSteelExchangerMaxRange", DefaultValues.darkSteelMaxRange, 0, 12); - - vibrantMaxEnergy = builder - .comment("Set the energy capacity for Vibrant Exchanger") - .defineInRange("vibrantExchangerMaxEnergy", DefaultValues.vibrantMaxEnergy, 1000, Integer.MAX_VALUE); - vibrantPerBlockUse = builder - .comment("Set the energy consumption per block for Vibrant Exchanger") - .defineInRange("vibrantExchangerPerBlockUse", DefaultValues.vibrantPerBlockUse, 1, Integer.MAX_VALUE); - vibrantMaxHarvestLevel = builder - .comment( - "Set the max harvest level for Vibrant Exchanger", - "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", - "For modded values, please check the tool tiers for the mod that you want to use", - "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" - ) - .define("vibrantExchangerMaxHarvestLevel", DefaultValues.vibrantMaxHarvestLevel); - vibrantMaxRange = builder - .comment("Set the max range for Vibrant Exchanger") - .defineInRange("vibrantExchangerMaxRange", DefaultValues.vibrantMaxRange, 0, 12); - - endSteelMaxEnergy = builder - .comment("Set the energy capacity for End Steel Exchanger") - .defineInRange("endSteelExchangerMaxEnergy", DefaultValues.endSteelMaxEnergy, 1000, Integer.MAX_VALUE); - endSteelPerBlockUse = builder - .comment("Set the energy consumption per block for End Steel Exchanger") - .defineInRange("endSteelExchangerPerBlockUse", DefaultValues.endSteelPerBlockUse, 1, Integer.MAX_VALUE); - endSteelMaxHarvestLevel = builder + netheriteMaxHarvestLevel = builder .comment( - "Set the max harvest level for End Steel Exchanger", + "Set the max harvest level for Netherite Exchanger", "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", "For modded values, please check the tool tiers for the mod that you want to use", "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" ) - .define("endSteelExchangerMaxHarvestLevel", DefaultValues.endSteelMaxHarvestLevel); - endSteelMaxRange = builder - .comment("Set the max range for End Steel Exchanger") - .defineInRange("endSteelExchangerMaxRange", DefaultValues.endSteelMaxRange, 0, 12); - builder.pop(); + .define("netheriteExchangerMaxHarvestLevel", DefaultValues.netheriteMaxHarvestLevel); + netheriteMaxRange = builder + .comment("Set the max range for Netherite Exchanger") + .defineInRange("netheriteExchangerMaxRange", DefaultValues.netheriteMaxRange, 0, 12); - builder.push("ender_io_endergy_tweaks"); - crudeSteelMaxEnergy = builder - .comment("Set the energy capacity for Crude Steel Exchanger") - .defineInRange("crudeSteelExchangerMaxEnergy", DefaultValues.crudeSteelMaxEnergy, 1000, Integer.MAX_VALUE); - crudeSteelPerBlockUse = builder - .comment("Set the energy consumption per block for Crude Steel Exchanger") - .defineInRange("crudeSteelExchangerPerBlockUse", DefaultValues.crudeSteelPerBlockUse, 1, Integer.MAX_VALUE); - crudeSteelMaxHarvestLevel = builder - .comment( - "Set the max harvest level for Crude Steel Exchanger", - "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", - "For modded values, please check the tool tiers for the mod that you want to use", - "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" - ) - .define("crudeSteelExchangerMaxHarvestLevel", DefaultValues.crudeSteelMaxHarvestLevel); - crudeSteelMaxRange = builder - .comment("Set the max range for Crude Steel Exchanger") - .defineInRange("crudeSteelExchangerMaxRange", DefaultValues.crudeSteelMaxRange, 0, 12); - - energeticSilverMaxEnergy = builder - .comment("Set the energy capacity for Energetic Silver Exchanger") - .defineInRange("energeticSilverExchangerMaxEnergy", DefaultValues.energeticSilverMaxEnergy, 1000, Integer.MAX_VALUE); - energeticSilverPerBlockUse = builder - .comment("Set the energy consumption per block for Energetic Silver Exchanger") - .defineInRange("energeticSilverExchangerPerBlockUse", DefaultValues.energeticSilverPerBlockUse, 1, Integer.MAX_VALUE); - energeticSilverMaxHarvestLevel = builder - .comment( - "Set the max harvest level for Energetic Silver Exchanger", - "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", - "For modded values, please check the tool tiers for the mod that you want to use", - "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" - ) - .define("energeticSilverExchangerMaxHarvestLevel", DefaultValues.energeticSilverMaxHarvestLevel); - energeticSilverMaxRange = builder - .comment("Set the max range for Energetic Silver Exchanger") - .defineInRange("energeticSilverExchangerMaxRange", DefaultValues.energeticSilverMaxRange, 0, 12); - - vividMaxEnergy = builder - .comment("Set the energy capacity for Vivid Exchanger") - .defineInRange("vividExchangerMaxEnergy", DefaultValues.vividMaxEnergy, 1000, Integer.MAX_VALUE); - vividPerBlockUse = builder - .comment("Set the energy consumption per block for Vivid Exchanger") - .defineInRange("vividExchangerPerBlockUse", DefaultValues.vividPerBlockUse, 1, Integer.MAX_VALUE); - vividMaxHarvestLevel = builder - .comment( - "Set the max harvest level for Vivid Exchanger", - "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", - "For modded values, please check the tool tiers for the mod that you want to use", - "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" - ) - .define("vividExchangerMaxHarvestLevel", DefaultValues.vividMaxHarvestLevel); - vividMaxRange = builder - .comment("Set the max range for Vivid Exchanger") - .defineInRange("vividExchangerMaxRange", DefaultValues.vividMaxRange, 0, 12); - - crystallineMaxEnergy = builder - .comment("Set the energy capacity for Crystalline Exchanger") - .defineInRange("crystallineExchangerMaxEnergy", DefaultValues.crystallineMaxEnergy, 1000, Integer.MAX_VALUE); - crystallinePerBlockUse = builder - .comment("Set the energy consumption per block for Crystalline Exchanger") - .defineInRange("crystallineExchangerPerBlockUse", DefaultValues.crystallinePerBlockUse, 1, Integer.MAX_VALUE); - crystallineMaxHarvestLevel = builder - .comment( - "Set the max harvest level for Crystalline Exchanger", - "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", - "For modded values, please check the tool tiers for the mod that you want to use", - "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" - ) - .define("crystallineExchangerMaxHarvestLevel", DefaultValues.crystallineMaxHarvestLevel); - crystallineMaxRange = builder - .comment("Set the max range for Crystalline Exchanger") - .defineInRange("crystallineExchangerMaxRange", DefaultValues.crystallineMaxRange, 0, 12); - - melodicMaxEnergy = builder - .comment("Set the energy capacity for Melodic Exchanger") - .defineInRange("melodicExchangerMaxEnergy", DefaultValues.melodicMaxEnergy, 1000, Integer.MAX_VALUE); - melodicPerBlockUse = builder - .comment("Set the energy consumption per block for Melodic Exchanger") - .defineInRange("melodicExchangerPerBlockUse", DefaultValues.melodicPerBlockUse, 1, Integer.MAX_VALUE); - melodicMaxHarvestLevel = builder - .comment( - "Set the max harvest level for Melodic Exchanger", - "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", - "For modded values, please check the tool tiers for the mod that you want to use", - "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" - ) - .define("melodicExchangerMaxHarvestLevel", DefaultValues.melodicMaxHarvestLevel); - melodicMaxRange = builder - .comment("Set the max range for Melodic Exchanger") - .defineInRange("melodicExchangerMaxRange", DefaultValues.melodicMaxRange, 0, 12); - - stellarMaxEnergy = builder - .comment("Set the energy capacity for Stellar Exchanger") - .defineInRange("stellarExchangerMaxEnergy", DefaultValues.stellarMaxEnergy, 1000, Integer.MAX_VALUE); - stellarPerBlockUse = builder - .comment("Set the energy consumption per block for Stellar Exchanger") - .defineInRange("stellarExchangerPerBlockUse", DefaultValues.stellarPerBlockUse, 1, Integer.MAX_VALUE); - stellarMaxHarvestLevel = builder + endMaxHarvestLevel = builder .comment( - "Set the max harvest level for Stellar Exchanger", + "Set the max harvest level for End Exchanger", "Valid Vanilla values are: minecraft:wood, minecraft:stone, minecraft:iron, minecraft:diamond, minecraft:netherite", "For modded values, please check the tool tiers for the mod that you want to use", "Entering an incorrect value will result in the Exchanger using the default value to prevent crashes" ) - .define("stellarExchangerMaxHarvestLevel", DefaultValues.stellarMaxHarvestLevel); - stellarMaxRange = builder - .comment("Set the max range for Stellar Exchanger") - .defineInRange("stellarExchangerMaxRange", DefaultValues.stellarMaxRange, 0, 12); + .define("endExchangerMaxHarvestLevel", DefaultValues.endMaxHarvestLevel); + endMaxRange = builder + .comment("Set the max range for End Exchanger") + .defineInRange("endExchangerMaxRange", DefaultValues.endMaxRange, 0, 12); builder.pop(); builder.push("thermal_tweaks"); @@ -747,22 +487,6 @@ public static class CommonConfig { "'hard' Hard recipes, progressive, expensive recipe costs." ) .defineInList("vanillaRecipesType", "normal", Arrays.asList("easy", "normal", "hard")); - enderIORecipesType = builder - .comment( - "Set the recipes type for Ender IO-based exchangers:", - "'easy' Easy recipes, non-progressive, lowest recipe costs.", - "'normal' Normal recipes, progressive, moderate recipe costs.", - "'hard' Hard recipes, progressive, expensive recipe costs." - ) - .defineInList("enderIORecipesType", "normal", Arrays.asList("easy", "normal", "hard")); - enderIOEndergyRecipesType = builder - .comment( - "Set the recipes type for Ender IO Endergy-based exchangers:", - "'easy' Easy recipes, non-progressive, lowest recipe costs.", - "'normal' Normal recipes, progressive, moderate recipe costs.", - "'hard' Hard recipes, progressive, expensive recipe costs." - ) - .defineInList("enderIOEndergyRecipesType", "normal", Arrays.asList("easy", "normal", "hard")); thermalRecipesType = builder .comment( "Set the recipes type for Thermal Series-based exchangers:", @@ -838,4 +562,4 @@ public static class CommonConfig { CONFIG = specPair.getLeft(); } -} \ No newline at end of file +} diff --git a/src/main/java/jackyy/exchangers/registry/ModItems.java b/src/main/java/jackyy/exchangers/registry/ModItems.java index d2651e0..32f1b0e 100644 --- a/src/main/java/jackyy/exchangers/registry/ModItems.java +++ b/src/main/java/jackyy/exchangers/registry/ModItems.java @@ -1,7 +1,5 @@ package jackyy.exchangers.registry; -import jackyy.exchangers.item.enderio.*; -import jackyy.exchangers.item.enderioendergy.*; import jackyy.exchangers.item.immersiveengineering.*; import jackyy.exchangers.item.mekanism.*; import jackyy.exchangers.item.special.ItemBeeExchanger; @@ -24,9 +22,12 @@ public class ModItems { public static final RegistryObject STONE_EXCHANGER = ITEMS.register("stone_exchanger", ItemStoneExchanger::new); public static final RegistryObject GOLDEN_EXCHANGER = ITEMS.register("golden_exchanger", ItemGoldenExchanger::new); public static final RegistryObject IRON_EXCHANGER = ITEMS.register("iron_exchanger", ItemIronExchanger::new); + public static final RegistryObject COPPER_EXCHANGER = ITEMS.register("copper_exchanger", ItemCopperExchanger::new); public static final RegistryObject DIAMOND_EXCHANGER = ITEMS.register("diamond_exchanger", ItemDiamondExchanger::new); public static final RegistryObject EMERALD_EXCHANGER = ITEMS.register("emerald_exchanger", ItemEmeraldExchanger::new); public static final RegistryObject OBSIDIAN_EXCHANGER = ITEMS.register("obsidian_exchanger", ItemObsidianExchanger::new); + public static final RegistryObject AMETHYST_EXCHANGER = ITEMS.register("amethyst_exchanger", ItemAmethystExchanger::new); + public static final RegistryObject NETHERITE_EXCHANGER = ITEMS.register("netherite_exchanger", ItemNetheriteExchanger::new); public static final RegistryObject END_EXCHANGER = ITEMS.register("end_exchanger", ItemEndExchanger::new); public static final RegistryObject EXCHANGER_CORE_TIER1 = ITEMS.register("exchanger_core_tier1", ItemExchangerCoreT1::new); public static final RegistryObject EXCHANGER_CORE_TIER2 = ITEMS.register("exchanger_core_tier2", ItemExchangerCoreT2::new); @@ -36,27 +37,6 @@ public class ModItems { public static final RegistryObject BEE_EXCHANGER = ITEMS.register("bee_exchanger", ItemBeeExchanger::new); public static final RegistryObject CREATIVE_EXCHANGER = ITEMS.register("creative_exchanger", ItemCreativeExchanger::new); - public static final RegistryObject CONDUCTIVE_IRON_EXCHANGER = ITEMS.register("conductive_iron_exchanger", ItemConductiveIronExchanger::new); - public static final RegistryObject PULSATING_IRON_EXCHANGER = ITEMS.register("pulsating_iron_exchanger", ItemPulsatingIronExchanger::new); - public static final RegistryObject ELECTRICAL_STEEL_EXCHANGER = ITEMS.register("electrical_steel_exchanger", ItemElectricalSteelExchanger::new); - public static final RegistryObject ENERGETIC_EXCHANGER = ITEMS.register("energetic_exchanger", ItemEnergeticExchanger::new); - public static final RegistryObject DARK_STEEL_EXCHANGER = ITEMS.register("dark_steel_exchanger", ItemDarkSteelExchanger::new); - public static final RegistryObject VIBRANT_EXCHANGER = ITEMS.register("vibrant_exchanger", ItemVibrantExchanger::new); - public static final RegistryObject END_STEEL_EXCHANGER = ITEMS.register("end_steel_exchanger", ItemEndSteelExchanger::new); - public static final RegistryObject EIO_EXCHANGER_CORE_TIER1 = ITEMS.register("eio_exchanger_core_tier1", ItemEIOExchangerCoreT1::new); - public static final RegistryObject EIO_EXCHANGER_CORE_TIER2 = ITEMS.register("eio_exchanger_core_tier2", ItemEIOExchangerCoreT2::new); - public static final RegistryObject EIO_EXCHANGER_CORE_TIER3 = ITEMS.register("eio_exchanger_core_tier3", ItemEIOExchangerCoreT3::new); - - public static final RegistryObject CRUDE_STEEL_EXCHANGER = ITEMS.register("crude_steel_exchanger", ItemCrudeSteelExchanger::new); - public static final RegistryObject ENERGETIC_SILVER_EXCHANGER = ITEMS.register("energetic_silver_exchanger", ItemEnergeticSilverExchanger::new); - public static final RegistryObject VIVID_EXCHANGER = ITEMS.register("vivid_exchanger", ItemVividExchanger::new); - public static final RegistryObject CRYSTALLINE_EXCHANGER = ITEMS.register("crystalline_exchanger", ItemCrystallineExchanger::new); - public static final RegistryObject MELODIC_EXCHANGER = ITEMS.register("melodic_exchanger", ItemMelodicExchanger::new); - public static final RegistryObject STELLAR_EXCHANGER = ITEMS.register("stellar_exchanger", ItemStellarExchanger::new); - public static final RegistryObject EIO_ENDERGY_EXCHANGER_CORE_TIER1 = ITEMS.register("eio_endergy_exchanger_core_tier1", ItemEIOEndergyExchangerCoreT1::new); - public static final RegistryObject EIO_ENDERGY_EXCHANGER_CORE_TIER2 = ITEMS.register("eio_endergy_exchanger_core_tier2", ItemEIOEndergyExchangerCoreT2::new); - public static final RegistryObject EIO_ENDERGY_EXCHANGER_CORE_TIER3 = ITEMS.register("eio_endergy_exchanger_core_tier3", ItemEIOEndergyExchangerCoreT3::new); - public static final RegistryObject LEADSTONE_EXCHANGER = ITEMS.register("leadstone_exchanger", ItemLeadstoneExchanger::new); public static final RegistryObject HARDENED_EXCHANGER = ITEMS.register("hardened_exchanger", ItemHardenedExchanger::new); public static final RegistryObject REINFORCED_EXCHANGER = ITEMS.register("reinforced_exchanger", ItemReinforcedExchanger::new); diff --git a/src/main/java/jackyy/exchangers/registry/crafting/ModCrafting.java b/src/main/java/jackyy/exchangers/registry/crafting/ModCrafting.java index bc9e033..c1617fd 100644 --- a/src/main/java/jackyy/exchangers/registry/crafting/ModCrafting.java +++ b/src/main/java/jackyy/exchangers/registry/crafting/ModCrafting.java @@ -1,22 +1,21 @@ package jackyy.exchangers.registry.crafting; import jackyy.exchangers.registry.crafting.condition.module.*; -import jackyy.exchangers.registry.crafting.condition.recipe.*; +import jackyy.exchangers.registry.crafting.condition.recipe.ConditionImmersiveEngineeringRecipesType; +import jackyy.exchangers.registry.crafting.condition.recipe.ConditionMekanismRecipesType; +import jackyy.exchangers.registry.crafting.condition.recipe.ConditionThermalRecipesType; +import jackyy.exchangers.registry.crafting.condition.recipe.ConditionVanillaRecipesType; import net.minecraftforge.common.crafting.CraftingHelper; public class ModCrafting { public static void registerConditions() { CraftingHelper.register(ConditionVanillaModule.SERIALIZER); - CraftingHelper.register(ConditionEnderIOModule.SERIALIZER); - CraftingHelper.register(ConditionEnderIOEndergyModule.SERIALIZER); CraftingHelper.register(ConditionThermalModule.SERIALIZER); CraftingHelper.register(ConditionMekanismModule.SERIALIZER); CraftingHelper.register(ConditionImmersiveEngineeringModule.SERIALIZER); CraftingHelper.register(ConditionSpecialModule.SERIALIZER); CraftingHelper.register(ConditionVanillaRecipesType.SERIALIZER); - CraftingHelper.register(ConditionEnderIORecipesType.SERIALIZER); - CraftingHelper.register(ConditionEnderIOEndergyRecipesType.SERIALIZER); CraftingHelper.register(ConditionThermalRecipesType.SERIALIZER); CraftingHelper.register(ConditionMekanismRecipesType.SERIALIZER); CraftingHelper.register(ConditionImmersiveEngineeringRecipesType.SERIALIZER); diff --git a/src/main/java/jackyy/exchangers/registry/crafting/condition/module/ConditionEnderIOEndergyModule.java b/src/main/java/jackyy/exchangers/registry/crafting/condition/module/ConditionEnderIOEndergyModule.java deleted file mode 100644 index 4b47cce..0000000 --- a/src/main/java/jackyy/exchangers/registry/crafting/condition/module/ConditionEnderIOEndergyModule.java +++ /dev/null @@ -1,47 +0,0 @@ -package jackyy.exchangers.registry.crafting.condition.module; - -import com.google.gson.JsonObject; -import jackyy.exchangers.util.Reference; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.common.crafting.conditions.ICondition; -import net.minecraftforge.common.crafting.conditions.IConditionSerializer; - -public class ConditionEnderIOEndergyModule implements ICondition { - - public static final ResourceLocation ID = new ResourceLocation(Reference.MODID, "ender_io_endergy_module"); - private final boolean value; - - public ConditionEnderIOEndergyModule(boolean value) { - this.value = value; - } - - @Override - public ResourceLocation getID() { - return ID; - } - - @Override - public boolean test(IContext context) { - //return ModConfigs.CONFIG.enderIOEndergyModule.get() == value; - //Disabled recipes for now until Ender IO Endergy gets ported - return false; - } - - public static final IConditionSerializer SERIALIZER = new IConditionSerializer<>() { - @Override - public void write(JsonObject json, ConditionEnderIOEndergyModule condition) { - json.addProperty("enabled", condition.value); - } - - @Override - public ConditionEnderIOEndergyModule read(JsonObject json) { - return new ConditionEnderIOEndergyModule(json.get("enabled").getAsBoolean()); - } - - @Override - public ResourceLocation getID() { - return ID; - } - }; - -} diff --git a/src/main/java/jackyy/exchangers/registry/crafting/condition/module/ConditionEnderIOModule.java b/src/main/java/jackyy/exchangers/registry/crafting/condition/module/ConditionEnderIOModule.java deleted file mode 100644 index c169c29..0000000 --- a/src/main/java/jackyy/exchangers/registry/crafting/condition/module/ConditionEnderIOModule.java +++ /dev/null @@ -1,47 +0,0 @@ -package jackyy.exchangers.registry.crafting.condition.module; - -import com.google.gson.JsonObject; -import jackyy.exchangers.util.Reference; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.common.crafting.conditions.ICondition; -import net.minecraftforge.common.crafting.conditions.IConditionSerializer; - -public class ConditionEnderIOModule implements ICondition { - - public static final ResourceLocation ID = new ResourceLocation(Reference.MODID, "ender_io_module"); - private final boolean value; - - public ConditionEnderIOModule(boolean value) { - this.value = value; - } - - @Override - public ResourceLocation getID() { - return ID; - } - - @Override - public boolean test(IContext context) { - //return ModConfigs.CONFIG.enderIOModule.get() == value; - //Disabled recipes for now until Ender IO gets ported - return false; - } - - public static final IConditionSerializer SERIALIZER = new IConditionSerializer<>() { - @Override - public void write(JsonObject json, ConditionEnderIOModule condition) { - json.addProperty("enabled", condition.value); - } - - @Override - public ConditionEnderIOModule read(JsonObject json) { - return new ConditionEnderIOModule(json.get("enabled").getAsBoolean()); - } - - @Override - public ResourceLocation getID() { - return ID; - } - }; - -} diff --git a/src/main/java/jackyy/exchangers/registry/crafting/condition/recipe/ConditionEnderIOEndergyRecipesType.java b/src/main/java/jackyy/exchangers/registry/crafting/condition/recipe/ConditionEnderIOEndergyRecipesType.java deleted file mode 100644 index 0b23c42..0000000 --- a/src/main/java/jackyy/exchangers/registry/crafting/condition/recipe/ConditionEnderIOEndergyRecipesType.java +++ /dev/null @@ -1,46 +0,0 @@ -package jackyy.exchangers.registry.crafting.condition.recipe; - -import com.google.gson.JsonObject; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.Reference; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.common.crafting.conditions.ICondition; -import net.minecraftforge.common.crafting.conditions.IConditionSerializer; - -public class ConditionEnderIOEndergyRecipesType implements ICondition { - - public static final ResourceLocation ID = new ResourceLocation(Reference.MODID, "ender_io_endergy_recipes_type"); - private final String value; - - public ConditionEnderIOEndergyRecipesType(String value) { - this.value = value; - } - - @Override - public ResourceLocation getID() { - return ID; - } - - @Override - public boolean test(IContext context) { - return ModConfigs.CONFIG.enderIOEndergyRecipesType.get().equals(value); - } - - public static final IConditionSerializer SERIALIZER = new IConditionSerializer<>() { - @Override - public void write(JsonObject json, ConditionEnderIOEndergyRecipesType condition) { - json.addProperty("value", condition.value); - } - - @Override - public ConditionEnderIOEndergyRecipesType read(JsonObject json) { - return new ConditionEnderIOEndergyRecipesType(json.get("value").getAsString()); - } - - @Override - public ResourceLocation getID() { - return ID; - } - }; - -} diff --git a/src/main/java/jackyy/exchangers/registry/crafting/condition/recipe/ConditionEnderIORecipesType.java b/src/main/java/jackyy/exchangers/registry/crafting/condition/recipe/ConditionEnderIORecipesType.java deleted file mode 100644 index dbe6342..0000000 --- a/src/main/java/jackyy/exchangers/registry/crafting/condition/recipe/ConditionEnderIORecipesType.java +++ /dev/null @@ -1,46 +0,0 @@ -package jackyy.exchangers.registry.crafting.condition.recipe; - -import com.google.gson.JsonObject; -import jackyy.exchangers.registry.ModConfigs; -import jackyy.exchangers.util.Reference; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.common.crafting.conditions.ICondition; -import net.minecraftforge.common.crafting.conditions.IConditionSerializer; - -public class ConditionEnderIORecipesType implements ICondition { - - public static final ResourceLocation ID = new ResourceLocation(Reference.MODID, "ender_io_recipes_type"); - private final String value; - - public ConditionEnderIORecipesType(String value) { - this.value = value; - } - - @Override - public ResourceLocation getID() { - return ID; - } - - @Override - public boolean test(IContext context) { - return ModConfigs.CONFIG.enderIORecipesType.get().equals(value); - } - - public static final IConditionSerializer SERIALIZER = new IConditionSerializer<>() { - @Override - public void write(JsonObject json, ConditionEnderIORecipesType condition) { - json.addProperty("value", condition.value); - } - - @Override - public ConditionEnderIORecipesType read(JsonObject json) { - return new ConditionEnderIORecipesType(json.get("value").getAsString()); - } - - @Override - public ResourceLocation getID() { - return ID; - } - }; - -} diff --git a/src/main/java/jackyy/exchangers/util/DefaultValues.java b/src/main/java/jackyy/exchangers/util/DefaultValues.java index ac62090..e869a8b 100644 --- a/src/main/java/jackyy/exchangers/util/DefaultValues.java +++ b/src/main/java/jackyy/exchangers/util/DefaultValues.java @@ -3,8 +3,6 @@ public final class DefaultValues { public static boolean vanillaModule = true; - public static boolean enderIOModule = true; - public static boolean enderIOEndergyModule = true; public static boolean thermalModule = true; public static boolean mekanismModule = true; public static boolean immersiveEngineeringModule = true; @@ -22,15 +20,24 @@ public final class DefaultValues { public static int ironMaxDmg = 1024; public static String ironMaxHarvestLevel = "minecraft:iron"; public static int ironMaxRange = 3; + public static int copperMaxDmg = 1024; + public static String copperMaxHarvestLevel = "minecraft:iron"; + public static int copperMaxRange = 3; public static int diamondMaxDmg = 4096; public static String diamondMaxHarvestLevel = "minecraft:diamond"; public static int diamondMaxRange = 4; public static int emeraldMaxDmg = 8192; public static String emeraldMaxHarvestLevel = "minecraft:diamond"; public static int emeraldMaxRange = 5; - public static int obsidianMaxDmg = 16384; - public static String obsidianMaxHarvestLevel = "minecraft:netherite"; + public static int obsidianMaxDmg = 10240; + public static String obsidianMaxHarvestLevel = "minecraft:diamond"; public static int obsidianMaxRange = 6; + public static int amethystMaxDmg = 12288; + public static String amethystMaxHarvestLevel = "minecraft:diamond"; + public static int amethystMaxRange = 6; + public static int netheriteMaxDmg = 16384; + public static String netheriteMaxHarvestLevel = "minecraft:netherite"; + public static int netheriteMaxRange = 7; public static int endMaxDmg = 32768; public static String endMaxHarvestLevel = "minecraft:netherite"; public static int endMaxRange = 7; @@ -42,60 +49,6 @@ public final class DefaultValues { public static String beeMaxHarvestLevel = "minecraft:iron"; public static int beeMaxRange = 3; - public static int conductiveMaxEnergy = 50000; - public static int conductivePerBlockUse = 50; - public static String conductiveMaxHarvestLevel = "minecraft:stone"; - public static int conductiveMaxRange = 1; - public static int pulsatingMaxEnergy = 250000; - public static int pulsatingPerBlockUse = 100; - public static String pulsatingMaxHarvestLevel = "minecraft:iron"; - public static int pulsatingMaxRange = 2; - public static int electricalSteelMaxEnergy = 1000000; - public static int electricalSteelPerBlockUse = 500; - public static String electricalSteelMaxHarvestLevel = "minecraft:diamond"; - public static int electricalSteelMaxRange = 4; - public static int energeticMaxEnergy = 5000000; - public static int energeticPerBlockUse = 1000; - public static String energeticMaxHarvestLevel = "minecraft:diamond"; - public static int energeticMaxRange = 5; - public static int darkSteelMaxEnergy = 10000000; - public static int darkSteelPerBlockUse = 1500; - public static String darkSteelMaxHarvestLevel = "minecraft:netherite"; - public static int darkSteelMaxRange = 6; - public static int vibrantMaxEnergy = 25000000; - public static int vibrantPerBlockUse = 2500; - public static String vibrantMaxHarvestLevel = "minecraft:netherite"; - public static int vibrantMaxRange = 7; - public static int endSteelMaxEnergy = 50000000; - public static int endSteelPerBlockUse = 5000; - public static String endSteelMaxHarvestLevel = "minecraft:netherite"; - public static int endSteelMaxRange = 7; - - public static int crudeSteelMaxEnergy = 50000; - public static int crudeSteelPerBlockUse = 50; - public static String crudeSteelMaxHarvestLevel = "minecraft:stone"; - public static int crudeSteelMaxRange = 1; - public static int energeticSilverMaxEnergy = 250000; - public static int energeticSilverPerBlockUse = 100; - public static String energeticSilverMaxHarvestLevel = "minecraft:iron"; - public static int energeticSilverMaxRange = 2; - public static int vividMaxEnergy = 1000000; - public static int vividPerBlockUse = 500; - public static String vividMaxHarvestLevel = "minecraft:diamond"; - public static int vividMaxRange = 4; - public static int crystallineMaxEnergy = 10000000; - public static int crystallinePerBlockUse = 1500; - public static String crystallineMaxHarvestLevel = "minecraft:diamond"; - public static int crystallineMaxRange = 5; - public static int melodicMaxEnergy = 50000000; - public static int melodicPerBlockUse = 2500; - public static String melodicMaxHarvestLevel = "minecraft:netherite"; - public static int melodicMaxRange = 7; - public static int stellarMaxEnergy = 100000000; - public static int stellarPerBlockUse = 5000; - public static String stellarMaxHarvestLevel = "minecraft:netherite"; - public static int stellarMaxRange = 9; - public static int leadstoneMaxEnergy = 100000; public static int leadstonePerBlockUse = 50; public static String leadstoneMaxHarvestLevel = "minecraft:stone"; diff --git a/src/main/java/jackyy/exchangers/util/Reference.java b/src/main/java/jackyy/exchangers/util/Reference.java index eb34224..e48f735 100644 --- a/src/main/java/jackyy/exchangers/util/Reference.java +++ b/src/main/java/jackyy/exchangers/util/Reference.java @@ -12,13 +12,11 @@ public final class Reference { public static final String MODID = "exchangers"; public static final String MODNAME = "Exchangers"; - public static final String EIO = "enderio"; - public static final String EIO_ENDERGY = "enderioendergy"; public static final String THERMAL = "thermal"; public static final String THERMAL_INNOVATION = "thermal_innovation"; public static final String MEK = "mekanism"; public static final String IE = "immersiveengineering"; - public static final String BWM = "betterwithmods"; + public static final Rarity RARITY_TIER1 = Rarity.create(MODID + "_rarity_tier1", ChatFormatting.GREEN); public static final Rarity RARITY_BEE = Rarity.create(MODID + "_rarity_bee", ChatFormatting.GOLD); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index dc47ce4..374fbba 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,83 +1,63 @@ modLoader="javafml" -loaderVersion="[45,)" -license="Jacky's Minecraft Mods License" -issueTrackerURL="https://github.com/JackyyTV/Exchangers/issues" +loaderVersion="${loader_version_range}" +license="${mod_license}" +issueTrackerURL="https://github.com/JackyyTV/${jar_name}/issues" [[mods]] -modId="exchangers" -version="1.19.4-3.3.2" -displayName="Exchangers" -displayURL="https://github.com/JackyyTV/Exchangers" +modId="${mod_id}" +version="${mc_version}-${mod_version}" +displayName="${mod_name}" +displayURL="https://github.com/JackyyTV/${jar_name}" logoFile="logo.png" credits="ThatGamerBlue, ColossalPercy, JCOnline and many other people that helped the development of this mod!" -authors="Jackyy, TurkeyDev" -description=''' -Block Exchangers. -''' +authors="${mod_authors}" +description='''${mod_description}''' -[[dependencies.exchangers]] +[[dependencies.${mod_id}]] modId="forge" mandatory=true - versionRange="[45,)" + versionRange="${forge_version_range}" ordering="NONE" side="BOTH" -[[dependencies.exchangers]] +[[dependencies.${mod_id}]] modId="minecraft" mandatory=true - versionRange="[1.19.4,1.20)" + versionRange="${mc_version_range}" ordering="NONE" side="BOTH" -[[dependencies.exchangers]] +[[dependencies.${mod_id}]] modId="gunpowderlib" mandatory=true versionRange="[1.19.4-2.1,)" ordering="AFTER" side="BOTH" -[[dependencies.exchangers]] +[[dependencies.${mod_id}]] modId="cofh_core" mandatory=false versionRange="[1.0,)" ordering="AFTER" side="BOTH" -[[dependencies.exchangers]] +[[dependencies.${mod_id}]] modId="thermal" mandatory=false versionRange="[1.0,)" ordering="AFTER" side="BOTH" -[[dependencies.exchangers]] +[[dependencies.${mod_id}]] modId="thermal_innovation" mandatory=false versionRange="[1.0,)" ordering="AFTER" side="BOTH" -[[dependencies.exchangers]] - modId="enderio" - mandatory=false - versionRange="[1.0,)" - ordering="AFTER" - side="BOTH" -[[dependencies.exchangers]] - modId="enderioendergy" - mandatory=false - versionRange="[1.0,)" - ordering="AFTER" - side="BOTH" -[[dependencies.exchangers]] +[[dependencies.${mod_id}]] modId="mekanism" mandatory=false versionRange="[1.0,)" ordering="AFTER" side="BOTH" -[[dependencies.exchangers]] +[[dependencies.${mod_id}]] modId="immersiveengineering" mandatory=false versionRange="[1.0,)" ordering="AFTER" side="BOTH" -[[dependencies.exchangers]] - modId="betterwithmods" - mandatory=false - versionRange="[1.0,)" - ordering="AFTER" - side="BOTH" diff --git a/src/main/resources/assets/exchangers/lang/de_de.json b/src/main/resources/assets/exchangers/lang/de_de.json index 9352206..0fecb67 100644 --- a/src/main/resources/assets/exchangers/lang/de_de.json +++ b/src/main/resources/assets/exchangers/lang/de_de.json @@ -28,10 +28,6 @@ "item.exchangers.exchanger_core_tier1": "Austauscher Kern (Stufe 1)", "item.exchangers.exchanger_core_tier2": "Austauscher Kern (Stufe 2)", "item.exchangers.exchanger_core_tier3": "Austauscher Kern (Stufe 3)", - "_comment": "Ender IO", - "item.exchangers.eio_exchanger_core_tier1": "Ender IO Austauscher Kern (Stufe 1)", - "item.exchangers.eio_exchanger_core_tier2": "Ender IO Austauscher Kern (Stufe 2)", - "item.exchangers.eio_exchanger_core_tier3": "Ender IO Austauscher Kern (Stufe 3)", "_comment": "Thermal", "item.exchangers.thermal_exchanger_core_tier1": "Thermal Austauscher Kern (Stufe 1)", "item.exchangers.thermal_exchanger_core_tier2": "Thermal Austauscher Kern (Stufe 2)", @@ -58,14 +54,6 @@ "item.exchangers.emerald_exchanger": "Smaragd Austauscher", "item.exchangers.obsidian_exchanger": "Obsidian Austauscher", - "_comment": "Ender IO Exchangers", - "item.exchangers.conductive_iron_exchanger": "Leitendes Eisen Austauscher", - "item.exchangers.pulsating_iron_exchanger": "Pulsierender Eisen Austauscher", - "item.exchangers.electrical_steel_exchanger": "Elektrischer Stahl Austauscher", - "item.exchangers.energetic_exchanger": "Energetisierte Legierung Austauscher", - "item.exchangers.dark_steel_exchanger": "Dunkelstahl Austauscher", - "item.exchangers.vibrant_exchanger": "Dynamische Legierung Austauscher", - "_comment": "Thermal Exchangers", "item.exchangers.leadstone_exchanger": "Blei Austauscher", "item.exchangers.hardened_exchanger": "Gehärteter Austauscher", diff --git a/src/main/resources/assets/exchangers/lang/en_us.json b/src/main/resources/assets/exchangers/lang/en_us.json index 4ce6d26..b80e64e 100644 --- a/src/main/resources/assets/exchangers/lang/en_us.json +++ b/src/main/resources/assets/exchangers/lang/en_us.json @@ -62,7 +62,6 @@ "exchangers.error.out_of_block": "§cError: Out of block!", "exchangers.error.out_of_power": "§cError: Out of power!", "exchangers.error.event_cancelled": "§cError: Exchange event cancelled by other mods!", - "exchangers.error.event_cancelled_bwm": "§cYou need an Exchanger with higher harvest level due to Better With Mods Hardcore Strata!", "exchangers.error.low_harvest_level": "§cError: Your Exchanger's maximum harvest level is too low to exchange this block!", "exchangers.msg.force_drop_items.on": "Force Drop Items mode is now §a§lenabled§r.", "exchangers.msg.force_drop_items.off": "Force Drop Items mode is now §4§ldisabled§r.", @@ -84,14 +83,6 @@ "item.exchangers.exchanger_core_tier1": "Exchanger Core (Tier 1)", "item.exchangers.exchanger_core_tier2": "Exchanger Core (Tier 2)", "item.exchangers.exchanger_core_tier3": "Exchanger Core (Tier 3)", - "_comment": "Ender IO", - "item.exchangers.eio_exchanger_core_tier1": "Ender IO Exchanger Core (Tier 1)", - "item.exchangers.eio_exchanger_core_tier2": "Ender IO Exchanger Core (Tier 2)", - "item.exchangers.eio_exchanger_core_tier3": "Ender IO Exchanger Core (Tier 3)", - "_comment": "Ender IO Endergy", - "item.exchangers.eio_endergy_exchanger_core_tier1": "Ender IO Endergy Exchanger Core (Tier 1)", - "item.exchangers.eio_endergy_exchanger_core_tier2": "Ender IO Endergy Exchanger Core (Tier 2)", - "item.exchangers.eio_endergy_exchanger_core_tier3": "Ender IO Endergy Exchanger Core (Tier 3)", "_comment": "Thermal", "item.exchangers.thermal_exchanger_core_tier1": "Thermal Exchanger Core (Tier 1)", "item.exchangers.thermal_exchanger_core_tier2": "Thermal Exchanger Core (Tier 2)", @@ -114,29 +105,15 @@ "item.exchangers.wooden_exchanger": "Wooden Exchanger", "item.exchangers.stone_exchanger": "Stone Exchanger", "item.exchangers.golden_exchanger": "Golden Exchanger", + "item.exchangers.copper_exchanger": "Copper Exchanger", "item.exchangers.iron_exchanger": "Iron Exchanger", "item.exchangers.diamond_exchanger": "Diamond Exchanger", "item.exchangers.emerald_exchanger": "Emerald Exchanger", + "item.exchangers.amethyst_exchanger": "Amethyst Exchanger", "item.exchangers.obsidian_exchanger": "Obsidian Exchanger", + "item.exchangers.netherite_exchanger": "Netherite Exchanger", "item.exchangers.end_exchanger": "End Exchanger", - "_comment": "Ender IO Exchangers", - "item.exchangers.conductive_iron_exchanger": "Conductive Iron Exchanger", - "item.exchangers.pulsating_iron_exchanger": "Pulsating Iron Exchanger", - "item.exchangers.electrical_steel_exchanger": "Electrical Steel Exchanger", - "item.exchangers.energetic_exchanger": "Energetic Exchanger", - "item.exchangers.dark_steel_exchanger": "Dark Steel Exchanger", - "item.exchangers.vibrant_exchanger": "Vibrant Exchanger", - "item.exchangers.end_steel_exchanger": "End Steel Exchanger", - - "_comment": "Ender IO Endergy Exchangers", - "item.exchangers.crude_steel_exchanger": "Crude Steel Exchanger", - "item.exchangers.energetic_silver_exchanger": "Energetic Silver Exchanger", - "item.exchangers.vivid_exchanger": "Vivid Exchanger", - "item.exchangers.crystalline_exchanger": "Crystalline Exchanger", - "item.exchangers.melodic_exchanger": "Melodic Exchanger", - "item.exchangers.stellar_exchanger": "Stellar Exchanger", - "_comment": "Thermal Exchangers", "item.exchangers.leadstone_exchanger": "Leadstone Exchanger", "item.exchangers.hardened_exchanger": "Hardened Exchanger", diff --git a/src/main/resources/assets/exchangers/lang/pl_pl.json b/src/main/resources/assets/exchangers/lang/pl_pl.json index 1626dfb..21e29fc 100644 --- a/src/main/resources/assets/exchangers/lang/pl_pl.json +++ b/src/main/resources/assets/exchangers/lang/pl_pl.json @@ -28,10 +28,6 @@ "item.exchangers.exchanger_core_tier1": "Rdzeń Wymieniacza (Poziom 1)", "item.exchangers.exchanger_core_tier2": "Rdzeń Wymieniacza (Poziom 2)", "item.exchangers.exchanger_core_tier3": "Rdzeń Wymieniacza (Poziom 3)", - "_comment": "Ender IO", - "item.exchangers.eio_exchanger_core_tier1": "Rdzeń Wymieniacza z Ender IO (Poziom 1)", - "item.exchangers.eio_exchanger_core_tier2": "Rdzeń Wymieniacza z Ender IO (Poziom 2)", - "item.exchangers.eio_exchanger_core_tier3": "Rdzeń Wymieniacza z Ender IO (Poziom 3)", "_comment": "Thermal", "item.exchangers.thermal_exchanger_core_tier1": "Rdzeń Wymieniacza z Thermal (Poziom 1)", "item.exchangers.thermal_exchanger_core_tier2": "Rdzeń Wymieniacza z Thermal (Poziom 2)", @@ -58,14 +54,6 @@ "item.exchangers.emerald_exchanger": "Szmaragdowy Wymieniacz", "item.exchangers.obsidian_exchanger": "Obsydianowy Wymieniacz", - "_comment": "Ender IO Exchangers", - "item.exchangers.conductive_iron_exchanger": "Wymieniacz z Przewodzącego Żelaza", - "item.exchangers.pulsating_iron_exchanger": "Wymieniacz z Pulsującego Żelaza", - "item.exchangers.electrical_steel_exchanger": "Wymieniacz z Elektrycznej Stali", - "item.exchangers.energetic_exchanger": "EnergetycznyWymieniacz", - "item.exchangers.dark_steel_exchanger": "Wymieniacz z Ciemnej Stali", - "item.exchangers.vibrant_exchanger": "Wibrujący Wymieniacz", - "_comment": "Thermal Exchangers", "item.exchangers.leadstone_exchanger": "Ołowiany Wymieniacz", "item.exchangers.hardened_exchanger": "Utwardzony Wymieniacz", diff --git a/src/main/resources/assets/exchangers/lang/pt_br.json b/src/main/resources/assets/exchangers/lang/pt_br.json index dbfaf7a..87797ae 100644 --- a/src/main/resources/assets/exchangers/lang/pt_br.json +++ b/src/main/resources/assets/exchangers/lang/pt_br.json @@ -28,10 +28,6 @@ "item.exchangers.exchanger_core_tier1": "Núcleo de Alteração (Nível 1)", "item.exchangers.exchanger_core_tier2": "Núcleo de Alteração (Nível 2)", "item.exchangers.exchanger_core_tier3": "Núcleo de Alteração (Nível 3)", - "_comment": "Ender IO", - "item.exchangers.eio_exchanger_core_tier1": "Núcleo de Alteração do Ender IO (Nível 1)", - "item.exchangers.eio_exchanger_core_tier2": "Núcleo de Alteração do Ender IO (Nível 2)", - "item.exchangers.eio_exchanger_core_tier3": "Núcleo de Alteração do Ender IO (Nível 3)", "_comment": "Thermal", "item.exchangers.thermal_exchanger_core_tier1": "Núcleo de Alteração do Thermal (Nível 1)", "item.exchangers.thermal_exchanger_core_tier2": "Núcleo de Alteração do Thermal (Nível 2)", @@ -58,14 +54,6 @@ "item.exchangers.emerald_exchanger": "Alterador de Esmeralda", "item.exchangers.obsidian_exchanger": "Alterador de Obsidiana", - "_comment": "Ender IO Exchangers", - "item.exchangers.conductive_iron_exchanger": "Alterador de Ferro Condutivo", - "item.exchangers.pulsating_iron_exchanger": "Alterador de Ferro Pulsante", - "item.exchangers.electrical_steel_exchanger": "Alterador de Aço Elétrico", - "item.exchangers.energetic_exchanger": "Alterador de Liga Energética", - "item.exchangers.dark_steel_exchanger": "Alterador de Aço Negro", - "item.exchangers.vibrant_exchanger": "Alterador de Liga Vibrante", - "_comment": "Thermal Exchangers", "item.exchangers.leadstone_exchanger": "Alterador de Chumbo", "item.exchangers.hardened_exchanger": "Alterador Endurecido", diff --git a/src/main/resources/assets/exchangers/lang/zh_cn.json b/src/main/resources/assets/exchangers/lang/zh_cn.json index 96c2574..fe312f6 100644 --- a/src/main/resources/assets/exchangers/lang/zh_cn.json +++ b/src/main/resources/assets/exchangers/lang/zh_cn.json @@ -14,9 +14,9 @@ "exchangers.tooltip.state.enabled": "启用", "exchangers.tooltip.state.disabled": "禁用", "exchangers.tooltip.tuberous_exchanger.warning": "§c§o真聪明！但并没有卵用！", - "exchangers.tooltip.selected_block": "§2S当前选定方块： %s", - "exchangers.tooltip.current_range": "§2当前更替范围： %s", - "exchangers.tooltip.max_range": "§2最大更替范围： %s", + "exchangers.tooltip.selected_block": "§2S当前选定方块：%s", + "exchangers.tooltip.current_range": "§2当前更替范围：%s", + "exchangers.tooltip.max_range": "§2最大更替范围：%s", "exchangers.tooltip.no_selected_block": "§4没有选定方块", "exchangers.tooltip.silk_touch": "§f精准采集模式已在配置里%s", @@ -31,10 +31,6 @@ "item.exchangers.exchanger_core_tier1": "交换器核心（等级 1）", "item.exchangers.exchanger_core_tier2": "交换器核心（等级 2）", "item.exchangers.exchanger_core_tier3": "交换器核心（等级 3）", - "_comment": "Ender IO", - "item.exchangers.eio_exchanger_core_tier1": "末影接口交换器核心（等级 1）", - "item.exchangers.eio_exchanger_core_tier2": "末影接口交换器核心（等级 2）", - "item.exchangers.eio_exchanger_core_tier3": "末影接口交换器核心（等级 3）", "_comment": "Thermal", "item.exchangers.thermal_exchanger_core_tier1": "热力膨胀交换器核心（等级 1）", "item.exchangers.thermal_exchanger_core_tier2": "热力膨胀交换器核心（等级 2）", @@ -60,15 +56,7 @@ "item.exchangers.diamond_exchanger": "钻石方块交换器", "item.exchangers.emerald_exchanger": "绿宝石方块交换器", "item.exchangers.obsidian_exchanger": "黑曜石方块交换器", - - "_comment": "Ender IO Exchangers", - "item.exchangers.conductive_iron_exchanger": "导电铁方块交换器", - "item.exchangers.pulsating_iron_exchanger": "脉冲铁方块交换器", - "item.exchangers.electrical_steel_exchanger": "磁钢方块交换器", - "item.exchangers.energetic_exchanger": "充能合金方块交换器", - "item.exchangers.dark_steel_exchanger": "玄钢方块交换器", - "item.exchangers.vibrant_exchanger": "脉冲合金方块交换器", - + "_comment": "Thermal Exchangers", "item.exchangers.leadstone_exchanger": "铅石方块交换器", "item.exchangers.hardened_exchanger": "硬化方块交换器", @@ -83,7 +71,7 @@ "item.exchangers.ultimate_exchanger": "终极方块交换器", "_comment": "Immersive Engineering Exchangers", - "item.exchangers.lv_exchanger": "LV方块交换器", - "item.exchangers.mv_exchanger": "MV方块交换器", - "item.exchangers.hv_exchanger": "HV方块交换器" + "item.exchangers.lv_exchanger": "低压方块交换器", + "item.exchangers.mv_exchanger": "中压方块交换器", + "item.exchangers.hv_exchanger": "高压方块交换器" } \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/lang/zh_hk.json b/src/main/resources/assets/exchangers/lang/zh_hk.json new file mode 100644 index 0000000..38efa9e --- /dev/null +++ b/src/main/resources/assets/exchangers/lang/zh_hk.json @@ -0,0 +1,134 @@ +{ + "_comment": "Creative Tab", + "item_group.exchangers.main_creative_tab": "方塊交換器", + + "_comment": "Key Bindings", + "key.categories.exchangers": "方塊交換器", + "key.exchangers.open_gui": "打開交換器介面", + "key.exchangers.range_switch": "變更交換器範圍", + "key.exchangers.mode_switch": "變更交換器模式", + "key.exchangers.force_drop_items_mode_toggle": "切換强制丟棄物品模式", + "key.exchangers.directional_placement_mode_toggle": "切換定向放置方塊模式", + "key.exchangers.fuzzy_placement_mode_toggle": "切換模糊放置方塊模式", + "key.exchangers.void_items_mode_toggle": "切換消除物品模式", + + "_comment": "GUI", + "screen.exchangers.exchanger_gui.title": "交換器介面", + "exchangers.tooltip.decrease_range_button": "縮細範圍", + "exchangers.tooltip.increase_range_button": "放大範圍", + "exchangers.tooltip.mode_switch_button": "變更交換器模式", + "exchangers.tooltip.force_drop_items_button_name": "强制丟棄物品模式", + "exchangers.tooltip.force_drop_items_button_desc": "這模式允許交換器將交換出來的方塊或物品扔到地上，與可以消除多餘方塊或物品的工具配合得很好。", + "exchangers.tooltip.directional_placement_button_name": "定向放置方塊模式", + "exchangers.tooltip.directional_placement_button_desc": "這模式允許交換器根據玩家面向的方向交換方塊。", + "exchangers.tooltip.fuzzy_placement_button_name": "模糊放置方塊模式", + "exchangers.tooltip.fuzzy_placement_button_desc": "這模式允許交換器以百分比為基礎放置每個方塊，請使用右邊的文本框設置機會率。", + "exchangers.tooltip.fuzzy_placement_chance_box_name": "模糊放置方塊機會率", + "exchangers.tooltip.fuzzy_placement_chance_box_desc": "設置為每個方塊的放置機會率，一個從1到100之間的數值，僅在啟用模糊放置方塊模式時生效。", + "exchangers.tooltip.void_items_button_name": "消除物品模式", + "exchangers.tooltip.void_items_button_desc": "這模式會把所有交換出來的方塊或物品消除，請謹慎使用。", + + "_comment": "Tooltips", + "exchangers.tooltip.durability": "耐久度", + "exchangers.tooltip.tier": "等級 %d", + "exchangers.tooltip.hold_shift": "長按 %s 鍵查看詳情", + "exchangers.tooltip.hold_shift.shift": "Shift", + "exchangers.tooltip.hold_ctrl": "長按 %s 鍵查看額外信息", + "exchangers.tooltip.hold_ctrl.ctrl": "Ctrl", + "exchangers.tooltip.state.enabled": "已啟用", + "exchangers.tooltip.state.disabled": "已禁用", + "exchangers.tooltip.extra1": "潛行右鍵單擊方塊進行選擇", + "exchangers.tooltip.extra2": "右鍵單擊方塊進行交換", + "exchangers.tooltip.extra3": "使用 %s 鍵打開交換器介面", + "exchangers.tooltip.tuberous_exchanger.warning": "§c§o聰明的！但不能交換方塊。", + "exchangers.tooltip.bee_exchanger.flavor_text": "§6§o快樂的蜜蜂！ :)", + "exchangers.tooltip.selected_block": "選定的方塊：%s", + "exchangers.tooltip.selected_block.none": "什麽都沒有", + "exchangers.tooltip.selected_block.error": "無法獲取方塊名稱", + "exchangers.tooltip.current_range": "當前的交換範圍：%s", + "exchangers.tooltip.max_range": "最大交換範圍：%s", + "exchangers.tooltip.max_harvest_level": "最高破壞等級：%s", + "exchangers.tooltip.current_mode": "當前的模式：%s", + "exchangers.tooltip.state": "狀態：%s", + "exchangers.tooltip.silk_touch": "絲綢之觸模式已在配置檔裏%s。", + "exchangers.tooltip.force_drop_items": "强制丟棄物品模式是%s的。", + "exchangers.tooltip.directional_placement": "定向放置方塊模式是%s的。", + "exchangers.tooltip.fuzzy_placement": "模糊放置方塊模式是%s的。", + + "_comment": "Messages", + "exchangers.error.invalid_block.te": "§c錯誤：無效的方塊！（方塊實體）", + "exchangers.error.invalid_block.unbreakable": "§c錯誤：無效的方塊！（無法破壞的方塊）", + "exchangers.error.blacklisted": "§c錯誤：這方塊已被配置檔列入黑名單!", + "exchangers.error.out_of_block": "§c錯誤：選定方塊耗盡！", + "exchangers.error.out_of_power": "§c錯誤：能量不足！", + "exchangers.error.event_cancelled": "§c錯誤：方塊交換活動被其他模組取消！", + "exchangers.error.low_harvest_level": "§c錯誤：您的交換器的最高破壞等級太低，不能交換此方塊！", + "exchangers.msg.force_drop_items.on": "强制丟棄物品模式已被§a§l啟用§r。", + "exchangers.msg.force_drop_items.off": "强制丟棄物品模式已被§4§l禁用§r。", + "exchangers.msg.directional_placement.on": "定向放置方塊模式已被§a§l啟用§r。", + "exchangers.msg.directional_placement.off": "定向放置方塊模式已被§4§l禁用§r。", + "exchangers.msg.fuzzy_placement.on": "模糊放置方塊模式已被§a§l啟用§r。", + "exchangers.msg.fuzzy_placement.off": "模糊放置方塊模式已被§4§l禁用§r。", + "exchangers.msg.void_items.on": "消除物品模式已被§a§l啟用§r。", + "exchangers.msg.void_items.off": "消除物品模式已被§4§l禁用§r。", + "exchangers.msg.mode": "交換器模式已被設定至：%s", + + "_comment": "Modes", + "exchangers.mode.plane": "平面", + "exchangers.mode.horizontal": "水平柱", + "exchangers.mode.vertical": "垂直柱", + + "_comment": "Crafting Components", + "_comment": "Vanilla", + "item.exchangers.exchanger_core_tier1": "交換器核心（等級 1）", + "item.exchangers.exchanger_core_tier2": "交換器核心（等級 2）", + "item.exchangers.exchanger_core_tier3": "交換器核心（等級 3）", + "_comment": "Thermal", + "item.exchangers.thermal_exchanger_core_tier1": "Thermal 交換器核心（等級 1）", + "item.exchangers.thermal_exchanger_core_tier2": "Thermal 交換器核心（等級 2）", + "item.exchangers.thermal_exchanger_core_tier3": "Thermal 交換器核心（等級 3）", + "_comment": "Mekanism", + "item.exchangers.mekanism_exchanger_core_tier1": "Mekanism 交換器核心（等級 1）", + "item.exchangers.mekanism_exchanger_core_tier2": "Mekanism 交換器核心（等級 2）", + "item.exchangers.mekanism_exchanger_core_tier3": "Mekanism 交換器核心（等級 3）", + "_comment": "Immersive Engineering", + "item.exchangers.ie_exchanger_core_tier1": "Immersive Engineering 交換器核心（等級 1）", + "item.exchangers.ie_exchanger_core_tier2": "Immersive Engineering 交換器核心（等級 2）", + "item.exchangers.ie_exchanger_core_tier3": "Immersive Engineering 交換器核心（等級 3）", + + "_comment": "Special Exchangers", + "item.exchangers.tuberous_exchanger": "薯仔方塊交換器", + "item.exchangers.bee_exchanger": "蜜蜂方塊交換器", + "item.exchangers.creative_exchanger": "創造模式方塊交換器", + + "_comment": "Vanilla Exchangers", + "item.exchangers.wooden_exchanger": "木方塊交換器", + "item.exchangers.stone_exchanger": "石方塊交換器", + "item.exchangers.golden_exchanger": "金方塊交換器", + "item.exchangers.copper_exchanger": "銅方塊交換器", + "item.exchangers.iron_exchanger": "鐵方塊交換器", + "item.exchangers.diamond_exchanger": "鑽石方塊交換器", + "item.exchangers.emerald_exchanger": "綠寶石方塊交換器", + "item.exchangers.amethyst_exchanger": "紫水晶方塊交換器", + "item.exchangers.obsidian_exchanger": "黑曜石方塊交換器", + "item.exchangers.netherite_exchanger": "地獄合金方塊交換器", + "item.exchangers.end_exchanger": "終界方塊交換器", + + "_comment": "Thermal Exchangers", + "item.exchangers.leadstone_exchanger": "鉛石方塊交換器", + "item.exchangers.hardened_exchanger": "硬化方塊交換器", + "item.exchangers.reinforced_exchanger": "強化方塊交換器", + "item.exchangers.signalum_exchanger": "信素方塊交換器", + "item.exchangers.resonant_exchanger": "終界合金方塊交換器", + + "_comment": "Mekanism Exchangers", + "item.exchangers.basic_exchanger": "基礎方塊交換器", + "item.exchangers.advanced_exchanger": "高級方塊交換器", + "item.exchangers.elite_exchanger": "菁英方塊交換器", + "item.exchangers.ultimate_exchanger": "終極方塊交換器", + + "_comment": "Immersive Engineering Exchangers", + "item.exchangers.lv_exchanger": "低壓方塊交換器", + "item.exchangers.mv_exchanger": "中壓方塊交換器", + "item.exchangers.hv_exchanger": "高壓方塊交換器" +} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/lang/zh_tw.json b/src/main/resources/assets/exchangers/lang/zh_tw.json new file mode 100644 index 0000000..59bf8a8 --- /dev/null +++ b/src/main/resources/assets/exchangers/lang/zh_tw.json @@ -0,0 +1,134 @@ +{ + "_comment": "Creative Tab", + "item_group.exchangers.main_creative_tab": "方塊交換器", + + "_comment": "Key Bindings", + "key.categories.exchangers": "方塊交換器", + "key.exchangers.open_gui": "打開交換器介面", + "key.exchangers.range_switch": "變更交換器範圍", + "key.exchangers.mode_switch": "變更交換器模式", + "key.exchangers.force_drop_items_mode_toggle": "切換强制丟棄物品模式", + "key.exchangers.directional_placement_mode_toggle": "切換定向放置方塊模式", + "key.exchangers.fuzzy_placement_mode_toggle": "切換模糊放置方塊模式", + "key.exchangers.void_items_mode_toggle": "切換消除物品模式", + + "_comment": "GUI", + "screen.exchangers.exchanger_gui.title": "交換器介面", + "exchangers.tooltip.decrease_range_button": "縮小範圍", + "exchangers.tooltip.increase_range_button": "放大範圍", + "exchangers.tooltip.mode_switch_button": "變更交換器模式", + "exchangers.tooltip.force_drop_items_button_name": "强制丟棄物品模式", + "exchangers.tooltip.force_drop_items_button_desc": "這模式允許交換器將交換出來的方塊或物品扔到地上，與可以消除多餘方塊或物品的工具配合得很好。", + "exchangers.tooltip.directional_placement_button_name": "定向放置方塊模式", + "exchangers.tooltip.directional_placement_button_desc": "這模式允許交換器根據玩家面向的方向交換方塊。", + "exchangers.tooltip.fuzzy_placement_button_name": "模糊放置方塊模式", + "exchangers.tooltip.fuzzy_placement_button_desc": "這模式允許交換器以百分比為基礎放置每個方塊，請使用右邊的文本框設置機會率。", + "exchangers.tooltip.fuzzy_placement_chance_box_name": "模糊放置方塊機會率", + "exchangers.tooltip.fuzzy_placement_chance_box_desc": "設置為每個方塊的放置機會率，一個從1到100之間的數值，僅在啟用模糊放置方塊模式時生效。", + "exchangers.tooltip.void_items_button_name": "消除物品模式", + "exchangers.tooltip.void_items_button_desc": "這模式會把所有交換出來的方塊或物品消除，請謹慎使用。", + + "_comment": "Tooltips", + "exchangers.tooltip.durability": "耐久度", + "exchangers.tooltip.tier": "等級 %d", + "exchangers.tooltip.hold_shift": "長按 %s 鍵查看詳情", + "exchangers.tooltip.hold_shift.shift": "Shift", + "exchangers.tooltip.hold_ctrl": "長按 %s 鍵查看額外信息", + "exchangers.tooltip.hold_ctrl.ctrl": "Ctrl", + "exchangers.tooltip.state.enabled": "已啟用", + "exchangers.tooltip.state.disabled": "已禁用", + "exchangers.tooltip.extra1": "潛行右鍵單擊方塊進行選擇", + "exchangers.tooltip.extra2": "右鍵單擊方塊進行交換", + "exchangers.tooltip.extra3": "使用 %s 鍵打開交換器介面", + "exchangers.tooltip.tuberous_exchanger.warning": "§c§o聰明的！但不能交換方塊。", + "exchangers.tooltip.bee_exchanger.flavor_text": "§6§o快樂的蜜蜂！ :)", + "exchangers.tooltip.selected_block": "選定的方塊：%s", + "exchangers.tooltip.selected_block.none": "什麽都沒有", + "exchangers.tooltip.selected_block.error": "無法獲取方塊名稱", + "exchangers.tooltip.current_range": "當前的交換範圍：%s", + "exchangers.tooltip.max_range": "最大交換範圍：%s", + "exchangers.tooltip.max_harvest_level": "最高破壞等級：%s", + "exchangers.tooltip.current_mode": "當前的模式：%s", + "exchangers.tooltip.state": "狀態：%s", + "exchangers.tooltip.silk_touch": "絲綢之觸模式已在配置檔裏%s。", + "exchangers.tooltip.force_drop_items": "强制丟棄物品模式是%s的。", + "exchangers.tooltip.directional_placement": "定向放置方塊模式是%s的。", + "exchangers.tooltip.fuzzy_placement": "模糊放置方塊模式是%s的。", + + "_comment": "Messages", + "exchangers.error.invalid_block.te": "§c錯誤：無效的方塊！（方塊實體）", + "exchangers.error.invalid_block.unbreakable": "§c錯誤：無效的方塊！（無法破壞的方塊）", + "exchangers.error.blacklisted": "§c錯誤：這方塊已被配置檔列入黑名單!", + "exchangers.error.out_of_block": "§c錯誤：選定方塊耗盡！", + "exchangers.error.out_of_power": "§c錯誤：能量不足！", + "exchangers.error.event_cancelled": "§c錯誤：方塊交換活動被其他模組取消！", + "exchangers.error.low_harvest_level": "§c錯誤：您的交換器的最高破壞等級太低，不能交換此方塊！", + "exchangers.msg.force_drop_items.on": "强制丟棄物品模式已被§a§l啟用§r。", + "exchangers.msg.force_drop_items.off": "强制丟棄物品模式已被§4§l禁用§r。", + "exchangers.msg.directional_placement.on": "定向放置方塊模式已被§a§l啟用§r。", + "exchangers.msg.directional_placement.off": "定向放置方塊模式已被§4§l禁用§r。", + "exchangers.msg.fuzzy_placement.on": "模糊放置方塊模式已被§a§l啟用§r。", + "exchangers.msg.fuzzy_placement.off": "模糊放置方塊模式已被§4§l禁用§r。", + "exchangers.msg.void_items.on": "消除物品模式已被§a§l啟用§r。", + "exchangers.msg.void_items.off": "消除物品模式已被§4§l禁用§r。", + "exchangers.msg.mode": "交換器模式已被設定至：%s", + + "_comment": "Modes", + "exchangers.mode.plane": "平面", + "exchangers.mode.horizontal": "水平柱", + "exchangers.mode.vertical": "垂直柱", + + "_comment": "Crafting Components", + "_comment": "Vanilla", + "item.exchangers.exchanger_core_tier1": "交換器核心（等級 1）", + "item.exchangers.exchanger_core_tier2": "交換器核心（等級 2）", + "item.exchangers.exchanger_core_tier3": "交換器核心（等級 3）", + "_comment": "Thermal", + "item.exchangers.thermal_exchanger_core_tier1": "Thermal 交換器核心（等級 1）", + "item.exchangers.thermal_exchanger_core_tier2": "Thermal 交換器核心（等級 2）", + "item.exchangers.thermal_exchanger_core_tier3": "Thermal 交換器核心（等級 3）", + "_comment": "Mekanism", + "item.exchangers.mekanism_exchanger_core_tier1": "Mekanism 交換器核心（等級 1）", + "item.exchangers.mekanism_exchanger_core_tier2": "Mekanism 交換器核心（等級 2）", + "item.exchangers.mekanism_exchanger_core_tier3": "Mekanism 交換器核心（等級 3）", + "_comment": "Immersive Engineering", + "item.exchangers.ie_exchanger_core_tier1": "Immersive Engineering 交換器核心（等級 1）", + "item.exchangers.ie_exchanger_core_tier2": "Immersive Engineering 交換器核心（等級 2）", + "item.exchangers.ie_exchanger_core_tier3": "Immersive Engineering 交換器核心（等級 3）", + + "_comment": "Special Exchangers", + "item.exchangers.tuberous_exchanger": "馬鈴薯方塊交換器", + "item.exchangers.bee_exchanger": "蜜蜂方塊交換器", + "item.exchangers.creative_exchanger": "創造模式方塊交換器", + + "_comment": "Vanilla Exchangers", + "item.exchangers.wooden_exchanger": "木方塊交換器", + "item.exchangers.stone_exchanger": "石方塊交換器", + "item.exchangers.golden_exchanger": "金方塊交換器", + "item.exchangers.copper_exchanger": "銅方塊交換器", + "item.exchangers.iron_exchanger": "鐵方塊交換器", + "item.exchangers.diamond_exchanger": "鑽石方塊交換器", + "item.exchangers.emerald_exchanger": "綠寶石方塊交換器", + "item.exchangers.amethyst_exchanger": "紫水晶方塊交換器", + "item.exchangers.obsidian_exchanger": "黑曜石方塊交換器", + "item.exchangers.netherite_exchanger": "地獄合金方塊交換器", + "item.exchangers.end_exchanger": "終界方塊交換器", + + "_comment": "Thermal Exchangers", + "item.exchangers.leadstone_exchanger": "鉛石方塊交換器", + "item.exchangers.hardened_exchanger": "硬化方塊交換器", + "item.exchangers.reinforced_exchanger": "強化方塊交換器", + "item.exchangers.signalum_exchanger": "信素方塊交換器", + "item.exchangers.resonant_exchanger": "終界合金方塊交換器", + + "_comment": "Mekanism Exchangers", + "item.exchangers.basic_exchanger": "基礎方塊交換器", + "item.exchangers.advanced_exchanger": "高級方塊交換器", + "item.exchangers.elite_exchanger": "菁英方塊交換器", + "item.exchangers.ultimate_exchanger": "終極方塊交換器", + + "_comment": "Immersive Engineering Exchangers", + "item.exchangers.lv_exchanger": "低壓方塊交換器", + "item.exchangers.mv_exchanger": "中壓方塊交換器", + "item.exchangers.hv_exchanger": "高壓方塊交換器" +} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/models/item/amethyst_exchanger.json b/src/main/resources/assets/exchangers/models/item/amethyst_exchanger.json new file mode 100644 index 0000000..5fb992a --- /dev/null +++ b/src/main/resources/assets/exchangers/models/item/amethyst_exchanger.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "exchangers:item/vanilla/amethyst_exchanger" + } +} diff --git a/src/main/resources/assets/exchangers/models/item/conductive_iron_exchanger.json b/src/main/resources/assets/exchangers/models/item/conductive_iron_exchanger.json deleted file mode 100644 index 81f25db..0000000 --- a/src/main/resources/assets/exchangers/models/item/conductive_iron_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderio/conductive_iron_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/copper_exchanger.json b/src/main/resources/assets/exchangers/models/item/copper_exchanger.json new file mode 100644 index 0000000..ea46596 --- /dev/null +++ b/src/main/resources/assets/exchangers/models/item/copper_exchanger.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "exchangers:item/vanilla/copper_exchanger" + } +} diff --git a/src/main/resources/assets/exchangers/models/item/crude_steel_exchanger.json b/src/main/resources/assets/exchangers/models/item/crude_steel_exchanger.json deleted file mode 100644 index 9d702c8..0000000 --- a/src/main/resources/assets/exchangers/models/item/crude_steel_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderioendergy/crude_steel_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/crystalline_exchanger.json b/src/main/resources/assets/exchangers/models/item/crystalline_exchanger.json deleted file mode 100644 index 7f82cb7..0000000 --- a/src/main/resources/assets/exchangers/models/item/crystalline_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderioendergy/crystalline_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/dark_steel_exchanger.json b/src/main/resources/assets/exchangers/models/item/dark_steel_exchanger.json deleted file mode 100644 index fc06885..0000000 --- a/src/main/resources/assets/exchangers/models/item/dark_steel_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderio/dark_steel_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/eio_endergy_exchanger_core_tier1.json b/src/main/resources/assets/exchangers/models/item/eio_endergy_exchanger_core_tier1.json deleted file mode 100644 index b51fd8b..0000000 --- a/src/main/resources/assets/exchangers/models/item/eio_endergy_exchanger_core_tier1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderioendergy/eio_endergy_exchanger_core_tier1" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/eio_endergy_exchanger_core_tier2.json b/src/main/resources/assets/exchangers/models/item/eio_endergy_exchanger_core_tier2.json deleted file mode 100644 index 9de5bc6..0000000 --- a/src/main/resources/assets/exchangers/models/item/eio_endergy_exchanger_core_tier2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderioendergy/eio_endergy_exchanger_core_tier2" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/eio_endergy_exchanger_core_tier3.json b/src/main/resources/assets/exchangers/models/item/eio_endergy_exchanger_core_tier3.json deleted file mode 100644 index a6d0bc2..0000000 --- a/src/main/resources/assets/exchangers/models/item/eio_endergy_exchanger_core_tier3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderioendergy/eio_endergy_exchanger_core_tier3" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/eio_exchanger_core_tier1.json b/src/main/resources/assets/exchangers/models/item/eio_exchanger_core_tier1.json deleted file mode 100644 index 1817921..0000000 --- a/src/main/resources/assets/exchangers/models/item/eio_exchanger_core_tier1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderio/eio_exchanger_core_tier1" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/eio_exchanger_core_tier2.json b/src/main/resources/assets/exchangers/models/item/eio_exchanger_core_tier2.json deleted file mode 100644 index f3b84af..0000000 --- a/src/main/resources/assets/exchangers/models/item/eio_exchanger_core_tier2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderio/eio_exchanger_core_tier2" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/eio_exchanger_core_tier3.json b/src/main/resources/assets/exchangers/models/item/eio_exchanger_core_tier3.json deleted file mode 100644 index c83c865..0000000 --- a/src/main/resources/assets/exchangers/models/item/eio_exchanger_core_tier3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderio/eio_exchanger_core_tier3" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/electrical_steel_exchanger.json b/src/main/resources/assets/exchangers/models/item/electrical_steel_exchanger.json deleted file mode 100644 index 6d4e515..0000000 --- a/src/main/resources/assets/exchangers/models/item/electrical_steel_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderio/electrical_steel_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/end_steel_exchanger.json b/src/main/resources/assets/exchangers/models/item/end_steel_exchanger.json deleted file mode 100644 index 1dbed81..0000000 --- a/src/main/resources/assets/exchangers/models/item/end_steel_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderio/end_steel_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/energetic_exchanger.json b/src/main/resources/assets/exchangers/models/item/energetic_exchanger.json deleted file mode 100644 index a4b9c0b..0000000 --- a/src/main/resources/assets/exchangers/models/item/energetic_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderio/energetic_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/energetic_silver_exchanger.json b/src/main/resources/assets/exchangers/models/item/energetic_silver_exchanger.json deleted file mode 100644 index ae0c7e0..0000000 --- a/src/main/resources/assets/exchangers/models/item/energetic_silver_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderioendergy/energetic_silver_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/melodic_exchanger.json b/src/main/resources/assets/exchangers/models/item/melodic_exchanger.json deleted file mode 100644 index ed3d70b..0000000 --- a/src/main/resources/assets/exchangers/models/item/melodic_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderioendergy/melodic_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/netherite_exchanger.json b/src/main/resources/assets/exchangers/models/item/netherite_exchanger.json new file mode 100644 index 0000000..c2788dd --- /dev/null +++ b/src/main/resources/assets/exchangers/models/item/netherite_exchanger.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "exchangers:item/vanilla/netherite_exchanger" + } +} diff --git a/src/main/resources/assets/exchangers/models/item/pulsating_iron_exchanger.json b/src/main/resources/assets/exchangers/models/item/pulsating_iron_exchanger.json deleted file mode 100644 index 69d098a..0000000 --- a/src/main/resources/assets/exchangers/models/item/pulsating_iron_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderio/pulsating_iron_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/stellar_exchanger.json b/src/main/resources/assets/exchangers/models/item/stellar_exchanger.json deleted file mode 100644 index 0aaeda2..0000000 --- a/src/main/resources/assets/exchangers/models/item/stellar_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderioendergy/stellar_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/vibrant_exchanger.json b/src/main/resources/assets/exchangers/models/item/vibrant_exchanger.json deleted file mode 100644 index b179fcc..0000000 --- a/src/main/resources/assets/exchangers/models/item/vibrant_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderio/vibrant_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/models/item/vivid_exchanger.json b/src/main/resources/assets/exchangers/models/item/vivid_exchanger.json deleted file mode 100644 index de5aa16..0000000 --- a/src/main/resources/assets/exchangers/models/item/vivid_exchanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "exchangers:item/enderioendergy/vivid_exchanger" - } -} diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/conductive_iron_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderio/conductive_iron_exchanger.png deleted file mode 100644 index 1542d0b..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderio/conductive_iron_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/dark_steel_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderio/dark_steel_exchanger.png deleted file mode 100644 index dcf1a64..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderio/dark_steel_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier1.png b/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier1.png deleted file mode 100644 index f1014df..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier1.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier2.png b/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier2.png deleted file mode 100644 index 315d5d4..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier2.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier2.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier2.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier2.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier3.png b/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier3.png deleted file mode 100644 index d946a65..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier3.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier3.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier3.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier3.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/electrical_steel_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderio/electrical_steel_exchanger.png deleted file mode 100644 index feece51..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderio/electrical_steel_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/electrical_steel_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderio/electrical_steel_exchanger.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderio/electrical_steel_exchanger.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/end_steel_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderio/end_steel_exchanger.png deleted file mode 100644 index e17dc7f..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderio/end_steel_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/end_steel_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderio/end_steel_exchanger.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderio/end_steel_exchanger.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/energetic_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderio/energetic_exchanger.png deleted file mode 100644 index debddcd..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderio/energetic_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/energetic_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderio/energetic_exchanger.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderio/energetic_exchanger.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/pulsating_iron_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderio/pulsating_iron_exchanger.png deleted file mode 100644 index c8564d8..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderio/pulsating_iron_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/pulsating_iron_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderio/pulsating_iron_exchanger.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderio/pulsating_iron_exchanger.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/vibrant_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderio/vibrant_exchanger.png deleted file mode 100644 index d9dc69e..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderio/vibrant_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/vibrant_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderio/vibrant_exchanger.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderio/vibrant_exchanger.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/crude_steel_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderioendergy/crude_steel_exchanger.png deleted file mode 100644 index a03746c..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderioendergy/crude_steel_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/crude_steel_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderioendergy/crude_steel_exchanger.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderioendergy/crude_steel_exchanger.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/crystalline_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderioendergy/crystalline_exchanger.png deleted file mode 100644 index 5434c80..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderioendergy/crystalline_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/crystalline_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderioendergy/crystalline_exchanger.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderioendergy/crystalline_exchanger.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier1.png b/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier1.png deleted file mode 100644 index b170d7a..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier1.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier1.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier1.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier1.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier2.png b/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier2.png deleted file mode 100644 index 01720fc..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier2.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier2.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier2.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier2.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier3.png b/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier3.png deleted file mode 100644 index 04cb316..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier3.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier3.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier3.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderioendergy/eio_endergy_exchanger_core_tier3.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/energetic_silver_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderioendergy/energetic_silver_exchanger.png deleted file mode 100644 index ae14816..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderioendergy/energetic_silver_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/energetic_silver_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderioendergy/energetic_silver_exchanger.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderioendergy/energetic_silver_exchanger.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/melodic_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderioendergy/melodic_exchanger.png deleted file mode 100644 index df81102..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderioendergy/melodic_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/melodic_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderioendergy/melodic_exchanger.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderioendergy/melodic_exchanger.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/stellar_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderioendergy/stellar_exchanger.png deleted file mode 100644 index 5c4c937..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderioendergy/stellar_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/stellar_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderioendergy/stellar_exchanger.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderioendergy/stellar_exchanger.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/vivid_exchanger.png b/src/main/resources/assets/exchangers/textures/item/enderioendergy/vivid_exchanger.png deleted file mode 100644 index 2a87853..0000000 Binary files a/src/main/resources/assets/exchangers/textures/item/enderioendergy/vivid_exchanger.png and /dev/null differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderioendergy/vivid_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/enderioendergy/vivid_exchanger.png.mcmeta deleted file mode 100644 index 6739fa5..0000000 --- a/src/main/resources/assets/exchangers/textures/item/enderioendergy/vivid_exchanger.png.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/exchangers/textures/item/vanilla/amethyst_exchanger.png b/src/main/resources/assets/exchangers/textures/item/vanilla/amethyst_exchanger.png new file mode 100644 index 0000000..11e546d Binary files /dev/null and b/src/main/resources/assets/exchangers/textures/item/vanilla/amethyst_exchanger.png differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/conductive_iron_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/vanilla/amethyst_exchanger.png.mcmeta similarity index 100% rename from src/main/resources/assets/exchangers/textures/item/enderio/conductive_iron_exchanger.png.mcmeta rename to src/main/resources/assets/exchangers/textures/item/vanilla/amethyst_exchanger.png.mcmeta diff --git a/src/main/resources/assets/exchangers/textures/item/vanilla/copper_exchanger.png b/src/main/resources/assets/exchangers/textures/item/vanilla/copper_exchanger.png new file mode 100644 index 0000000..aad9d95 Binary files /dev/null and b/src/main/resources/assets/exchangers/textures/item/vanilla/copper_exchanger.png differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/dark_steel_exchanger.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/vanilla/copper_exchanger.png.mcmeta similarity index 100% rename from src/main/resources/assets/exchangers/textures/item/enderio/dark_steel_exchanger.png.mcmeta rename to src/main/resources/assets/exchangers/textures/item/vanilla/copper_exchanger.png.mcmeta diff --git a/src/main/resources/assets/exchangers/textures/item/vanilla/diamond_exchanger.png b/src/main/resources/assets/exchangers/textures/item/vanilla/diamond_exchanger.png index dd7e53d..e8733ca 100644 Binary files a/src/main/resources/assets/exchangers/textures/item/vanilla/diamond_exchanger.png and b/src/main/resources/assets/exchangers/textures/item/vanilla/diamond_exchanger.png differ diff --git a/src/main/resources/assets/exchangers/textures/item/vanilla/emerald_exchanger.png b/src/main/resources/assets/exchangers/textures/item/vanilla/emerald_exchanger.png index 09a7dac..5692c1f 100644 Binary files a/src/main/resources/assets/exchangers/textures/item/vanilla/emerald_exchanger.png and b/src/main/resources/assets/exchangers/textures/item/vanilla/emerald_exchanger.png differ diff --git a/src/main/resources/assets/exchangers/textures/item/vanilla/end_exchanger.png b/src/main/resources/assets/exchangers/textures/item/vanilla/end_exchanger.png index 7ecac54..330052e 100644 Binary files a/src/main/resources/assets/exchangers/textures/item/vanilla/end_exchanger.png and b/src/main/resources/assets/exchangers/textures/item/vanilla/end_exchanger.png differ diff --git a/src/main/resources/assets/exchangers/textures/item/vanilla/golden_exchanger.png b/src/main/resources/assets/exchangers/textures/item/vanilla/golden_exchanger.png index d7883d6..d971c58 100644 Binary files a/src/main/resources/assets/exchangers/textures/item/vanilla/golden_exchanger.png and b/src/main/resources/assets/exchangers/textures/item/vanilla/golden_exchanger.png differ diff --git a/src/main/resources/assets/exchangers/textures/item/vanilla/iron_exchanger.png b/src/main/resources/assets/exchangers/textures/item/vanilla/iron_exchanger.png index 8c814d4..d2ff54f 100644 Binary files a/src/main/resources/assets/exchangers/textures/item/vanilla/iron_exchanger.png and b/src/main/resources/assets/exchangers/textures/item/vanilla/iron_exchanger.png differ diff --git a/src/main/resources/assets/exchangers/textures/item/vanilla/netherite_exchanger.png b/src/main/resources/assets/exchangers/textures/item/vanilla/netherite_exchanger.png new file mode 100644 index 0000000..bd4ad3f Binary files /dev/null and b/src/main/resources/assets/exchangers/textures/item/vanilla/netherite_exchanger.png differ diff --git a/src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier1.png.mcmeta b/src/main/resources/assets/exchangers/textures/item/vanilla/netherite_exchanger.png.mcmeta similarity index 100% rename from src/main/resources/assets/exchangers/textures/item/enderio/eio_exchanger_core_tier1.png.mcmeta rename to src/main/resources/assets/exchangers/textures/item/vanilla/netherite_exchanger.png.mcmeta diff --git a/src/main/resources/assets/exchangers/textures/item/vanilla/obsidian_exchanger.png b/src/main/resources/assets/exchangers/textures/item/vanilla/obsidian_exchanger.png index 5af93ba..3fa3968 100644 Binary files a/src/main/resources/assets/exchangers/textures/item/vanilla/obsidian_exchanger.png and b/src/main/resources/assets/exchangers/textures/item/vanilla/obsidian_exchanger.png differ diff --git a/src/main/resources/assets/exchangers/textures/item/vanilla/stone_exchanger.png b/src/main/resources/assets/exchangers/textures/item/vanilla/stone_exchanger.png index 60e5553..8502c2f 100644 Binary files a/src/main/resources/assets/exchangers/textures/item/vanilla/stone_exchanger.png and b/src/main/resources/assets/exchangers/textures/item/vanilla/stone_exchanger.png differ diff --git a/src/main/resources/assets/exchangers/textures/item/vanilla/wooden_exchanger.png b/src/main/resources/assets/exchangers/textures/item/vanilla/wooden_exchanger.png index 524d860..75fa24d 100644 Binary files a/src/main/resources/assets/exchangers/textures/item/vanilla/wooden_exchanger.png and b/src/main/resources/assets/exchangers/textures/item/vanilla/wooden_exchanger.png differ diff --git a/src/main/resources/data/exchangers/recipes/enderio/conductive_iron_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/conductive_iron_exchanger.json deleted file mode 100644 index d76e6fb..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/conductive_iron_exchanger.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - } - ], - "pattern": [ - "IBI", - "ICI", - "IBI" - ], - "key": { - "I": { - "tag": "forge:ingots/conductive_iron" - }, - "B": { - "item": "enderio:basic_capacitor" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier1" - } - }, - "result": { - "item": "exchangers:conductive_iron_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/dark_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/easy/dark_steel_exchanger.json deleted file mode 100644 index 859db7f..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/dark_steel_exchanger.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], - "pattern": [ - "SVS", - "SCS", - "SOS" - ], - "key": { - "S": { - "tag": "forge:ingots/dark_steel" - }, - "O": { - "item": "enderio:octadic_capacitor" - }, - "V": { - "item": "enderio:vibrant_crystal" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - } - }, - "result": { - "item": "exchangers:dark_steel_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier2.json deleted file mode 100644 index f59b3dc..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier2.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], - "pattern": [ - "PSP", - "SDS", - "PSP" - ], - "key": { - "P": { - "tag": "forge:powders/pulsating" - }, - "S": { - "tag": "forge:ingots/electrical_steel" - }, - "D": { - "item": "enderio:dew_of_the_void_bucket" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier2" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier3.json deleted file mode 100644 index cdc0e1b..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/eio_exchanger_core_tier3.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], - "pattern": [ - "PSP", - "SDS", - "PSP" - ], - "key": { - "D": { - "tag": "forge:ingots/dark_steel" - }, - "B": { - "item": "enderio:basic_capacitor" - }, - "V": { - "item": "enderio:vapor_of_levity_bucket" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier3" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/electrical_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/easy/electrical_steel_exchanger.json deleted file mode 100644 index 6e8bdef..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/electrical_steel_exchanger.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], - "pattern": [ - "DBD", - "BVB", - "DBD" - ], - "key": { - "S": { - "tag": "forge:ingots/electrical_steel" - }, - "B": { - "item": "enderio:basic_capacitor_bank" - }, - "D": { - "item": "enderio:double_layer_capacitor" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - } - }, - "result": { - "item": "exchangers:electrical_steel_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/end_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/easy/end_steel_exchanger.json deleted file mode 100644 index 72bfeba..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/end_steel_exchanger.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], - "pattern": [ - "SPS", - "SCS", - "SAS" - ], - "key": { - "S": { - "tag": "forge:ingots/end_steel" - }, - "A": { - "item": "enderio:enhanced_wireless_charging_antenna" - }, - "P": { - "item": "enderio:precient_crystal" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - } - }, - "result": { - "item": "exchangers:end_steel_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/energetic_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/easy/energetic_exchanger.json deleted file mode 100644 index d118e24..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/energetic_exchanger.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], - "pattern": [ - "ADA", - "ACA", - "ABA" - ], - "key": { - "A": { - "tag": "forge:ingots/energetic_alloy" - }, - "B": { - "item": "enderio:capacitor_bank" - }, - "D": { - "item": "enderio:double_layer_capacitor" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - } - }, - "result": { - "item": "exchangers:energetic_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/pulsating_iron_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/easy/pulsating_iron_exchanger.json deleted file mode 100644 index 8d92617..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/pulsating_iron_exchanger.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], - "pattern": [ - "IPI", - "ICI", - "IBI" - ], - "key": { - "I": { - "tag": "forge:ingots/pulsating_iron" - }, - "P": { - "item": "enderio:pulsating_crystal" - }, - "B": { - "item": "enderio:basic_capacitor" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier1" - } - }, - "result": { - "item": "exchangers:pulsating_iron_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/easy/vibrant_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/easy/vibrant_exchanger.json deleted file mode 100644 index fec3fb6..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/easy/vibrant_exchanger.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "easy" - } - ], - "pattern": [ - "AEA", - "ACA", - "ABA" - ], - "key": { - "A": { - "tag": "forge:ingots/vibrant_alloy" - }, - "B": { - "item": "enderio:vibrant_capacitor_bank" - }, - "E": { - "item": "enderio:ender_crystal" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - } - }, - "result": { - "item": "exchangers:vibrant_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/eio_exchanger_core_tier1.json b/src/main/resources/data/exchangers/recipes/enderio/eio_exchanger_core_tier1.json deleted file mode 100644 index 0f3e4f3..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/eio_exchanger_core_tier1.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - } - ], - "pattern": [ - "PCP", - "CNC", - "PCP" - ], - "key": { - "P": { - "tag": "forge:nuggets/pulsating_iron" - }, - "C": { - "tag": "forge:ingots/conductive_iron" - }, - "N": { - "item": "enderio:nutrient_distillation_bucket" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier1" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/dark_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/hard/dark_steel_exchanger.json deleted file mode 100644 index 2a3883a..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/dark_steel_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], - "pattern": [ - "SVS", - "CXC", - "SOS" - ], - "key": { - "S": { - "tag": "forge:ingots/dark_steel" - }, - "O": { - "item": "enderio:octadic_capacitor" - }, - "V": { - "item": "enderio:vibrant_crystal" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - }, - "X": { - "item": "exchangers:energetic_exchanger" - } - }, - "result": { - "item": "exchangers:dark_steel_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier2.json deleted file mode 100644 index b5c1a15..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier2.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], - "pattern": [ - "PSP", - "CDC", - "PSP" - ], - "key": { - "P": { - "tag": "forge:powders/pulsating" - }, - "S": { - "tag": "forge:ingots/electrical_steel" - }, - "D": { - "item": "enderio:dew_of_the_void_bucket" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier1" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier2" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier3.json deleted file mode 100644 index c830736..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/eio_exchanger_core_tier3.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], - "pattern": [ - "DCD", - "CVC", - "DCD" - ], - "key": { - "D": { - "tag": "forge:ingots/dark_steel" - }, - "V": { - "item": "enderio:vapor_of_levity_bucket" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier3" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/electrical_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/hard/electrical_steel_exchanger.json deleted file mode 100644 index 1aa290b..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/electrical_steel_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], - "pattern": [ - "SDS", - "CXC", - "SBS" - ], - "key": { - "S": { - "tag": "forge:ingots/electrical_steel" - }, - "B": { - "item": "enderio:basic_capacitor_bank" - }, - "D": { - "item": "enderio:double_layer_capacitor" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - }, - "X": { - "item": "exchangers:pulsating_iron_exchanger" - } - }, - "result": { - "item": "exchangers:electrical_steel_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/end_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/hard/end_steel_exchanger.json deleted file mode 100644 index 73bacd9..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/end_steel_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], - "pattern": [ - "SPS", - "CXC", - "SAS" - ], - "key": { - "S": { - "tag": "forge:ingots/end_steel" - }, - "A": { - "item": "enderio:enhanced_wireless_charging_antenna" - }, - "P": { - "item": "enderio:precient_crystal" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - }, - "X": { - "item": "exchangers:vibrant_exchanger" - } - }, - "result": { - "item": "exchangers:end_steel_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/energetic_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/hard/energetic_exchanger.json deleted file mode 100644 index c5536a1..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/energetic_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], - "pattern": [ - "ADA", - "CXC", - "ABA" - ], - "key": { - "A": { - "tag": "forge:ingots/energetic_alloy" - }, - "B": { - "item": "enderio:capacitor_bank" - }, - "D": { - "item": "enderio:double_layer_capacitor" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - }, - "X": { - "item": "exchangers:electrical_steel_exchanger" - } - }, - "result": { - "item": "exchangers:energetic_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/pulsating_iron_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/hard/pulsating_iron_exchanger.json deleted file mode 100644 index 3e4352c..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/pulsating_iron_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], - "pattern": [ - "IPI", - "CXC", - "IBI" - ], - "key": { - "I": { - "tag": "forge:ingots/pulsating_iron" - }, - "P": { - "item": "enderio:pulsating_crystal" - }, - "B": { - "item": "enderio:basic_capacitor" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier1" - }, - "X": { - "item": "exchangers:conductive_iron_exchanger" - } - }, - "result": { - "item": "exchangers:pulsating_iron_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/hard/vibrant_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/hard/vibrant_exchanger.json deleted file mode 100644 index 769463a..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/hard/vibrant_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "hard" - } - ], - "pattern": [ - "AEA", - "CXC", - "ABA" - ], - "key": { - "A": { - "tag": "forge:ingots/vibrant_alloy" - }, - "B": { - "item": "enderio:vibrant_capacitor_bank" - }, - "E": { - "item": "enderio:ender_crystal" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - }, - "X": { - "item": "exchangers:dark_steel_exchanger" - } - }, - "result": { - "item": "exchangers:vibrant_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/dark_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/normal/dark_steel_exchanger.json deleted file mode 100644 index 3513d44..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/dark_steel_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], - "pattern": [ - "SCS", - "VXV", - "SOS" - ], - "key": { - "S": { - "tag": "forge:ingots/dark_steel" - }, - "O": { - "item": "enderio:octadic_capacitor" - }, - "V": { - "item": "enderio:vibrant_crystal" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - }, - "X": { - "item": "exchangers:energetic_exchanger" - } - }, - "result": { - "item": "exchangers:dark_steel_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier2.json deleted file mode 100644 index 24ebf03..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier2.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], - "pattern": [ - "PSP", - "DCD", - "PSP" - ], - "key": { - "P": { - "tag": "forge:powders/pulsating" - }, - "S": { - "tag": "forge:ingots/electrical_steel" - }, - "D": { - "item": "enderio:dew_of_the_void_bucket" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier1" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier2" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier3.json deleted file mode 100644 index 9d9c8a0..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/eio_exchanger_core_tier3.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], - "pattern": [ - "DBD", - "VCV", - "DBD" - ], - "key": { - "D": { - "tag": "forge:ingots/dark_steel" - }, - "B": { - "item": "enderio:basic_capacitor" - }, - "V": { - "item": "enderio:vapor_of_levity_bucket" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier3" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/electrical_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/normal/electrical_steel_exchanger.json deleted file mode 100644 index 95c007a..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/electrical_steel_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], - "pattern": [ - "SCS", - "DXD", - "SBS" - ], - "key": { - "S": { - "tag": "forge:ingots/electrical_steel" - }, - "B": { - "item": "enderio:basic_capacitor_bank" - }, - "D": { - "item": "enderio:double_layer_capacitor" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - }, - "X": { - "item": "exchangers:pulsating_iron_exchanger" - } - }, - "result": { - "item": "exchangers:electrical_steel_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/end_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/normal/end_steel_exchanger.json deleted file mode 100644 index f313172..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/end_steel_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], - "pattern": [ - "SCS", - "PXP", - "SAS" - ], - "key": { - "S": { - "tag": "forge:ingots/end_steel" - }, - "A": { - "item": "enderio:enhanced_wireless_charging_antenna" - }, - "P": { - "item": "enderio:precient_crystal" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - }, - "X": { - "item": "exchangers:vibrant_exchanger" - } - }, - "result": { - "item": "exchangers:end_steel_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/energetic_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/normal/energetic_exchanger.json deleted file mode 100644 index f954126..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/energetic_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], - "pattern": [ - "ACA", - "DXD", - "ABA" - ], - "key": { - "A": { - "tag": "forge:ingots/energetic_alloy" - }, - "B": { - "item": "enderio:capacitor_bank" - }, - "D": { - "item": "enderio:double_layer_capacitor" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - }, - "X": { - "item": "exchangers:electrical_steel_exchanger" - } - }, - "result": { - "item": "exchangers:energetic_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/pulsating_iron_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/normal/pulsating_iron_exchanger.json deleted file mode 100644 index 0d2c7cd..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/pulsating_iron_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], - "pattern": [ - "ICI", - "PXP", - "IBI" - ], - "key": { - "I": { - "tag": "forge:ingots/pulsating_iron" - }, - "P": { - "item": "enderio:pulsating_crystal" - }, - "B": { - "item": "enderio:basic_capacitor" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier1" - }, - "X": { - "item": "exchangers:conductive_iron_exchanger" - } - }, - "result": { - "item": "exchangers:pulsating_iron_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderio/normal/vibrant_exchanger.json b/src/main/resources/data/exchangers/recipes/enderio/normal/vibrant_exchanger.json deleted file mode 100644 index 72cd981..0000000 --- a/src/main/resources/data/exchangers/recipes/enderio/normal/vibrant_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderio" - }, - { - "type": "exchangers:ender_io_recipes_type", "value": "normal" - } - ], - "pattern": [ - "ACA", - "EXE", - "ABA" - ], - "key": { - "A": { - "tag": "forge:ingots/vibrant_alloy" - }, - "B": { - "item": "enderio:vibrant_capacitor_bank" - }, - "E": { - "item": "enderio:ender_crystal" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - }, - "X": { - "item": "exchangers:dark_steel_exchanger" - } - }, - "result": { - "item": "exchangers:vibrant_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/crude_steel_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/crude_steel_exchanger.json deleted file mode 100644 index 7f012a3..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/crude_steel_exchanger.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - } - ], - "pattern": [ - "S#S", - "SCS", - "S#S" - ], - "key": { - "S": { - "tag": "forge:ingots/crude_steel" - }, - "#": { - "item": "enderio:item_capacitor_silver" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier1" - } - }, - "result": { - "item": "exchangers:crude_steel_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/crystalline_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/crystalline_exchanger.json deleted file mode 100644 index 3573be5..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/crystalline_exchanger.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], - "pattern": [ - "A#A", - "ACA", - "ATA" - ], - "key": { - "A": { - "tag": "forge:ingots/crystalline_alloy" - }, - "T": { - "item": "enderio:item_capacitor_totemic" - }, - "#": { - "item": "enderio:item_capacitor_crystalline" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - } - }, - "result": { - "item": "exchangers:crystalline_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier2.json deleted file mode 100644 index 15d5b23..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier2.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], - "pattern": [ - "PVP", - "VLV", - "PVP" - ], - "key": { - "P": { - "item": "enderio:block_holy_fog" - }, - "V": { - "tag": "forge:ingots/vivid_alloy" - }, - "L": { - "item": "enderio:liquid_sunshine_bucket" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier2" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier3.json deleted file mode 100644 index fb9047b..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/eio_endergy_exchanger_core_tier3.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], - "pattern": [ - "MIM", - "ISI", - "MIM" - ], - "key": { - "M": { - "tag": "forge:ingots/melodic_alloy" - }, - "I": { - "tag": "forge:items/infinity_goop" - }, - "S": { - "item": "enderio:concentrated_cloud_seed_bucket" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier3" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/energetic_silver_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/energetic_silver_exchanger.json deleted file mode 100644 index 44b2a8d..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/energetic_silver_exchanger.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], - "pattern": [ - "SXS", - "SCS", - "S#S" - ], - "key": { - "S": { - "tag": "forge:ingots/energetic_silver" - }, - "X": { - "item": "enderio:item_capacitor_silver" - }, - "#": { - "item": "enderio:item_capacitor_energetic_silver" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier1" - } - }, - "result": { - "item": "exchangers:energetic_silver_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/melodic_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/melodic_exchanger.json deleted file mode 100644 index bd76530..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/melodic_exchanger.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], - "pattern": [ - "MLM", - "MCM", - "M#M" - ], - "key": { - "M": { - "tag": "forge:ingots/melodic_alloy" - }, - "L": { - "item": "enderio:item_capacitor_melodic" - }, - "#": { - "item": "enderio:item_ender_resonator" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - } - }, - "result": { - "item": "exchangers:melodic_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/stellar_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/stellar_exchanger.json deleted file mode 100644 index 4359a3b..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/stellar_exchanger.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], - "pattern": [ - "S#S", - "SCS", - "SDS" - ], - "key": { - "S": { - "tag": "forge:ingots/stellar_alloy" - }, - "#": { - "item": "enderio:item_capacitor_stellar" - }, - "D": { - "item": "enderio:block_dimensional_transceiver" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - } - }, - "result": { - "item": "exchangers:stellar_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/vivid_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/easy/vivid_exchanger.json deleted file mode 100644 index 356f6a3..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/easy/vivid_exchanger.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "easy" - } - ], - "pattern": [ - "VSV", - "VCV", - "VEV" - ], - "key": { - "V": { - "tag": "forge:ingots/vivid_alloy" - }, - "S": { - "item": "enderio:item_capacitor_energetic_silver" - }, - "E": { - "item": "enderio:item_capacitor_vivid" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - } - }, - "result": { - "item": "exchangers:vivid_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/eio_endergy_exchanger_core_tier1.json b/src/main/resources/data/exchangers/recipes/enderioendergy/eio_endergy_exchanger_core_tier1.json deleted file mode 100644 index d24593e..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/eio_endergy_exchanger_core_tier1.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - } - ], - "pattern": [ - "GSG", - "SIS", - "GSG" - ], - "key": { - "G": { - "item": "enderio:item_capacitor_grainy" - }, - "S": { - "tag": "forge:ingots/crude_steel" - }, - "I": { - "item": "enderio:block_infinity_fog" - } - }, - "result": { - "item": "exchangers:eio_endergy_exchanger_core_tier1" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/crystalline_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/crystalline_exchanger.json deleted file mode 100644 index b12c3bf..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/crystalline_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], - "pattern": [ - "A#A", - "CXC", - "ATA" - ], - "key": { - "A": { - "tag": "forge:ingots/crystalline_alloy" - }, - "T": { - "item": "enderio:item_capacitor_totemic" - }, - "#": { - "item": "enderio:item_capacitor_crystalline" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - }, - "X": { - "item": "exchangers:vivid_exchanger" - } - }, - "result": { - "item": "exchangers:crystalline_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier2.json deleted file mode 100644 index 8cc0c1c..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier2.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], - "pattern": [ - "PVP", - "CLC", - "PVP" - ], - "key": { - "P": { - "item": "enderio:block_holy_fog" - }, - "V": { - "tag": "forge:ingots/vivid_alloy" - }, - "L": { - "item": "enderio:liquid_sunshine_bucket" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier1" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier2" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier3.json deleted file mode 100644 index 1cd72ad..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/eio_endergy_exchanger_core_tier3.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], - "pattern": [ - "MCM", - "CSC", - "MCM" - ], - "key": { - "M": { - "tag": "forge:ingots/melodic_alloy" - }, - "S": { - "item": "enderio:concentrated_cloud_seed_bucket" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier3" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/energetic_silver_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/energetic_silver_exchanger.json deleted file mode 100644 index 4147970..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/energetic_silver_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], - "pattern": [ - "S#S", - "CXC", - "SES" - ], - "key": { - "S": { - "tag": "forge:ingots/energetic_silver" - }, - "#": { - "item": "enderio:item_capacitor_silver" - }, - "E": { - "item": "enderio:item_capacitor_energetic_silver" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier1" - }, - "X": { - "item": "exchangers:crude_steel_exchanger" - } - }, - "result": { - "item": "exchangers:energetic_silver_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/melodic_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/melodic_exchanger.json deleted file mode 100644 index 928b8af..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/melodic_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], - "pattern": [ - "MLM", - "CXC", - "M#M" - ], - "key": { - "M": { - "tag": "forge:ingots/melodic_alloy" - }, - "L": { - "item": "enderio:item_capacitor_melodic" - }, - "#": { - "item": "enderio:item_ender_resonator" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - }, - "X": { - "item": "exchangers:crystalline_exchanger" - } - }, - "result": { - "item": "exchangers:melodic_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/stellar_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/stellar_exchanger.json deleted file mode 100644 index 54a5fca..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/stellar_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], - "pattern": [ - "S#S", - "CXC", - "SDS" - ], - "key": { - "S": { - "tag": "forge:ingots/stellar_alloy" - }, - "#": { - "item": "enderio:item_capacitor_stellar" - }, - "D": { - "item": "enderio:block_dimensional_transceiver" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - }, - "X": { - "item": "exchangers:melodic_exchanger" - } - }, - "result": { - "item": "exchangers:stellar_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/vivid_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/hard/vivid_exchanger.json deleted file mode 100644 index a54c6f0..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/hard/vivid_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "hard" - } - ], - "pattern": [ - "VSV", - "CXC", - "V#V" - ], - "key": { - "V": { - "tag": "forge:ingots/vivid_alloy" - }, - "S": { - "item": "enderio:item_capacitor_energetic_silver" - }, - "#": { - "item": "enderio:item_capacitor_vivid" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - }, - "X": { - "item": "exchangers:energetic_silver_exchanger" - } - }, - "result": { - "item": "exchangers:vivid_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/crystalline_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/crystalline_exchanger.json deleted file mode 100644 index be0334f..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/crystalline_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], - "pattern": [ - "ACA", - "#X#", - "ATA" - ], - "key": { - "A": { - "tag": "forge:ingots/crystalline_alloy" - }, - "T": { - "item": "enderio:item_capacitor_totemic" - }, - "#": { - "item": "enderio:item_capacitor_crystalline" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - }, - "X": { - "item": "exchangers:vivid_exchanger" - } - }, - "result": { - "item": "exchangers:crystalline_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier2.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier2.json deleted file mode 100644 index 4ae80a5..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier2.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], - "pattern": [ - "PVP", - "LCL", - "PVP" - ], - "key": { - "P": { - "item": "enderio:block_holy_fog" - }, - "V": { - "tag": "forge:ingots/vivid_alloy" - }, - "L": { - "item": "enderio:liquid_sunshine_bucket" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier1" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier2" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier3.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier3.json deleted file mode 100644 index 5b95038..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/eio_endergy_exchanger_core_tier3.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], - "pattern": [ - "MIM", - "SCS", - "MIM" - ], - "key": { - "M": { - "tag": "forge:ingots/melodic_alloy" - }, - "I": { - "tag": "forge:items/infinity_goop" - }, - "S": { - "item": "enderio:concentrated_cloud_seed_bucket" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - } - }, - "result": { - "item": "exchangers:eio_exchanger_core_tier3" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/energetic_silver_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/energetic_silver_exchanger.json deleted file mode 100644 index 532d883..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/energetic_silver_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], - "pattern": [ - "SCS", - "#X#", - "SES" - ], - "key": { - "S": { - "tag": "forge:ingots/energetic_silver" - }, - "#": { - "item": "enderio:item_capacitor_silver" - }, - "E": { - "item": "enderio:item_capacitor_energetic_silver" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier1" - }, - "X": { - "item": "exchangers:crude_steel_exchanger" - } - }, - "result": { - "item": "exchangers:energetic_silver_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/melodic_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/melodic_exchanger.json deleted file mode 100644 index b2515ec..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/melodic_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], - "pattern": [ - "MCM", - "LXL", - "M#M" - ], - "key": { - "M": { - "tag": "forge:ingots/melodic_alloy" - }, - "L": { - "item": "enderio:item_capacitor_melodic" - }, - "#": { - "item": "enderio:item_ender_resonator" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - }, - "X": { - "item": "exchangers:crystalline_exchanger" - } - }, - "result": { - "item": "exchangers:melodic_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/stellar_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/stellar_exchanger.json deleted file mode 100644 index 27d70ed..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/stellar_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], - "pattern": [ - "SCS", - "#X#", - "SDS" - ], - "key": { - "S": { - "tag": "forge:ingots/stellar_alloy" - }, - "#": { - "item": "enderio:item_capacitor_stellar" - }, - "D": { - "item": "enderio:block_dimensional_transceiver" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier3" - }, - "X": { - "item": "exchangers:melodic_exchanger" - } - }, - "result": { - "item": "exchangers:stellar_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/vivid_exchanger.json b/src/main/resources/data/exchangers/recipes/enderioendergy/normal/vivid_exchanger.json deleted file mode 100644 index 1a02c18..0000000 --- a/src/main/resources/data/exchangers/recipes/enderioendergy/normal/vivid_exchanger.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "crafting_shaped", - "conditions": [ - { - "type": "exchangers:ender_io_endergy_module", "enabled": true - }, - { - "type": "forge:mod_loaded", "modid": "enderioendergy" - }, - { - "type": "exchangers:ender_io_endergy_recipes_type", "value": "normal" - } - ], - "pattern": [ - "VCV", - "SXS", - "V#V" - ], - "key": { - "V": { - "tag": "forge:ingots/vivid_alloy" - }, - "S": { - "item": "enderio:item_capacitor_energetic_silver" - }, - "#": { - "item": "enderio:item_capacitor_vivid" - }, - "C": { - "item": "exchangers:eio_exchanger_core_tier2" - }, - "X": { - "item": "exchangers:energetic_silver_exchanger" - } - }, - "result": { - "item": "exchangers:vivid_exchanger" - } -} diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/amethyst_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/amethyst_exchanger.json new file mode 100644 index 0000000..8e6e2b4 --- /dev/null +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/amethyst_exchanger.json @@ -0,0 +1,30 @@ +{ + "type": "crafting_shaped", + "conditions": [ + { + "type": "exchangers:vanilla_module", "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", "value": "easy" + } + ], + "pattern": [ + "AEA", + "ACA", + "AEA" + ], + "key": { + "A": { + "tag": "forge:gems/amethyst" + }, + "E": { + "item": "minecraft:ender_eye" + }, + "C": { + "item": "exchangers:exchanger_core_tier3" + } + }, + "result": { + "item": "exchangers:amethyst_exchanger" + } +} diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/copper_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/copper_exchanger.json new file mode 100644 index 0000000..c428017 --- /dev/null +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/copper_exchanger.json @@ -0,0 +1,30 @@ +{ + "type": "crafting_shaped", + "conditions": [ + { + "type": "exchangers:vanilla_module", "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", "value": "easy" + } + ], + "pattern": [ + "IEI", + "ICI", + "IEI" + ], + "key": { + "I": { + "tag": "forge:ingots/copper" + }, + "E": { + "item": "minecraft:ender_eye" + }, + "C": { + "item": "exchangers:exchanger_core_tier2" + } + }, + "result": { + "item": "exchangers:copper_exchanger" + } +} diff --git a/src/main/resources/data/exchangers/recipes/vanilla/easy/netherite_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/easy/netherite_exchanger.json new file mode 100644 index 0000000..4f79f6f --- /dev/null +++ b/src/main/resources/data/exchangers/recipes/vanilla/easy/netherite_exchanger.json @@ -0,0 +1,36 @@ +{ + "type": "crafting_shaped", + "conditions": [ + { + "type": "exchangers:vanilla_module", "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", "value": "easy" + } + ], + "pattern": [ + "SNS", + "ECE", + "OOO" + ], + "key": { + "O": { + "tag": "forge:obsidian" + }, + "S": { + "item": "minecraft:netherite_scrap" + }, + "N": { + "tag": "forge:ingots/netherite" + }, + "E": { + "item": "minecraft:ender_eye" + }, + "C": { + "item": "exchangers:exchanger_core_tier3" + } + }, + "result": { + "item": "exchangers:netherite_exchanger" + } +} diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/amethyst_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/amethyst_exchanger.json new file mode 100644 index 0000000..88a5889 --- /dev/null +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/amethyst_exchanger.json @@ -0,0 +1,33 @@ +{ + "type": "crafting_shaped", + "conditions": [ + { + "type": "exchangers:vanilla_module", "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", "value": "hard" + } + ], + "pattern": [ + "AEA", + "CXC", + "AEA" + ], + "key": { + "A": { + "tag": "forge:gems/amethyst" + }, + "E": { + "item": "minecraft:ender_eye" + }, + "C": { + "item": "exchangers:exchanger_core_tier3" + }, + "X": { + "item": "exchangers:obsidian_exchanger" + } + }, + "result": { + "item": "exchangers:amethyst_exchanger" + } +} diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/copper_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/copper_exchanger.json new file mode 100644 index 0000000..c2716e1 --- /dev/null +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/copper_exchanger.json @@ -0,0 +1,33 @@ +{ + "type": "crafting_shaped", + "conditions": [ + { + "type": "exchangers:vanilla_module", "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", "value": "hard" + } + ], + "pattern": [ + "IEI", + "CXC", + "IEI" + ], + "key": { + "I": { + "tag": "forge:ingots/copper" + }, + "E": { + "item": "minecraft:ender_eye" + }, + "C": { + "item": "exchangers:exchanger_core_tier2" + }, + "X": { + "item": "exchangers:stone_exchanger" + } + }, + "result": { + "item": "exchangers:copper_exchanger" + } +} diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/diamond_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/diamond_exchanger.json index a8085df..82feefa 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/diamond_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/diamond_exchanger.json @@ -23,9 +23,17 @@ "C": { "item": "exchangers:exchanger_core_tier3" }, - "X": { - "item": "exchangers:iron_exchanger" - } + "X": [ + { + "item": "exchangers:iron_exchanger" + }, + { + "item": "exchangers:copper_exchanger" + }, + { + "item": "exchangers:golden_exchanger" + } + ] }, "result": { "item": "exchangers:diamond_exchanger" diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/end_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/end_exchanger.json index 4086eed..71739dc 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/end_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/end_exchanger.json @@ -27,7 +27,7 @@ "item": "exchangers:exchanger_core_tier3" }, "X": { - "item": "exchangers:obsidian_exchanger" + "item": "exchangers:netherite_exchanger" } }, "result": { diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/iron_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/iron_exchanger.json index 5475e91..0759831 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/iron_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/iron_exchanger.json @@ -24,7 +24,7 @@ "item": "exchangers:exchanger_core_tier2" }, "X": { - "item": "exchangers:golden_exchanger" + "item": "exchangers:stone_exchanger" } }, "result": { diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/netherite_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/netherite_exchanger.json new file mode 100644 index 0000000..2700a6b --- /dev/null +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/netherite_exchanger.json @@ -0,0 +1,36 @@ +{ + "type": "crafting_shaped", + "conditions": [ + { + "type": "exchangers:vanilla_module", "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", "value": "hard" + } + ], + "pattern": [ + "NEN", + "CXC", + "SES" + ], + "key": { + "S": { + "item": "minecraft:netherite_scrap" + }, + "N": { + "tag": "forge:ingots/netherite" + }, + "E": { + "item": "minecraft:ender_eye" + }, + "C": { + "item": "exchangers:exchanger_core_tier3" + }, + "X": { + "item": "exchangers:amethyst_exchanger" + } + }, + "result": { + "item": "exchangers:netherite_exchanger" + } +} diff --git a/src/main/resources/data/exchangers/recipes/vanilla/hard/obsidian_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/hard/obsidian_exchanger.json index 69cb74d..63a6283 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/hard/obsidian_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/hard/obsidian_exchanger.json @@ -9,7 +9,7 @@ } ], "pattern": [ - "NEN", + "OEO", "CXC", "OEO" ], @@ -17,9 +17,6 @@ "O": { "tag": "forge:obsidian" }, - "N": { - "tag": "forge:ingots/netherite" - }, "E": { "item": "minecraft:ender_eye" }, diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/amethyst_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/amethyst_exchanger.json new file mode 100644 index 0000000..132a48c --- /dev/null +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/amethyst_exchanger.json @@ -0,0 +1,33 @@ +{ + "type": "crafting_shaped", + "conditions": [ + { + "type": "exchangers:vanilla_module", "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", "value": "normal" + } + ], + "pattern": [ + "ACA", + "EXE", + "AAA" + ], + "key": { + "A": { + "tag": "forge:gems/amethyst" + }, + "E": { + "item": "minecraft:ender_eye" + }, + "C": { + "item": "exchangers:exchanger_core_tier3" + }, + "X": { + "item": "exchangers:obsidian_exchanger" + } + }, + "result": { + "item": "exchangers:amethyst_exchanger" + } +} diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/copper_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/copper_exchanger.json new file mode 100644 index 0000000..cdf1705 --- /dev/null +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/copper_exchanger.json @@ -0,0 +1,33 @@ +{ + "type": "crafting_shaped", + "conditions": [ + { + "type": "exchangers:vanilla_module", "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", "value": "normal" + } + ], + "pattern": [ + "ICI", + "EXE", + "III" + ], + "key": { + "I": { + "tag": "forge:ingots/copper" + }, + "E": { + "item": "minecraft:ender_eye" + }, + "C": { + "item": "exchangers:exchanger_core_tier2" + }, + "X": { + "item": "exchangers:stone_exchanger" + } + }, + "result": { + "item": "exchangers:copper_exchanger" + } +} diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/diamond_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/diamond_exchanger.json index 5cc5712..decc10f 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/diamond_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/diamond_exchanger.json @@ -23,9 +23,17 @@ "C": { "item": "exchangers:exchanger_core_tier3" }, - "X": { - "item": "exchangers:iron_exchanger" - } + "X": [ + { + "item": "exchangers:iron_exchanger" + }, + { + "item": "exchangers:copper_exchanger" + }, + { + "item": "exchangers:golden_exchanger" + } + ] }, "result": { "item": "exchangers:diamond_exchanger" diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/end_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/end_exchanger.json index a54932e..e5137ef 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/end_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/end_exchanger.json @@ -30,7 +30,7 @@ "item": "exchangers:exchanger_core_tier3" }, "X": { - "item": "exchangers:obsidian_exchanger" + "item": "exchangers:netherite_exchanger" } }, "result": { diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/iron_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/iron_exchanger.json index 7150836..c83a568 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/iron_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/iron_exchanger.json @@ -24,7 +24,7 @@ "item": "exchangers:exchanger_core_tier2" }, "X": { - "item": "exchangers:golden_exchanger" + "item": "exchangers:stone_exchanger" } }, "result": { diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/netherite_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/netherite_exchanger.json new file mode 100644 index 0000000..c3d63a6 --- /dev/null +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/netherite_exchanger.json @@ -0,0 +1,36 @@ +{ + "type": "crafting_shaped", + "conditions": [ + { + "type": "exchangers:vanilla_module", "enabled": true + }, + { + "type": "exchangers:vanilla_recipes_type", "value": "normal" + } + ], + "pattern": [ + "SCS", + "EXE", + "SNS" + ], + "key": { + "S": { + "item": "minecraft:netherite_scrap" + }, + "N": { + "tag": "forge:ingots/netherite" + }, + "E": { + "item": "minecraft:ender_eye" + }, + "C": { + "item": "exchangers:exchanger_core_tier3" + }, + "X": { + "item": "exchangers:amethyst_exchanger" + } + }, + "result": { + "item": "exchangers:netherite_exchanger" + } +} diff --git a/src/main/resources/data/exchangers/recipes/vanilla/normal/obsidian_exchanger.json b/src/main/resources/data/exchangers/recipes/vanilla/normal/obsidian_exchanger.json index d56450a..bb0b0ff 100644 --- a/src/main/resources/data/exchangers/recipes/vanilla/normal/obsidian_exchanger.json +++ b/src/main/resources/data/exchangers/recipes/vanilla/normal/obsidian_exchanger.json @@ -11,15 +11,12 @@ "pattern": [ "OCO", "EXE", - "ONO" + "OOO" ], "key": { "O": { "tag": "forge:obsidian" }, - "N": { - "tag": "forge:ingots/netherite" - }, "E": { "item": "minecraft:ender_eye" }, diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 718ecb9..140775a 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,8 @@ { - "pack": { - "description": "Exchangers Resources", - "pack_format": 13 - } + "pack": { + "description": { + "text": "${mod_name} resources" + }, + "pack_format": 13 + } }