Merge pull request #48 from repo-alt/rv3-1.7.10

gradle fixed

Author: repo-alt

build.gradle

@@ -30,18 +30,21 @@ buildscript {
         mavenCentral()
 
         maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
+            name = "gt"
+            url = "https://gregtech.overminddl1.com/"
         }
-
         maven {
             name = "sonatype"
             url = "https://oss.sonatype.org/content/repositories/snapshots/"
         }
+        maven {
+            name = "jitpack.io"
+            url = "https://jitpack.io"
+        }
     }
 
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT'
     }
 }
 

gradle.properties

@@ -1,6 +1,6 @@
 aeversion=rv3
 aechannel=beta
-aebuild=45-GTNH
+aebuild=46-GTNH
 #KEEP V6 FOR MOD SUPPORT
 aegroup=appeng
 aebasename=appliedenergistics2

src/main/java/appeng/integration/IntegrationType.java

@@ -67,7 +67,9 @@ public enum IntegrationType
 
 	PneumaticCraft( IntegrationSide.BOTH, "PneumaticCraft", "PneumaticCraft" ),
 
-	GT( IntegrationSide.BOTH, "GregTech", "gregtech" );
+	GT( IntegrationSide.BOTH, "GregTech", "gregtech" ),
+
+	Chisel(IntegrationSide.BOTH, "Chisel", "chisel");
 
 	public final IntegrationSide side;
 	public final String dspName;

src/main/java/appeng/integration/modules/Chisel.java

@@ -0,0 +1,58 @@
+package appeng.integration.modules;
+
+import appeng.api.AEApi;
+import appeng.api.definitions.IBlocks;
+import appeng.helpers.Reflected;
+import appeng.integration.IIntegrationModule;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.block.Block;
+
+public class Chisel implements IIntegrationModule {
+
+    @Reflected
+    public static Chisel instance;
+    @Reflected
+    public Chisel(){}
+
+    private static final String chiselModID = "chisel";
+    private static final String addVariation = "variation:add";
+    private static final String groupOre = "group:ore";
+
+    static void registerBlock(final Block block, final int meta, final String blockGroupName) {
+        FMLInterModComms.sendMessage(chiselModID, addVariation, String.join("|",
+                blockGroupName,
+                GameRegistry.findUniqueIdentifierFor(block).toString(),
+                Integer.toString(meta)));
+    }
+    static void registerOre(final String groupOreName, final String blockGroupName) {
+        FMLInterModComms.sendMessage(chiselModID, groupOre, String.join("|",
+                blockGroupName,
+                groupOreName));
+    }
+
+    @Override
+    public void init() {
+        final IBlocks blocks = AEApi.instance().definitions().blocks();
+
+        if (blocks.quartz().maybeBlock().isPresent())
+            registerBlock(blocks.quartz().maybeBlock().get(), 0, "AECertusQuartz");
+        if (blocks.quartzPillar().maybeBlock().isPresent())
+            registerBlock(blocks.quartzPillar().maybeBlock().get(), 0, "AECertusQuartz");
+        if (blocks.quartzChiseled().maybeBlock().isPresent())
+            registerBlock(blocks.quartzChiseled().maybeBlock().get(), 0, "AECertusQuartz");
+        registerOre("AECertusQuartz", "AECertusQuartz");
+
+        if (blocks.skyStone().maybeBlock().isPresent()) {
+            registerBlock(blocks.skyStone().maybeBlock().get(), 1, "AESkyStone");
+            registerBlock(blocks.skyStone().maybeBlock().get(), 2, "AESkyStone");
+            registerBlock(blocks.skyStone().maybeBlock().get(), 3, "AESkyStone");
+            registerOre("AESkyStone", "AESkyStone");
+        }
+    }
+
+    @Override
+    public void postInit() {
+
+    }
+}