Removed GregTech debugger support for compatibility with GT 6.

Also updated change log.

build.gradle

@@ -58,7 +58,7 @@ configurations {
 
 dependencies {
 	provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
-	provided "com.gregoriust.gregtech:${config.gregtech.version}:dev"
+	//provided "com.gregoriust.gregtech:${config.gregtech.version}:dev"
 	provided "li.cil.oc:OpenComputers:${config.oc.version}:api"
 	compile name: "buildcraft", version: "${config.buildcraft.version}", classifier: "dev"
 }

build.properties

@@ -3,9 +3,9 @@ maven.url=/srv/http/shinonome/subdomains/maven
 minecraft.version=1.7.10
 forge.version=10.13.2.1291
 
-asielib.version=0.4.5
+asielib.version=0.4.6
 
 buildcraft.version=7.0.6
-gregtech.version=gregtech_1.7.10:5.07.07
+#gregtech.version=gregtech_1.7.10:5.07.07
 ic2.version=2.2.643-experimental
 oc.version=MC1.7.10-1.5.7.14

changelog.md

@@ -1,3 +1,10 @@
+==== 0.4.6 ====
+
+  * FIXED: Made audio system a lot more efficient.
+  * FIXED: Version number detection.
+  * FIXED: IC2 energy integration.
+  * REMOVED: GregTech debugger support for asielib blocks. AsieLib now works with both GregTech 5 and GregTech 6.
+
 ==== 0.4.5 ====
 
   * ADDED: Spy mode and /spy command for server administrators using the chat-radius config option.

src/main/java/pl/asie/lib/AsieLibMod.java

@@ -36,7 +36,7 @@
 import pl.asie.lib.tweak.enchantment.EnchantmentTweak;
 
 @Mod(modid = Mods.AsieLib, name = Mods.AsieLib_NAME, version = "@VERSION@",
-	dependencies = "required-after:Forge@[10.13.2.1236,);after:gregtech@[MC1710];"
+	dependencies = "required-after:Forge@[10.13.2.1236,);"
 		+ "after:CoFHAPI|block@[1.7.10R1.0.0,);after:CoFHAPI|energy@[1.7.10R1.0.0,);"
 		+ "after:CoFHAPI|tileentity@[1.7.10R1.0.0,);after:CoFHAPI|item@[1.7.10R1.0.0,)")
 public class AsieLibMod extends AsieLibAPI {

src/main/java/pl/asie/lib/api/tile/IInformationProvider.java

@@ -2,7 +2,6 @@
 
 import cofh.api.tileentity.ITileInfo;
 import cpw.mods.fml.common.Optional;
-import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.util.ForgeDirection;
 import pl.asie.lib.reference.Mods;
@@ -12,12 +11,12 @@
 /**
  * Loosely inspired by CoFH's ITileInfo and generally serves as a wrapper for that and some other APIs.
  * @author asie
- *
  */
 @Optional.InterfaceList({
-	@Optional.Interface(iface = "gregtech.api.interfaces.tileentity.IGregTechDeviceInformation", modid = Mods.GregTech),
+	//@Optional.Interface(iface = "gregtech.api.interfaces.tileentity.IGregTechDeviceInformation", modid = Mods.GregTech),
 	@Optional.Interface(iface = "cofh.api.tileentity.ITileInfo", modid = Mods.API.CoFHTileEntities)
 })
-public interface IInformationProvider extends ITileInfo, IGregTechDeviceInformation {
+public interface IInformationProvider extends ITileInfo/*, IGregTechDeviceInformation*/ {
+
 	public void getInformation(EntityPlayer player, ForgeDirection side, List<String> info, boolean debug);
 }

src/main/java/pl/asie/lib/block/BlockBase.java

@@ -4,7 +4,6 @@
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.interfaces.IDebugableBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -36,11 +35,11 @@
 import java.util.List;
 
 @Optional.InterfaceList({
-	@Optional.Interface(iface = "gregtech.api.interfaces.IDebugableBlock", modid = Mods.GregTech),
+	//@Optional.Interface(iface = "gregtech.api.interfaces.IDebugableBlock", modid = Mods.GregTech),
 	@Optional.Interface(iface = "cofh.api.block.IBlockInfo", modid = Mods.API.CoFHBlocks)
 })
 public abstract class BlockBase extends BlockContainer implements
-	IBlockInfo, IDebugableBlock {
+	IBlockInfo/*, IDebugableBlock*/ {
 
 	public enum Rotation {
 		NONE,
@@ -345,7 +344,7 @@ protected boolean useTool(World world, int x, int y, int z, EntityPlayer player,
 		return false;
 	}
 
-	protected boolean canUseTool(World world, int x, int y, int z, EntityPlayer player, int side){
+	protected boolean canUseTool(World world, int x, int y, int z, EntityPlayer player, int side) {
 		return this.rotation != Rotation.NONE;
 	}
 
@@ -442,6 +441,7 @@ public int getRenderType() {
 
     /* IInformationProvider boilerplate code */
 
+	/*
 	@Override
 	@Optional.Method(modid = Mods.GregTech)
 	public ArrayList<String> getDebugInfo(EntityPlayer aPlayer, int aX, int aY,
@@ -453,6 +453,7 @@ public ArrayList<String> getDebugInfo(EntityPlayer aPlayer, int aX, int aY,
 		}
 		return data;
 	}
+	*/
 
 	@Override
 	@Optional.Method(modid = Mods.API.CoFHBlocks)

src/main/java/pl/asie/lib/reference/Mods.java

@@ -24,7 +24,7 @@ public class Mods {
 		AE2 = "appliedenergistics2",
 		IC2 = "IC2",
 		IC2Classic = "IC2-Classic",
-		GregTech = "gregtech",
+		//GregTech = "gregtech",
 		Mekanism = "Mekanism",
 		ProjectRed = "ProjRed|Core",
 		RedLogic = "RedLogic";

src/main/java/pl/asie/lib/tile/TileMachine.java

@@ -37,6 +37,7 @@
 })
 public class TileMachine extends TileEntityBase implements
 	IConnectable, ISidedInventory /* RedLogic */ {
+
 	private IBattery battery;
 	private IBundledRedstoneProvider brP;
 	private ItemStack[] items;
@@ -557,6 +558,7 @@ public void getTileInfo(List<IChatComponent> info, ForgeDirection side,
 		}
 	}
 
+	/*
 	@Optional.Method(modid = Mods.GregTech)
 	public boolean isGivingInformation() {
 		return (this instanceof IInformationProvider);
@@ -573,4 +575,5 @@ public String[] getInfoData() {
 			return new String[] {};
 		}
 	}
+	*/
 }