Update Forge, Fix elevator platform stuck in endless loop, i18n works

build.gradle

@@ -1,151 +1,156 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            name = 'forge'
-            url = 'http://files.minecraftforge.net/maven'
-        }
-        maven {
-            name = 'sonatype'
-            url = 'https://oss.sonatype.org/content/repositories/snapshots/'
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-    }
-}
-
-repositories {
-	maven {
-		name 'slimevoid'
-		url 'http://hyda.slimevoid.net/maven/repos'
-	}
-}
-
-apply plugin: 'maven'
-apply plugin: 'forge'
-apply plugin: 'eclipse'
-
-def slimevoidVersion = '2.0.4.6'
-def forge = '10.13.0.1186'
-def mc = '1.7.10-' + forge
-def pack = 'dynamictransport'
-def github = 'DynamicTransport'
-version = '0.1.2.1'
-group = 'net.slimevoid'
-archivesBaseName = 'DynamicTransport'
-
-dependencies {
-    compile 'net.slimevoid:SlimevoidLibrary:' + slimevoidVersion + ':dev'
-}
-
-minecraft {
-    version = mc
-    runDir = 'eclipse/assets'
-
-    replaceIn 'net/slimevoid/' + pack + '/core/lib/CoreLib.java'
-    replace '@VERSION@', project.version
-    replace 'required-after:SlimevoidLib', 'required-after:Forge@[' + forge + ',);required-after:SlimevoidLib@['+ slimevoidVersion + ',)'
-}
-
-processResources {
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
-    }
-
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}
-
-task sourceJar(type: Jar) {
-	from sourceSets.main.allSource
-	classifier = 'sources'
-}
-
-task deobfJar(type: Jar) {
-	from sourceSets.main.output
-	classifier = 'dev'
-}
-
-build.dependsOn sourceJar,deobfJar
-
-configurations {
-	deployJars
-}
-
-dependencies {
-    deployJars 'org.apache.maven.wagon:wagon-ssh:2.2'
-}
-
-artifacts {
-	archives sourceJar
-	archives deobfJar
-}
-
-uploadArchives {
-	dependsOn 'reobf'
-    repositories.mavenDeployer {
-    	configuration = configurations.deployJars
-        if (project.hasProperty("slimevoidUsername")) {
-            repository(url: 'scp://hyda.slimevoid.net/home/maven/www/repos') {
-                authentication(userName: slimevoidUsername, password: slimevoidPassword)
-            }
-        } else {
-            repository(url: 'file://localhost/' + project.file('build/repo').getAbsolutePath())
-        }
-        pom {
-            groupId = project.group
-            version = project.version
-            artifactId = project.archivesBaseName
-        }
-        pom.project {
-            name project.archivesBaseName
-            packaging 'jar'
-            description archivesBaseName
-            url 'https://github.com/Slimevoid/' + github
-
-            scm {
-                url 'https://github.com/Slimevoid/' + github
-                connection 'scm:git:git://github.com/Slimevoid/' + github + '.git'
-                developerConnection 'scm:git:git@Slimevoid/' + github + '.git'
-            }
-
-            issueManagement {
-                system 'github'
-                url 'https://github.com/Slimevoid/' + github + '/issues'
-            }
-
-            licenses {
-                license {
-                    name 'Lesser General Public Licence'
-                    url 'https://raw.github.com/Slimevoid/' + github + '/master/LICENSE'
-                    distribution 'repo'
-                }
-            }
-
-            developers {
-                developer {
-                    id 'Eurymachus'
-                    name 'Eurymachus'
-                    roles { role 'developer' }
-                }
-                developer {
-                    id 'Slimevoid'
-                    name 'Slimevoid Dev Team'
-                    roles { role 'developer' }
-                }
-                developer {
-                    id 'Tarig'
-                    name 'Tarig0'
-                    roles { role 'developer' }
-                }
-            }
-        }
-    }
-}
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+    }
+}
+
+repositories {
+	maven {
+		name 'slimevoid'
+		url 'http://hyda.slimevoid.net/maven/repos'
+	}
+}
+
+apply plugin: 'maven'
+apply plugin: 'forge'
+apply plugin: 'eclipse'
+
+def slimevoidVersion = "2.0.4.6"
+def forge = "10.13.4.1558"
+def mc = "1.7.10-" + forge + "-1.7.10"
+def pack = "dynamictransport"
+def github = "DynamicTransport"
+version = "0.1.2.0"
+group= "net.slimevoid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "DynamicTransport"
+
+minecraft {
+    version = mc
+    runDir = "eclipse"
+
+    replaceIn "net/slimevoid/" + pack + "/core/lib/CoreLib.java"
+    replace "@VERSION@", project.version
+    replace "required-after:SlimevoidLib", "required-after:Forge@[" + forge + ",);required-after:SlimevoidLib@[" + slimevoidVersion + ",)"
+}
+
+dependencies {
+    compile 'net.slimevoid:SlimevoidLibrary:' + slimevoidVersion + ':dev'
+}
+
+processResources
+{
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+
+        // replace version and mcversion
+        expand 'version':project.version, 'mcversion':project.minecraft.version
+    }
+
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
+
+task sourceJar(type: Jar) {
+	from sourceSets.main.allSource
+	classifier = 'sources'
+}
+
+task deobfJar(type: Jar) {
+	from sourceSets.main.output
+	classifier = 'dev'
+}
+
+build.dependsOn sourceJar,deobfJar
+
+configurations {
+	deployJars
+}
+
+dependencies {
+    deployJars 'org.apache.maven.wagon:wagon-ssh:2.2'
+}
+
+artifacts {
+	archives sourceJar
+	archives deobfJar
+}
+
+uploadArchives {
+	dependsOn 'reobf'
+    repositories.mavenDeployer {
+    	configuration = configurations.deployJars
+        if (project.hasProperty("slimevoidUsername")) {
+            repository(url: 'scp://hyda.slimevoid.net/home/maven/www/repos') {
+                authentication(userName: slimevoidUsername, password: slimevoidPassword)
+            }
+        } else {
+            repository(url: 'file://localhost/' + project.file('build/repo').getAbsolutePath())
+        }
+        pom {
+            groupId = project.group
+            version = project.version
+            artifactId = project.archivesBaseName
+        }
+        pom.project {
+            name project.archivesBaseName
+            packaging 'jar'
+            description archivesBaseName
+            url 'https://github.com/Slimevoid/' + github
+
+            scm {
+                url 'https://github.com/Slimevoid/' + github
+                connection 'scm:git:git://github.com/Slimevoid/' + github + '.git'
+                developerConnection 'scm:git:git@Slimevoid/' + github + '.git'
+            }
+
+            issueManagement {
+                system 'github'
+                url 'https://github.com/Slimevoid/' + github + '/issues'
+            }
+
+            licenses {
+                license {
+                    name 'Lesser General Public Licence'
+                    url 'https://raw.github.com/Slimevoid/' + github + '/master/LICENSE'
+                    distribution 'repo'
+                }
+            }
+
+            developers {
+                developer {
+                    id 'Eurymachus'
+                    name 'Eurymachus'
+                    roles { role 'developer' }
+                }
+                developer {
+                    id 'Slimevoid'
+                    name 'Slimevoid Dev Team'
+                    roles { role 'developer' }
+                }
+                developer {
+                    id 'Tarig'
+                    name 'Tarig0'
+                    roles { role 'developer' }
+                }
+            }
+        }
+    }
+}

