Fix #183. Fix #182. Bump version 2.8.9

planetguy32 · Feb 12, 2016 · fa5877c · fa5877c
1 parent 0910f4c
commit fa5877c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,11 +24,11 @@ buildscript {
 }
 
 
-apply plugin: 'scala'
+//apply plugin: 'scala'
 apply plugin: 'forge'
 apply plugin: 'eclipse'
 
-compileScala {
+//compileScala {
     repositories {
         maven {
             name = "chickenbones"
@@ -38,14 +38,14 @@ compileScala {
     dependencies {
         compile 'codechicken:ForgeMultipart:1.7.10-1.2.0.345:dev'
         //compile 'com.mod-buildcraft:buildcraft:7.0.17:dev'
-        compile files('libs')
-        compile group: 'com.googlecode.efficient-java-matrix-library', name: 'core', version: '0.26'
-        compile group: 'com.googlecode.efficient-java-matrix-library', name: 'equation', version: '0.26'
+        //compile files('libs')
+        //compile group: 'com.googlecode.efficient-java-matrix-library', name: 'core', version: '0.26'
+        //compile group: 'com.googlecode.efficient-java-matrix-library', name: 'equation', version: '0.26'
     }
-}
+//}
 
 
-version = "2.8.8"
+version = "2.8.9"
 group= "me.planetguy.remaininmotion"
 archivesBaseName = "RemainInMotion"
 

diff --git a/src/main/java/me/planetguy/remaininmotion/base/BlockCamouflageable.java b/src/main/java/me/planetguy/remaininmotion/base/BlockCamouflageable.java
@@ -2,6 +2,7 @@
 
 import me.planetguy.remaininmotion.core.RiMConfiguration;
 import net.minecraft.block.Block;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
@@ -27,7 +28,10 @@ public IIcon getIconCamouflaged(IBlockAccess world, int x, int y, int z, int sid
                 if(((TileEntityCamouflageable) te).Decoration instanceof BlockCamouflageable) throw new Exception("Making a frame look like another? Interesting....");
 
                 // This line causes White Wool to have issues (and other metadata 0 blocks), we need to find a better way
-                if(true || ((TileEntityCamouflageable) te).DecorationMeta != 0) throw new Exception("This method will almost always attempt to get metadata from world, resulting in the wrong texture.");
+                Item item = Item.getItemFromBlock(((TileEntityCamouflageable) te).Decoration);
+
+                if(item.getHasSubtypes()) throw new Exception("Subtypes almost always attempt to get metadata from world, resulting in the wrong texture.");
+                if(((TileEntityCamouflageable) te).DecorationMeta != 0) throw new Exception("This method will almost always attempt to get metadata from world, resulting in the wrong texture.");
                 return ((TileEntityCamouflageable) te).Decoration.getIcon
                 		(world, x, y, z, side);
         	} catch(Exception e) {

diff --git a/src/main/java/me/planetguy/remaininmotion/core/RiMConfiguration.java b/src/main/java/me/planetguy/remaininmotion/core/RiMConfiguration.java
@@ -47,7 +47,9 @@ public abstract static class CarriageMotion {
 		public static int		SoundIndex						= 0;
 		public static String	SoundFile						= "hum";
 
-		public static float volume=1.2f;
+		public static float     volume                          = 1.2f;
+
+        public static boolean   SupportCarriageRecurseSoftBL    = false;
 
 	}
 
@@ -205,13 +207,16 @@ public void Process() {
 			CarriageMotion.RenderInFinalPositionDuringLag = Boolean("StopAnimationDuringLag",
 					"Animation of motion should stop during severe lag", CarriageMotion.RenderInFinalPositionDuringLag);
 
+            CarriageMotion.SupportCarriageRecurseSoftBL = Boolean("SupportCarriageRecurseSoftBlacklist",
+                    "When adding blocks, should the support carriage 'see' through soft blacklisted blocks", CarriageMotion.SupportCarriageRecurseSoftBL);
+
 			CarriageMotion.MotionDuration = BoundedInteger("MotionDurationInTicks", "Duration of motion in ticks", 1,
 					CarriageMotion.MotionDuration, Integer.MAX_VALUE);
 
 			CarriageMotion.TeleportationDuration = BoundedInteger("TeleportDurationInTicks",
 					"Duration of translocation in ticks", 1, CarriageMotion.TeleportationDuration, Integer.MAX_VALUE);
 
-            // Allow for adding more sounds without bother people's configs.
+            // Allow for adding more sounds without bothering people's configs.
 			CarriageMotion.SoundIndex = BoundedInteger("Sound File Index",
 					"Which Sounds to use. 0 is Default, 1-3 are sounds DA3DSOUL made, 10 is silence", 0, CarriageMotion.SoundIndex,
 					10);

diff --git a/src/main/java/me/planetguy/remaininmotion/crafting/Recipes.java b/src/main/java/me/planetguy/remaininmotion/crafting/Recipes.java
@@ -100,7 +100,7 @@ public static void RegisterCarriageRecipes() {
 
 		RegisterCarriageRecipe(BlockCarriage.Types.Template, Vanilla.DyeTypes.Purple);
 
-RegisterCarriageRecipe(BlockCarriage.Types.Memory, Vanilla.DyeTypes.Red);
+        RegisterCarriageRecipe(BlockCarriage.Types.Memory, Vanilla.DyeTypes.Red);
 
 		// allow un-dyeing carriages
 		GameRegistry.addShapelessRecipe(ItemTypes.CarriageFramework.Stack(),

diff --git a/src/main/java/me/planetguy/remaininmotion/motion/CarriagePackage.java b/src/main/java/me/planetguy/remaininmotion/motion/CarriagePackage.java
@@ -94,11 +94,12 @@ public boolean MatchesCarriageType(BlockRecord record) {
 	public boolean AddBlock(BlockRecord record) throws CarriageMotionException {
 		boolean couldAddBlock=AddBlock_impl(record);
 		if(!couldAddBlock) {
-			this.AddPotentialObstruction(record);
+			//this.AddPotentialObstruction(record);
+            return RiMConfiguration.CarriageMotion.SupportCarriageRecurseSoftBL;
 		}
 		return couldAddBlock;
 	}
-	
+
 	private boolean AddBlock_impl(BlockRecord record) throws CarriageMotionException {
 
 		if ((MotionDirection == Directions.PosY) && (record.Y >= 254)) { throw (new CarriageObstructionException(