diff --git a/build.gradle b/build.gradle index c54da9f..774ce01 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,6 @@ buildscript { apply plugin: 'net.minecraftforge.gradle.forge' //Only edit below this line, the above code adds and enables the nessasary things for Forge to be setup. - version = "${mc_version}-${mod_version}" group= "me.jacky1356400.exchangers" archivesBaseName = "Exchangers" @@ -23,7 +22,7 @@ compileJava { minecraft { version = "${mc_version}-${forge_version}" runDir = "run" - mappings = "snapshot_20170624" + mappings = "snapshot_20170705" } repositories { @@ -39,14 +38,22 @@ repositories { maven { url "http://tehnut.info/maven" } + maven { + name = "CoFH Maven" + url = "http://maven.covers1624.net" + } + maven { + url = "http://chickenbones.net/maven" + } } dependencies { compile files('libs/') - deobfCompile "mezz.jei:jei_1.12:4.7.0.68:api" - runtime "mezz.jei:jei_1.12:4.7.0.68" - deobfCompile "mcp.mobius.waila:Hwyla:1.8.18-B32_1.12:api" - runtime "mcp.mobius.waila:Hwyla:1.8.18-B32_1.12" + deobfCompile "mezz.jei:jei_1.12:4.7.1.69:api" + runtime "mezz.jei:jei_1.12:4.7.1.69" + deobfCompile "mcp.mobius.waila:Hwyla:1.8.19-B33_1.12:api" + runtime "mcp.mobius.waila:Hwyla:1.8.19-B33_1.12" + compile "cofh:RedstoneFlux:1.12-2.0.0.+:deobf" } processResources diff --git a/gradle.properties b/gradle.properties index 556dbdc..f401fdf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,5 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx4G mc_version=1.12 -forge_version=14.21.1.2387 -mod_version=2.0.1 +forge_version=14.21.1.2396 +mod_version=2.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d60322e..671daab 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jun 13 19:20:47 CST 2017 +#Mon Sep 14 12:28:28 PDT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip diff --git a/src/main/java/me/jacky1356400/exchangers/Config.java b/src/main/java/me/jacky1356400/exchangers/Config.java index b4838e8..98f6b00 100644 --- a/src/main/java/me/jacky1356400/exchangers/Config.java +++ b/src/main/java/me/jacky1356400/exchangers/Config.java @@ -36,40 +36,40 @@ public class Config { public static int obsMaxDmg; //Ender IO - public static int conductiveIronExchangerMaxRF; - public static int conductiveIronExchangerPerBlockRF; - public static int pulsatingIronExchangerMaxRF; - public static int pulsatingIronExchangerPerBlockRF; - public static int electricalSteelExchangerMaxRF; - public static int electricalSteelExchangerPerBlockRF; - public static int energeticExchangerMaxRF; - public static int energeticExchangerPerBlockRF; - public static int darkSteelExchangerMaxRF; - public static int darkSteelExchangerPerBlockRF; - public static int vibrantExchangerMaxRF; - public static int vibrantExchangerPerBlockRF; + public static int conductiveMaxEnergy; + public static int conductivePerBlockUse; + public static int pulsatingMaxEnergy; + public static int pulsatingPerBlockUse; + public static int electricalSteelMaxEnergy; + public static int electricalSteelPerBlockUse; + public static int energeticMaxEnergy; + public static int energeticPerBlockUse; + public static int darkSteelMaxEnergy; + public static int darkSteelPerBlockUse; + public static int vibrantMaxEnergy; + public static int vibrantPerBlockUse; //Thermal Expansion - public static int leadstoneExchangerMaxRF; - public static int leadstoneExchangerPerBlockRF; - public static int hardenedExchangerMaxRF; - public static int hardenedExchangerPerBlockRF; - public static int reinforcedExchangerMaxRF; - public static int reinforcedExchangerPerBlockRF; - public static int signalumExchangerMaxRF; - public static int signalumExchangerPerBlockRF; - public static int resonantExchangerMaxRF; - public static int resonantExchangerPerBlockRF; + public static int leadstoneMaxEnergy; + public static int leadstonePerBlockUse; + public static int hardenedMaxEnergy; + public static int hardenedPerBlockUse; + public static int reinforcedMaxEnergy; + public static int reinforcedPerBlockUse; + public static int signalumMaxEnergy; + public static int signalumPerBlockUse; + public static int resonantMaxEnergy; + public static int resonantPerBlockUse; //Mekanism - public static int basicExchangerMaxRF; - public static int basicExchangerPerBlockRF; - public static int advancedExchangerMaxRF; - public static int advancedExchangerPerBlockRF; - public static int eliteExchangerMaxRF; - public static int eliteExchangerPerBlockRF; - public static int ultimateExchangerMaxRF; - public static int ultimateExchangerPerBlockRF; + public static int basicMaxEnergy; + public static int basicPerBlockUse; + public static int advancedMaxEnergy; + public static int advancedPerBlockUse; + public static int eliteMaxEnergy; + public static int elitePerBlockUse; + public static int ultimateMaxEnergy; + public static int ultimatePerBlockUse; public static void readConfig() { Configuration cfg = CommonProxy.config; @@ -92,8 +92,8 @@ private static void initConfig(Configuration cfg) { "If true, enables recipes for vanilla-based exchangers."); enderIOModule = cfg.getBoolean("Ender IO Module", CATEGORY_MODULES, false, "[Not implemented!] If true, enables recipes for Ender IO-based exchangers (Requires Ender IO to be installed)."); - thermalExpansionModule = cfg.getBoolean("Thermal Expansion Module", CATEGORY_MODULES, false, - "[Not implemented!] If true, enables recipes for Thermal Expansion-based exchangers (Requires Thermal Expansion to be installed)."); + thermalExpansionModule = cfg.getBoolean("Thermal Expansion Module", CATEGORY_MODULES, true, + "If true, enables recipes for Thermal Expansion-based exchangers (Requires Thermal Expansion to be installed)."); mekanismModule = cfg.getBoolean("Mekanism Module", CATEGORY_MODULES, false, "[Not implemented!] If true, enables recipes for Mekanism-based exchangers (Requires Mekanism to be installed)."); specialModule = cfg.getBoolean("Special Module", CATEGORY_MODULES, true, @@ -130,71 +130,71 @@ private static void initConfig(Configuration cfg) { //Ender IO Tweaks cfg.addCustomCategoryComment(CATEGORY_TWEAKS_EIO, "[Not implemented!] Ender IO Exchanger Tweaks"); - conductiveIronExchangerMaxRF = cfg.getInt("Conductive Iron Exchanger Capacity", CATEGORY_TWEAKS_EIO, 80000, + conductiveMaxEnergy = cfg.getInt("Conductive Iron Exchanger Capacity", CATEGORY_TWEAKS_EIO, 80000, 1000, 100000000, "Set the RF capacity for Conductive Iron Exchanger"); - conductiveIronExchangerPerBlockRF = cfg.getInt("Conductive Iron Exchanger Power Consumption", + conductivePerBlockUse = cfg.getInt("Conductive Iron Exchanger Power Consumption", CATEGORY_TWEAKS_EIO, 10, 1, 250, "Set the Rf consumption per block for Conductive Iron Exchanger"); - pulsatingIronExchangerMaxRF = cfg.getInt("Pulsating Iron Exchanger Capacity", CATEGORY_TWEAKS_EIO, 400000, 1000, + pulsatingMaxEnergy = cfg.getInt("Pulsating Iron Exchanger Capacity", CATEGORY_TWEAKS_EIO, 400000, 1000, 100000000, "Set the RF capacity for Pulsating Iron Exchanger"); - pulsatingIronExchangerPerBlockRF = cfg.getInt("Pulsating Iron Exchanger Power Consumption", CATEGORY_TWEAKS_EIO, + pulsatingPerBlockUse = cfg.getInt("Pulsating Iron Exchanger Power Consumption", CATEGORY_TWEAKS_EIO, 50, 1, 500, "Set the RF consumption per block for Pulsating Iron Exchanger"); - electricalSteelExchangerMaxRF = cfg.getInt("Electrical Steel Exchanger Capacity", CATEGORY_TWEAKS_EIO, 800000, + electricalSteelMaxEnergy = cfg.getInt("Electrical Steel Exchanger Capacity", CATEGORY_TWEAKS_EIO, 800000, 1000, 100000000, "Set the RF capacity for Electrical Steel Exchanger"); - electricalSteelExchangerPerBlockRF = cfg.getInt("Electrical Steel Exchanger Power Consumption", + electricalSteelPerBlockUse = cfg.getInt("Electrical Steel Exchanger Power Consumption", CATEGORY_TWEAKS_EIO, 100, 1, 1000, "Set the RF consumption per block for Electrical Steel Exchanger"); - energeticExchangerMaxRF = cfg.getInt("Energetic Exchanger Capacity", CATEGORY_TWEAKS_EIO, 5000000, 1000, + energeticMaxEnergy = cfg.getInt("Energetic Exchanger Capacity", CATEGORY_TWEAKS_EIO, 5000000, 1000, 100000000, "Set the RF capacity for Energetic Exchanger"); - energeticExchangerPerBlockRF = cfg.getInt("Energetic Exchanger Power Consumption", CATEGORY_TWEAKS_EIO, 250, 1, + energeticPerBlockUse = cfg.getInt("Energetic Exchanger Power Consumption", CATEGORY_TWEAKS_EIO, 250, 1, 2500, "Set the RF consumption per block for Energetic Exchanger"); - darkSteelExchangerMaxRF = cfg.getInt("Dark Steel Exchanger Capacity", CATEGORY_TWEAKS_EIO, 10000000, 1000, + darkSteelMaxEnergy = cfg.getInt("Dark Steel Exchanger Capacity", CATEGORY_TWEAKS_EIO, 10000000, 1000, 100000000, "Set the RF capacity for Dark Steel Exchanger"); - darkSteelExchangerPerBlockRF = cfg.getInt("Dark Steel Exchanger Power Consumption", CATEGORY_TWEAKS_EIO, 500, 1, + darkSteelPerBlockUse = cfg.getInt("Dark Steel Exchanger Power Consumption", CATEGORY_TWEAKS_EIO, 500, 1, 5000, "Set the RF consumption per block for Dark Steel Exchanger"); - vibrantExchangerMaxRF = cfg.getInt("Vibrant Exchanger Capacity", CATEGORY_TWEAKS_EIO, 20000000, 1000, 100000000, + vibrantMaxEnergy = cfg.getInt("Vibrant Exchanger Capacity", CATEGORY_TWEAKS_EIO, 20000000, 1000, 100000000, "Set the RF capacity for Vibrant Exchanger"); - vibrantExchangerPerBlockRF = cfg.getInt("Vibrant Exchanger Power Consumption", CATEGORY_TWEAKS_EIO, 1000, 1, + vibrantPerBlockUse = cfg.getInt("Vibrant Exchanger Power Consumption", CATEGORY_TWEAKS_EIO, 1000, 1, 10000, "Set the RF consumption per block for Vibrant Exchanger"); //Thermal Expansion Tweaks cfg.addCustomCategoryComment(CATEGORY_TWEAKS_TE, "[Not implemented!] Thermal Expansion Exchanger Tweaks"); - leadstoneExchangerMaxRF = cfg.getInt("Leadstone Exchanger Capacity", CATEGORY_TWEAKS_TE, 80000, 1000, 100000000, + leadstoneMaxEnergy = cfg.getInt("Leadstone Exchanger Capacity", CATEGORY_TWEAKS_TE, 80000, 1000, 100000000, "Set the RF capacity for Leadstone Exchanger"); - leadstoneExchangerPerBlockRF = cfg.getInt("Leadstone Exchanger Power Consumption", CATEGORY_TWEAKS_TE, 10, 1, + leadstonePerBlockUse = cfg.getInt("Leadstone Exchanger Power Consumption", CATEGORY_TWEAKS_TE, 10, 1, 250, "Set the RF consumption per block for Leadstone Exchanger"); - hardenedExchangerMaxRF = cfg.getInt("Hardened Exchanger Capacity", CATEGORY_TWEAKS_TE, 500000, 1000, 100000000, + hardenedMaxEnergy = cfg.getInt("Hardened Exchanger Capacity", CATEGORY_TWEAKS_TE, 500000, 1000, 100000000, "Set the RF capacity for Hardened Exchanger"); - hardenedExchangerPerBlockRF = cfg.getInt("Hardened Exchanger Power Consumption", CATEGORY_TWEAKS_TE, 50, 1, 500, + hardenedPerBlockUse = cfg.getInt("Hardened Exchanger Power Consumption", CATEGORY_TWEAKS_TE, 50, 1, 500, "Set the RF consumption per block for Hardened Exchanger"); - reinforcedExchangerMaxRF = cfg.getInt("Reinforced Exchanger Capacity", CATEGORY_TWEAKS_TE, 1000000, 1000, + reinforcedMaxEnergy = cfg.getInt("Reinforced Exchanger Capacity", CATEGORY_TWEAKS_TE, 1000000, 1000, 100000000, "Set the RF capacity for Reinforced Exchanger"); - reinforcedExchangerPerBlockRF = cfg.getInt("Reinforced Exchanger Power Consumption", CATEGORY_TWEAKS_TE, 100, 1, + reinforcedPerBlockUse = cfg.getInt("Reinforced Exchanger Power Consumption", CATEGORY_TWEAKS_TE, 100, 1, 1000, "Set the RF consumption per block for Reinforced Exchanger"); - signalumExchangerMaxRF = cfg.getInt("Signalum Exchanger Capacity", CATEGORY_TWEAKS_TE, 10000000, 1000, + signalumMaxEnergy = cfg.getInt("Signalum Exchanger Capacity", CATEGORY_TWEAKS_TE, 10000000, 1000, 100000000, "Set the RF capacity for Signalum Exchanger"); - signalumExchangerPerBlockRF = cfg.getInt("Signalum Exchanger Power Consumption", CATEGORY_TWEAKS_TE, 500, 1, + signalumPerBlockUse = cfg.getInt("Signalum Exchanger Power Consumption", CATEGORY_TWEAKS_TE, 500, 1, 5000, "Set the RF consumption per block for Signalum Exchanger"); - resonantExchangerMaxRF = cfg.getInt("Resonant Exchanger Capacity", CATEGORY_TWEAKS_TE, 20000000, 1000, + resonantMaxEnergy = cfg.getInt("Resonant Exchanger Capacity", CATEGORY_TWEAKS_TE, 20000000, 1000, 100000000, "Set the RF capacity for Resonant Exchanger"); - resonantExchangerPerBlockRF = cfg.getInt("Resonant Exchanger Power Consumption", CATEGORY_TWEAKS_TE, 1000, 1, + resonantPerBlockUse = cfg.getInt("Resonant Exchanger Power Consumption", CATEGORY_TWEAKS_TE, 1000, 1, 10000, "Set the RF consumption per block for Resonant Exchanger"); //Mekanism Tweaks cfg.addCustomCategoryComment(CATEGORY_TWEAKS_MEKANISM, "[Not implemented!] Mekanism Exchanger Tweaks"); - basicExchangerMaxRF = cfg.getInt("Basic Exchanger Capacity", CATEGORY_TWEAKS_MEKANISM, 100000, 1000, 100000000, + basicMaxEnergy = cfg.getInt("Basic Exchanger Capacity", CATEGORY_TWEAKS_MEKANISM, 100000, 1000, 100000000, "Set the RF capacity for Basic Exchanger"); - basicExchangerPerBlockRF = cfg.getInt("Basic Exchanger Power Consumption", CATEGORY_TWEAKS_MEKANISM, 50, 1, 500, + basicPerBlockUse = cfg.getInt("Basic Exchanger Power Consumption", CATEGORY_TWEAKS_MEKANISM, 50, 1, 500, "Set the RF consumption per block for Basic Exchanger"); - advancedExchangerMaxRF = cfg.getInt("Advanced Exchanger Capacity", CATEGORY_TWEAKS_MEKANISM, 800000, 1000, + advancedMaxEnergy = cfg.getInt("Advanced Exchanger Capacity", CATEGORY_TWEAKS_MEKANISM, 800000, 1000, 100000000, "Set the RF capacity for Advanced Exchanger"); - advancedExchangerPerBlockRF = cfg.getInt("Advanced Exchanger Power Consumption", CATEGORY_TWEAKS_MEKANISM, 100, + advancedPerBlockUse = cfg.getInt("Advanced Exchanger Power Consumption", CATEGORY_TWEAKS_MEKANISM, 100, 1, 1000, "Set the RF consumption per block for Advanced Exchanger"); - eliteExchangerMaxRF = cfg.getInt("Elite Exchanger Capacity", CATEGORY_TWEAKS_MEKANISM, 5000000, 1000, 100000000, + eliteMaxEnergy = cfg.getInt("Elite Exchanger Capacity", CATEGORY_TWEAKS_MEKANISM, 5000000, 1000, 100000000, "Set the RF capacity for Elite Exchanger"); - eliteExchangerPerBlockRF = cfg.getInt("Elite Exchanger Power Consumption", CATEGORY_TWEAKS_MEKANISM, 250, 1, + elitePerBlockUse = cfg.getInt("Elite Exchanger Power Consumption", CATEGORY_TWEAKS_MEKANISM, 250, 1, 2500, "Set the RF consumption per block for Elite Exchanger"); - ultimateExchangerMaxRF = cfg.getInt("Ultimate Exchanger Capacity", CATEGORY_TWEAKS_MEKANISM, 10000000, 1000, + ultimateMaxEnergy = cfg.getInt("Ultimate Exchanger Capacity", CATEGORY_TWEAKS_MEKANISM, 10000000, 1000, 100000000, "Set the RF capacity for Ultimate Exchanger"); - ultimateExchangerPerBlockRF = cfg.getInt("Ultimate Exchanger Power Consumption", CATEGORY_TWEAKS_MEKANISM, 500, + ultimatePerBlockUse = cfg.getInt("Ultimate Exchanger Power Consumption", CATEGORY_TWEAKS_MEKANISM, 500, 1, 5000, "Set the RF consumption per block for Ultimate Exchanger"); } diff --git a/src/main/java/me/jacky1356400/exchangers/Exchangers.java b/src/main/java/me/jacky1356400/exchangers/Exchangers.java index cfbed30..c49e9dc 100644 --- a/src/main/java/me/jacky1356400/exchangers/Exchangers.java +++ b/src/main/java/me/jacky1356400/exchangers/Exchangers.java @@ -2,19 +2,18 @@ import me.jacky1356400.exchangers.proxy.CommonProxy; import me.jacky1356400.exchangers.util.Data; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; @Mod(modid = Data.MODID, version = Data.VERSION, name = Data.MODNAME, dependencies = Exchangers.DEPENDS, useMetadata = true) public class Exchangers { - public static final String DEPENDS = "after:enderio;after:thermalfoundation;after:thermalexpansion;after:mekanism;"; + public static final String DEPENDS = "after:redstoneflux;after:enderio;after:thermalfoundation;after:thermalexpansion;after:mekanism;"; public static Logger logger = LogManager.getLogger("Exchangers"); diff --git a/src/main/java/me/jacky1356400/exchangers/client/Keys.java b/src/main/java/me/jacky1356400/exchangers/client/Keys.java index e1e6963..75bdfd4 100644 --- a/src/main/java/me/jacky1356400/exchangers/client/Keys.java +++ b/src/main/java/me/jacky1356400/exchangers/client/Keys.java @@ -1,11 +1,10 @@ package me.jacky1356400.exchangers.client; -import org.lwjgl.input.Keyboard; - import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; @SideOnly(Side.CLIENT) public class Keys { diff --git a/src/main/java/me/jacky1356400/exchangers/handler/ExchangerHandler.java b/src/main/java/me/jacky1356400/exchangers/handler/ExchangerHandler.java index faecb27..7147448 100644 --- a/src/main/java/me/jacky1356400/exchangers/handler/ExchangerHandler.java +++ b/src/main/java/me/jacky1356400/exchangers/handler/ExchangerHandler.java @@ -1,34 +1,13 @@ package me.jacky1356400.exchangers.handler; -import static me.jacky1356400.exchangers.handler.WorldEventHandler.queueExchanges; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import me.jacky1356400.exchangers.client.Keys; +import me.jacky1356400.exchangers.helper.DirectionHelper; import me.jacky1356400.exchangers.helper.StringHelper; import me.jacky1356400.exchangers.item.ItemExchanger; import me.jacky1356400.exchangers.item.ItemPoweredExchanger; import me.jacky1356400.exchangers.util.Data; import me.jacky1356400.exchangers.util.Tier; -import me.jacky1356400.exchangers.helper.DirectionHelper; -import net.minecraft.block.Block; -import net.minecraft.block.BlockDoor; -import net.minecraft.block.BlockFence; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockHugeMushroom; -import net.minecraft.block.BlockLadder; -import net.minecraft.block.BlockLeaves; -import net.minecraft.block.BlockLiquid; -import net.minecraft.block.BlockPistonBase; -import net.minecraft.block.BlockRedstoneLight; -import net.minecraft.block.BlockTorch; -import net.minecraft.block.BlockTrapDoor; -import net.minecraft.block.BlockWorkbench; +import net.minecraft.block.*; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; @@ -37,18 +16,17 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvent; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.fluids.BlockFluidBase; +import java.util.*; + +import static me.jacky1356400.exchangers.handler.WorldEventHandler.queueExchanges; + public abstract class ExchangerHandler extends Item { public static final int MODE_1X1 = 0; diff --git a/src/main/java/me/jacky1356400/exchangers/handler/RenderOverlayHandler.java b/src/main/java/me/jacky1356400/exchangers/handler/RenderOverlayHandler.java index 29381bb..a359124 100644 --- a/src/main/java/me/jacky1356400/exchangers/handler/RenderOverlayHandler.java +++ b/src/main/java/me/jacky1356400/exchangers/handler/RenderOverlayHandler.java @@ -1,6 +1,5 @@ package me.jacky1356400.exchangers.handler; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/me/jacky1356400/exchangers/handler/WorldEventHandler.java b/src/main/java/me/jacky1356400/exchangers/handler/WorldEventHandler.java index 9394ba5..a0899b6 100644 --- a/src/main/java/me/jacky1356400/exchangers/handler/WorldEventHandler.java +++ b/src/main/java/me/jacky1356400/exchangers/handler/WorldEventHandler.java @@ -1,12 +1,5 @@ package me.jacky1356400.exchangers.handler; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import me.jacky1356400.exchangers.util.Exchange; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; @@ -14,6 +7,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; +import java.util.*; + public class WorldEventHandler { public static Map> exchanges = new HashMap<>(); diff --git a/src/main/java/me/jacky1356400/exchangers/helper/DirectionHelper.java b/src/main/java/me/jacky1356400/exchangers/helper/DirectionHelper.java index 8be7384..203d216 100644 --- a/src/main/java/me/jacky1356400/exchangers/helper/DirectionHelper.java +++ b/src/main/java/me/jacky1356400/exchangers/helper/DirectionHelper.java @@ -1,10 +1,10 @@ package me.jacky1356400.exchangers.helper; +import net.minecraft.util.EnumFacing; + import java.util.ArrayList; import java.util.List; -import net.minecraft.util.EnumFacing; - public class DirectionHelper { /*** Facings for the 4 faces around X Axis */ diff --git a/src/main/java/me/jacky1356400/exchangers/helper/EnergyHelper.java b/src/main/java/me/jacky1356400/exchangers/helper/EnergyHelper.java new file mode 100644 index 0000000..e967fee --- /dev/null +++ b/src/main/java/me/jacky1356400/exchangers/helper/EnergyHelper.java @@ -0,0 +1,22 @@ +package me.jacky1356400.exchangers.helper; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.capabilities.CapabilityInject; +import net.minecraftforge.energy.IEnergyStorage; + +public class EnergyHelper { + + @CapabilityInject (IEnergyStorage.class) + + public static ItemStack setDefaultEnergyTag(ItemStack container, int energy) { + + if (!container.hasTagCompound()) { + container.setTagCompound(new NBTTagCompound()); + } + container.getTagCompound().setInteger("Energy", energy); + + return container; + } + +} diff --git a/src/main/java/me/jacky1356400/exchangers/helper/StringHelper.java b/src/main/java/me/jacky1356400/exchangers/helper/StringHelper.java index c33840c..a8043ba 100644 --- a/src/main/java/me/jacky1356400/exchangers/helper/StringHelper.java +++ b/src/main/java/me/jacky1356400/exchangers/helper/StringHelper.java @@ -1,14 +1,13 @@ package me.jacky1356400.exchangers.helper; -import java.text.NumberFormat; - -import org.lwjgl.input.Keyboard; - import me.jacky1356400.exchangers.util.Data; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; + +import java.text.NumberFormat; public final class StringHelper { diff --git a/src/main/java/me/jacky1356400/exchangers/init/ModRegistry.java b/src/main/java/me/jacky1356400/exchangers/init/ModRegistry.java index 561743c..e40cd55 100644 --- a/src/main/java/me/jacky1356400/exchangers/init/ModRegistry.java +++ b/src/main/java/me/jacky1356400/exchangers/init/ModRegistry.java @@ -1,8 +1,10 @@ package me.jacky1356400.exchangers.init; import me.jacky1356400.exchangers.Config; +import me.jacky1356400.exchangers.integration.ThermalExpansionIntegration; import me.jacky1356400.exchangers.item.ItemBasic; import me.jacky1356400.exchangers.item.ItemExchanger; +import me.jacky1356400.exchangers.item.ItemPoweredExchanger; import me.jacky1356400.exchangers.item.special.ItemTuberousExchanger; import me.jacky1356400.exchangers.util.Data; import me.jacky1356400.exchangers.util.RecipeHelper; @@ -10,8 +12,14 @@ import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ModRegistry { @@ -23,11 +31,23 @@ public class ModRegistry { public static final Item DIAMOND = new ItemExchanger("exdiamond", Tier.FIVE, Config.diaMaxDmg); public static final Item EMERALD = new ItemExchanger("exemerald", Tier.SIX, Config.emeMaxDmg); public static final Item OBSIDIAN = new ItemExchanger("exobsidian", Tier.SEVEN, Config.obsMaxDmg); + public static final Item LEADSTONE = new ItemPoweredExchanger("exleadstone", Tier.TE_ONE, Config.leadstoneMaxEnergy, Config.leadstonePerBlockUse); + public static final Item HARDENED = new ItemPoweredExchanger("exhardened", Tier.TE_TWO, Config.hardenedMaxEnergy, Config.hardenedPerBlockUse); + public static final Item REINFORCED = new ItemPoweredExchanger("exreinforced", Tier.TE_THREE, Config.reinforcedMaxEnergy, Config.reinforcedPerBlockUse); + public static final Item SIGNALUM = new ItemPoweredExchanger("exsignalum", Tier.TE_FOUR, Config.signalumMaxEnergy, Config.signalumPerBlockUse); + public static final Item RESONANT = new ItemPoweredExchanger("exresonant", Tier.TE_FIVE, Config.resonantMaxEnergy, Config.resonantPerBlockUse); public static final Item CREATIVE = new ItemExchanger("excreative", Tier.CREATIVE, 9001); public static final Item POTATO = new ItemTuberousExchanger(); public static final Item CORE_1 = new ItemBasic("excore_t1"); public static final Item CORE_2 = new ItemBasic("excore_t2"); public static final Item CORE_3 = new ItemBasic("excore_t3"); + public static final Item TECORE_1 = new ItemBasic("teexcore_t1"); + public static final Item TECORE_2 = new ItemBasic("teexcore_t2"); + public static final Item TECORE_3 = new ItemBasic("teexcore_t3"); + + public static ItemStack bucketResonantEnder; + public static ItemStack bucketEnergizedGlowstone; + public static ItemStack bucketGelidCryotheum; @SuppressWarnings("deprecation") private static void initRecipes() { @@ -75,6 +95,51 @@ private static void initRecipes() { RecipeHelper.addShaped(CORE_2, 3, 3, I, "gemLapis", I, CORE_1, Items.ENDER_EYE, CORE_1, I, "gemLapis", I); RecipeHelper.addShaped(CORE_3, 3, 3, D, CORE_2, E, CORE_2, "blockDiamond", CORE_2, E, CORE_2, D); } + if ((Config.thermalExpansionModule = true) && (Loader.isModLoaded(Data.THERMAL))) { + RecipeHelper.addOldShaped(LEADSTONE, "LSL", "LCL", "LFL", 'L', "ingotLead", 'S', ThermalExpansionIntegration.redstoneServo, 'F', ThermalExpansionIntegration.fluxCapacitorBasic, 'C', TECORE_1); + + if (Config.thermalExpansionProgressiveRecipes = true) { + RecipeHelper.addOldShaped(HARDENED, "IRI", "CXC", "IFI", 'I', "ingotInvar", 'R', + ThermalExpansionIntegration.redstoneReceptionCoil, 'F', ThermalExpansionIntegration.fluxCapacitorHardened, + 'C', TECORE_1, 'X', LEADSTONE); + RecipeHelper.addOldShaped(REINFORCED, "ERE", "CXC", "EFE", 'E', "ingotElectrum", 'R', + ThermalExpansionIntegration.redstoneTransmissionCoil, 'F', ThermalExpansionIntegration.fluxCapacitorReinforced, + 'C', TECORE_2, 'X', HARDENED); + RecipeHelper.addOldShaped(SIGNALUM, "SRS", "CXC", "SFS", 'S', "ingotSignalum", 'R', + ThermalExpansionIntegration.redstoneConductanceCoil, 'F', ThermalExpansionIntegration.fluxCapacitorSignalum, + 'C', TECORE_3, 'X', REINFORCED); + RecipeHelper.addOldShaped(RESONANT, "IRI", "CXC", "IFI", 'I', "ingotEnderium", 'R', + ThermalExpansionIntegration.redstoneConductanceCoil, 'F', ThermalExpansionIntegration.fluxCapacitorResonant, + 'C', TECORE_3, 'X', SIGNALUM); + } else { + RecipeHelper.addOldShaped(HARDENED, "IRI", "ICI", "IFI", 'I', "ingotInvar", + 'R', ThermalExpansionIntegration.redstoneReceptionCoil, 'F', ThermalExpansionIntegration.fluxCapacitorHardened, + 'C', TECORE_1); + RecipeHelper.addOldShaped(REINFORCED, "ERE", "ECE", "EFE", 'E', "ingotElectrum", + 'R', ThermalExpansionIntegration.redstoneTransmissionCoil, 'F', ThermalExpansionIntegration.fluxCapacitorReinforced, + 'C', TECORE_2); + RecipeHelper.addOldShaped(SIGNALUM, "SRS", "SCS", "SFS", 'S', "ingotSignalum", + 'R', ThermalExpansionIntegration.redstoneConductanceCoil, 'F', ThermalExpansionIntegration.fluxCapacitorSignalum, + 'C', TECORE_3); + RecipeHelper.addOldShaped(RESONANT, "IRI", "ICI", "IFI", 'I', "ingotEnderium", + 'R', ThermalExpansionIntegration.redstoneConductanceCoil, 'F', ThermalExpansionIntegration.fluxCapacitorResonant, + 'C', TECORE_3); + } + + Fluid ender = FluidRegistry.getFluid("ender"); + bucketResonantEnder = FluidUtil.getFilledBucket(new FluidStack(ender, 1000)); + Fluid glowstone = FluidRegistry.getFluid("glowstone"); + bucketEnergizedGlowstone = FluidUtil.getFilledBucket(new FluidStack(glowstone, 1000)); + Fluid cryotheum = FluidRegistry.getFluid("cryotheum"); + bucketGelidCryotheum = FluidUtil.getFilledBucket(new FluidStack(cryotheum, 1000)); + + RecipeHelper.addOldShaped(TECORE_1, "CLC", "LRL", "CLC", 'C', "gearCopper", 'L', "ingotLead", + 'R', bucketResonantEnder); + RecipeHelper.addOldShaped(TECORE_2, "BIB", "CGC", "BIB", 'B', "gearBronze", 'I', "gearInvar",'C', + TECORE_1, 'G', bucketEnergizedGlowstone); + RecipeHelper.addOldShaped(TECORE_3, "LCL", "CGC", "LCL", 'C', TECORE_2, + 'L', "gearLumium", 'G', bucketGelidCryotheum); + } } @SubscribeEvent diff --git a/src/main/java/me/jacky1356400/exchangers/integration/EnderIOIntegration.java b/src/main/java/me/jacky1356400/exchangers/integration/EnderIOIntegration.java index 48f33c4..1df363f 100644 --- a/src/main/java/me/jacky1356400/exchangers/integration/EnderIOIntegration.java +++ b/src/main/java/me/jacky1356400/exchangers/integration/EnderIOIntegration.java @@ -1,15 +1,5 @@ package me.jacky1356400.exchangers.integration; -import me.jacky1356400.exchangers.Exchangers; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.ForgeModContainer; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.UniversalBucket; - public class EnderIOIntegration { /* public static ItemStack capacitorBankBasic; diff --git a/src/main/java/me/jacky1356400/exchangers/integration/MekanismIntegration.java b/src/main/java/me/jacky1356400/exchangers/integration/MekanismIntegration.java index 43aec52..334b528 100644 --- a/src/main/java/me/jacky1356400/exchangers/integration/MekanismIntegration.java +++ b/src/main/java/me/jacky1356400/exchangers/integration/MekanismIntegration.java @@ -1,10 +1,5 @@ package me.jacky1356400.exchangers.integration; -import me.jacky1356400.exchangers.Exchangers; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - public class MekanismIntegration { /* public static ItemStack circuitBasic; diff --git a/src/main/java/me/jacky1356400/exchangers/integration/ThermalExpansionIntegration.java b/src/main/java/me/jacky1356400/exchangers/integration/ThermalExpansionIntegration.java index 057760c..0ecbc26 100644 --- a/src/main/java/me/jacky1356400/exchangers/integration/ThermalExpansionIntegration.java +++ b/src/main/java/me/jacky1356400/exchangers/integration/ThermalExpansionIntegration.java @@ -4,13 +4,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.ForgeModContainer; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.UniversalBucket; public class ThermalExpansionIntegration { - /* + public static ItemStack fluxCapacitorBasic; public static ItemStack fluxCapacitorHardened; public static ItemStack fluxCapacitorReinforced; @@ -20,9 +16,6 @@ public class ThermalExpansionIntegration { public static ItemStack redstoneReceptionCoil; public static ItemStack redstoneTransmissionCoil; public static ItemStack redstoneConductanceCoil; - public static ItemStack bucketResonantEnder; - public static ItemStack bucketEnergizedGlowstone; - public static ItemStack bucketGelidCryotheum; public static void init() { Exchangers.logger.info("Fetching items for Thermal Expansion integration..."); @@ -44,14 +37,6 @@ public static void init() { redstoneConductanceCoil = new ItemStack(teMaterialsItem, 1, 515); } - Fluid ender = FluidRegistry.getFluid("ender"); - bucketResonantEnder = UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, ender); - Fluid glowstone = FluidRegistry.getFluid("glowstone"); - bucketEnergizedGlowstone = UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, - glowstone); - Fluid cryotheum = FluidRegistry.getFluid("cryotheum"); - bucketGelidCryotheum = UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, - cryotheum); } - */ + } diff --git a/src/main/java/me/jacky1356400/exchangers/item/ItemExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/ItemExchanger.java index 6b75791..e6a70c2 100644 --- a/src/main/java/me/jacky1356400/exchangers/item/ItemExchanger.java +++ b/src/main/java/me/jacky1356400/exchangers/item/ItemExchanger.java @@ -1,7 +1,5 @@ package me.jacky1356400.exchangers.item; -import java.util.List; - import me.jacky1356400.exchangers.handler.ExchangerHandler; import me.jacky1356400.exchangers.helper.StringHelper; import me.jacky1356400.exchangers.util.Data; @@ -11,6 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import java.util.List; + import static me.jacky1356400.exchangers.helper.StringHelper.localize; public class ItemExchanger extends ExchangerHandler implements IHasModel { @@ -41,8 +41,10 @@ public boolean showDurabilityBar(ItemStack stack) { @Override public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag bool) { super.addInformation(stack, world, tooltip, bool); - tooltip.add(StringHelper.formatNumber(stack.getMaxDamage() - stack.getItemDamage()) + " / " + StringHelper.formatNumber(stack.getMaxDamage()) + " " + localize("tooltip.durability")); - tooltip.add(getTier().getFormattedText()); + if (!isPowered()){ + tooltip.add(StringHelper.formatNumber(stack.getMaxDamage() - stack.getItemDamage()) + " / " + StringHelper.formatNumber(stack.getMaxDamage()) + " " + localize("tooltip.durability")); + tooltip.add(getTier().getFormattedText()); + } } public Tier getTier() { diff --git a/src/main/java/me/jacky1356400/exchangers/item/ItemPoweredExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/ItemPoweredExchanger.java index 0d79d47..783dcdf 100644 --- a/src/main/java/me/jacky1356400/exchangers/item/ItemPoweredExchanger.java +++ b/src/main/java/me/jacky1356400/exchangers/item/ItemPoweredExchanger.java @@ -1,17 +1,19 @@ package me.jacky1356400.exchangers.item; -import java.util.List; - +import cofh.redstoneflux.api.IEnergyContainerItem; +import me.jacky1356400.exchangers.helper.EnergyHelper; +import me.jacky1356400.exchangers.helper.NBTHelper; +import me.jacky1356400.exchangers.helper.StringHelper; import me.jacky1356400.exchangers.util.Tier; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemPoweredExchanger extends ItemExchanger { +import java.util.List; + +public class ItemPoweredExchanger extends ItemExchanger implements IEnergyContainerItem { private final int maxEnergy; private final int perBlockUse; @@ -22,50 +24,53 @@ public ItemPoweredExchanger(String name, Tier tier, int maxStorage, int perBlock perBlockUse = perBlock; } - //TODO implement Forge Energy - @Override - public boolean showDurabilityBar(ItemStack stack) { - return false; //TODO implement Forge Energy + public int receiveEnergy(ItemStack container, int energy, boolean simulate) { + return NBTHelper.receiveEnergy(container, energy, getMaxEnergyStored(container), simulate); } @Override - public double getDurabilityForDisplay(ItemStack stack) { - /* - if (!stack.hasTagCompound()) { - EnergyHelper.setDefaultEnergyTag(stack, 0); - } - return 1D - ((double) stack.getTagCompound().getInteger("Energy") / (double) getMaxEnergyStored(stack)); - */ - return 0; //TODO implement Forge Energy + public int extractEnergy(ItemStack container, int energy, boolean simulate) { + return NBTHelper.extractEnergy(container, energy, simulate); } @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - ItemStack empty = new ItemStack(this); - list.add(empty); - ItemStack full = new ItemStack(this); - //EnergyHelper.setDefaultEnergyTag(full, Config.darkSteelExchangerMaxRF); - list.add(full); + public int getEnergyStored(ItemStack container) { + return NBTHelper.getEnergyStored(container); } @Override - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag bool) { - super.addInformation(stack, world, tooltip, bool); - //tooltip.add(StringHelper.formatNumber(getEnergyStored(stack)) + " / " + StringHelper.formatNumber(getMaxEnergyStored(stack)) + " RF"); + public int getMaxEnergyStored(ItemStack container) { + return maxEnergy; + } + + public int getPerBlockCost() { + return perBlockUse; } @Override - public boolean isDamaged(ItemStack stack) { + public boolean showDurabilityBar(ItemStack stack) { return true; } - public int getMaxEnergy() { - return maxEnergy; + @Override + public double getDurabilityForDisplay(ItemStack stack) { + if (stack.getTagCompound() == null) { + EnergyHelper.setDefaultEnergyTag(stack, 0); + } + return 1D - ((double) stack.getTagCompound().getInteger("Energy") / (double) getMaxEnergyStored(stack)); } - public int getPerBlockCost() { - return perBlockUse; + @Override + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); + tooltip.add(StringHelper.formatNumber(getEnergyStored(stack)) + " / " + StringHelper.formatNumber(getMaxEnergyStored(stack)) + " RF"); + tooltip.add(getTier().getFormattedText()); + } + + @Override + public boolean isDamaged(ItemStack stack) { + return true; } @Override @@ -73,4 +78,15 @@ public boolean isPowered() { return true; } + @Override + public void getSubItems(CreativeTabs tab, NonNullList list) { + if (this.isInCreativeTab(tab)) { + ItemStack empty = new ItemStack(this); + list.add(empty); + ItemStack full = new ItemStack(this); + EnergyHelper.setDefaultEnergyTag(full, maxEnergy); + list.add(full); + } + } + } diff --git a/src/main/java/me/jacky1356400/exchangers/item/special/ItemTuberousExchanger.java b/src/main/java/me/jacky1356400/exchangers/item/special/ItemTuberousExchanger.java index 9b1c9c7..ed11a54 100644 --- a/src/main/java/me/jacky1356400/exchangers/item/special/ItemTuberousExchanger.java +++ b/src/main/java/me/jacky1356400/exchangers/item/special/ItemTuberousExchanger.java @@ -1,23 +1,19 @@ package me.jacky1356400.exchangers.item.special; -import java.util.List; - import me.jacky1356400.exchangers.helper.StringHelper; import me.jacky1356400.exchangers.item.ItemExchanger; import me.jacky1356400.exchangers.util.Tier; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EntityDamageSource; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.List; + public class ItemTuberousExchanger extends ItemExchanger { public ItemTuberousExchanger() { diff --git a/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java b/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java index 07bab89..4376dec 100644 --- a/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java +++ b/src/main/java/me/jacky1356400/exchangers/proxy/CommonProxy.java @@ -1,7 +1,5 @@ package me.jacky1356400.exchangers.proxy; -import java.io.File; - import me.jacky1356400.exchangers.Config; import me.jacky1356400.exchangers.Exchangers; import me.jacky1356400.exchangers.handler.RenderOverlayHandler; @@ -9,8 +7,6 @@ import me.jacky1356400.exchangers.handler.network.PacketHandler; import me.jacky1356400.exchangers.helper.DirectionHelper; import me.jacky1356400.exchangers.init.ModRegistry; -import me.jacky1356400.exchangers.integration.EnderIOIntegration; -import me.jacky1356400.exchangers.integration.MekanismIntegration; import me.jacky1356400.exchangers.integration.ThermalExpansionIntegration; import me.jacky1356400.exchangers.item.ItemExchanger; import me.jacky1356400.exchangers.util.Data; @@ -21,6 +17,8 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import java.io.File; + public class CommonProxy { public static Configuration config; @@ -29,18 +27,20 @@ public void preInit(FMLPreInitializationEvent e) { File configDir = e.getModConfigurationDirectory(); config = new Configuration(new File(configDir.getPath(), "exchangers.cfg")); Config.readConfig(); - MinecraftForge.EVENT_BUS.register(new ModRegistry()); /* if ((Config.enderIOModule = true) && (Loader.isModLoaded(Data.EIO))) { EnderIOIntegration.init(); } + */ if ((Config.thermalExpansionModule = true) && (Loader.isModLoaded(Data.THERMAL))) { ThermalExpansionIntegration.init(); } + /* if ((Config.mekanismModule = true) && (Loader.isModLoaded(Data.MEK))) { MekanismIntegration.init(); } */ + MinecraftForge.EVENT_BUS.register(new ModRegistry()); PacketHandler.registerMessages(Data.MODID); } diff --git a/src/main/java/me/jacky1356400/exchangers/util/Data.java b/src/main/java/me/jacky1356400/exchangers/util/Data.java index d152da7..e17caa3 100644 --- a/src/main/java/me/jacky1356400/exchangers/util/Data.java +++ b/src/main/java/me/jacky1356400/exchangers/util/Data.java @@ -1,8 +1,5 @@ package me.jacky1356400.exchangers.util; -import java.util.ArrayList; -import java.util.List; - import me.jacky1356400.exchangers.init.ModRegistry; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -10,6 +7,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import java.util.ArrayList; +import java.util.List; + public class Data { public static final List ITEMS = new ArrayList(); @@ -18,7 +18,7 @@ public class Data { public static final String EIO = "enderio"; public static final String MEK = "mekanism"; public static final String THERMAL = "thermalexpansion"; - public static final String VERSION = "1.12-2.0.1"; + public static final String VERSION = "1.12-2.1"; public static final String MODID = "exchangers"; public static final String MODNAME = "Exchangers"; public static final CreativeTabs TAB = new CreativeTabs(MODID) { diff --git a/src/main/java/me/jacky1356400/exchangers/util/RecipeHelper.java b/src/main/java/me/jacky1356400/exchangers/util/RecipeHelper.java index 8c2dbdc..6747e3b 100644 --- a/src/main/java/me/jacky1356400/exchangers/util/RecipeHelper.java +++ b/src/main/java/me/jacky1356400/exchangers/util/RecipeHelper.java @@ -1,7 +1,5 @@ package me.jacky1356400.exchangers.util; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,6 +13,8 @@ import net.minecraftforge.common.crafting.CraftingHelper.ShapedPrimer; import net.minecraftforge.oredict.OreIngredient; +import java.util.List; + public class RecipeHelper { private static int j = 0; diff --git a/src/main/java/me/jacky1356400/exchangers/util/Tier.java b/src/main/java/me/jacky1356400/exchangers/util/Tier.java index 6620613..b9cf0ed 100644 --- a/src/main/java/me/jacky1356400/exchangers/util/Tier.java +++ b/src/main/java/me/jacky1356400/exchangers/util/Tier.java @@ -14,6 +14,11 @@ public enum Tier { FIVE(ExchangerHandler.MODE_9X9), SIX(ExchangerHandler.MODE_11X11), SEVEN(ExchangerHandler.MODE_15X15), + TE_ONE(ExchangerHandler.MODE_3X3), + TE_TWO(ExchangerHandler.MODE_7X7), + TE_THREE(ExchangerHandler.MODE_11X11), + TE_FOUR(ExchangerHandler.MODE_13X13), + TE_FIVE(ExchangerHandler.MODE_15X15), CREATIVE(ExchangerHandler.MODE_25X25); final int size; @@ -25,6 +30,11 @@ public enum Tier { @SideOnly(Side.CLIENT) public String getFormattedText() { int k = this.ordinal(); + if(this == Tier.TE_ONE) k = 1; + if(this == Tier.TE_TWO) k = 2; + if(this == Tier.TE_THREE) k = 3; + if(this == Tier.TE_FOUR) k = 4; + if(this == Tier.TE_FIVE) k = 5; if(this == Tier.CREATIVE) k = 9001; return I18n.format(Data.MODID + ".tooltip.tier", k); } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 3b76b00..48e2e55 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "exchangers", "name": "Exchangers", "description": "Block Exchangers.", - "version": "1.12-2.0.1", + "version": "1.12-2.1", "mcversion": "1.12", "url": "https://github.com/Jacky1356400/Exchangers", "updateUrl": "",