src/main/java/net/slimevoid/dynamictransport/client/proxy/ClientProxy.java

@@ -7,6 +7,7 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
 import net.slimevoid.dynamictransport.client.event.PlayerTick;
 import net.slimevoid.dynamictransport.client.presentation.gui.GuiDynamicMarker;
 import net.slimevoid.dynamictransport.client.presentation.gui.GuiFloorSelection;
@@ -18,6 +19,7 @@
 import net.slimevoid.dynamictransport.core.lib.PacketLib;
 import net.slimevoid.dynamictransport.entities.EntityElevatorPart;
 import net.slimevoid.dynamictransport.entities.EntityMasterElevator;
+import net.slimevoid.dynamictransport.event.EntityJoinWorld;
 import net.slimevoid.dynamictransport.proxy.CommonProxy;
 import net.slimevoid.dynamictransport.tileentity.TileEntityElevator;
 import net.slimevoid.dynamictransport.tileentity.TileEntityElevatorComputer;
@@ -90,5 +92,6 @@ public void registerConfigurationProperties(File configFile) {
     @Override
     public void registerEventHandlers() {
         FMLCommonHandler.instance().bus().register(new PlayerTick());
+        MinecraftForge.EVENT_BUS.register(new EntityJoinWorld());
     }
 }

src/main/java/net/slimevoid/dynamictransport/entities/EntityElevatorPart.java

@@ -20,9 +20,11 @@ public class EntityElevatorPart  extends Entity {
     public EntityMasterElevator entityElevatorObj;
     private HashSet<Entity> confirmedRiders;
     private int elevatorYOffset;
+    private boolean flag;
 
     public EntityElevatorPart(World par1World,EntityMasterElevator parent, double x,double y, double z) {
         this(par1World);
+        this.flag = true;
         this.prevPosX = x + 0.5F;
         this.prevPosY = y;
         this.prevPosZ = z + 0.5F;
@@ -167,7 +169,9 @@ public void setDead(ChunkCoordinates parentComputer) {
                         y,
                         z);
                 if (tile != null) {
-                    tile.setParentElevatorComputer(parentComputer);
+                	if (this.flag) {
+                		tile.setParentElevatorComputer(parentComputer);
+                	}
                     if (this.getCamoItem() != null) {
                         tile.setCamoItem(this.getCamoItem());
                     }
@@ -340,6 +344,12 @@ public void setArrived() {
     public Boolean hasArrived() {
       return  this.getDataWatcher().getWatchableObjectInt(6) == 1;
     }
+
+    public void checkFlag() {
+    	if (!this.worldObj.isRemote && !this.flag) {
+        	this.setDead(null);
+        }
+    }
 }