Skip to content

Commit

Permalink
2.3 Update
Browse files Browse the repository at this point in the history
- Updated Forge, mappings, JEI and RedstoneFlux
- Fixed modules not disabling recipes, closes #11
- Rewritten exchanger mechanics, fixed crashes with certain modded
blocks, closes #12
- Re-added Mekanism integration for when it's ready
- Added maximum range in exchanger tooltips
- Added out of block error
- Removed selected block and total count in GUI as it's not accurate all
the time
- Code cleanups
  • Loading branch information
Jacky1356400 committed Jul 31, 2017
1 parent 76b8838 commit 4d79fcd
Show file tree
Hide file tree
Showing 35 changed files with 1,634 additions and 1,705 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ repositories {

dependencies {
compile files('libs/')
deobfCompile "mezz.jei:jei_1.12:4.7.1.69:api"
runtime "mezz.jei:jei_1.12:4.7.1.69"
deobfCompile "mezz.jei:jei_1.12:4.7.1.+:api"
runtime "mezz.jei:jei_1.12:4.7.1.+"
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"
compile "cofh:RedstoneFlux:1.12-2.+:deobf"
}

processResources
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# 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.2406
mod_version=2.2
mappings_version=snapshot_20170710
forge_version=14.21.1.2428
mod_version=2.3
mappings_version=snapshot_20170731
386 changes: 193 additions & 193 deletions src/main/java/me/jacky1356400/exchangers/Config.java

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions src/main/java/me/jacky1356400/exchangers/Exchangers.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@
@Mod(modid = Data.MODID, version = Data.VERSION, name = Data.MODNAME, dependencies = Exchangers.DEPENDS, useMetadata = true)
public class Exchangers {

public static final String DEPENDS = "required-after:redstoneflux;after:enderio;after:thermalfoundation;after:thermalexpansion;after:mekanism;";
public static final String DEPENDS = "required-after:redstoneflux;after:enderio;after:thermalfoundation;after:thermalexpansion;after:mekanism;";

public static Logger logger = LogManager.getLogger("Exchangers");
public static Logger logger = LogManager.getLogger("Exchangers");

@SidedProxy(serverSide = "me.jacky1356400.exchangers.proxy.CommonProxy", clientSide = "me.jacky1356400.exchangers.proxy.ClientProxy")
public static CommonProxy proxy;
@SidedProxy(serverSide = "me.jacky1356400.exchangers.proxy.CommonProxy", clientSide = "me.jacky1356400.exchangers.proxy.ClientProxy")
public static CommonProxy proxy;

@Mod.EventHandler
public void preInit(FMLPreInitializationEvent e) {
proxy.preInit(e);
}
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent e) {
proxy.preInit(e);
}

@Mod.EventHandler
public void init(FMLInitializationEvent e) {
proxy.init(e);
}
@Mod.EventHandler
public void init(FMLInitializationEvent e) {
proxy.init(e);
}

@Mod.EventHandler
public void postInit(FMLPostInitializationEvent e) {
proxy.postInit(e);
}
@Mod.EventHandler
public void postInit(FMLPostInitializationEvent e) {
proxy.postInit(e);
}

}
10 changes: 5 additions & 5 deletions src/main/java/me/jacky1356400/exchangers/client/Keys.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
@SideOnly(Side.CLIENT)
public class Keys {

public static KeyBinding modeKey;
public static KeyBinding modeKey;

public static void init() {
modeKey = new KeyBinding("key.exchangermode", Keyboard.KEY_COMMA, "key.categories.exchangers");
ClientRegistry.registerKeyBinding(modeKey);
}
public static void init() {
modeKey = new KeyBinding("key.exchangermode", Keyboard.KEY_COMMA, "key.categories.exchangers");
ClientRegistry.registerKeyBinding(modeKey);
}

}
Loading

0 comments on commit 4d79fcd

Please sign in to comment.