-
-
Notifications
You must be signed in to change notification settings - Fork 44
/
patches-deobfuscated.xml
327 lines (327 loc) · 17.2 KB
/
patches-deobfuscated.xml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<mods>
<minecraftCommon>
<class id="net.minecraft.world.SpawnerAnimals">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchSpawnerAnimals"/>
</class>
<class id="net.minecraft.pathfinding.Path">
<newInitializer field="pathPoints" class="net.minecraft.pathfinding.PathPoint" arraySize="128"/>
</class>
<class id="net.minecraft.server.MinecraftServer">
<addClass class="net.minecraft.network.packet.IPacketHandler"/>
<addClass class="me.nallar.tickthreading.Log"/>
<addClass class="me.nallar.tickthreading.LogFormatter"/>
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchMinecraftServer"/>
<public field="mcServer"/>
</class>
<class id="net.minecraft.profiler.Profiler">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchProfiler"/>
</class>
<class id="net.minecraft.network.packet.Packet51MapChunk">
<volatile field="chunkData"/>
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchPacket51MapChunk"/>
</class>
<class id="net.minecraft.network.packet.Packet56MapChunks">
<volatile field="field_73587_e"/>
</class>
<class id="net.minecraft.network.TcpWriterThread">
<ignoreExceptions type="java.net.SocketException">run</ignoreExceptions>
</class>
<class id="net.minecraft.world.WorldServer">
<!-- Fixes an issue where the tickNextTickLists would become out of sync -->
<synchronize>func_82740_a,scheduleBlockUpdateFromLoad,getPendingBlockUpdates,addBlockEvent,tickUpdates</synchronize>
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchWorldServer"/>
<insertSuper>tickBlocksAndAmbiance</insertSuper>
<newInitializer field="doneChunks" code="java.util.Collections.newSetFromMap(new java.util.concurrent.ConcurrentHashMap());"/>
</class>
<class id="net.minecraft.world.World">
<!-- Same list was used by multiple threads -->
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchWorld"/>
<public>releaseEntitySkin</public>
<newInitializer field="activeChunkSet" code="java.util.Collections.newSetFromMap(new java.util.concurrent.ConcurrentHashMap());"/>
</class>
<class id="net.minecraft.world.biome.WorldChunkManager">
<newField field="staticLock" class="java.lang.Object" static=""/>
<synchronize field="staticLock">getModdedBiomeGenerators</synchronize>
</class>
<class id="net.minecraft.world.gen.ChunkProviderServer">
<public field="loadedChunks"/>
</class>
<class id="net.minecraft.world.gen.ChunkProviderServer" env="forge">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchChunkProviderServer"/>
<synchronize field="chunkLoadLock">unloadAllChunks,saveChunks,unload100OldestChunks</synchronize>
<synchronize field="genLock">populate</synchronize>
</class>
<class id="net.minecraft.world.chunk.storage.AnvilChunkLoader" env="forge">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchAnvilChunkLoader"/>
</class>
<class id="net.minecraft.world.chunk.Chunk">
<!-- The entity list could be accessed from multiple threads, as usual causes problems during iteration -->
<newField field="entityListReadWriteLock" class="me.nallar.tickthreading.util.TwoWayReentrantReadWriteLock"/>
<newField field="entityListWriteLock" class="java.util.concurrent.locks.Lock" code="this.entityListReadWriteLock.writeLock();"/>
<newField field="entityListReadLock" class="java.util.concurrent.locks.Lock" code="this.entityListReadWriteLock.readLock();"/>
<lock field="entityListWriteLock">onChunkLoad,onChunkUnload,removeEntityAtIndex,addEntity</lock>
<lock field="entityListReadLock">getEntitiesWithinAABBForEntity,getEntitiesOfTypeWithinAAAB</lock>
</class>
<class id="net.minecraft.util.Vec3Pool">
<!-- This prevents entities in multiple threads using the same Vec3 for collisions. -->
<synchronize>getVecFromPool</synchronize>
</class>
<class id="net.minecraft.util.Vec3Pool" env="mcpc">
<synchronize>getVecFromPool,release,clear</synchronize>
</class>
<class id="net.minecraft.util.AxisAlignedBB">
<!-- Improves performance -->
<replaceMethod fromClass="me.nallar.tickthreading.minecraft.patched.PatchAxisAlignedBB">intersectsWith</replaceMethod>
</class>
<class id="net.minecraft.util.LongHashMap">
<replace class="me.nallar.tickthreading.minecraft.patched.LongHashMap"/>
</class>
<class id="net.minecraft.util.IntHashMap">
<replace class="me.nallar.tickthreading.minecraft.patched.IntHashMap"/>
</class>
<class id="net.minecraft.entity.player.EntityPlayerMP">
<!-- TODO: Fix this with less locking -->
<newField field="staticLock" class="java.lang.Object" static=""/>
<synchronize field="staticLock">onUpdate</synchronize>
<!-- Concurrent access during iteration = boom -->
</class>
<class id="net.minecraft.entity.player.EntityPlayerMP" env="forge">
<newInitializer field="destroyedItemsNetCache" class="me.nallar.tickthreading.collections.ConcurrentLinkedQueueList"/>
</class>
<class id="net.minecraft.entity.Entity">
<newField static="" field="nextEntityID_" class="java.util.concurrent.atomic.AtomicInteger"/>
<insertAfter field="entityId" code="this.$field = this.nextEntityID_.getAndIncrement();"/>
<insertBefore code="if ($1 == 0 && $2 == 0 && $3 == 0) { return; }">moveEntity</insertBefore>
</class>
<class id="net.minecraft.entity.item.EntityItem">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchEntityItem"/>
</class>
<class id="net.minecraft.tileentity.TileEntity">
<addMethod return="java.lang.String"
name="toString"
code="return super.toString() + " x,y,x: " + l + ", " + m + ", " + n;"/>
</class>
<class id="net.minecraft.entity.EntityTracker">
<!-- Yet more comodification exceptions -->
<newField field="readWriteLock" class="me.nallar.tickthreading.util.TwoWayReentrantReadWriteLock"/>
<newField field="writeLock" class="java.util.concurrent.locks.Lock" code="this.readWriteLock.writeLock();"/>
<newField field="readLock" class="java.util.concurrent.locks.Lock" code="this.readWriteLock.readLock();"/>
<lock field="writeLock">addEntityToTracker(Lnet/minecraft/entity/Entity;)V,addEntityToTracker(Lnet/minecraft/entity/Entity;IIZ)V,removeEntityFromAllTrackingPlayers</lock>
<lock field="readLock">updateTrackedEntities,removeAllTrackingPlayers,func_85172_a</lock>
</class>
<class id="net.minecraft.village.Village">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchVillage"/>
</class>
<class id="net.minecraft.village.VillageCollection">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchVillageCollection"/>
<!-- Literally the most useless collection. Locking instead of voiding in case it ever does something useful in future -->
<newField field="readWriteLock" class="me.nallar.tickthreading.util.TwoWayReentrantReadWriteLock"/>
<newField field="writeLock" class="java.util.concurrent.locks.Lock" code="this.readWriteLock.writeLock();"/>
<newField field="readLock" class="java.util.concurrent.locks.Lock" code="this.readWriteLock.readLock();"/>
<lock field="writeLock">addVillagerPosition</lock>
<lock field="readLock">findNearestVillage,func_82566_a</lock>
</class>
<class id="net.minecraft.server.management.PlayerManager">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchPlayerManager"/>
</class>
<class id="net.minecraft.server.management.PlayerManager" env="mcpc">
<synchronize>addPlayer,removePlayer,updateMountedMovingPlayer,updatePlayerInstances</synchronize>
</class>
<class id="net.minecraft.server.management.PlayerManager" env="forge">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchPlayerManagerForge"/>
<synchronize>addPlayer,removePlayer</synchronize>
<synchronize field="$1.loadedChunks">updateMountedMovingPlayer</synchronize>
</class>
<class id="net.minecraft.server.management.PlayerInstance" env="forge">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchPlayerInstance"/>
<lockMethodCall field="this.myManager.playerUpdateLock" method="add">flagChunkForUpdate</lockMethodCall>
<replaceMethodCall index="1" code="{ $_ = null; }"/>
</class>
<class id="net.minecraft.world.ChunkCoordIntPair">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchChunkCoordIntPair"/>
</class>
<class id="net.minecraft.crash.CrashReportCategory">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchClassReportCategory"/>
</class>
<class id="net.minecraft.block.BlockRedstoneWire">
<synchronize>calculateCurrentChanges,updateAndPropagateCurrentStrength</synchronize>
</class>
<class id="net.minecraft.network.TcpConnection">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchTcpConnection"/>
</class>
<class id="net.minecraft.entity.ai.EntityAITasks">
<synchronize>addTask,func_85156_a,onUpdateTasks,func_75775_b</synchronize>
</class>
</minecraftCommon>
<forgeModLoader>
<class id="cpw.mods.fml.common.asm.FMLSanityChecker">
<replaceMethodCall code="{ $_ = null; }" method="severe">call</replaceMethodCall>
</class>
<class id="cpw.mods.fml.common.FMLModContainer">
<replaceMethodCall index="0" code="{ $_ = null; }" method="log">constructMod</replaceMethodCall>
<replaceFieldUsage field="fingerprintNotPresent" readCode="$_ = false;">constructMod</replaceFieldUsage>
<replaceFieldUsage field="expectedFingerprint" readCode="$_ = null;">constructMod</replaceFieldUsage>
</class>
<class id="cpw.mods.fml.common.FMLCommonHandler">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchFMLCommonHandler"/>
</class>
<class id="cpw.mods.fml.common.SingleIntervalHandler">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchSingleIntervalHandler"/>
</class>
<class id="cpw.mods.fml.relauncher.RelaunchClassLoader">
<addAll fromClass="me.nallar.tickthreading.minecraft.patched.PatchRelaunchClassLoader"/>
</class>
<class id="cpw.mods.fml.common.network.ModListResponsePacket">
<replaceMethodCall index="2" code="{ $_ = null; }" method="info">execute</replaceMethodCall>
<replaceMethodCall index="3" code="{ $_ = null; }" method="info">execute</replaceMethodCall>
</class>
</forgeModLoader>
<factorization>
<class id="factorization.common.TileEntityWrathLamp">
<!-- ಠ_ಠ -->
<synchronize>findLightAirParent</synchronize>
</class>
<class id="factorization.api.Charge">
<newField field="staticLock" class="java.lang.Object" static=""/>
<synchronize field="staticLock">update</synchronize>
</class>
</factorization>
<liteLoader>
<class id="com.mumfrey.liteloader.core.HookProfiler">
<!-- LiteLoader makes the profiler not threadsafe - I may look into patching this better in future, but TT isn't really intended for clients -->
<synchronize>a(Ljava/lang/String;)V,b()V</synchronize>
</class>
</liteLoader>
<buildCraftTransport>
<class id="buildcraft.transport.TileGenericPipe">
<newField field="staticLock" class="java.lang.Object" static=""/>
<synchronize field="staticLock">initialize</synchronize>
<synchronize field="facadeBlocks">blockCreated,getBlockId,getTile,computeConnections</synchronize>
</class>
<class id="buildcraft.transport.PipeTransportItems">
<newInitializer field="travelingEntities" class="java.util.concurrent.ConcurrentHashMap"/>
</class>
<class id="buildcraft.transport.PipeTransportPower">
<newField field="staticLock" class="java.lang.Object" static=""/>
<synchronize field="staticLock">updateEntity</synchronize>
</class>
</buildCraftTransport>
<thermalExpansionTransport>
<class id="thermalexpansion.transport.tileentity.TileConduitEnergy">
<newField field="tickLock" class="java.lang.Object" static=""/>
<synchronize field="tickLock">updateGridIfNull</synchronize>
</class>
<class id="thermalexpansion.transport.tileentity.TileConduitLiquid">
<newField field="tickLock" class="java.lang.Object" static=""/>
<synchronize field="tickLock">updateGridIfNull</synchronize>
</class>
</thermalExpansionTransport>
<redPowerCore>
<class id="com.eloraam.redpower.core.RedPowerLib">
<threadLocal field="blockUpdates" type="java.util.HashSet" threadLocalField="javassist.is.faulty.ThreadLocals.redPowerBlockUpdateSet"/>
<threadLocal field="powerSearchTest" type="java.util.HashSet" threadLocalField="javassist.is.faulty.ThreadLocals.redPowerPowerSearchTest"/>
<threadLocal field="powerSearch" type="java.util.LinkedList" threadLocalField="javassist.is.faulty.ThreadLocals.redPowerPowerSearch"/>
<!-- Still broken - crashes JVM!
<threadLocal field="searching" type="boolean" setExpression="java.lang.Boolean.valueOf($1)" threadLocalField="javassist.is.faulty.ThreadLocals.redPowerIsSearching"/>
-->
</class>
<class id="com.eloraam.redpower.core.TubeFlow">
<newField field="staticLock" class="java.lang.Object" static=""/>
<synchronize field="staticLock">update,add,onRemove</synchronize>
<!-- Possibly buggy but fast fix
<replaceField field="contents" class="me.nallar.tickthreading.collections.ConcurrentLinkedQueueList" type="java.util.List"/>
-->
</class>
<class id="com.eloraam.redpower.core.PipeLib">
<replaceMethodCall index="0" code="{ $_ = null; }" method="printf">registerForgeFluid</replaceMethodCall>
</class>
</redPowerCore>
<industrialCraft>
<class id="ic2.core.EnergyNet">
<replaceMethodCall index="1" method="warning" code="{}">emitEnergyFrom</replaceMethodCall>
<synchronize>addTileEntity,removeTileEntity,emitEnergyFrom,discover</synchronize>
<replaceMethod
code="{
ic2.core.EnergyNet energyNet = (ic2.core.EnergyNet) worldToEnergyNetMap.get($1);
if (energyNet == null) {
synchronized(ic2.core.EnergyNet.class) {
energyNet = (ic2.core.EnergyNet) worldToEnergyNetMap.get($1);
if (energyNet == null) {
energyNet = new ic2.core.EnergyNet($1);
worldToEnergyNetMap.put($1, energyNet);
}
}
}
return energyNet;
}"
>getForWorld</replaceMethod>
</class>
</industrialCraft>
<gregTech>
<class id="gregtechmod.GT_Mod">
<synchronize>readIDSUData,writeIDSUData</synchronize>
</class>
</gregTech>
<chickenChunks>
<class id="codechicken.chunkloader.ChunkLoaderEventHandler">
<newField field="staticLock" class="java.lang.Object" static=""/>
<synchronize field="staticLock">tickEnd,onPlayerLogout,onWorldLoad,onWorldUnload,onChunkForce,onChunkUnForce</synchronize>
</class>
<class id="codechicken.chunkloader.PlayerChunkViewerManager">
<synchronize field="$1.b.g">calculateChunkChanges</synchronize>
</class>
<class id="codechicken.chunkloader.CommandChunkLoaders">
<synchronize field="codechicken.chunkloader.ChunkLoaderEventHandler.staticLock">handleCommand</synchronize>
</class>
</chickenChunks>
<wirelessRedstone>
<class id="codechicken.wirelessredstone.core.RedstoneEtherServer">
<synchronize>tick</synchronize>
</class>
</wirelessRedstone>
<myTown>
<class id="ee.lutsu.alpha.mc.mytown.event.ProtectionEvents">
<synchronize>tickStart</synchronize>
</class>
</myTown>
<soulShards>
<class id="com.shadwdrgn.soulshards.CommonProxy">
<replaceMethodCall index="0" code="{}" method="println">processShard</replaceMethodCall>
</class>
</soulShards>
<extraBiomesXL>
<class id="extrabiomes.blocks.BlockAutumnLeaves$BlockType">
<insertBefore code="if (loadedCustomBlocks) { return; }">loadCustomBlocks</insertBefore>
<synchronize/>
</class>
<class id="extrabiomes.blocks.BlockGreenLeaves$BlockType">
<insertBefore code="if (loadedCustomBlocks) { return; }">loadCustomBlocks</insertBefore>
<synchronize/>
</class>
<class id="extrabiomes.module.summa.worldgen.WorldGenLegendOak$TreeBlock">
<insertBefore code="if (loadedCustomBlocks) { return; }">loadCustomBlocks</insertBefore>
<synchronize>loadCustomBlocks</synchronize>
</class>
<class id="extrabiomes.module.summa.worldgen.WorldGenFirTreeHuge$TreeBlock">
<insertBefore code="if (loadedCustomBlocks) { return; }">loadCustomBlocks</insertBefore>
<synchronize>loadCustomBlocks</synchronize>
</class>
<class id="extrabiomes.module.summa.worldgen.WorldGenFirTree$TreeBlock">
<insertBefore code="if (loadedCustomBlocks) { return; }">loadCustomBlocks</insertBefore>
<synchronize>loadCustomBlocks</synchronize>
</class>
<class id="extrabiomes.module.summa.worldgen.WorldGenAutumnTree$AutumnTreeType">
<insertBefore code="if (loadedCustomBlocks) { return; }">loadCustomBlocks</insertBefore>
<synchronize>loadCustomBlocks</synchronize>
</class>
<class id="extrabiomes.module.summa.worldgen.WorldGenAcacia$TreeBlock">
<insertBefore code="if (loadedCustomBlocks) { return; }">loadCustomBlocks</insertBefore>
<synchronize>loadCustomBlocks</synchronize>
</class>
<class id="extrabiomes.module.summa.worldgen.WorldGenRedwood$TreeBlock">
<insertBefore code="if (loadedCustomBlocks) { return; }">loadCustomBlocks</insertBefore>
<synchronize>loadCustomBlocks</synchronize>
</class>
</extraBiomesXL>
</mods>