Anvilcraft/ModularPowersuits
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Cleanup some things and add Intellij 1.4 fix. Thanks Xen1290

Browse source
This commit is contained in:
lehjr 2015-10-22 10:28:51 -04:00
parent 72eab6609b
commit 37f2e0c0d6
5 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build.gradle
View file

@ -156,4 +156,11 @@ curse {
addGameVersion '1.7.10'
relatedProject 'numina': 'requiredLibrary'
}
}
apply plugin: 'idea'
idea {
module {
inheritOutputDirs = true
}
}

3
src/main/scala/net/machinemuse/general/gui/frame/PortableCraftingContainer.java
View file

@ -9,17 +9,14 @@ import net.minecraft.world.World;
public class PortableCraftingContainer extends ContainerWorkbench {
public PortableCraftingContainer(InventoryPlayer inventoryPlayer, World world, int x, int y, int z) {
super(inventoryPlayer, world, x, y, z);
System.out.println("PortableCraftingContainer");
}
@Override
public boolean canInteractWith(EntityPlayer player) {
System.out.println("anInteractWith");
return true;
}
public void onCraftGuiClosed(EntityPlayer player) {
super.onContainerClosed(player);
System.out.println("onCraftGuiClose");
}
}

18
src/main/scala/net/machinemuse/powersuits/common/ModCompatibility.java
View file

@ -10,10 +10,6 @@ import net.machinemuse.powersuits.powermodule.misc.AirtightSealModule;
import net.machinemuse.powersuits.powermodule.misc.ThaumGogglesModule;
import net.machinemuse.powersuits.powermodule.tool.*;
import net.minecraftforge.common.config.Configuration;
import net.minecraft.block.Block; //needed?
import java.util.Arrays;
import java.util.Collections;
@ -66,6 +62,18 @@ public class ModCompatibility {
return Loader.isModLoaded("extracells");
}
public static boolean isMFRLoaded() {
return Loader.isModLoaded("MineFactoryReloaded");
}
public static boolean isRailcraftLoaded() {
return Loader.isModLoaded("Railcraft");
}
public static boolean isCompactMachinesLaded() {
return Loader.isModLoaded("CompactMachines");
}
public static boolean enableThaumGogglesModule() {
boolean defaultval = isThaumCraftLoaded();
return Config.getConfig().get("Special Modules", "Thaumcraft Goggles Module", defaultval).getBoolean(defaultval);
@ -128,7 +136,7 @@ public class ModCompatibility {
}
// Multi-Mod Compatible OmniProbe
if (Loader.isModLoaded("EnderIO") || Loader.isModLoaded("MineFactoryReloaded") || Loader.isModLoaded("Railcraft")) {
if (isEnderIOLoaded() || isMFRLoaded() || isRailcraftLoaded()) {
ModuleManager.addModule(new OmniProbeModule(Collections.singletonList((IModularItem) MPSItems.powerTool())));
}

1
src/main/scala/net/machinemuse/powersuits/common/ModularPowersuits.scala
View file

@ -26,7 +26,6 @@ object ModularPowersuits {
@SidedProxy(clientSide = "net.machinemuse.powersuits.common.ClientProxy", serverSide = "net.machinemuse.powersuits.common.ServerProxy")
var proxy: CommonProxy = null
var config: Configuration = null
var modid = "powersuitaddons";
val INSTANCE=this

1
src/main/scala/net/machinemuse/powersuits/powermodule/tool/TerminalHandler.java
View file

@ -123,7 +123,6 @@ public static void registerHandler() {
if (Loader.isModLoaded("appliedenergistics2")) {
TerminalHandler handler = new TerminalHandler();
registerAEHandler(handler);
System.out.println("MPSA: Registering AE Terminal Handler :MPSA");
if (Loader.isModLoaded("extracells")) {
registerECHandler(handler);
}