update for CCC/L 1.2.0

CONTRIBUTING.md

@@ -15,7 +15,7 @@ To set up the mod as to allow you to make changes, do the following:
 
 ### IntelliJ IDEA
 1. Run `gradlew idea`.
-2. Open IntelliJ and point to either the project folder or the build.gradle file.
+2. Open IntelliJ and point to either the project folder or the `build.gradle` file.
 3. After opening the project in IntelliJ, run `gradlew genIntellijRuns` in the command terminal you opened earlier.
 
 ### Eclipse
@@ -24,9 +24,8 @@ To set up the mod as to allow you to make changes, do the following:
 2. Open Eclipse and import the folder as a project.
 
 You now have a functional local copy of Chisel, ready to develop on.
-
 ___
 Formatting
 ----------
 
-When coding for Chisel 2, please use the provided [formatter settings](eclipseFormat.xml) to format your code. Poorly formatted code, or PRs which reformat existing code will likely not be accepted.
+When coding for the GTNH branch, please run `gradlew spotlessApply` before posting a PR.

README.md

@@ -1,6 +1,6 @@
 Chisel
 =======
-Chisel is a mod for Minecraft which adds aesthetic blocks to the game through the use of a chisel.  
+Chisel is a mod for Minecraft which adds aesthetic blocks to the game through the use of a chisel.
 
 Originally created by AUTOMATIC_MAIDEN, it was ported to Minecraft 1.7.2 by asie, and maintained by Pokefenn/Cricket during 1.7.10.
 
@@ -12,9 +12,7 @@ It was previously maintained by [tterrag](http://github.com/tterrag1098), [Drull
 Pull Requests
 ---------------
 
-Pull requests with new features, translations, and bugfixes are very welcome. Please make sure to always submit PRs against the ***dev*** branch, not master.
-
-Do not make PRs that are solely formatting or other aesthetic things.
+Pull requests with new features, translations, and bugfixes are very welcome.
 
 If your PR is going to take a lot of work, it may be best to make an issue so we can discuss the feature before you create it.
 
@@ -22,10 +20,9 @@ See the [CONTRIBUTING](CONTRIBUTING.md) file for more details.
 
 Issue Reporting
 ----------------
-If you wish to report an issue with the mod, please submit one to the issue tracker in this repository.  When creating an
+If you wish to report an issue with this version of the mod, please submit one to the [GTNH issue tracker](https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues). When creating an
 issue, please be sure to include:
 
-- The version of Chisel you are using ("latest" is not an acceptable version)
-- The version of Forge you are using
-- If applicable, the crash report (preferably via [Pastebin](http://pastebin.com/)). generated by the error
+- The version of Chisel or GTNH you are using ("latest" is not an acceptable version)
+- The crash report (preferably via [Pastebin](http://pastebin.com/)) generated by the error, if any
 - Depending on the error, an image of the problem

src/main/java/team/chisel/client/render/FullBrightLighting.java

@@ -8,16 +8,19 @@ public class FullBrightLighting implements CCRenderState.IVertexOperation {
     public int id;
 
     public boolean load() {
-        if (!CCRenderState.computeLighting) {
+        final CCRenderState state = CCRenderState.instance();
+
+        if (!state.computeLighting) {
             return false;
         }
-        CCRenderState.pipeline.addDependency(CCRenderState.colourAttrib);
-        CCRenderState.pipeline.addDependency(CCRenderState.lightCoordAttrib);
+        state.pipeline.addDependency(CCRenderState.colourAttrib);
+        state.pipeline.addDependency(CCRenderState.lightCoordAttrib);
         return true;
     }
 
     public void operate() {
-        CCRenderState.setBrightness(FULL_BRIGHT_BLOCK_BRIGHTNESS);
+        CCRenderState.instance()
+            .setBrightness(FULL_BRIGHT_BLOCK_BRIGHTNESS);
     }
 
     public int operationID() {

src/main/java/team/chisel/client/render/FullBrightMicroMaterial.java

@@ -18,7 +18,7 @@ public class FullBrightMicroMaterial extends BlockMicroMaterial {
 
     @SideOnly(Side.CLIENT)
     public void renderMicroFace(final Vector3 pos, final int pass, final Cuboid6 bounds) {
-        CCRenderState.pipeline.builder()
+        CCRenderState.instance().pipeline.builder()
             .add((CCRenderState.IVertexOperation) pos.translation())
             .add((CCRenderState.IVertexOperation) this.icont())
             .add((CCRenderState.IVertexOperation) ColourMultiplier.instance(FULL_BRIGHT_COLOR_MULTIPLIER))