Update to 1.12.2

.gitignore

@@ -0,0 +1,8 @@
+.gradle/
+.idea/
+*.iml
+lib/*
+!lib/README.txt
+build/
+classes/
+run/

build.gradle

@@ -1,31 +1,49 @@
 buildscript {
     repositories {
+        mavenCentral()
+        mavenLocal()
         jcenter()
-        maven { url = "http://files.minecraftforge.net/maven" }
+        maven {
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
-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.
 
+apply plugin: 'net.minecraftforge.gradle.forge'
 
-//version = "1.0"
-//group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = jarName
 
+repositories {
+    maven { url = "http://maven.cil.li/" }
+    maven {
+        name = 'oss-sonatype-public'
+        url = 'https://oss.sonatype.org/content/groups/public/'
+    }
+    maven { url = "http://maven.ic2.player.to" }
+    maven { url = "http://repo.spongepowered.org/maven" }
+    maven { url = "http://cc.crzd.me/maven/" }
+}
+
+dependencies {
+    compile "li.cil.oc:OpenComputers:MC1.12.1-1.7.1.52"
+    compile "net.industrial-craft:industrialcraft-2:2.8.93-ex112:api"
+    deobfCompile "dan200.computercraft:ComputerCraft:1.80pr1-build4"
+}
+
+deobfMcMCP { failOnAtError = false }
+deobfMcSRG { failOnAtError = false }
+
 minecraft {
-    version = "1.10.2-12.18.2.2099"
+    version = "1.12.2-14.23.5.2768"
     runDir = "run"
-
-    // the mappings can be changed at any time, and must be in the following format.
-    // snapshot_YYYYMMDD   snapshot are built nightly.
-    // stable_#            stables are built at the discretion of the MCP team.
-    // Use non-default mappings at your own risk. they may not allways work.
-    // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "snapshot_20160518"
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    mappings = 'snapshot_20180808'
+    useDepAts = true
 }
 
 sourceSets.main {
@@ -34,10 +52,6 @@ sourceSets.main {
 	resources.srcDirs "src/resources"
 }
 
-//jar {
-//	exclude "ic2"
-//}
-
 processResources {
 
     // this will ensure that this task is redone when the versions change.

gradle.properties

@@ -1,4 +1,4 @@
-version = 1.13.2-mc1.10.2
-mcversion = [1.10.2,1.10.2]
+version = 1.15.8-forge-release
+mcversion = [1.12.2,1.12.2]
 group = gcewing.sg
 jarName = SGCraft

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Sep 14 12:28:28 PDT 2015
+#Fri Sep 30 11:48:54 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-3.5-all.zip

gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

readme.md

@@ -0,0 +1,16 @@
+This repo contains several continuations of the original SGCraft mod developed by gcewing.
+
+Downloads are available here:  https://ore.spongepowered.org/Dockter/SGCraft
+
+The following branches are active:
+- 1.12.2 -> Active fixes for 1.12.2
+- api-7 -> All fixes from 1.12.2 branch plus Sponge permissions checks and event firings.
+- feature/zpm -> Everything from api-7 + a custom zpm module implementation specifically designed for usage with IC2 and the Almura mod.
+
+feature/zpm branch, use this:
+- vm options: -Xincgc -Xms1024M -Xmx2048M -Dfml.coreMods.load=org.spongepowered.mod.SpongeCoremod
+- program arguments: --noCoreSearch
+
+Any questions please create an issue.
+
+Thanks.

src/base/gcewing/sg/BaseAORenderingManager.java

@@ -13,9 +13,9 @@
 import net.minecraft.client.renderer.BlockModelShapes;
 import net.minecraft.client.renderer.BlockModelRenderer;
 import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
@@ -66,26 +66,26 @@ public void renderBlockDamage(IBlockState state, BlockPos pos, TextureAtlasSprit
                 Trans3 t = Trans3.blockCenter;
                 Block block = state.getBlock();
                 for (BlockRenderLayer layer : BlockRenderLayer.values())
-                    if (block.canRenderInLayer(layer))
+                    if (block.canRenderInLayer(state,layer))
                         rend.renderBlock(world, pos, state, target, layer, t);
                 IBakedModel model = target.getBakedModel();
-                VertexBuffer tess = Tessellator.getInstance().getBuffer();
+                BufferBuilder tess = Tessellator.getInstance().getBuffer();
                 getBlockModelRenderer().renderModel(world, model, state, pos, tess, false); //TODO chould checkSides be false?
             }
             else
                 base.renderBlockDamage(state, pos, icon, world);
         }
 
         @Override
-        public boolean renderBlock(IBlockState state, BlockPos pos, IBlockAccess world, VertexBuffer tess) {
+        public boolean renderBlock(IBlockState state, BlockPos pos, IBlockAccess world, BufferBuilder tess) {
             ICustomRenderer rend = getCustomRenderer(world, pos, state);
             if (rend != null)
                 return customRenderBlockToWorld(world, pos, state, tess, null, rend);
             else
                 return base.renderBlock(state, pos, world, tess);
         }
 
-        protected boolean customRenderBlockToWorld(IBlockAccess world, BlockPos pos, IBlockState state, VertexBuffer tess,
+        protected boolean customRenderBlockToWorld(IBlockAccess world, BlockPos pos, IBlockState state, BufferBuilder tess,
             TextureAtlasSprite icon, ICustomRenderer rend)
         {
             BaseWorldRenderTarget target = new BaseWorldRenderTarget(world, pos, tess, icon);

src/base/gcewing/sg/BaseBakedRenderTarget.java

@@ -6,28 +6,24 @@
 
 package gcewing.sg;
 
-import java.util.*;
-import java.nio.*;
-//import javax.vecmath.Vector3f;
+import net.minecraft.client.renderer.block.model.*;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.vertex.VertexFormat;
+import net.minecraft.client.renderer.vertex.VertexFormatElement;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
 import org.lwjgl.util.vector.Vector3f;
-import net.minecraft.client.renderer.Tessellator;
 
-import net.minecraft.block.*;
-import net.minecraft.block.state.*;
-import net.minecraft.client.renderer.block.model.*;
-import net.minecraft.client.renderer.texture.*;
-import net.minecraft.client.renderer.vertex.*;
-import net.minecraft.client.renderer.block.model.*;
-import net.minecraft.item.*;
-import net.minecraft.util.*;
-import net.minecraft.util.math.*;
-import net.minecraft.world.*;
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static net.minecraft.client.renderer.vertex.DefaultVertexFormats.*;
 
-import net.minecraftforge.client.model.*;
-
-import gcewing.sg.BaseModClient.ITexture;
+//import javax.vecmath.Vector3f;
 
 public class BaseBakedRenderTarget extends BaseRenderTarget {
 
@@ -53,7 +49,7 @@ public class BaseBakedRenderTarget extends BaseRenderTarget {
     //protected VertexFormat format = Attributes.DEFAULT_BAKED_FORMAT;
     //protected VertexFormat format = DefaultVertexFormats.ITEM;
     protected VertexFormat format = theFormat;
-    protected int bytesPerVertex = format.getNextOffset();
+    protected int bytesPerVertex = format.getSize();
     protected int intsPerVertex = bytesPerVertex / 4;
     protected ByteBuffer buf = ByteBuffer.allocate(bytesPerVertex * 4);
 

src/base/gcewing/sg/BaseBlock.java

@@ -13,13 +13,10 @@
 import net.minecraft.block.properties.*;
 import net.minecraft.block.state.*;
 import net.minecraft.client.particle.*;
-import net.minecraft.client.renderer.texture.*;
 import net.minecraft.entity.*;
-import net.minecraft.entity.item.*;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.*;
 import net.minecraft.item.*;
-import net.minecraft.nbt.*;
 import net.minecraft.tileentity.*;
 import net.minecraft.util.*;
 import net.minecraft.util.math.*;
@@ -30,8 +27,6 @@
 
 import static gcewing.sg.BaseMod.*;
 import static gcewing.sg.BaseModClient.*;
-import static gcewing.sg.BaseUtils.*;
-import static gcewing.sg.BaseBlockUtils.*;
 
 public class BaseBlock<TE extends TileEntity>
     extends BlockContainer implements BaseMod.IBlock
@@ -347,8 +342,7 @@ public TileEntity createNewTileEntity(World world, int meta) {
     // -------------------------------------------------------------------
 
     @Override
-    public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing side, 
-        float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
+    public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)    
     {
         IBlockState state = getOrientationHandler().onBlockPlaced(this, world, pos, side,
             hitX, hitY, hitZ, getStateFromMeta(meta), placer);
@@ -395,9 +389,9 @@ public boolean addHitEffects(IBlockState blockState, World world, RayTraceResult
         int k = pos.getZ();
         AxisAlignedBB boundingBox = blockState.getBoundingBox(world, pos);
         float f = 0.1F;
-        double d0 = i + RANDOM.nextDouble() * (boundingBox.maxX - boundingBox.minX - (f * 2.0F)) + f + boundingBox.minX;
-        double d1 = j + RANDOM.nextDouble() * (boundingBox.maxY - boundingBox.minY - (f * 2.0F)) + f + boundingBox.minY;
-        double d2 = k + RANDOM.nextDouble() * (boundingBox.maxZ - boundingBox.minZ - (f * 2.0F)) + f + boundingBox.minZ;
+        double d0 = i + RANDOM.nextDouble() * (boundingBox.maxX - boundingBox.minX - (f * 2F)) + f + boundingBox.minX;
+        double d1 = j + RANDOM.nextDouble() * (boundingBox.maxY - boundingBox.minY - (f * 2F)) + f + boundingBox.minY;
+        double d2 = k + RANDOM.nextDouble() * (boundingBox.maxZ - boundingBox.minZ - (f * 2F)) + f + boundingBox.minZ;
         switch (target.sideHit) {
             case DOWN: d1 = j + boundingBox.minY - f; break;
             case UP: d1 = j + boundingBox.maxY + f; break;
@@ -493,8 +487,8 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, Block
 			return super.getBoundingBox(state, world, pos);
 	}
 
-    @Override
     public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) {
+        // Update: This had an override above the method, may be needed.
         return getBoundingBox(state, world, pos);
     }
 
@@ -513,15 +507,15 @@ protected AxisAlignedBB getLocalBounds(IBlockAccess world, BlockPos pos, IBlockS
 
     @Override
 	public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, 
-		AxisAlignedBB clip, List result, Entity entity)
+		AxisAlignedBB clip, List result, Entity entity, boolean enableStats)
 	{
 		List<AxisAlignedBB> list = getGlobalCollisionBoxes(world, pos, state, entity);
 		if (list != null)
 			for (AxisAlignedBB box : list)
-				if (clip.intersectsWith(box))
+				if (clip.intersects(box))
 					result.add(box);
 	    else
-	        super.addCollisionBoxToList(state, world, pos, clip, result, entity);
+	        super.addCollisionBoxToList(state, world, pos, clip, result, entity, enableStats);
 	}
 
 	protected List<AxisAlignedBB> getGlobalCollisionBoxes(IBlockAccess world, BlockPos pos,
@@ -550,5 +544,4 @@ protected List<AxisAlignedBB> getCollisionBoxes(IBlockAccess world, BlockPos pos
         }
         return null;
 	}
-
 }