Merge branch '1.7/dev' into 1.7/release

Conflicts:
	gradle.properties

Author: tterrag1098

build.gradle

@@ -32,8 +32,8 @@ ext.buildnumber = 0
 project.buildnumber = System.getenv('BUILD_NUMBER') != null ? System.getenv('BUILD_NUMBER') : project.ext.gitHash
 
 version = "${mod_version}.${buildnumber}"
-group = "com.cricketcraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = dev ? "Chisel2_DEV" : "Chisel2"
+group = "team.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = dev ? "Chisel_DEV" : "Chisel"
 
 minecraft {
     version = "${minecraft_version}-${forge_version}"
@@ -185,7 +185,7 @@ curse {
     projectId = project.projectId
     changelog = System.getenv("CHANGELOG").equals("none") ? getChangelogText() : System.getenv("CHANGELOG")
     releaseType = 'release'
-    displayName = "Chisel 2 - ${mod_version}"
+    displayName = "Chisel - ${mod_version}"
     additionalArtifact deobfJar, sourcesJar, apiJar
 }
 

changelog

@@ -1,3 +1,29 @@
+CT2.5.0:
+New
+- Lots of new endstone variants
+- Purpur blocks
+- New technical blocks (piping, battery, and more)
+
+Changes
+- Under new management! Name of the project has been changed to "Chisel"
+- Now includes CTMLib 1.2.0-10
+- Greatly improve the look of energized voidstone
+- Retexture 2 of the voidstone variants (bevel and metalborder)
+- Removed special player rendering
+- Fixed EMC registrations so that they are actually dynamic
+- Lavastone and Waterstone now use the still texture, not flowing
+
+Fixes
+- Fix "The Turkey Bug"
+- Fix crash when an unchiselable item made its way into the autochisel
+- Fix VariationInfos always returning CUSTOM for their texture type
+- Fix antiblocks not working when smooth lighting is off
+- Fix Botania compat
+- Fix pick block on bookshelves
+
+API
+- Add IConnectable for allowing other blocks to determine if chisel blocks will connect to them
+
 2.4.1:
 New
 - New UberWavy futura block

eclipseFormat.xml

@@ -26,12 +26,12 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
 <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="49"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>

gradle.properties

@@ -1,12 +1,12 @@
-mod_version=2.4.1
+mod_version=CT2.5.0
 minecraft_version=1.7.10
 forge_version=10.13.4.1481-1.7.10
 
-ctmlib_version=1.0.1.5
-ccl_version=1.1.3.136
-ccc_version=1.0.6.43
-nei_version=1.0.4.107
+ctmlib_version=1.2.0-10
+ccl_version=1.1.3.140
+ccc_version=1.0.7.46
+nei_version=1.0.5.111
 waila_version=1.5.10
 fmp_version=1.2.0.344
 
-projectId=225236
+projectId=235279

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'Chisel2'
+rootProject.name = 'Chisel'

src/main/java/com/cricketcraft/chisel/api/ChiselAPIProps.java

@@ -3,5 +3,5 @@
 public class ChiselAPIProps {
 
 	public static final String VERSION = "0.1.0";
-	public static String MOD_ID = null; // Set by Chisel 
+	public static String MOD_ID = null; // Set by Chisel
 }

src/main/java/com/cricketcraft/chisel/api/IAdvancedChisel.java

@@ -1,18 +1,16 @@
 package com.cricketcraft.chisel.api;
 
-import com.cricketcraft.chisel.api.carving.IChiselMode;
-
 import net.minecraft.item.ItemStack;
 
+import com.cricketcraft.chisel.api.carving.IChiselMode;
+
 /**
- * Implement this on chisel items which require more control over chisel modes
- * (including adding new modes).
+ * Implement this on chisel items which require more control over chisel modes (including adding new modes).
  */
 public interface IAdvancedChisel {
 
 	/**
-	 * Gets the next mode the button in the GUI should switch to given the
-	 * current mode.
+	 * Gets the next mode the button in the GUI should switch to given the current mode.
 	 * 
 	 * @param stack
 	 *            The {@link ItemStack} representing the chisel

src/main/java/com/cricketcraft/chisel/api/ICarvable.java

@@ -1,16 +1,16 @@
 package com.cricketcraft.chisel.api;
 
-import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
 
 import com.cricketcraft.chisel.api.carving.CarvableHelper;
 import com.cricketcraft.chisel.api.carving.IVariationInfo;
+import com.cricketcraft.ctmlib.ICTMBlock;
 import com.cricketcraft.ctmlib.ISubmapManager;
 
 /**
  * To be implemented on blocks that can be chiseled and need advanced metadata to variation mapping. Currently not very usable without internal classes.
  */
-public interface ICarvable {
+public interface ICarvable extends ICTMBlock<IVariationInfo> {
 
 	/**
 	 * Gets a {@link ISubmapManager} from this block, based on metadata.
@@ -31,15 +31,14 @@ public interface ICarvable {
 	 *            The metadata of the block
 	 * @return The {@link ISubmapManager} that represents this block in the world.
 	 */
-	public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata);
+	@Override
+	public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata);
 
 	/**
 	 * Gets the {@link ISubmapManager} for this block when it is in item form.
 	 * 
-	 * @param stack
-	 *            The {@link ItemStack} representing this block;
 	 * @return A {@link ISubmapManager}
 	 */
-	public IVariationInfo getVariation(ItemStack stack);
+	@Override
+	public IVariationInfo getManager(int meta);
 }
-	

src/main/java/com/cricketcraft/chisel/api/IConnectable.java

@@ -0,0 +1,26 @@
+package com.cricketcraft.chisel.api;
+
+import net.minecraft.world.IBlockAccess;
+
+/**
+ * This extension of {@link IFacade} allows the block to say whether or not OTHER CTM blocks can connect to IT.
+ */
+public interface IConnectable {
+
+	/**
+	 * Determines whether other CTM blocks can connect to this one.
+	 * 
+	 * @param world
+	 * @param x
+	 *            The X position of the block that is connecting to this one. NOT the position of your block.
+	 * @param y
+	 *            The Y position of the block that is connecting to this one. NOT the position of your block.
+	 * @param z
+	 *            The Z position of the block that is connecting to this one. NOT the position of your block.
+	 * @param side
+	 *            The side being drawn.
+	 * @return True if a block can connect to this one from the given direction. False otherwise.
+	 */
+	boolean canConnectCTM(IBlockAccess world, int x, int y, int z, int side);
+
+}

src/main/java/com/cricketcraft/chisel/api/IFacade.java

@@ -5,36 +5,45 @@
 import net.minecraft.world.World;
 
 /**
- * To be implemented on blocks that "hide" another block inside, so connected textuers can still be
- * accomplished.
+ * To be implemented on blocks that "hide" another block inside, so connected textuers can still be accomplished.
  */
-public interface IFacade
-{
-    /**
-     * Gets the block this facade is acting as.
-     * 
-     * @param world {@link World}
-     * @param x X coord of your block
-     * @param y Y coord of your block
-     * @param z Z coord of your block
-     * @param side The side being rendered, NOT the side being connected from.
-     *            <p>
-     *            This value can be -1 if no side is specified. Please handle this appropriately.
-     * @return The block inside of your facade block.
-     */
-    Block getFacade(IBlockAccess world, int x, int y, int z, int side);
+public interface IFacade {
 
-    /**
-     * Gets the metadata of the block that this facade is acting as.
-     * 
-     * @param world {@link World}
-     * @param x X coord of your block
-     * @param y Y coord of your block
-     * @param z Z coord of your block
-     * @param side The side being rendered, NOT the side being connected from.
-     *            <p>
-     *            This value can be -1 if no side is specified. Please handle this appropriately.
-     * @return The metadata of your facade block.
-     */
-    int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side);
+	/**
+	 * Gets the block this facade is acting as.
+	 * 
+	 * @param world
+	 *            {@link World}
+	 * @param x
+	 *            X coord of your block
+	 * @param y
+	 *            Y coord of your block
+	 * @param z
+	 *            Z coord of your block
+	 * @param side
+	 *            The side being rendered, NOT the side being connected from.
+	 *            <p>
+	 *            This value can be -1 if no side is specified. Please handle this appropriately.
+	 * @return The block inside of your facade block.
+	 */
+	Block getFacade(IBlockAccess world, int x, int y, int z, int side);
+
+	/**
+	 * Gets the metadata of the block that this facade is acting as.
+	 * 
+	 * @param world
+	 *            {@link World}
+	 * @param x
+	 *            X coord of your block
+	 * @param y
+	 *            Y coord of your block
+	 * @param z
+	 *            Z coord of your block
+	 * @param side
+	 *            The side being rendered, NOT the side being connected from.
+	 *            <p>
+	 *            This value can be -1 if no side is specified. Please handle this appropriately.
+	 * @return The metadata of your facade block.
+	 */
+	int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side);
 }