diff --git a/config/betterquesting/DefaultQuests.json b/config/betterquesting/DefaultQuests.json index 6acc4e687..5fdcdd37b 100644 --- a/config/betterquesting/DefaultQuests.json +++ b/config/betterquesting/DefaultQuests.json @@ -13296,7 +13296,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§6Crystallize §rthe Sodium Aluminate solution in aa §6Crystallizer §rwith water to get§5§6 Aluminium Hydroxide§r.", + "desc:8": "§6Crystallize §rthe Sodium Aluminate solution in a §6Crystallizer §rwith water to get§5§6 Aluminium Hydroxide§r.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -24244,7 +24244,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "No Description", + "desc:8": "§6Element§r: Rutherfordium (Rf)\n§bAtomic Number§r: 104\n§aAtomic Mass§r: 267 amu\n§cMelting Point§r: 2400 K\n§5Boiling Point§r: 5800 K\n§6Properties§r: Rutherfordium is a radioactive metal that does not occur naturally. Relatively few atoms of it have ever been made. At present, it is only used in research.\n", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -30129,7 +30129,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§6Silver Oxide §rmust then be roasted with Carbon to make §6Silver§r.", + "desc:8": "§6Silver Oxide §rmust then be roasted to make §6Silver§r.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -30202,7 +30202,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§6Acanthite §rcan be §croasted §rwith Oxygen to create §6Silver Oxide§r.", + "desc:8": "§6Acanthite §rand a tiny pile of §6Calcite §rcan be §croasted §rwith Oxygen to create §6Silver Oxide§r.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -54495,7 +54495,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "With Energy, Items, and a specified Recipe, RFTools Autocrafters can automatically craft stuff for you.\n\nGT Wirse/Cables are compatible with RF machines, so don\u0027t worry about having to convert energy.\n\nThese can come in handy if you dont want to make a GT Packager to deal with tiny dusts or small dusts.", + "desc:8": "With Energy, Items, and a specified Recipe, RFTools Autocrafters can automatically craft stuff for you.\n\nGT Wires/Cables are compatible with RF machines, so don\u0027t worry about having to convert energy.\n\nThese can come in handy if you dont want to make a GT Packager to deal with tiny dusts or small dusts.", "globalshare:1": 0, "icon:10": { "Count:3": 1, diff --git a/config/mod-director/serializationisbad.url.json b/config/mod-director/serializationisbad.url.json deleted file mode 100644 index 446b78874..000000000 --- a/config/mod-director/serializationisbad.url.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "url": "https://github.com/dogboy21/serializationisbad/releases/download/1.3/serializationisbad-1.3.jar" -} \ No newline at end of file diff --git a/config/serializationisbad.json b/config/serializationisbad.json new file mode 100644 index 000000000..5e6241b49 --- /dev/null +++ b/config/serializationisbad.json @@ -0,0 +1,378 @@ +{ + "executeBlocking": true, + "patchModules": [ + { + "classesToPatch": [ + "net.bdew.lib.network.SerializedMessageCodec", + "net.bdew.lib.network.NetChannel" + ], + "classAllowlist": [], + "packageAllowlist": [ + "net.bdew" + ] + }, + { + "classesToPatch": [ + "com.enderio.core.common.config.PacketConfigSync" + ], + "classAllowlist": [], + "packageAllowlist": [ + "crazypants", + "com.enderio" + ] + }, + { + "classesToPatch": [ + "p455w0rd.danknull.network.PacketConfigSync" + ], + "classAllowlist": [], + "packageAllowlist": [ + "p455w0rd.danknull" + ] + }, + { + "classesToPatch": [ + "reborncore.common.network.ExtendedPacketBuffer" + ], + "classAllowlist": [ + "java.math.BigInteger" + ], + "packageAllowlist": [] + }, + { + "classesToPatch": [ + "makeo.gadomancy.common.network.packets.PacketUpdateGolemTypeOrder", + "makeo.gadomancy.common.network.packets.PacketSyncConfigs" + ], + "classAllowlist": [], + "packageAllowlist": [ + "makeo.gadomancy" + ] + }, + { + "classesToPatch": [ + "org.wyldmods.simpleachievements.common.networking.MessageSendAchievements" + ], + "classAllowlist": [], + "packageAllowlist": [ + "org.wyldmods.simpleachievements" + ] + }, + { + "classesToPatch": [ + "immersive_armors.cobalt.network.Message" + ], + "classAllowlist": [], + "packageAllowlist": [ + "immersive_armors" + ] + }, + { + "classesToPatch": [ + "immersive_aircraft.cobalt.network.Message" + ], + "classAllowlist": [], + "packageAllowlist": [ + "immersive_aircraft" + ] + }, + { + "classesToPatch": [ + "immersive_paintings.cobalt.network.Message" + ], + "classAllowlist": [], + "packageAllowlist": [ + "immersive_paintings" + ] + }, + { + "classesToPatch": [ + "gcewing.projectblue.BaseNBTChannel$NBTCodec" + ], + "classAllowlist": [], + "packageAllowlist": [ + "gcewing.projectblue" + ] + }, + { + "classesToPatch": [ + "com.github.technus.tectech.mechanics.spark.RendererMessage" + ], + "classAllowlist": [], + "packageAllowlist": [ + "com.github.technus" + ] + }, + { + "classesToPatch": [ + "com.n247s.N2ConfigApi.api.networking.N2ConfigApiMessageHandler" + ], + "classAllowlist": [], + "packageAllowlist": [ + "com.n247s.N2ConfigApi" + ] + }, + { + "classesToPatch": [ + "p455w0rd.endermanevo.network.PacketFriendermanRegistrySync" + ], + "classAllowlist": [], + "packageAllowlist": [ + "p455w0rd.endermanevo" + ] + }, + { + "classesToPatch": [ + "com.mattdahepic.mdecore.config.sync.PacketConfigSync" + ], + "classAllowlist": [], + "packageAllowlist": [ + "com.mattdahepic" + ] + }, + { + "classesToPatch": [ + "com.iconmaster.aec.network.TransferConfigsPacket" + ], + "classAllowlist": [], + "packageAllowlist": [ + "com.iconmaster.aec" + ] + }, + { + "classesToPatch": [ + "net.tslat.aoa3.common.packet.leaderboard.PacketLeaderboardStats", + "net.tslat.aoa3.common.packet.leaderboard.PacketIndividualLeaderboardStats" + ], + "classAllowlist": [], + "packageAllowlist": [ + "net.tslat.aoa3" + ] + }, + { + "classesToPatch": [ + "pl.asie.lib.util.Base64" + ], + "classAllowlist": [], + "packageAllowlist": [ + "pl.asie" + ] + }, + { + "classesToPatch": [ + "arrowsplus.core.forge.PacketHandler" + ], + "classAllowlist": [], + "packageAllowlist": [ + "arrowsplus" + ] + }, + { + "classesToPatch": [ + "hellfirepvp.astralsorcery.common.network.packet.server.PktSyncConfig" + ], + "classAllowlist": [], + "packageAllowlist": [ + "hellfirepvp.astralsorcery" + ] + }, + { + "classesToPatch": [ + "mal.carbonization.network.MultiblockFurnaceMessageServer" + ], + "classAllowlist": [], + "packageAllowlist": [ + "mal.carbonization" + ] + }, + { + "classesToPatch": [ + "p455w0rd.capes.packet.PacketClientAddFriend", + "p455w0rd.capes.packet.PacketClientRemoveFriend", + "p455w0rd.capes.packet.PacketClientUpdateFriend", + "p455w0rd.capes.packet.PacketServerFriendSync", + "p455w0rd.capes.packet.PacketServerPlayerSync", + "p455w0rd.capes.packet.PacketServerTextureURLSync" + ], + "classAllowlist": [], + "packageAllowlist": [ + "p455w0rd.capes" + ] + }, + { + "classesToPatch": [ + "gcewing.sg.base.ForgeNBTNetworking$BasePacketHandler", + "gcewing.sg.BaseNBTChannel$NBTCodec", + "gcewing.sg.BaseNBTChannel$BasePacketHandler" + ], + "classAllowlist": [], + "packageAllowlist": [ + "gcewing.sg" + ] + }, + { + "classesToPatch": [ + "com.zerren.extrafirma.core.network.PacketHandler" + ], + "classAllowlist": [], + "packageAllowlist": [ + "com.zerren.extrafirma" + ] + }, + { + "classesToPatch": [ + "journeymap.common.network.impl.Message" + ], + "classAllowlist": [], + "packageAllowlist": [ + "journeymap" + ] + }, + { + "classesToPatch": [ + "com.polipo.bookshelf.net.MyMessage" + ], + "classAllowlist": [], + "packageAllowlist": [ + "com.polipo.bookshelf" + ] + }, + { + "classesToPatch": [ + "mca.PacketHandler", + "mca.core.forge.PacketHandler" + ], + "classAllowlist": [], + "packageAllowlist": [ + "mca" + ] + }, + { + "classesToPatch": [ + "logisticspipes.network.abstractpackets.GenericPacket", + "logisticspipes.network.packets.debuggui.DebugInfoUpdate", + "logisticspipes.network.packets.debuggui.DebugTargetResponse", + "logisticspipes.network.packets.debuggui.DebugTypePacket", + "logisticspipes.network.packets.routingdebug.RoutingUpdateTargetResponse" + ], + "classAllowlist": [], + "packageAllowlist": [ + "logisticspipes" + ] + }, + { + "classesToPatch": [ + "aeronicamc.mods.mxtune.network.NetworkSerializedHelper" + ], + "classAllowlist": [], + "packageAllowlist": [ + "aeronicamc.mods.mxtune" + ] + }, + { + "classesToPatch": [ + "p455w0rd.p455w0rdsthings.network.PacketConfigSync" + ], + "classAllowlist": [], + "packageAllowlist": [ + "p455w0rd.p455w0rdsthings" + ] + }, + { + "classesToPatch": [ + "radixcore.modules.RadixNettyIO" + ], + "classAllowlist": [], + "packageAllowlist": [ + "radixcore" + ] + }, + { + "classesToPatch": [ + "net.smart.moving.SmartMovingPacketStream" + ], + "classAllowlist": [], + "packageAllowlist": [ + "net.smart.moving" + ] + }, + { + "classesToPatch": [ + "svenhjol.strange.scrolls.message.ClientQuestList" + ], + "classAllowlist": [], + "packageAllowlist": [ + "svenhjol.strange" + ] + }, + { + "classesToPatch": [ + "com.supermartijn642.configlib.ConfigSyncPacket" + ], + "classAllowlist": [], + "packageAllowlist": [ + "com.supermartijn642" + ] + }, + { + "classesToPatch": [ + "vazkii.tinkerer.common.network.PacketManager" + ], + "classAllowlist": [], + "packageAllowlist": [ + "vazkii.tinkerer" + ] + }, + { + "classesToPatch": [ + "p455w0rd.tanaddons.network.PacketConfigSync" + ], + "classAllowlist": [], + "packageAllowlist": [ + "p455w0rd.tanaddons" + ] + }, + { + "classesToPatch": [ + "tterrag.core.common.config.PacketConfigSync" + ], + "classAllowlist": [], + "packageAllowlist": [ + "tterrag" + ] + }, + { + "classesToPatch": [ + "mods.gra.energymanipulator.client.ClientPacketHandler" + ], + "classAllowlist": [], + "packageAllowlist": [ + "mods.gra.energymanipulator" + ] + }, + { + "classesToPatch": [ + "com.possible_triangle.brazier.network.ByteConfigSerializer" + ], + "classAllowlist": [], + "packageAllowlist": [ + "com.possible_triangle.brazier" + ] + } + ], + "classAllowlist": [ + "boolean", + "byte", + "char", + "short", + "int", + "long", + "float", + "double", + "void" + ], + "packageAllowlist": [ + "java.util", + "java.lang" + ] +} diff --git a/manifest.json b/manifest.json index 844ba396e..b53977fd6 100644 --- a/manifest.json +++ b/manifest.json @@ -900,6 +900,11 @@ "fileID": 2708193, "required": true }, + { + "projectID": 896591, + "fileID": 4672511, + "required": true + }, { "projectID": 260262, "fileID": 3459767,