First semi-working 1.5.2 build. Much will not work, can at least conn…

…ect with FTB 152 test packs. Signed-off-by: Ross Allan <rallanpcl@gmail.com>
MinimallyCorrect · Jun 18, 2013 · 7cec5c5 · 7cec5c5
1 parent 08c2bd4
commit 7cec5c5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 41 deletions.
diff --git a/resources/patches.xml b/resources/patches.xml
@@ -645,35 +645,6 @@
 		<class id="buildcraft.core.EntityRobot">
 			<synchronize>build</synchronize>
 		</class>
-		<class id="buildcraft.core.inventory.TransactorSimple">
-			<replaceMethod code="{
-				int injected = 0;
-
-				int slotIndex = 0;
-				int slot = 0;
-				int size = inventory.^method:IInventory/getSizeInventory^();
-				while (slotIndex &lt; size &amp;&amp; injected &lt; $1.^field:ItemStack/stackSize^) {
-					slot = getPartialSlot($1, $2, slotIndex++);
-					if (slot != -1){
-						injected += addToSlot(slot, $1, injected, $3);
-					}
-				}
-
-				slotIndex = 0;
-				while (slotIndex &lt; size &amp;&amp; injected &lt; $1.^field:ItemStack/stackSize^) {
-					slotIndex++;
-					slot = getEmptySlot($2);
-					if (slot != -1){
-						injected += addToSlot(slot, $1, injected, $3);
-					}
-				}
-				if (injected > 0) {
-					inventory.^method:IInventory/onInventoryChanged^();
-				}
-				return injected;
-			}">inject
-			</replaceMethod>
-		</class>
 	</buildCraftCore>
 	<buildCraftEnergy>
 		<class id="buildcraft.energy.TileEngine">
@@ -1136,7 +1107,7 @@
 	</extraBiomesXL>
 	<portalGun>
 		<class id="portalgun.common.core.TickHandlerServer">
-			<synchronize field="$1.e">worldTick</synchronize>
+			<synchronize field="$1.^field:World/loadedEntityList^">worldTick</synchronize>
 			<replaceInitializer field="grabMap" class="nallar.collections.CHashMap"/>
 			<replaceInitializer field="portals" class="nallar.collections.CHashMap"/>
 			<replaceInitializer field="moonPortals" class="nallar.collections.CHashMap"/>
@@ -1155,7 +1126,7 @@
 	</portalGun>
 	<graviGun>
 		<class id="gravigun.common.core.TickHandlerServer">
-			<synchronize field="$1.i">worldTick</synchronize>
+			<synchronize field="$1.^field:World/weatherEffects^">worldTick</synchronize>
 			<replaceInitializer field="grabMap" class="java.util.concurrent.ConcurrentHashMap"/>
 			<replaceInitializer field="tossedEntities" class="java.util.concurrent.ConcurrentHashMap"/>
 			<replaceInitializer field="tosser" class="java.util.concurrent.ConcurrentHashMap"/>
@@ -1555,8 +1526,8 @@
 		<class id="vswe.stevescarts.CommonProxy">
 			<replaceMethod code="{
 				^class:Entity^ entity = $2.getEntity($1);
-				if (entity instanceof vswe.stevescarts.Carts.entMCBase) {
-					return (vswe.stevescarts.Carts.entMCBase) entity;
+				if (entity instanceof vswe.stevescarts.Carts.MinecartModular) {
+					return (vswe.stevescarts.Carts.MinecartModular) entity;
 				}
 				return null;
 			}">getCart

diff --git a/src/common/javassist/RemappingPool.java b/src/common/javassist/RemappingPool.java
@@ -20,7 +20,6 @@ public static boolean exclude(final String className) {
 	public boolean setSrgFor(String className) {
 		byte[] bytes = getBytes(className);
 		if (bytes == null) {
-			Log.severe("Not found " + className);
 			return isSrg;
 		}
 		return isSrg = classIsSrgObfuscated(bytes, className);
@@ -32,14 +31,11 @@ public static boolean classIsSrgObfuscated(byte[] bytes, String name) {
 		if (bytes == null) {
 			return false;
 		}
-		Log.info("setSRG for " + name);
 		for (String entry : StringExtractor.getStrings(bytes)) {
 			if (entry.contains(target) && !entry.contains("server/MinecraftServer") && !entry.contains("client/Minecraft") && !entry.contains("network/packet/IPacketHandler")) {
-				Log.info("setSRG true for " + entry);
 				return true;
 			}
 		}
-		Log.info("setSRG false");
 		return false;
 	}
 
@@ -66,8 +62,15 @@ private byte[] getBytes(String name) {
 		CtClass ctClass = super.getCached(name);
 		if (ctClass != null && ctClass.isModified()) {
 			try {
+				boolean oldSrg = isSrg;
+				if (oldSrg) {
+					isSrg = false;
+				}
 				byte[] bytes = ctClass.toBytecode();
 				ctClass.defrost();
+				if (oldSrg) {
+					isSrg = true;
+				}
 				return bytes;
 			} catch (Throwable t) {
 				Log.severe("Failed to get class bytes from modified class " + name, t);
@@ -91,12 +94,9 @@ protected synchronized CtClass get0(String className, boolean useCache) throws N
 				String remappedName = Transformer.unmapClassName(className);
 
 				byte[] bytes = getBytes(remappedName);
-				if (bytes == null) {
-					Log.severe("Couldn't find bytes " + remappedName + " for " + className);
-				} else {
+				if (bytes != null) {
 					bytes = Transformer.transform(bytes);
 					try {
-						Log.severe(className + " deobfuscated from file " + remappedName);
 						CtClass ctClass = new CtClassType(new ByteArrayInputStream(bytes), this);
 						if (!remappedName.equals(className)) {
 							ctClass.freeze();