From a528db1e6d4ae0f7dba66ff7080d760727ffac2a Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 14 Nov 2023 22:28:40 +0500 Subject: [PATCH 1/4] Revert "Merge pull request #5 from TerraFirmaGreg-Team/revert-4-crafting-recipes-from-cube" This reverts commit 7cff4c0eebd856e5d806dff4aac2f081ea323ffc, reversing changes made to 05c4beb7e57c98a1cb4e63b528abbea148b59434. --- kubejs/client_scripts/mainClientScript.js | 1 + .../sophisticatedbackpacks/constants.js | 24 ++ .../sophisticatedbackpacks/rei.js | 7 + kubejs/server_scripts/mainServerScript.js | 1 + .../sophisticatedbackback/recipes.js | 298 ++++++++++++++++++ 5 files changed, 331 insertions(+) create mode 100644 kubejs/client_scripts/sophisticatedbackpacks/constants.js create mode 100644 kubejs/client_scripts/sophisticatedbackpacks/rei.js create mode 100644 kubejs/server_scripts/sophisticatedbackback/recipes.js diff --git a/kubejs/client_scripts/mainClientScript.js b/kubejs/client_scripts/mainClientScript.js index 7dff6b554..b858d738e 100644 --- a/kubejs/client_scripts/mainClientScript.js +++ b/kubejs/client_scripts/mainClientScript.js @@ -7,6 +7,7 @@ REIEvents.hide('item', event => { hideCreateStuff(event) hideMinecraftStuff(event) hideExtendedCraftingStuff(event) + hideSophisticatedBackpacksStuff(event) }) diff --git a/kubejs/client_scripts/sophisticatedbackpacks/constants.js b/kubejs/client_scripts/sophisticatedbackpacks/constants.js new file mode 100644 index 000000000..3899285c7 --- /dev/null +++ b/kubejs/client_scripts/sophisticatedbackpacks/constants.js @@ -0,0 +1,24 @@ +// priority: 199 + +const sophisticatedbackpacksItemsToHide = [ + 'sophisticatedbackpacks:inception_upgrade', + 'sophisticatedbackpacks:smelting_upgrade', + 'sophisticatedbackpacks:auto_smelting_upgrade', + 'sophisticatedbackpacks:smoking_upgrade', + 'sophisticatedbackpacks:auto_smoking_upgrade', + 'sophisticatedbackpacks:blasting_upgrade', + 'sophisticatedbackpacks:auto_blasting_upgrade', + 'sophisticatedbackpacks:stonecutter_upgrade', + 'sophisticatedbackpacks:stack_upgrade_tier_2', + 'sophisticatedbackpacks:stack_upgrade_tier_3', + 'sophisticatedbackpacks:stack_upgrade_tier_4', + 'sophisticatedbackpacks:tank_upgrade', + 'sophisticatedbackpacks:battery_upgrade', + 'sophisticatedbackpacks:pump_upgrade', + 'sophisticatedbackpacks:advanced_pump_upgrade', + 'sophisticatedbackpacks:xp_pump_upgrade', + 'sophisticatedbackpacks:advanced_compacting_upgrade', + 'sophisticatedbackpacks:compacting_upgrade', + 'sophisticatedbackpacks:advanced_feeding_upgrade', + 'sophisticatedbackpacks:feeding_upgrade' +] diff --git a/kubejs/client_scripts/sophisticatedbackpacks/rei.js b/kubejs/client_scripts/sophisticatedbackpacks/rei.js new file mode 100644 index 000000000..11f8819fa --- /dev/null +++ b/kubejs/client_scripts/sophisticatedbackpacks/rei.js @@ -0,0 +1,7 @@ +// priority: 0 + +const hideSophisticatedBackpacksStuff = (event) => { + sophisticatedbackpacksItemsToHide.forEach(itemToHide => { + event.hide(itemToHide) + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js index a0738c1a6..e12b086b9 100644 --- a/kubejs/server_scripts/mainServerScript.js +++ b/kubejs/server_scripts/mainServerScript.js @@ -19,6 +19,7 @@ ServerEvents.recipes(event => { registerExtendedCraftingRecipes(event) registerMinecraftRecipes(event) registerTFCRecipes(event) + registersophisticatedbackpacksRecipes(event) }) LootJS.modifiers((event) => { diff --git a/kubejs/server_scripts/sophisticatedbackback/recipes.js b/kubejs/server_scripts/sophisticatedbackback/recipes.js new file mode 100644 index 000000000..8599b5f92 --- /dev/null +++ b/kubejs/server_scripts/sophisticatedbackback/recipes.js @@ -0,0 +1,298 @@ +const registersophisticatedbackpacksRecipes = (event) => { + +// Удаление рецептов мода sophisticatedbackpacks + + event.remove({ mod: 'sophisticatedbackpacks' }); + + +//изменение крафтов рюкзаков + + //измененный крафт БАЗОВОГО рюкзака + event.shaped('sophisticatedbackpacks:backpack', [ + 'ABD', + 'ACA', + 'BBB' + ], { + A: '#forge:string', + B: 'minecraft:leather', + C: '#forge:chests/wooden', + D: 'minecraft:name_tag' + }); + + //измененный крафт ЖЕЛЕЗНОГО рюкзака + event.shaped('sophisticatedbackpacks:iron_backpack', [// arg 1: output + 'ABA', + 'BCB', // arg 2: the shape (array of strings) + 'ABA' + ], { + A: '#forge:plates/double/wrought_iron', + B: '#forge:rods/long/wrought_iron', //arg 3: the mapping object + C: 'sophisticatedbackpacks:backpack' + }); + + //измененный крафт ЗОЛОТОГО рюкзака + event.shaped('sophisticatedbackpacks:gold_backpack', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: '#forge:plates/double/rose_gold', + B: '#forge:rods/long/sterling_silver', + C: '#forge:rods/long/gold', + D: 'sophisticatedbackpacks:iron_backpack', + E: '#forge:plates/double/steel' + }); + + //измененный крафт АЛМАЗНОГО рюкзака + event.shaped('sophisticatedbackpacks:diamond_backpack', [ + 'ABA', + 'BCB', + 'ABA' + ], { + A: '#forge:plates/double/black_steel', + B: '#forge:rods/long/black_steel', + C: 'sophisticatedbackpacks:gold_backpack' + }); + + //измененный крафт НЕЗЕРИТОВОГО рюкзака + event.shaped('sophisticatedbackpacks:netherite_backpack', [ + 'ABC', + 'DED', + 'CBA' + ], { + A: '#forge:plates/double/blue_steel', + B: '#forge:rods/long/red_steel', + C: '#forge:plates/double/red_steel', + D: '#forge:rods/long/blue_steel', + E: 'sophisticatedbackpacks:diamond_backpack' + }); + + +//изменение крафтов апгрейдов + + //измененный крафт upgrade_base + event.shaped('sophisticatedbackpacks:upgrade_base', [ + 'ABA', + 'BCB', + 'ADA' + ], { + A: '#forge:string', + B: '#forge:rods/long/wrought_iron', + C: 'minecraft:leather', + D: '#forge:plates/steel' + }); + + //измененный крафт pickup_upgrade + event.shaped('sophisticatedbackpacks:pickup_upgrade', [ + 'ABA', + 'CDE', + 'FGF' + ], { + A: 'gtceu:hv_electric_motor', + B: 'gtceu:mercury_barium_calcium_cuprate_single_wire', + C: 'gtceu:hv_conveyor_module', + D: 'sophisticatedbackpacks:upgrade_base', + E: 'gtceu:hv_robot_arm', + F: '#forge:circuits/hv', + G: '#forge:batteries/hv' + }); + + //измененный крафт advanced_pickup_upgrade + event.shapeless('sophisticatedbackpacks:advanced_pickup_upgrade', [ + 'sophisticatedbackpacks:pickup_upgrade', + '#forge:circuits/ev' + ]); + + //измененный крафт filter_upgrade + event.shaped('sophisticatedbackpacks:filter_upgrade', [ + 'ABC', + 'DEF', + 'GHG' + ], { + A: '#forge:batteries/lv', + B: 'gtceu:item_filter', + C: 'gtceu:manganese_phosphide_single_wire', + D: 'gtceu:lv_conveyor_module', + E: 'sophisticatedbackpacks:upgrade_base', + F: 'gtceu:lv_robot_arm', + G: '#forge:circuits/lv', + H: 'gtceu:item_tag_filter' + }); + + //измененный крафт advanced_filter_upgrade + event.shapeless('sophisticatedbackpacks:advanced_filter_upgrade', [ + 'sophisticatedbackpacks:filter_upgrade', + '#forge:circuits/mv' + ]); + + //измененный крафт magnet_upgrade + event.shaped('sophisticatedbackpacks:magnet_upgrade', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: 'gtceu:hv_robot_arm', + B: 'gtceu:item_filter', + C: '#forge:circuits/hv', + D: 'sophisticatedbackpacks:upgrade_base', + E: '#forge:batteries/hv' + }); + + //измененный крафт advanced_magnet_upgrade + event.shapeless('sophisticatedbackpacks:advanced_magnet_upgrade', [ + 'sophisticatedbackpacks:magnet_upgrade', + '#forge:circuits/ev' + ]); + + //измененный крафт void_upgrade + event.shaped('sophisticatedbackpacks:void_upgrade', [ + 'ABA', + 'CDE', + 'FGF' + ], { + A: '#forge:screws/steel', + B: 'gtceu:item_detector_cover', + C: '#forge:tools/screwdrivers', + D: 'sophisticatedbackpacks:upgrade_base', + E: '#forge:tools/wrenches', + F: 'gtceu:brass_normal_item_pipe', + G: '#forge:ender_pearls' + }); + + //измененный крафт advanced_void_upgrade + event.shapeless('sophisticatedbackpacks:advanced_void_upgrade', [ + 'sophisticatedbackpacks:void_upgrade', + '#forge:circuits/mv' + ]); + + //измененный крафт deposit_upgrade + event.shaped('sophisticatedbackpacks:deposit_upgrade', [ + 'ABC', + 'DED', + ' F ' + ], { + A: '#forge:batteries/lv', + B: 'gtceu:manganese_phosphide_single_wire', + C: '#forge:circuits/lv', + D: 'gtceu:lv_conveyor_module', + E: 'sophisticatedbackpacks:upgrade_base', + F: 'gtceu:lv_robot_arm' + }); + + //измененный крафт advanced_deposit_upgrade + event.shapeless('sophisticatedbackpacks:advanced_deposit_upgrade', [ + 'sophisticatedbackpacks:deposit_upgrade', + '#forge:circuits/mv' + ]); + + //измененный крафт restock_upgrade + event.shaped('sophisticatedbackpacks:restock_upgrade', [ + ' A ', + 'BCB', + 'DEF' + ], { + A: 'gtceu:lv_robot_arm', + B: 'gtceu:lv_conveyor_module', + C: 'sophisticatedbackpacks:upgrade_base', + D: '#forge:batteries/lv', + E: 'gtceu:manganese_phosphide_single_wire', + F: '#forge:circuits/lv', + }); + + //измененный крафт advanced_restock_upgrade + event.shapeless('sophisticatedbackpacks:advanced_restock_upgrade', [ + 'sophisticatedbackpacks:restock_upgrade', + '#forge:circuits/mv' + ]); + + //измененный крафт refill_upgrade + event.shaped('sophisticatedbackpacks:refill_upgrade', [ + 'ABC', + 'DED', + 'CBA' + ], { + A: 'gtceu:manganese_phosphide_single_wire', + B: '#forge:circuits/lv', + C: '#forge:batteries/lv', + D: 'gtceu:lv_robot_arm', + E: 'sophisticatedbackpacks:upgrade_base' + }); + + //измененный крафт advanced_refill_upgrade + event.shapeless('sophisticatedbackpacks:advanced_refill_upgrade', [ + 'sophisticatedbackpacks:refill_upgrade', + '#forge:circuits/mv' + ]); + + //измененный крафт everlasting_upgrade + event.shaped('sophisticatedbackpacks:everlasting_upgrade', [ + 'ABC', + 'BDB', + 'EBA' + ], { + A: 'gtceu:zpm_field_generator', + B: '#forge:plates/neutronium', + C: '#forge:circuits/zpm', + D: 'sophisticatedbackpacks:upgrade_base', + E: '#forge:batteries/zpm' + }); + + //измененный крафт crafting_upgrade + event.shaped('sophisticatedbackpacks:crafting_upgrade', [ + 'ABA', + 'CDC', + 'ACA' + ], { + A: '#forge:rods/steel', + B: '#tfc:workbenches', + C: '#forge:plates/steel', + D: 'sophisticatedbackpacks:upgrade_base', + }); + + //измененный крафт stack_upgrade_tier_1 + event.shaped('sophisticatedbackpacks:stack_upgrade_tier_1', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: '#forge:circuits/iv', + B: 'gtceu:samarium_iron_arsenic_oxide_single_wire', + C: '#forge:batteries/iv', + D: 'sophisticatedbackpacks:upgrade_base', + E: 'gtceu:iv_field_generator' + }); + + //измененный крафт jukebox_upgrade + event.shaped('sophisticatedbackpacks:jukebox_upgrade', [ + 'ABA', + 'CDC', + 'ACA' + ], { + A: '#forge:rods/steel', + B: 'minecraft:jukebox', + C: '#forge:plates/steel', + D: 'sophisticatedbackpacks:upgrade_base', + }); + + //измененный крафт tool_swapper_upgrade + event.shaped('sophisticatedbackpacks:tool_swapper_upgrade', [ + 'ABC', + 'DEF', + 'CGA' + ], { + A: '#forge:circuits/lv', + B: '#minecraft:pickaxes', + C: 'gtceu:lv_robot_arm', + D: '#minecraft:hoes', + E: 'sophisticatedbackpacks:upgrade_base', + F: '#minecraft:shovels', + G: '#minecraft:axes', + }); + + //измененный крафт advanced_tool_swapper_upgrade + event.shapeless('sophisticatedbackpacks:advanced_tool_swapper_upgrade', [ + 'sophisticatedbackpacks:tool_swapper_upgrade', + '#forge:circuits/mv' + ]); +//все крафты данного мода были изменены или удалены. +} \ No newline at end of file From 77241eec12adce02e8db407e38ac8d7c42c8358d Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 14 Nov 2023 22:35:34 +0500 Subject: [PATCH 2/4] CustomSkinLoader .gitignore --- CustomSkinLoader/CustomSkinAPIPlus-ClientID | 1 - CustomSkinLoader/CustomSkinLoader.log | 73 ------------------- .../99ee481cd9c30654ac1ddc2969289c74b83780d0 | 9 --- ...e481cd9c30654ac1ddc2969289c74b83780d0.json | 5 -- 4 files changed, 88 deletions(-) delete mode 100644 CustomSkinLoader/CustomSkinAPIPlus-ClientID delete mode 100644 CustomSkinLoader/CustomSkinLoader.log delete mode 100644 CustomSkinLoader/caches/99ee481cd9c30654ac1ddc2969289c74b83780d0 delete mode 100644 CustomSkinLoader/caches/99ee481cd9c30654ac1ddc2969289c74b83780d0.json diff --git a/CustomSkinLoader/CustomSkinAPIPlus-ClientID b/CustomSkinLoader/CustomSkinAPIPlus-ClientID deleted file mode 100644 index 430020325..000000000 --- a/CustomSkinLoader/CustomSkinAPIPlus-ClientID +++ /dev/null @@ -1 +0,0 @@ -ee786150-e761-4128-9c2e-9d0aaa4f805e \ No newline at end of file diff --git a/CustomSkinLoader/CustomSkinLoader.log b/CustomSkinLoader/CustomSkinLoader.log deleted file mode 100644 index a1ad74336..000000000 --- a/CustomSkinLoader/CustomSkinLoader.log +++ /dev/null @@ -1,73 +0,0 @@ -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: CustomSkinLoader 14.18.1 -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: DataDir: C:\Users\Dmitry\AppData\Roaming\com.modrinth.theseus\profiles\TFG 1.20.1\CustomSkinLoader -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Operating System: Windows 11 (amd64) version 10.0 -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Java Version: 20.0.1, Oracle Corporation -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Java VM Version: Java HotSpot(TM) 64-Bit Server VM (mixed mode, sharing), Oracle Corporation -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Minecraft: unknown -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Config File: C:\Users\Dmitry\AppData\Roaming\com.modrinth.theseus\profiles\TFG 1.20.1\CustomSkinLoader\CustomSkinLoader.json -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Config file not found, use default instead. -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Successfully create config. -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Add a profile loader: MojangAPI -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Add a profile loader: Legacy -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Add a profile loader: CustomSkinAPI -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Add a profile loader: CustomSKinAPIPlus -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Add a profile loader: UniSkinAPI -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Add a profile loader: ElyByAPI -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Add a profile loader: GlitchlessAPI -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Add a profile loader: MinecraftCapesAPI -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Add a profile loader: WynntilsAPI -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: Successfully update config. -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: version : 14.18.1 -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: buildNumber : 22 -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: loadlist : [{ "name": "Mojang", "type": "MojangAPI", "apiRoot": "https://api.mojang.com/", "sessionRoot": "https://sessionserver.mojang.com/" }, { "name": "LittleSkin", "type": "CustomSkinAPI", "root": "https://littleskin.cn/csl/" }, { "name": "BlessingSkin", "type": "CustomSkinAPI", "root": "https://skin.prinzeugen.net/" }, { "name": "ElyBy", "type": "ElyByAPI", "root": "http://skinsystem.ely.by/textures/" }, { "name": "SkinMe", "type": "UniSkinAPI", "root": "http://www.skinme.cc/uniskin/" }, { "name": "TLauncher", "type": "ElyByAPI", "root": "https://auth.tlauncher.org/skin/profile/texture/login/" }, { "name": "GlitchlessGames", "type": "GlitchlessAPI", "root": "https://games.glitchless.ru/api/minecraft/users/profiles/textures/?nickname=" }, { "name": "LocalSkin", "type": "Legacy", "checkPNG": "false", "skin": "LocalSkin/skins/{USERNAME}.png", "model": "auto", "cape": "LocalSkin/capes/{USERNAME}.png", "elytra": "LocalSkin/elytras/{USERNAME}.png" }, { "name": "MinecraftCapes", "type": "MinecraftCapesAPI", "root": "https://api.minecraftcapes.net/profile/" }, { "name": "OptiFine", "type": "Legacy", "checkPNG": "false", "model": "auto", "cape": "https://optifine.net/capes/{USERNAME}.png" }, { "name": "Wynntils", "type": "WynntilsAPI", "root": "https://athena.wynntils.com/user/getInfo" }, { "name": "CloakPlus", "type": "Legacy", "checkPNG": "false", "model": "auto", "cape": "http://161.35.130.99/capes/{USERNAME}.png" }, { "name": "LabyMod", "type": "Legacy", "checkPNG": "false", "model": "auto", "cape": "https://dl.labymod.net/capes/{STANDARD_UUID}" }, { "name": "Cosmetica", "type": "Legacy", "checkPNG": "false", "model": "auto", "cape": "https://api.cosmetica.cc/get/cloak?username={USERNAME}&uuid={STANDARD_UUID}¬hirdparty" }] -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: enableDynamicSkull : true -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: enableTransparentSkin : true -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: forceIgnoreHttpsCertificate : false -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: forceLoadAllTextures : true -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: enableCape : true -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: threadPoolSize : 8 -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: enableLogStdOut : false -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: cacheExpiry : 30 -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: forceUpdateSkull : false -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: enableLocalProfileCache : false -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: enableCacheAutoClean : false -[2023-11-12 11:37:04] [Render thread/INFO] [CustomSkinLoader Core]: forceDisableCache : false -[2023-11-12 11:37:04] [SpeeeDCraft/INFO] [CustomSkinLoader Core]: Loading SpeeeDCraft's profile. -[2023-11-12 11:37:04] [SpeeeDCraft/INFO] [CustomSkinLoader Core]: 1/14 Try to load profile from 'Mojang'. -[2023-11-12 11:37:04] [SpeeeDCraft/DEBUG] [CustomSkinLoader Core]: Try to request 'https://api.mojang.com/profiles/minecraft'. -[2023-11-12 11:37:04] [SpeeeDCraft/INFO] [CustomSkinLoader Core]: Payload: ["SpeeeDCraft"] -[2023-11-12 11:37:05] [SpeeeDCraft/DEBUG] [CustomSkinLoader Core]: Successfully request (Response Code: 200 , Content Length: 77) -[2023-11-12 11:37:05] [SpeeeDCraft/DEBUG] [CustomSkinLoader Core]: Content: [ { - "id" : "9d9c39ad4d3a4e6191c73d327f5dcf51", - "name" : "SpeeeDCraft" -} ] -[2023-11-12 11:37:05] [SpeeeDCraft/DEBUG] [CustomSkinLoader Core]: Try to request 'https://sessionserver.mojang.com/session/minecraft/profile/9d9c39ad4d3a4e6191c73d327f5dcf51'. -[2023-11-12 11:37:05] [SpeeeDCraft/DEBUG] [CustomSkinLoader Core]: Successfully request (Response Code: 200 , Content Length: 733) -[2023-11-12 11:37:05] [SpeeeDCraft/DEBUG] [CustomSkinLoader Core]: Saved to cache (Length: 733 , Path: 'C:\Users\Dmitry\AppData\Roaming\com.modrinth.theseus\profiles\TFG 1.20.1\CustomSkinLoader\caches\99ee481cd9c30654ac1ddc2969289c74b83780d0' , Expire: 1699763855) -[2023-11-12 11:37:05] [SpeeeDCraft/DEBUG] [CustomSkinLoader Core]: Content: { - "id" : "9d9c39ad4d3a4e6191c73d327f5dcf51", - "name" : "SpeeeDCraft", - "properties" : [ { - "name" : "textures", - "value" : "ewogICJ0aW1lc3RhbXAiIDogMTY5OTc2MzgyNjAyOCwKICAicHJvZmlsZUlkIiA6ICI5ZDljMzlhZDRkM2E0ZTYxOTFjNzNkMzI3ZjVkY2Y1MSIsCiAgInByb2ZpbGVOYW1lIiA6ICJTcGVlZURDcmFmdCIsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9jNzQxM2EyZmNiZDUwMGFlMGM4ZmQ5Nzc1ZTA0OTJiZjVhZTNiNmE4ODIxNDFmMTgyN2EyYjYzNDAyODBiZDkxIgogICAgfSwKICAgICJDQVBFIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS8yMzQwYzBlMDNkZDI0YTExYjE1YThiMzNjMmE3ZTllMzJhYmIyMDUxYjI0ODFkMGJhN2RlZmQ2MzVjYTdhOTMzIgogICAgfQogIH0KfQ==" - } ], - "profileActions" : [ ] -} -[2023-11-12 11:37:05] [SpeeeDCraft/INFO] [CustomSkinLoader Core]: SpeeeDCraft's profile loaded. -[2023-11-12 11:37:05] [SpeeeDCraft/INFO] [CustomSkinLoader Core]: (SkinUrl: http://textures.minecraft.net/texture/c7413a2fcbd500ae0c8fd9775e0492bf5ae3b6a882141f1827a2b6340280bd91 , Model: default , CapeUrl: http://textures.minecraft.net/texture/2340c0e03dd24a11b15a8b33c2a7e9e32abb2051b2481d0ba7defd635ca7a933 , Expiry: 1699763855) -[2023-11-12 11:41:28] [SpeeeDCraft/INFO] [CustomSkinLoader Core]: Loading SpeeeDCraft's profile. -[2023-11-12 11:41:28] [SpeeeDCraft/INFO] [CustomSkinLoader Core]: 1/14 Try to load profile from 'Mojang'. -[2023-11-12 11:41:28] [SpeeeDCraft/DEBUG] [CustomSkinLoader Core]: Try to request 'https://sessionserver.mojang.com/session/minecraft/profile/9d9c39ad4d3a4e6191c73d327f5dcf51'. -[2023-11-12 11:41:29] [SpeeeDCraft/DEBUG] [CustomSkinLoader Core]: Successfully request (Response Code: 200 , Content Length: 733) -[2023-11-12 11:41:29] [SpeeeDCraft/DEBUG] [CustomSkinLoader Core]: Saved to cache (Length: 733 , Path: 'C:\Users\Dmitry\AppData\Roaming\com.modrinth.theseus\profiles\TFG 1.20.1\CustomSkinLoader\caches\99ee481cd9c30654ac1ddc2969289c74b83780d0' , Expire: 1699764119) -[2023-11-12 11:41:29] [SpeeeDCraft/DEBUG] [CustomSkinLoader Core]: Content: { - "id" : "9d9c39ad4d3a4e6191c73d327f5dcf51", - "name" : "SpeeeDCraft", - "properties" : [ { - "name" : "textures", - "value" : "ewogICJ0aW1lc3RhbXAiIDogMTY5OTc2NDA4OTM0OCwKICAicHJvZmlsZUlkIiA6ICI5ZDljMzlhZDRkM2E0ZTYxOTFjNzNkMzI3ZjVkY2Y1MSIsCiAgInByb2ZpbGVOYW1lIiA6ICJTcGVlZURDcmFmdCIsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9jNzQxM2EyZmNiZDUwMGFlMGM4ZmQ5Nzc1ZTA0OTJiZjVhZTNiNmE4ODIxNDFmMTgyN2EyYjYzNDAyODBiZDkxIgogICAgfSwKICAgICJDQVBFIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS8yMzQwYzBlMDNkZDI0YTExYjE1YThiMzNjMmE3ZTllMzJhYmIyMDUxYjI0ODFkMGJhN2RlZmQ2MzVjYTdhOTMzIgogICAgfQogIH0KfQ==" - } ], - "profileActions" : [ ] -} -[2023-11-12 11:41:29] [SpeeeDCraft/INFO] [CustomSkinLoader Core]: SpeeeDCraft's profile loaded. -[2023-11-12 11:41:29] [SpeeeDCraft/INFO] [CustomSkinLoader Core]: (SkinUrl: http://textures.minecraft.net/texture/c7413a2fcbd500ae0c8fd9775e0492bf5ae3b6a882141f1827a2b6340280bd91 , Model: default , CapeUrl: http://textures.minecraft.net/texture/2340c0e03dd24a11b15a8b33c2a7e9e32abb2051b2481d0ba7defd635ca7a933 , Expiry: 1699764119) diff --git a/CustomSkinLoader/caches/99ee481cd9c30654ac1ddc2969289c74b83780d0 b/CustomSkinLoader/caches/99ee481cd9c30654ac1ddc2969289c74b83780d0 deleted file mode 100644 index abbece882..000000000 --- a/CustomSkinLoader/caches/99ee481cd9c30654ac1ddc2969289c74b83780d0 +++ /dev/null @@ -1,9 +0,0 @@ -{ - "id" : "9d9c39ad4d3a4e6191c73d327f5dcf51", - "name" : "SpeeeDCraft", - "properties" : [ { - "name" : "textures", - "value" : "ewogICJ0aW1lc3RhbXAiIDogMTY5OTc2NDA4OTM0OCwKICAicHJvZmlsZUlkIiA6ICI5ZDljMzlhZDRkM2E0ZTYxOTFjNzNkMzI3ZjVkY2Y1MSIsCiAgInByb2ZpbGVOYW1lIiA6ICJTcGVlZURDcmFmdCIsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9jNzQxM2EyZmNiZDUwMGFlMGM4ZmQ5Nzc1ZTA0OTJiZjVhZTNiNmE4ODIxNDFmMTgyN2EyYjYzNDAyODBiZDkxIgogICAgfSwKICAgICJDQVBFIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS8yMzQwYzBlMDNkZDI0YTExYjE1YThiMzNjMmE3ZTllMzJhYmIyMDUxYjI0ODFkMGJhN2RlZmQ2MzVjYTdhOTMzIgogICAgfQogIH0KfQ==" - } ], - "profileActions" : [ ] -} \ No newline at end of file diff --git a/CustomSkinLoader/caches/99ee481cd9c30654ac1ddc2969289c74b83780d0.json b/CustomSkinLoader/caches/99ee481cd9c30654ac1ddc2969289c74b83780d0.json deleted file mode 100644 index d8a6eb78d..000000000 --- a/CustomSkinLoader/caches/99ee481cd9c30654ac1ddc2969289c74b83780d0.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "url": "https://sessionserver.mojang.com/session/minecraft/profile/9d9c39ad4d3a4e6191c73d327f5dcf51", - "lastModified": 0, - "expire": 1699764119 -} \ No newline at end of file From 5a1c01d3cbb1b5bf31dcccb54facd5a437f776c4 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 14 Nov 2023 22:35:38 +0500 Subject: [PATCH 3/4] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c5ba037f3..74f458a50 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ servers.dat servers.dat_old .sl_password cherishedworlds-favorites.dat +CustomSkinLoader/* From 47e3609e58458ccf80c77c7d53161dc1f476c425 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 14 Nov 2023 22:39:23 +0500 Subject: [PATCH 4/4] realms_persistence.json .gitignore --- .gitignore | 1 + realms_persistence.json | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 realms_persistence.json diff --git a/.gitignore b/.gitignore index 74f458a50..4f1215e05 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ servers.dat_old .sl_password cherishedworlds-favorites.dat CustomSkinLoader/* +realms_persistence.json diff --git a/realms_persistence.json b/realms_persistence.json deleted file mode 100644 index 0f529bb3c..000000000 --- a/realms_persistence.json +++ /dev/null @@ -1 +0,0 @@ -{"newsLink":"https://minecraft.net/article/new-realms--maps-from-the-past?ref\u003dpcrealmsclient","hasUnreadNews":true} \ No newline at end of file