From 0583cd85e2e2987ab81c6d5a28d1ee65cef2980a Mon Sep 17 00:00:00 2001 From: Hikari_Nova <3044344887@qq.com> Date: Sat, 16 Mar 2024 20:50:03 +0800 Subject: [PATCH] Initial commit --- .github/workflows/build.yml | 25 ++ .gitignore | 120 ++++++ build.gradle.kts | 360 ++++++++++++++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 234 ++++++++++++ gradlew.bat | 89 +++++ settings.gradle.kts | 24 ++ .../kasuminova/stellarcore/StellarCore.java | 57 +++ .../stellarcore/client/ClientProxy.java | 55 +++ .../gui/font/CachedRGBFontRenderer.java | 187 +++++++++ .../client/gui/font/RGBSettingsUtils.java | 97 +++++ .../client/gui/font/TextRenderFunction.java | 7 + .../client/gui/font/TextRenderInfo.java | 22 ++ .../client/gui/font/TextWrapInfo.java | 22 ++ .../client/handler/ClientEventHandler.java | 59 +++ .../client/hitokoto/HitokotoAPI.java | 100 +++++ .../client/hitokoto/HitokotoDeserializer.java | 55 +++ .../client/hitokoto/HitokotoResult.java | 126 ++++++ .../client/profiler/PacketProfiler.java | 103 +++++ .../profiler/TEUpdatePacketProfiler.java | 71 ++++ .../stellarcore/client/util/RenderUtils.java | 34 ++ .../stellarcore/common/CommonProxy.java | 33 ++ .../fluxnetworks/FluxPlugAcceptor.java | 25 ++ .../IntegrationsFluxNetworks.java | 25 ++ .../fluxnetworks/MekanismEnergyHandler.java | 45 +++ .../common/util/BlockPos2ValueMap.java | 142 +++++++ .../common/util/HashedItemStack.java | 41 ++ .../stellarcore/common/util/RandomUtils.java | 14 + .../mixin/StellarCoreEarlyMixinLoader.java | 48 +++ .../mixin/StellarCoreLateMixinLoader.java | 84 ++++ .../mixin/appeng/MixinStackSizeRenderer.java | 39 ++ .../armourersworkshop/MixinSkinTexture.java | 29 ++ .../AccessorResearchManager.java | 22 ++ .../InvokerPerkEffectHelper.java | 19 + .../astralsorcery/MixinKeyChainMining.java | 22 ++ .../MixinPlayerAttributeMap.java | 52 +++ .../astralsorcery/MixinPlayerProgress.java | 89 +++++ .../athenaeum/MixinEnchantmentHelper.java | 20 + .../mixin/avaritia/MixinTileBase.java | 20 + .../mixin/betterchat/MixinGuiBetterChat.java | 87 +++++ .../biomesoplenty/MixinBiomesOPlenty.java | 29 ++ .../mixin/bloodmagic/MixinBloodAltar.java | 72 ++++ .../botania/MixinCosmeticAttachRecipe.java | 26 ++ .../botania/MixinCosmeticRemoveRecipe.java | 26 ++ .../mixin/botania/MixinEntitySpark.java | 53 +++ .../mixin/cfm/MixinImageCache.java | 144 +++++++ .../mixin/chisel/MixinTileAutoChisel.java | 54 +++ .../stellarcore/mixin/eio/MixinItemTools.java | 39 ++ .../mixin/eio/MixinTileEntityBase.java | 24 ++ .../mixin/eioconduit/AccessorTarget.java | 16 + .../eioconduit/InvokerNetworkedInventory.java | 17 + .../eioconduit/MixinAbstractConduit.java | 43 +++ .../mixin/eioconduit/MixinItemConduit.java | 63 +++ .../eioconduit/MixinNetworkedInventory.java | 189 +++++++++ .../mixin/extrabotany/MixinClientProxy.java | 32 ++ .../fluxnetworks/MixinTOPIntegration.java | 70 ++++ .../mixin/ic2/MixinEnergyCalculatorLeg.java | 32 ++ .../mixin/ic2/MixinGradualRecipe.java | 27 ++ .../mixin/ic2/MixinItemUpgradeModule.java | 32 ++ .../mixin/ic2/MixinTileEntityMatter.java | 19 + .../mixin/ic2/MixinTileEntityReplicator.java | 19 + .../mixin/igi/MixinInGameInfoCore.java | 113 ++++++ .../stellarcore/mixin/igi/MixinInfoItem.java | 26 ++ .../mixin/igi/MixinPlayerHandler.java | 18 + .../MixinBlockIEMultiblock.java | 33 ++ .../MixinBlockIETileProvider.java | 37 ++ .../MixinRecipeJerrycan.java | 31 ++ .../legendarytooltips/MixinTooltipDecor.java | 29 ++ .../mek_top/MixinEnergyAcceptorWrapper.java | 27 ++ .../mek_top/MixinIStrictEnergyStorage.java | 35 ++ .../mixin/mekanism/MixinPipeUtils.java | 48 +++ .../mixin/mets/MixinEnchantmentManager.java | 22 ++ .../mixin/mets/MixinEntityTachyonBullet.java | 35 ++ .../mixin/mets/MixinFirstAidLifeSupport.java | 27 ++ .../mixin/mets/MixinForceFieldGenerator.java | 27 ++ .../mixin/mets/MixinLifeSupportRing.java | 26 ++ .../mixin/mets/MixinNutritionSupply.java | 27 ++ .../mixin/minecraft/MixinChunk.java | 26 ++ .../mixin/minecraft/MixinFontRenderer.java | 48 +++ .../MixinNettyCompressionDecoder.java | 42 ++ .../minecraft/MixinNettyPacketDecoder.java | 28 ++ .../mixin/minecraft/MixinTessellator.java | 43 +++ .../mixin/minecraft/MixinWorld.java | 41 ++ .../minecraft/forge/MixinForgeHooks.java | 134 +++++++ .../forge/MixinSimpleIndexedCodec.java | 29 ++ .../minecraft/forge/MixinSplashProgress.java | 22 ++ .../nco/MixinRadiationCapabilityHandler.java | 34 ++ .../mixin/oreexcavation/MixinMiningAgent.java | 63 +++ .../mixin/rgbchat/MixinRGBChat.java | 21 + .../mixin/rgbchat/MixinRGBSettings.java | 16 + .../mixin/scalingguis/MixinJsonHelper.java | 47 +++ .../mixin/techguns/MixinAmmoSumRecipe.java | 64 ++++ .../mixin/techguns/MixinTGDamageSource.java | 17 + .../mixin/techguns/MixinTGExtendedPlayer.java | 21 + .../mixin/techguns/MixinTGPermissions.java | 18 + .../mixin/theoneprobe/MixinRenderHelper.java | 64 ++++ .../MixinDuctUnitFluidSuper.java | 52 +++ .../mixin/util/BlockSnapShotProvider.java | 11 + .../mixin/util/CachedItemConduit.java | 11 + .../mixin/util/CustomLoadingScreenUtils.java | 19 + .../mixin/util/EntityLivingBaseValues.java | 25 ++ .../mixin/util/IMixinInGameInfoCore.java | 9 + .../stellarcore/mixin/util/ITaskExecutor.java | 9 + src/main/resources/mcmod.info | 23 ++ .../resources/mixins.stellar_core_ae.json | 10 + ...ixins.stellar_core_armourers_workshop.json | 10 + .../mixins.stellar_core_astralsorcery.json | 14 + .../mixins.stellar_core_athenaeum.json | 10 + .../mixins.stellar_core_avaritia.json | 10 + .../mixins.stellar_core_betterchat.json | 10 + .../mixins.stellar_core_biomesoplenty.json | 10 + .../mixins.stellar_core_bloodmagic.json | 10 + .../mixins.stellar_core_botania.json | 12 + .../resources/mixins.stellar_core_cfm.json | 10 + .../resources/mixins.stellar_core_chisel.json | 10 + .../resources/mixins.stellar_core_eio.json | 11 + .../mixins.stellar_core_eio_conduit.json | 14 + .../mixins.stellar_core_extrabotany.json | 10 + .../mixins.stellar_core_fluxnetworks.json | 10 + .../resources/mixins.stellar_core_ic2.json | 14 + .../resources/mixins.stellar_core_igi.json | 14 + ...ins.stellar_core_immersiveengineering.json | 12 + ...mixins.stellar_core_legendarytooltips.json | 10 + .../mixins.stellar_core_mek_top.json | 11 + .../mixins.stellar_core_mekanism.json | 10 + .../resources/mixins.stellar_core_mets.json | 15 + .../resources/mixins.stellar_core_nco.json | 10 + .../mixins.stellar_core_oreexcavation.json | 10 + .../mixins.stellar_core_rgb_chat.json | 11 + .../mixins.stellar_core_scalingguis.json | 10 + .../mixins.stellar_core_techguns.json | 13 + .../mixins.stellar_core_theoneprobe.json | 10 + .../mixins.stellar_core_thermaldynamics.json | 10 + .../mixins.stellar_core_vanilla.json | 20 + 135 files changed, 5573 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .gitignore create mode 100644 build.gradle.kts create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts create mode 100644 src/main/java/github/kasuminova/stellarcore/StellarCore.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/ClientProxy.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/gui/font/CachedRGBFontRenderer.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/gui/font/RGBSettingsUtils.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderFunction.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderInfo.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/gui/font/TextWrapInfo.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/handler/ClientEventHandler.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoAPI.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoDeserializer.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoResult.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/profiler/PacketProfiler.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/profiler/TEUpdatePacketProfiler.java create mode 100644 src/main/java/github/kasuminova/stellarcore/client/util/RenderUtils.java create mode 100644 src/main/java/github/kasuminova/stellarcore/common/CommonProxy.java create mode 100644 src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/FluxPlugAcceptor.java create mode 100644 src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/IntegrationsFluxNetworks.java create mode 100644 src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/MekanismEnergyHandler.java create mode 100644 src/main/java/github/kasuminova/stellarcore/common/util/BlockPos2ValueMap.java create mode 100644 src/main/java/github/kasuminova/stellarcore/common/util/HashedItemStack.java create mode 100644 src/main/java/github/kasuminova/stellarcore/common/util/RandomUtils.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreEarlyMixinLoader.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreLateMixinLoader.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/appeng/MixinStackSizeRenderer.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/armourersworkshop/MixinSkinTexture.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/AccessorResearchManager.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/InvokerPerkEffectHelper.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinKeyChainMining.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerAttributeMap.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerProgress.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/athenaeum/MixinEnchantmentHelper.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/avaritia/MixinTileBase.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/betterchat/MixinGuiBetterChat.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/biomesoplenty/MixinBiomesOPlenty.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/bloodmagic/MixinBloodAltar.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticAttachRecipe.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticRemoveRecipe.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinEntitySpark.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/cfm/MixinImageCache.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/chisel/MixinTileAutoChisel.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinItemTools.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinTileEntityBase.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/AccessorTarget.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/InvokerNetworkedInventory.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinAbstractConduit.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinItemConduit.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinNetworkedInventory.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/extrabotany/MixinClientProxy.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/fluxnetworks/MixinTOPIntegration.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinEnergyCalculatorLeg.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinGradualRecipe.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinItemUpgradeModule.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityMatter.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityReplicator.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInGameInfoCore.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInfoItem.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinPlayerHandler.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIEMultiblock.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIETileProvider.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinRecipeJerrycan.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/legendarytooltips/MixinTooltipDecor.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinEnergyAcceptorWrapper.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinIStrictEnergyStorage.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/mekanism/MixinPipeUtils.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEnchantmentManager.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEntityTachyonBullet.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinFirstAidLifeSupport.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinForceFieldGenerator.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinLifeSupportRing.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinNutritionSupply.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinChunk.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinFontRenderer.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyCompressionDecoder.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyPacketDecoder.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinTessellator.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinWorld.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinForgeHooks.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSimpleIndexedCodec.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSplashProgress.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/nco/MixinRadiationCapabilityHandler.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/oreexcavation/MixinMiningAgent.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBChat.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBSettings.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/scalingguis/MixinJsonHelper.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinAmmoSumRecipe.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGDamageSource.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGExtendedPlayer.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGPermissions.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/theoneprobe/MixinRenderHelper.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/thermaldynamics/MixinDuctUnitFluidSuper.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/util/BlockSnapShotProvider.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/util/CachedItemConduit.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/util/CustomLoadingScreenUtils.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/util/EntityLivingBaseValues.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/util/IMixinInGameInfoCore.java create mode 100644 src/main/java/github/kasuminova/stellarcore/mixin/util/ITaskExecutor.java create mode 100644 src/main/resources/mcmod.info create mode 100644 src/main/resources/mixins.stellar_core_ae.json create mode 100644 src/main/resources/mixins.stellar_core_armourers_workshop.json create mode 100644 src/main/resources/mixins.stellar_core_astralsorcery.json create mode 100644 src/main/resources/mixins.stellar_core_athenaeum.json create mode 100644 src/main/resources/mixins.stellar_core_avaritia.json create mode 100644 src/main/resources/mixins.stellar_core_betterchat.json create mode 100644 src/main/resources/mixins.stellar_core_biomesoplenty.json create mode 100644 src/main/resources/mixins.stellar_core_bloodmagic.json create mode 100644 src/main/resources/mixins.stellar_core_botania.json create mode 100644 src/main/resources/mixins.stellar_core_cfm.json create mode 100644 src/main/resources/mixins.stellar_core_chisel.json create mode 100644 src/main/resources/mixins.stellar_core_eio.json create mode 100644 src/main/resources/mixins.stellar_core_eio_conduit.json create mode 100644 src/main/resources/mixins.stellar_core_extrabotany.json create mode 100644 src/main/resources/mixins.stellar_core_fluxnetworks.json create mode 100644 src/main/resources/mixins.stellar_core_ic2.json create mode 100644 src/main/resources/mixins.stellar_core_igi.json create mode 100644 src/main/resources/mixins.stellar_core_immersiveengineering.json create mode 100644 src/main/resources/mixins.stellar_core_legendarytooltips.json create mode 100644 src/main/resources/mixins.stellar_core_mek_top.json create mode 100644 src/main/resources/mixins.stellar_core_mekanism.json create mode 100644 src/main/resources/mixins.stellar_core_mets.json create mode 100644 src/main/resources/mixins.stellar_core_nco.json create mode 100644 src/main/resources/mixins.stellar_core_oreexcavation.json create mode 100644 src/main/resources/mixins.stellar_core_rgb_chat.json create mode 100644 src/main/resources/mixins.stellar_core_scalingguis.json create mode 100644 src/main/resources/mixins.stellar_core_techguns.json create mode 100644 src/main/resources/mixins.stellar_core_theoneprobe.json create mode 100644 src/main/resources/mixins.stellar_core_thermaldynamics.json create mode 100644 src/main/resources/mixins.stellar_core_vanilla.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..41244f7 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,25 @@ +name: Build mod + +on: [ push, pull_request, workflow_dispatch ] + +jobs: + build: + name: Build mod + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '8' + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew -Pnet.minecraftforge.gradle.disableUpdateChecker=true build + - name: Upload artifacts + uses: actions/upload-artifact@v2 + with: + name: JustEnoughPatches + path: build/libs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..350a3ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,120 @@ +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +gradle.properties \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..bea78d2 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,360 @@ +import org.jetbrains.gradle.ext.Gradle +import org.jetbrains.gradle.ext.RunConfigurationContainer +import java.util.* + +plugins { + id("java-library") + id("maven-publish") + id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7" + id("eclipse") + id("com.gtnewhorizons.retrofuturagradle") version "1.3.19" +} + +// Project properties +group = "github.kasuminova.stellarcore" +version = "1.0.0" + +// Set the toolchain version to decouple the Java we run Gradle with from the Java used to compile and run the mod +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + // Azul covers the most platforms for Java 8 toolchains, crucially including MacOS arm64 + vendor.set(JvmVendorSpec.AZUL) + } + // Generate sources and javadocs jars when building and publishing + withSourcesJar() + withJavadocJar() +} + +// Most RFG configuration lives here, see the JavaDoc for com.gtnewhorizons.retrofuturagradle.MinecraftExtension +minecraft { + mcVersion.set("1.12.2") + + // Username for client run configurations + username.set("Kasumi_Nova") + + // Generate a field named VERSION with the mod version in the injected Tags class + injectedTags.put("VERSION", project.version) + + // If you need the old replaceIn mechanism, prefer the injectTags task because it doesn't inject a javac plugin. + // tagReplacementFiles.add("RfgExampleMod.java") + + // Enable assertions in the mod's package when running the client or server + val args = mutableListOf("-ea:${project.group}") + + // Mixin args + args.add("-Dmixin.hotSwap=true") + args.add("-Dmixin.checks.interfaces=true") + args.add("-Dmixin.debug.export=true") + extraRunJvmArguments.addAll(args) + + // If needed, add extra tweaker classes like for mixins. + // extraTweakClasses.add("org.spongepowered.asm.launch.MixinTweaker") + + // Exclude some Maven dependency groups from being automatically included in the reobfuscated runs + groupsToExcludeFromAutoReobfMapping.addAll("com.diffplug", "com.diffplug.durian", "net.industrial-craft") +} + +// Generates a class named rfg.examplemod.Tags with the mod version in it, you can find it at +tasks.injectTags.configure { + outputClassName.set("${project.group}.Tags") +} + +// Put the version from gradle into mcmod.info +tasks.processResources.configure { +// inputs.property("version", project.version) +// +// filesMatching("mcmod.info") { +// expand(mapOf("version" to project.version)) +// } +} + +tasks.compileJava.configure { + sourceCompatibility = "17" + options.release = 8 + options.encoding = "UTF-8" // Use the UTF-8 charset for Java compilation + + javaCompiler = javaToolchains.compilerFor { + languageVersion = JavaLanguageVersion.of(17) + } +} + +tasks.compileTestJava.configure { + sourceCompatibility = "17" + options.release = 8 + options.encoding = "UTF-8" // Use the UTF-8 charset for Java compilation + + javaCompiler = javaToolchains.compilerFor { + languageVersion = JavaLanguageVersion.of(17) + } +} + +tasks.javadoc.configure { + // No need for JavaDoc. + actions = Collections.emptyList() +} + + +tasks.jar.configure { + manifest { + val attributes = manifest.attributes + attributes["FMLCorePlugin"] = "github.kasuminova.jep.mixin.JEPEarlyMixinLoader" + attributes["FMLCorePluginContainsFMLMod"] = true + } +} + +// Create a new dependency type for runtime-only dependencies that don't get included in the maven publication +val runtimeOnlyNonPublishable: Configuration by configurations.creating { + description = "Runtime only dependencies that are not published alongside the jar" + isCanBeConsumed = false + isCanBeResolved = false +} +listOf(configurations.runtimeClasspath, configurations.testRuntimeClasspath).forEach { + it.configure { + extendsFrom( + runtimeOnlyNonPublishable + ) + } +} + +//tasks.deobfuscateMergedJarToSrg.configure { +// accessTransformerFiles.from("src/main/resources/META-INF/justenoughpatches_at.cfg") +//} +//tasks.srgifyBinpatchedJar.configure { +// accessTransformerFiles.from("src/main/resources/META-INF/justenoughpatches_at.cfg") +//} + +// Dependencies +repositories { + flatDir { + dirs("lib") + } + maven { + url = uri("https://maven.aliyun.com/nexus/content/groups/public/") + } + maven { + url = uri("https://maven.aliyun.com/nexus/content/repositories/jcenter") + } + maven { + url = uri("https://maven.cleanroommc.com") + } + maven { + url = uri("https://cfa2.cursemaven.com") + } + maven { + url = uri("https://cursemaven.com") + } + maven { + url = uri("https://maven.blamejared.com/") + } + maven { + url = uri("https://repo.spongepowered.org/maven") + } + maven { + name = "GeckoLib" + url = uri("https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/") + } + maven { + name = "OvermindDL1 Maven" + url = uri("https://gregtech.overminddl1.com/") + mavenContent { + excludeGroup("net.minecraftforge") // missing the `universal` artefact + } + } + maven { + name = "GTNH Maven" + url = uri("http://jenkins.usrv.eu:8081/nexus/content/groups/public/") + isAllowInsecureProtocol = true + } +} + +//mixin { +// add sourceSets.main, "mixins.justenoughpatches.refmap.json" +//} + +dependencies { + annotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:0.4.2") + compileOnly("com.github.bsideup.jabel:jabel-javac-plugin:0.4.2") + // workaround for https://github.com/bsideup/jabel/issues/174 + annotationProcessor("net.java.dev.jna:jna-platform:5.13.0") + // Allow jdk.unsupported classes like sun.misc.Unsafe, workaround for JDK-8206937 and fixes Forge crashes in tests. + patchedMinecraft("me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0") + // allow Jabel to work in tests + testAnnotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:1.0.0") + testCompileOnly("com.github.bsideup.jabel:jabel-javac-plugin:1.0.0") { + isTransitive = false // We only care about the 1 annotation class + } + testCompileOnly("me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0") + + // Mixins +// implementation("zone.rong:mixinbooter:7.1") + val mixin : String = modUtils.enableMixins("zone.rong:mixinbooter:8.9", "mixins.justenoughpatches.refmap.json").toString() + api (mixin) { + isTransitive = false + } + annotationProcessor("org.ow2.asm:asm-debug-all:5.2") + annotationProcessor("com.google.guava:guava:30.0-jre") + annotationProcessor("com.google.code.gson:gson:2.8.9") + annotationProcessor (mixin) { + isTransitive = false + } + + // Mod Dependencies + implementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.+") + implementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.+") + compileOnly(rfg.deobf("curse.maven:modularmachinery-community-edition-817377:4991928")) + implementation(rfg.deobf("curse.maven:had-enough-items-557549:4810661")) + implementation(rfg.deobf("curse.maven:the-one-probe-245211:2667280")) + compileOnly(rfg.deobf("curse.maven:ae2-extended-life-570458:5147702")) +// implementation(rfg.deobf("curse.maven:applied-energistics-2-223794:2747063")) + compileOnly(rfg.deobf("curse.maven:tx-loader-706505:4515357")) + compileOnly(rfg.deobf("curse.maven:CodeChickenLib-242818:2779848")) + compileOnly(rfg.deobf("curse.maven:nuclearcraft-overhauled-336895:3862197")) + compileOnly(rfg.deobf("curse.maven:industrialcraft-2-242638:3078604")) + compileOnly(rfg.deobf("curse.maven:mekanism-unofficial-edition-v10-edition-840735:4464199")) + compileOnly(rfg.deobf("curse.maven:RedstoneFlux-270789:2920436")) + compileOnly(rfg.deobf("curse.maven:cofh-core-69162:2920433")) + compileOnly(rfg.deobf("curse.maven:cofh-world-271384:2920434")) + compileOnly(rfg.deobf("curse.maven:thermal-foundation-222880:2926428")) + compileOnly(rfg.deobf("curse.maven:thermal-innovation-291737:2920441")) + compileOnly(rfg.deobf("curse.maven:thermal-expansion-69163:2926431")) + compileOnly(rfg.deobf("curse.maven:botania-225643:3330934")) + compileOnly(rfg.deobf("curse.maven:astral-sorcery-241721:3044416")) + compileOnly(rfg.deobf("curse.maven:baubles-227083:2518667")) + compileOnly(rfg.deobf("curse.maven:matter-overdrive-community-edition-557428:4592069")) + compileOnly(rfg.deobf("curse.maven:zenutil-401178:4394263")) + compileOnly(rfg.deobf("curse.maven:libvulpes-236541:3801015")) + compileOnly(rfg.deobf("curse.maven:advanced-rocketry-236542:4671856")) + implementation(rfg.deobf("curse.maven:immersive-engineering-231951:2974106")) + implementation(rfg.deobf("curse.maven:immersive-petroleum-268250:3382321")) + compileOnly(rfg.deobf("curse.maven:valkyrielib-245480:2691542")) + compileOnly(rfg.deobf("curse.maven:environmental-tech-245453:2691536")) + compileOnly(rfg.deobf("curse.maven:smooth-font-285742:3944565")) + compileOnly(rfg.deobf("curse.maven:athenaeum-284350:4633750")) + compileOnly(rfg.deobf("curse.maven:artisan-worktables-284351:3205284")) + compileOnly(rfg.deobf("curse.maven:touhou-little-maid-355044:3576415")) + compileOnly(rfg.deobf("curse.maven:ingame-info-xml-225604:2489566")) + compileOnly(rfg.deobf("curse.maven:lunatriuscore-225605:2489549")) + compileOnly(rfg.deobf("curse.maven:rgb-chat-702720:4092100")) + compileOnly(rfg.deobf("software.bernie.geckolib:geckolib-forge-1.12.2:3.0.31")) + compileOnly(rfg.deobf("curse.maven:endercore-231868:4671384")) + compileOnly(rfg.deobf("curse.maven:ender-io-64578:4674244")) + compileOnly(rfg.deobf("curse.maven:tinkers-evolution-384589:4941753")) + compileOnly(rfg.deobf("curse.maven:ore-excavation-250898:2897369")) + compileOnly(rfg.deobf("curse.maven:techguns-244201:2958103")) + compileOnly(rfg.deobf("curse.maven:biomes-o-plenty-220318:3558882")) + compileOnly(rfg.deobf("curse.maven:more-electric-tools-366298:3491973")) + compileOnly(rfg.deobf("curse.maven:brandonscore-231382:3051539")) + compileOnly(rfg.deobf("curse.maven:draconicevolution-223565:3051542")) + compileOnly(rfg.deobf("curse.maven:tinkers-construct-74072:2902483")) + compileOnly(rfg.deobf("curse.maven:thermal-dynamics-227443:2920505")) + compileOnly(rfg.deobf("curse.maven:armourers-workshop-229523:3101995")) + compileOnly(rfg.deobf("curse.maven:avaritia-1-10-261348:3143349")) + compileOnly(rfg.deobf("curse.maven:blood-magic-224791:2822288")) + compileOnly(rfg.deobf("curse.maven:legendary-tooltips-532127:4499615")) + compileOnly(rfg.deobf("curse.maven:ftb-quests-forge-289412:3156637")) + compileOnly(rfg.deobf("curse.maven:flux-networks-248020:3178199")) + compileOnly(rfg.deobf("curse.maven:scalingguis-319656:2716334")) + compileOnly(rfg.deobf("curse.maven:chisel-235279:2915375")) + compileOnly(rfg.deobf("curse.maven:extrabotany-299086:3112313")) + compileOnly(rfg.deobf("curse.maven:better-loading-screen-229302:3769828")) + compileOnly(rfg.deobf("curse.maven:better-chat-363860:3048407")) + compileOnly(rfg.deobf("curse.maven:mrcrayfish-furniture-mod-55438:3865259")) +} + +// Publishing to a Maven repository +publishing { + publications { + create("maven") { + from(components["java"]) + } + } + repositories { +// // Example: publishing to the GTNH Maven repository +// maven { +// url = uri("http://jenkins.usrv.eu:8081/nexus/content/repositories/releases") +// isAllowInsecureProtocol = true +// credentials { +// username = System.getenv("MAVEN_USER") ?: "NONE" +// password = System.getenv("MAVEN_PASSWORD") ?: "NONE" +// } +// } + } +} + +// IDE Settings +//eclipse { +// classpath { +// isDownloadSources = true +// isDownloadJavadoc = true +// } +//} + +idea { + module { + isDownloadJavadoc = true + isDownloadSources = true + inheritOutputDirs = true // Fix resources in IJ-Native runs + } + project { + this.withGroovyBuilder { + "settings" { + "runConfigurations" { + val self = this.delegate as RunConfigurationContainer + self.add(Gradle("1. Run Client").apply { + setProperty("taskNames", listOf("runClient")) + }) + self.add(Gradle("2. Run Server").apply { + setProperty("taskNames", listOf("runServer")) + }) + self.add(Gradle("3. Run Obfuscated Client").apply { + setProperty("taskNames", listOf("runObfClient")) + }) + self.add(Gradle("4. Run Obfuscated Server").apply { + setProperty("taskNames", listOf("runObfServer")) + }) + /* + These require extra configuration in IntelliJ, so are not enabled by default + self.add(Application("Run Client (IJ Native, Deprecated)", project).apply { + mainClass = "GradleStart" + moduleName = project.name + ".ideVirtualMain" + afterEvaluate { + val runClient = tasks.runClient.get() + workingDirectory = runClient.workingDir.absolutePath + programParameters = runClient.calculateArgs(project).map { '"' + it + '"' }.joinToString(" ") + jvmArgs = runClient.calculateJvmArgs(project).map { '"' + it + '"' }.joinToString(" ") + + ' ' + runClient.systemProperties.map { "\"-D" + it.key + '=' + it.value.toString() + '"' } + .joinToString(" ") + } + }) + self.add(Application("Run Server (IJ Native, Deprecated)", project).apply { + mainClass = "GradleStartServer" + moduleName = project.name + ".ideVirtualMain" + afterEvaluate { + val runServer = tasks.runServer.get() + workingDirectory = runServer.workingDir.absolutePath + programParameters = runServer.calculateArgs(project).map { '"' + it + '"' }.joinToString(" ") + jvmArgs = runServer.calculateJvmArgs(project).map { '"' + it + '"' }.joinToString(" ") + + ' ' + runServer.systemProperties.map { "\"-D" + it.key + '=' + it.value.toString() + '"' } + .joinToString(" ") + } + }) + */ + } + "compiler" { + val self = this.delegate as org.jetbrains.gradle.ext.IdeaCompilerConfiguration + afterEvaluate { + self.javac.moduleJavacAdditionalOptions = mapOf( + (project.name + ".main") to + tasks.compileJava.get().options.compilerArgs.map { '"' + it + '"' }.joinToString(" ") + ) + } + } + } + } + } +} + +tasks.processIdeaSettings.configure { + dependsOn(tasks.injectTags) +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa GIT binary patch literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..15de902 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..3da45c1 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright ? 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?, +# ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?; +# * compound commands having a testable exit status, especially ?case?; +# * various built-in commands including ?command?, ?set?, and ?ulimit?. +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..648e4b3 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,24 @@ +pluginManagement { + repositories { + maven { + // RetroFuturaGradle + name = "GTNH Maven" + url = uri("http://jenkins.usrv.eu:8081/nexus/content/groups/public/") + isAllowInsecureProtocol = true + mavenContent { + includeGroup("com.gtnewhorizons") + includeGroup("com.gtnewhorizons.retrofuturagradle") + } + } + gradlePluginPortal() + mavenCentral() + mavenLocal() + } +} + +plugins { + // Automatic toolchain provisioning + id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0" +} + +rootProject.name = "StellarCore" diff --git a/src/main/java/github/kasuminova/stellarcore/StellarCore.java b/src/main/java/github/kasuminova/stellarcore/StellarCore.java new file mode 100644 index 0000000..8429a51 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/StellarCore.java @@ -0,0 +1,57 @@ +package github.kasuminova.stellarcore; + +import github.kasuminova.stellarcore.common.CommonProxy; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.*; +import org.apache.logging.log4j.Logger; + +@Mod(modid = StellarCore.MOD_ID, name = StellarCore.MOD_NAME, version = StellarCore.VERSION, + dependencies = "required-after:forge@[14.23.5.2847,);" + + "required-after:theoneprobe@[1.12-1.4.28,);" + + "after:jianghun@[1.0,);", + acceptedMinecraftVersions = "[1.12, 1.13)" +) +@SuppressWarnings("MethodMayBeStatic") +public class StellarCore { + public static final String MOD_ID = "stellarcore"; + public static final String MOD_NAME = "Stellar Core"; + + public static final String VERSION = Tags.VERSION; + + public static final String CLIENT_PROXY = "github.kasuminova.stellarcore.client.ClientProxy"; + public static final String COMMON_PROXY = "github.kasuminova.stellarcore.common.CommonProxy"; + + @Mod.Instance(MOD_ID) + public static StellarCore instance = null; + @SidedProxy(clientSide = CLIENT_PROXY, serverSide = COMMON_PROXY) + public static CommonProxy proxy = null; + public static Logger log = null; + + @Mod.EventHandler + public void construction(FMLConstructionEvent event) { + proxy.construction(); + } + + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) { + event.getModMetadata().version = VERSION; + log = event.getModLog(); + proxy.preInit(); + } + + @Mod.EventHandler + public void init(FMLInitializationEvent event) { + proxy.init(); + } + + @Mod.EventHandler + public void postInit(FMLPostInitializationEvent event) { + proxy.postInit(); + } + + @Mod.EventHandler + public void loadComplete(FMLLoadCompleteEvent event) { + proxy.loadComplete(); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/ClientProxy.java b/src/main/java/github/kasuminova/stellarcore/client/ClientProxy.java new file mode 100644 index 0000000..be95b33 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/ClientProxy.java @@ -0,0 +1,55 @@ +package github.kasuminova.stellarcore.client; + + +import github.kasuminova.stellarcore.client.handler.ClientEventHandler; +import github.kasuminova.stellarcore.client.hitokoto.HitokotoAPI; +import github.kasuminova.stellarcore.common.CommonProxy; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; + +import java.util.concurrent.CompletableFuture; + +@Mod.EventBusSubscriber(Side.CLIENT) +public class ClientProxy extends CommonProxy { + + static { + CompletableFuture.runAsync(HitokotoAPI::getRandomHitokoto); + } + + public ClientProxy() { + MinecraftForge.EVENT_BUS.register(this); + } + + @Override + public void construction() { + super.construction(); + } + + @Override + public void preInit() { + super.preInit(); + MinecraftForge.EVENT_BUS.register(ClientEventHandler.INSTANCE); + } + + @Override + public void init() { + super.init(); + } + + @Override + public void postInit() { + super.postInit(); + } + + @Override + public void loadComplete() { + super.loadComplete(); + } + + @SubscribeEvent + public void onModelRegister(ModelRegistryEvent event) { + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/gui/font/CachedRGBFontRenderer.java b/src/main/java/github/kasuminova/stellarcore/client/gui/font/CachedRGBFontRenderer.java new file mode 100644 index 0000000..0fccbde --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/gui/font/CachedRGBFontRenderer.java @@ -0,0 +1,187 @@ +package github.kasuminova.stellarcore.client.gui.font; + +import com.fred.jianghun.truergb.IColor; +import com.fred.jianghun.truergb.RGBSettings; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.settings.GameSettings; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Tuple; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.awt.*; +import java.util.List; +import java.util.*; + +public class CachedRGBFontRenderer extends FontRenderer { + private static final Map> TEXT_RENDER_CACHE = new WeakHashMap<>(); + private static final Map> LISTED_CACHE = new WeakHashMap<>(); + + CachedRGBFontRenderer(final GameSettings gameSettingsIn, final ResourceLocation location, final TextureManager textureManagerIn, final boolean unicode) { + super(gameSettingsIn, location, textureManagerIn, unicode); + } + + public static void overrideFontRenderer() { + Minecraft mc = Minecraft.getMinecraft(); + CachedRGBFontRenderer renderer = new CachedRGBFontRenderer(mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.renderEngine, false); + + mc.fontRenderer = renderer; + if (mc.gameSettings.language != null) { + renderer.setUnicodeFlag(mc.isUnicode()); + renderer.setBidiFlag(mc.getLanguageManager().isCurrentLanguageBidirectional()); + } + } + + public static List mapListedString(List listed, LinkedList strList, LinkedList colors) { + List mapped = new ArrayList<>(); + + StringBuilder mapping = new StringBuilder(); + + int lastMappedLineIndex = 0; + int lastMappedLineStrIndex = 0; + for (int i = 0; i < listed.size(); i++) { + final String s = listed.get(i); + + int lastMappedStrIndex = 0; + StringBuilder sb = new StringBuilder(); + for (final char ch : s.toCharArray()) { + mapping.append(ch); + + String strFirst = strList.getFirst(); + if (strFirst == null || colors.getFirst() == null) { + sb.append(ch); + continue; + } + + if (strFirst.contentEquals(mapping)) { + String color = colors.pollFirst(); + sb.insert(lastMappedStrIndex, color); + sb.append(ch); + + if (lastMappedLineIndex + 1 == i) { + StringBuilder lastMappedStrSb = new StringBuilder(mapped.get(lastMappedLineIndex)); + lastMappedStrSb.insert(lastMappedLineStrIndex, color); + mapped.set(lastMappedLineIndex, lastMappedStrSb.toString()); + } + + lastMappedLineIndex = i; + lastMappedStrIndex = sb.length(); + strList.pollFirst(); + mapping.setLength(0); + } else { + sb.append(ch); + } + } + + lastMappedLineStrIndex = lastMappedStrIndex; + mapped.add(sb.toString()); + } + + return mapped; + } + + /** + * 如果有看不懂的代码，缓存就是终极的解决方案。 + */ + public int drawString(@Nullable String text, float x, float y, int color, boolean dropShadow) { + if (text == null) { + return 0; // 如果文本为null，则直接返回0 + } + TextRenderInfo textRenderInfo = new TextRenderInfo(text, color); + + List cachedRenderFunction = TEXT_RENDER_CACHE.get(textRenderInfo); + if (cachedRenderFunction != null) { + return fastDrawString(x, y, dropShadow, cachedRenderFunction); + } + + cachedRenderFunction = new LinkedList<>(); + + // 将文本拆分为字符串和相应的RGB设置 + List> settings = RGBSettings.split(text); + int currentColorHex = color; // 初始颜色为传递的颜色参数 + this.posX = x; // 设置 X 坐标起始位置 + + for (final Tuple setting : settings) { + String s = setting.getFirst(); // 获取字符串 + RGBSettings set = setting.getSecond(); // 获取RGB设置 + + // 如果RGB设置中指定了固定颜色，使用该颜色绘制整个字符串 + if (set.isFixedColor()) { + currentColorHex = Optional.ofNullable(set.getColorAt(0)).map(IColor::toInt).orElse(color); + + Color currentColor = new Color(currentColorHex); + final int finalCurrentColor = new Color(currentColor.getRed(), currentColor.getGreen(), currentColor.getBlue(), color >> 24 & 255).getRGB(); + final String toRender = set.getFormatString() + s; + cachedRenderFunction.add((_y, _dropShadow) -> super.drawString(toRender, this.posX, _y, finalCurrentColor, _dropShadow)); + continue; + } + + // 如果RGB设置中没有指定固定颜色，为每个字符分别指定颜色并绘制 + for (int i = 0; i < s.length(); ++i) { + currentColorHex = Optional.ofNullable(set.getColorAt(i)).map(IColor::toInt).orElse(color); + + Color currentColor = new Color(currentColorHex); + final int finalCurrentColor = new Color(currentColor.getRed(), currentColor.getGreen(), currentColor.getBlue(), color >> 24 & 255).getRGB(); + final String toRender = set.getFormatString() + s.charAt(i); + cachedRenderFunction.add((_y, _dropShadow) -> super.drawString(toRender, this.posX, _y, finalCurrentColor, _dropShadow)); + } + } + + TEXT_RENDER_CACHE.put(textRenderInfo, cachedRenderFunction); + return fastDrawString(x, y, dropShadow, cachedRenderFunction); // 返回 X 坐标的最终位置 + } + + public int fastDrawString(float x, float y, boolean dropShadow, final List renderFunctions) { + this.posX = x; + + for (final TextRenderFunction renderFunction : renderFunctions) { + renderFunction.renderText(y, dropShadow); + } + + GlStateManager.color(1.0F, 1.0F, 1.0F); + return (int) this.posX; + } + + // 获取字符串的宽度 + public int getStringWidth(@Nullable String text) { + if (text == null) { + return 0; + } + + StringBuilder sb = new StringBuilder(); + for (Tuple stringRGBSettingsTuple : RGBSettings.split(text)) { + String first = stringRGBSettingsTuple.getFirst(); + sb.append(first); + } + return super.getStringWidth(sb.toString()); + } + + @Nonnull + @Override + public List listFormattedStringToWidth(@Nonnull final String content, final int wrapWidth) { + TextWrapInfo wrapInfo = new TextWrapInfo(content, wrapWidth); + List cachedListed = LISTED_CACHE.get(wrapInfo); + if (cachedListed != null) { + return cachedListed; + } + + StringBuilder sb = new StringBuilder(); + + LinkedList strList = new LinkedList<>(); + LinkedList rgbSettingList = new LinkedList<>(); + + for (Tuple strSettings : RGBSettingsUtils.splitRGBAndContents(content)) { + rgbSettingList.add(strSettings.getFirst()); + String str = strSettings.getSecond(); + sb.append(str); + strList.add(str.replace("\n", "")); + } + + cachedListed = mapListedString(super.listFormattedStringToWidth(sb.toString(), wrapWidth), strList, rgbSettingList); + LISTED_CACHE.put(wrapInfo, cachedListed); + return cachedListed; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/gui/font/RGBSettingsUtils.java b/src/main/java/github/kasuminova/stellarcore/client/gui/font/RGBSettingsUtils.java new file mode 100644 index 0000000..aa1676e --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/gui/font/RGBSettingsUtils.java @@ -0,0 +1,97 @@ +package github.kasuminova.stellarcore.client.gui.font; + +import com.fred.jianghun.truergb.Colors; +import com.fred.jianghun.truergb.RGBSettings; +import com.fred.jianghun.truergb.Utils; +import github.kasuminova.stellarcore.mixin.rgbchat.MixinRGBSettings; +import net.minecraft.util.Tuple; +import net.minecraft.util.text.TextFormatting; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.regex.Matcher; +import java.util.stream.Collectors; + +public class RGBSettingsUtils { + + public static List> splitRGBAndContents(String str) { + if (str != null && !str.isEmpty()) { + List> result = new ArrayList<>(); + Matcher matcher = RGBSettings.PATTERN.matcher(str); + + int index = 0; + RGBSettings lastSettings = RGBSettings.EMPTY; + + while (matcher.find(index)) { + String subString = str.substring(index, matcher.start()); + if (!subString.isEmpty()) { + lastSettings.addLength(subString.length()); + result.add(new Tuple<>(serializeRGBSettings(lastSettings), subString)); + } + + String format = matcher.group(); + if (format.startsWith("#")) { + String fString = matcher.group("rgb"); + lastSettings = new RGBSettings(Arrays.stream(fString.split("-")).map(Colors::of).collect(Collectors.toList())); + } else if (format.startsWith("§")) { + TextFormatting formatting = Utils.formattingOf(format.charAt(1)); + if (formatting == null) { + throw new NullPointerException("Format: " + format); + } + lastSettings = lastSettings.withFormat(formatting); + } else { + throw new IllegalStateException("Format: " + format); + } + + index = matcher.end(); + } + + String remainingString = str.substring(index); + lastSettings.addLength(remainingString.length()); + result.add(new Tuple<>(serializeRGBSettings(lastSettings), remainingString)); + + return result; + } else { + return Collections.singletonList(new Tuple<>("", "")); + } + } + + public static String serializeRGBSettings(RGBSettings rgbSettings) { + StringBuilder result = new StringBuilder(); + + // Serialize colors + List colorStrings = ((MixinRGBSettings) rgbSettings).getColors().stream() + .map(color -> String.format("%06X", color.toInt() & 0xFFFFFF)) + .collect(Collectors.toList()); + if (!colorStrings.isEmpty()) { + result.append('#').append(String.join("-", colorStrings)); + } + + // Serialize control codes + Boolean bold = rgbSettings.getBold(); + if (bold != null && bold) { + result.append("§l"); + } + Boolean italic = rgbSettings.getItalic(); + if (italic != null && italic) { + result.append("§o"); + } + Boolean underlined = rgbSettings.getUnderlined(); + if (underlined != null && underlined) { + result.append("§n"); + } + Boolean strikethrough = rgbSettings.getStrikethrough(); + if (strikethrough != null && strikethrough) { + result.append("§m"); + } + Boolean obfuscated = rgbSettings.getObfuscated(); + if (obfuscated != null && obfuscated) { + result.append("§k"); + } + + return result.toString(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderFunction.java b/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderFunction.java new file mode 100644 index 0000000..460be07 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderFunction.java @@ -0,0 +1,7 @@ +package github.kasuminova.stellarcore.client.gui.font; + +public interface TextRenderFunction { + + void renderText(float y, boolean dropShadow); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderInfo.java b/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderInfo.java new file mode 100644 index 0000000..99be5b0 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderInfo.java @@ -0,0 +1,22 @@ +package github.kasuminova.stellarcore.client.gui.font; + +import com.github.bsideup.jabel.Desugar; + +import java.util.Objects; + +@Desugar +public record TextRenderInfo(String info, int color) { + + @Override + public boolean equals(final Object o) { + if (o instanceof TextRenderInfo renderInfo) { + return renderInfo.hashCode() == hashCode(); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(info, color); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextWrapInfo.java b/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextWrapInfo.java new file mode 100644 index 0000000..eceab1d --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextWrapInfo.java @@ -0,0 +1,22 @@ +package github.kasuminova.stellarcore.client.gui.font; + +import com.github.bsideup.jabel.Desugar; + +import java.util.Objects; + +@Desugar +public record TextWrapInfo(String info, int wrapWidth) { + + @Override + public boolean equals(final Object o) { + if (o instanceof TextWrapInfo renderInfo) { + return renderInfo.hashCode() == hashCode(); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(info, wrapWidth); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/handler/ClientEventHandler.java b/src/main/java/github/kasuminova/stellarcore/client/handler/ClientEventHandler.java new file mode 100644 index 0000000..b77a835 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/handler/ClientEventHandler.java @@ -0,0 +1,59 @@ +package github.kasuminova.stellarcore.client.handler; + +import github.kasuminova.stellarcore.StellarCore; +import github.kasuminova.stellarcore.client.profiler.PacketProfiler; +import github.kasuminova.stellarcore.client.profiler.TEUpdatePacketProfiler; +import net.minecraft.client.Minecraft; +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; + +import java.util.ArrayList; +import java.util.List; + +public class ClientEventHandler { + public static final ClientEventHandler INSTANCE = new ClientEventHandler(); + + public static int debugPacketProfilerMessageLimit = 5; + public static int debugTEPacketProfilerMessageLimit = 5; + + private long clientTick = 0; + + private final List debugMessageCache = new ArrayList<>(); + private boolean debugMessageUpdateRequired = true; + + private ClientEventHandler() { + } + + @SubscribeEvent + public void onClientTick(TickEvent.ClientTickEvent event) { + if (event.phase != TickEvent.Phase.START) { + return; + } + clientTick++; + + if (clientTick % 5 == 0) { + debugMessageUpdateRequired = true; + } + } + + @SubscribeEvent + public void onDebugText(RenderGameOverlayEvent.Text event) { + if (!Minecraft.getMinecraft().gameSettings.showDebugInfo) { + return; + } + + if (debugMessageUpdateRequired) { + debugMessageUpdateRequired = false; + debugMessageCache.clear(); + debugMessageCache.add(""); + debugMessageCache.add(TextFormatting.BLUE + "[JustEnoughPatches] Ver: " + StellarCore.VERSION); + debugMessageCache.addAll(PacketProfiler.getProfilerMessages(debugPacketProfilerMessageLimit)); + debugMessageCache.addAll(TEUpdatePacketProfiler.getProfilerMessages(debugTEPacketProfilerMessageLimit)); + } + + List right = event.getRight(); + right.addAll(debugMessageCache); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoAPI.java b/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoAPI.java new file mode 100644 index 0000000..bd8c820 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoAPI.java @@ -0,0 +1,100 @@ +package github.kasuminova.stellarcore.client.hitokoto; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import net.minecraft.util.JsonUtils; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.nio.charset.StandardCharsets; + +public class HitokotoAPI { + public static final String API_URL = "https://v1.hitokoto.cn/"; + + public static String hitokotoCache = null; + + private static final Gson DESERIALIZER = new GsonBuilder() + .registerTypeHierarchyAdapter(HitokotoResult.class, new HitokotoDeserializer()) + .create(); + + public static String getHitokotoCache() { + return hitokotoCache; + } + + public static String getRandomHitokoto() { + if (hitokotoCache != null) { + return hitokotoCache; + } + + String jsonStr; + try { + jsonStr = getStringFromURL(API_URL); + } catch (IOException e) { + return ""; + } + + if (jsonStr == null || jsonStr.isEmpty()) { + return ""; + } + + HitokotoResult hitokoto; + try { + hitokoto = JsonUtils.fromJson(DESERIALIZER, jsonStr, HitokotoResult.class, true); + } catch (Exception e) { + return ""; + } + + if (hitokoto == null) { + return ""; + } + + String assembled = assembleHitokoto(hitokoto); + if (!assembled.isEmpty()) { + hitokotoCache = assembled; + } + return assembled; + } + + public static String assembleHitokoto(HitokotoResult result) { + String hitokoto = result.getHitokoto(); + String fromWho = result.getFromWho(); + if (fromWho.isEmpty()) { + fromWho = result.getFrom(); + if (fromWho.isEmpty()) { + fromWho = result.getCreator(); + } + } + + if (hitokoto != null && fromWho != null) { + return hitokoto + " —— " + fromWho; + } + + return ""; + } + + public static String getStringFromURL(String urlStr) throws IOException { + try { + URL url = new URL(urlStr); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.connect(); + BufferedReader reader = new BufferedReader( + new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8)); + + String line; + StringBuilder stringBuilder = new StringBuilder(); + while ((line = reader.readLine()) != null) { + stringBuilder.append(line); + } + + reader.close(); + connection.disconnect(); + return stringBuilder.toString(); + } catch (MalformedURLException e) { + return null; + } + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoDeserializer.java b/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoDeserializer.java new file mode 100644 index 0000000..c7f718c --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoDeserializer.java @@ -0,0 +1,55 @@ +package github.kasuminova.stellarcore.client.hitokoto; + +import com.google.gson.*; + +import java.lang.reflect.Type; + +public class HitokotoDeserializer implements JsonDeserializer { + + @Override + public HitokotoResult deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException { + JsonObject root = json.getAsJsonObject(); + HitokotoResult result = new HitokotoResult(); + + result.setId(getJsonNodeInt(root, "id")) + .setUUID(getJsonNodeString(root, "uuid")) + .setHitokoto(getJsonNodeString(root, "hitokoto")) + .setType(getJsonNodeString(root, "type")) + .setFrom(getJsonNodeString(root, "from")) + .setFromWho(getJsonNodeString(root, "from_who")) + .setCreator(getJsonNodeString(root, "creator")) + .setCreatorUid(getJsonNodeInt(root, "creator_uid")) + .setReviewer(getJsonNodeInt(root, "reviewer")) + .setCommitFrom(getJsonNodeString(root, "commit_from")) + .setCreatedAt(getJsonNodeString(root, "created_at")) + .setLength(getJsonNodeInt(root, "length")); + + return result; + } + + private static int getJsonNodeInt(JsonObject json, String memberName) { + if (json.has(memberName)) { + JsonElement element = json.get(memberName); + if (element.isJsonPrimitive()) { + JsonPrimitive primitive = element.getAsJsonPrimitive(); + if (primitive.isNumber()) { + return primitive.getAsInt(); + } + } + } + return -1; + } + + private static String getJsonNodeString(JsonObject json, String memberName) { + if (json.has(memberName)) { + JsonElement element = json.get(memberName); + if (element.isJsonPrimitive()) { + JsonPrimitive primitive = element.getAsJsonPrimitive(); + if (primitive.isString()) { + return primitive.getAsString(); + } + } + } + return ""; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoResult.java b/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoResult.java new file mode 100644 index 0000000..a5a8623 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoResult.java @@ -0,0 +1,126 @@ +package github.kasuminova.stellarcore.client.hitokoto; + +@SuppressWarnings("unused") +public class HitokotoResult { + private int id; + private String uuid; + private String hitokoto; + private String type; + private String from; + private String fromWho; + private String creator; + private int creatorUid; + private int reviewer; + private String commitFrom; + private String createdAt; + private int length; + + public int getId() { + return id; + } + + public HitokotoResult setId(final int id) { + this.id = id; + return this; + } + + public String getUuid() { + return uuid; + } + + public HitokotoResult setUUID(final String uuid) { + this.uuid = uuid; + return this; + } + + public String getHitokoto() { + return hitokoto; + } + + @SuppressWarnings("UnusedReturnValue") + public HitokotoResult setHitokoto(final String hitokoto) { + this.hitokoto = hitokoto; + return this; + } + + public String getType() { + return type; + } + + public HitokotoResult setType(final String type) { + this.type = type; + return this; + } + + public String getFrom() { + return from; + } + + public HitokotoResult setFrom(final String from) { + this.from = from; + return this; + } + + public String getFromWho() { + return fromWho; + } + + public HitokotoResult setFromWho(final String fromWho) { + this.fromWho = fromWho; + return this; + } + + public String getCreator() { + return creator; + } + + public HitokotoResult setCreator(final String creator) { + this.creator = creator; + return this; + } + + public int getCreatorUid() { + return creatorUid; + } + + public HitokotoResult setCreatorUid(final int creatorUid) { + this.creatorUid = creatorUid; + return this; + } + + public int getReviewer() { + return reviewer; + } + + public HitokotoResult setReviewer(final int reviewer) { + this.reviewer = reviewer; + return this; + } + + public String getCommitFrom() { + return commitFrom; + } + + public HitokotoResult setCommitFrom(final String commitFrom) { + this.commitFrom = commitFrom; + return this; + } + + public String getCreatedAt() { + return createdAt; + } + + public HitokotoResult setCreatedAt(final String createdAt) { + this.createdAt = createdAt; + return this; + } + + public int getLength() { + return length; + } + + public HitokotoResult setLength(final int length) { + this.length = length; + return this; + } +} \ No newline at end of file diff --git a/src/main/java/github/kasuminova/stellarcore/client/profiler/PacketProfiler.java b/src/main/java/github/kasuminova/stellarcore/client/profiler/PacketProfiler.java new file mode 100644 index 0000000..8355b52 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/profiler/PacketProfiler.java @@ -0,0 +1,103 @@ +package github.kasuminova.stellarcore.client.profiler; + +import hellfirepvp.modularmachinery.common.util.MiscUtils; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.util.Tuple; +import net.minecraft.util.text.TextFormatting; + +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.Collectors; + +public class PacketProfiler { + public static final ConcurrentHashMap, Tuple> PACKET_TOTAL_SIZE = new ConcurrentHashMap<>(); + public static final AtomicLong TOTAL_RECEIVED_DATA_SIZE = new AtomicLong(0); + + public static boolean enabled = false; + + public static long profilerStartTime = 0; + public static long profilerStopTime = 0; + + public static void onPacketReceived(Object packet, int packetSize) { + if (!enabled) { + return; + } + + if (PACKET_TOTAL_SIZE.isEmpty()) { + profilerStartTime = System.currentTimeMillis(); + } + + PACKET_TOTAL_SIZE.compute(packet.getClass(), (key, value) -> value == null + ? new Tuple<>(1L, (long) packetSize) + : new Tuple<>(value.getFirst() + 1, value.getSecond() + packetSize)); + + if (packet instanceof SPacketUpdateTileEntity) { + TEUpdatePacketProfiler.onPacketReceived((SPacketUpdateTileEntity) packet, packetSize); + } + } + + public static void onPacketDecoded(final int length) { + if (!enabled) { + return; + } + + TOTAL_RECEIVED_DATA_SIZE.addAndGet(length); + } + + public static List getProfilerMessages(final int limit) { + List messages = new LinkedList<>(); + + long totalPacketSize = TOTAL_RECEIVED_DATA_SIZE.get(); + + long profileTimeExisted = enabled ? System.currentTimeMillis() - profilerStartTime : profilerStopTime - profilerStartTime; + double networkBandwidthPerSec = profileTimeExisted <= 0 ? 0 : (totalPacketSize / ((double) profileTimeExisted / 1000D)); + + messages.add( + String.format("Network BandWidth Per Second: %s", + TextFormatting.GREEN + MiscUtils.formatNumber((long) networkBandwidthPerSec) + "B/s" + TextFormatting.WHITE) + ); + + if (limit <= 0) { + return messages; + } + + @SuppressWarnings("SimplifyStreamApiCallChains") + List, Tuple>> sorted = PacketProfiler.PACKET_TOTAL_SIZE.entrySet().stream() + .sorted((o1, o2) -> Long.compare(o2.getValue().getSecond(), o1.getValue().getSecond())) + .limit(limit) + .collect(Collectors.toList()); + + for (final Map.Entry, Tuple> entry : sorted) { + Class pClass = entry.getKey(); + long packetTotalAmount = entry.getValue().getFirst(); + long packetTotalSize = entry.getValue().getSecond(); + + if (pClass.isAssignableFrom(Packet.class)) { + messages.add( + String.format("Pkt Class: %s", + TextFormatting.BLUE + pClass.getSimpleName() + TextFormatting.WHITE + ) + ); + } else { + messages.add( + String.format("Mod Pkt Class: %s", + TextFormatting.BLUE + pClass.getName() + TextFormatting.WHITE + ) + ); + } + + messages.add( + String.format("Amt: %s, Size Total: %s, Size Avg: %s", + TextFormatting.GOLD + MiscUtils.formatDecimal(packetTotalAmount) + TextFormatting.WHITE, + TextFormatting.RED + MiscUtils.formatNumber(packetTotalSize) + 'B' + TextFormatting.WHITE, + TextFormatting.YELLOW + MiscUtils.formatNumber(packetTotalSize / packetTotalAmount)) + 'B' + TextFormatting.WHITE + ); + } + + return messages; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/profiler/TEUpdatePacketProfiler.java b/src/main/java/github/kasuminova/stellarcore/client/profiler/TEUpdatePacketProfiler.java new file mode 100644 index 0000000..8063b41 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/profiler/TEUpdatePacketProfiler.java @@ -0,0 +1,71 @@ +package github.kasuminova.stellarcore.client.profiler; + +import hellfirepvp.modularmachinery.common.util.MiscUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Tuple; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; + +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; + +public class TEUpdatePacketProfiler { + public static final ConcurrentHashMap, Tuple> TE_UPDATE_PACKET_TOTAL_SIZE = new ConcurrentHashMap<>(); + + public static void onPacketReceived(SPacketUpdateTileEntity packet, int packetSize) { + WorldClient world = Minecraft.getMinecraft().world; + BlockPos pos = packet.getPos(); + if (world.isBlockLoaded(pos)) { + TileEntity te = world.getTileEntity(pos); + if (te == null) { + return; + } + + TE_UPDATE_PACKET_TOTAL_SIZE.compute(te.getClass(), (key, value) -> value == null + ? new Tuple<>(1L, (long) packetSize) + : new Tuple<>(value.getFirst() + 1, value.getSecond() + packetSize)); + } + } + + public static List getProfilerMessages(final int limit) { + if (limit <= 0) { + return Collections.emptyList(); + } + + List messages = new LinkedList<>(); + + @SuppressWarnings("SimplifyStreamApiCallChains") + List, Tuple>> teSorted = TEUpdatePacketProfiler.TE_UPDATE_PACKET_TOTAL_SIZE.entrySet().stream() + .sorted((o1, o2) -> Long.compare(o2.getValue().getSecond(), o1.getValue().getSecond())) + .limit(limit) + .collect(Collectors.toList()); + + messages.add("SPacketUpdateTileEntity stat:"); + for (final Map.Entry, Tuple> entry : teSorted) { + Class tClass = entry.getKey(); + long packetTotalAmount = entry.getValue().getFirst(); + long packetTotalSize = entry.getValue().getSecond(); + + messages.add( + String.format("TE Class: %s", + TextFormatting.BLUE + tClass.getName() + TextFormatting.WHITE) + ); + messages.add( + String.format("Amt: %s, Size Total: %s, Size Avg: %s", + TextFormatting.GOLD + MiscUtils.formatDecimal(packetTotalAmount) + TextFormatting.WHITE, + TextFormatting.RED + MiscUtils.formatNumber(packetTotalSize) + 'B' + TextFormatting.WHITE, + TextFormatting.YELLOW + MiscUtils.formatNumber(packetTotalSize / packetTotalAmount)) + 'B' + TextFormatting.WHITE + ); + } + + return messages; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/util/RenderUtils.java b/src/main/java/github/kasuminova/stellarcore/client/util/RenderUtils.java new file mode 100644 index 0000000..5ce4f65 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/util/RenderUtils.java @@ -0,0 +1,34 @@ +package github.kasuminova.stellarcore.client.util; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.shader.Framebuffer; +import org.lwjgl.opengl.GL11; + +public class RenderUtils { + + public static void renderFramebuffer(final Minecraft minecraft, final Framebuffer framebuffer) { + ScaledResolution res = new ScaledResolution(minecraft); + double scaledHeight = res.getScaledHeight_double(); + double scaledWidth = res.getScaledWidth_double(); + GlStateManager.enableBlend(); + GlStateManager.tryBlendFuncSeparate(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + framebuffer.bindFramebufferTexture(); + GlStateManager.enableTexture2D(); + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder buffer = tessellator.getBuffer(); + buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + buffer.pos(0, scaledHeight, 0.0).tex(0, 0).endVertex(); + buffer.pos(scaledWidth, scaledHeight, 0.0).tex(1, 0).endVertex(); + buffer.pos(scaledWidth, 0, 0.0).tex(1, 1).endVertex(); + buffer.pos(0, 0, 0.0).tex(0, 1).endVertex(); + tessellator.draw(); + GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/CommonProxy.java b/src/main/java/github/kasuminova/stellarcore/common/CommonProxy.java new file mode 100644 index 0000000..b00cc6d --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/CommonProxy.java @@ -0,0 +1,33 @@ +package github.kasuminova.stellarcore.common; + +import github.kasuminova.stellarcore.common.integration.fluxnetworks.IntegrationsFluxNetworks; +import net.minecraftforge.fml.common.Loader; + +@SuppressWarnings("MethodMayBeStatic") +public class CommonProxy { + + public CommonProxy() { + } + + public void construction() { + + } + + public void preInit() { + if (Loader.isModLoaded("fluxnetworks")) { + IntegrationsFluxNetworks.preInit(); + } + } + + public void init() { + + } + + public void postInit() { + + } + + public void loadComplete() { + + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/FluxPlugAcceptor.java b/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/FluxPlugAcceptor.java new file mode 100644 index 0000000..c6fdd2c --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/FluxPlugAcceptor.java @@ -0,0 +1,25 @@ +package github.kasuminova.stellarcore.common.integration.fluxnetworks; + +import mekanism.common.base.EnergyAcceptorWrapper; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.energy.CapabilityEnergy; +import sonar.fluxnetworks.common.tileentity.TileFluxPlug; + +public class FluxPlugAcceptor extends EnergyAcceptorWrapper.ForgeAcceptor { + + private final TileFluxPlug plug; + + public FluxPlugAcceptor(final TileFluxPlug plug, final EnumFacing side) { + super(plug.getCapability(CapabilityEnergy.ENERGY, side)); + this.plug = plug; + } + + @Override + public double acceptEnergy(final EnumFacing facing, final double amount, final boolean simulate) { + double maxCanReceive = Math.min(plug.getMaxTransferLimit() - plug.getTransferBuffer(), amount / 2.5D); + if (maxCanReceive >= Long.MAX_VALUE) { + maxCanReceive = Long.MAX_VALUE; + } + return plug.getTransferHandler().receiveFromSupplier((long) maxCanReceive, facing, simulate) * 2.5D; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/IntegrationsFluxNetworks.java b/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/IntegrationsFluxNetworks.java new file mode 100644 index 0000000..2b4690b --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/IntegrationsFluxNetworks.java @@ -0,0 +1,25 @@ +package github.kasuminova.stellarcore.common.integration.fluxnetworks; + +import github.kasuminova.stellarcore.StellarCore; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.Optional; +import sonar.fluxnetworks.common.handler.TileEntityHandler; + +public class IntegrationsFluxNetworks { + + @Optional.Method(modid = "fluxnetworks") + public static void preInit() { + if (Loader.isModLoaded("mekanism")) { + initMekanismIntegration(); + } + } + + @Optional.Method(modid = "mekanism") + public static void initMekanismIntegration() { + //在列表头部插入适配器，保证不被其他类型覆盖结果。 + //Insert adapters in the head of the list to ensure that the results are not overwritten by other types. + TileEntityHandler.tileEnergyHandlers.add(0, MekanismEnergyHandler.INSTANCE); + StellarCore.log.info("Mekanism <===> FluxNetworks is initialized!"); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/MekanismEnergyHandler.java b/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/MekanismEnergyHandler.java new file mode 100644 index 0000000..612e52f --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/MekanismEnergyHandler.java @@ -0,0 +1,45 @@ +package github.kasuminova.stellarcore.common.integration.fluxnetworks; + +import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.energy.IStrictEnergyOutputter; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import sonar.fluxnetworks.api.energy.ITileEnergyHandler; + +import javax.annotation.Nonnull; + +public class MekanismEnergyHandler implements ITileEnergyHandler { + + public static final MekanismEnergyHandler INSTANCE = new MekanismEnergyHandler(); + + @Override + public boolean hasCapability(@Nonnull final TileEntity te, final EnumFacing facing) { + return canAddEnergy(te, facing) || canRemoveEnergy(te, facing); + } + + @Override + public boolean canAddEnergy(@Nonnull final TileEntity te, final EnumFacing facing) { + return te instanceof IStrictEnergyAcceptor acceptor && acceptor.canReceiveEnergy(facing); + } + + @Override + public boolean canRemoveEnergy(@Nonnull final TileEntity te, final EnumFacing facing) { + return te instanceof IStrictEnergyOutputter outputter && outputter.canOutputEnergy(facing); + } + + @Override + public long addEnergy(final long amount, @Nonnull final TileEntity te, final EnumFacing facing, final boolean simulate) { + if (te instanceof IStrictEnergyAcceptor acceptor) { + return (long) Math.ceil(acceptor.acceptEnergy(facing, ((double) amount) * 2.5D, simulate) / 2.5D); + } + return 0; + } + + @Override + public long removeEnergy(final long amount, @Nonnull final TileEntity te, final EnumFacing facing) { + if (te instanceof IStrictEnergyOutputter outputter) { + return (long) Math.ceil(outputter.pullEnergy(facing, ((double) amount) * 2.5D, false) / 2.5D); + } + return 0; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/util/BlockPos2ValueMap.java b/src/main/java/github/kasuminova/stellarcore/common/util/BlockPos2ValueMap.java new file mode 100644 index 0000000..820bee6 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/util/BlockPos2ValueMap.java @@ -0,0 +1,142 @@ +package github.kasuminova.stellarcore.common.util; + +import com.google.common.collect.Iterators; +import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; +import it.unimi.dsi.fastutil.longs.Long2ObjectMap; +import net.minecraft.util.math.BlockPos; + +import javax.annotation.Nonnull; +import java.util.*; +import java.util.stream.Collectors; + +public class BlockPos2ValueMap implements Map { + + protected final Long2ObjectMap internal = new Long2ObjectLinkedOpenHashMap<>(); + protected EntrySet entrySet = null; + + @Override + public int size() { + return internal.size(); + } + + @Override + public boolean isEmpty() { + return internal.isEmpty(); + } + + @Override + public boolean containsKey(final Object key) { + if (key instanceof BlockPos pos) { + return internal.containsKey(pos.toLong()); + } + return false; + } + + @Override + public boolean containsValue(final Object value) { + return internal.containsValue(value); + } + + @Override + public V get(final Object key) { + if (key instanceof BlockPos pos) { + return internal.get(pos.toLong()); + } + return null; + } + + @Override + public V put(final BlockPos key, final V value) { + return internal.put(key.toLong(), value); + } + + @Override + public V remove(final Object key) { + if (key instanceof BlockPos pos) { + return internal.remove(pos.toLong()); + } + return null; + } + + @Override + public void putAll(final Map map) { + map.forEach((k, v) -> internal.put(k.toLong(), v)); + } + + @Override + public void clear() { + internal.clear(); + } + + @Nonnull + @Override + public Set keySet() { + return internal.keySet().stream().map(BlockPos::fromLong).collect(Collectors.toSet()); + } + + @Nonnull + @Override + public Collection values() { + return internal.values(); + } + + @Nonnull + @Override + public Set> entrySet() { + return entrySet == null ? entrySet = new EntrySet() : entrySet; + } + + @Override + public boolean equals(final Object o) { + if (o instanceof BlockPos2ValueMap map) { + return internal.equals(map.internal); + } + return false; + } + + @Override + public int hashCode() { + return internal.hashCode(); + } + + public class EntrySet extends AbstractSet> { + @Override + public int size() { + return internal.size(); + } + + @Override + public void clear() { + internal.clear(); + } + + @Nonnull + @Override + public Iterator> iterator() { + return Iterators.transform(internal.long2ObjectEntrySet().iterator(), Entry::new); + } + } + + public static class Entry implements Map.Entry { + private final Long2ObjectMap.Entry parent; + + public Entry(Long2ObjectMap.Entry parent) { + this.parent = parent; + } + + @Override + public BlockPos getKey() { + return BlockPos.fromLong(parent.getLongKey()); + } + + @Override + public V getValue() { + return parent.getValue(); + } + + @Override + public V setValue(final V value) { + return parent.setValue(value); + } + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/util/HashedItemStack.java b/src/main/java/github/kasuminova/stellarcore/common/util/HashedItemStack.java new file mode 100644 index 0000000..bc323ef --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/util/HashedItemStack.java @@ -0,0 +1,41 @@ +package github.kasuminova.stellarcore.common.util; + +import com.github.bsideup.jabel.Desugar; +import net.minecraft.item.ItemStack; + +import java.util.Base64; +import java.util.Objects; + +@Desugar +public record HashedItemStack(ItemStack stack, int stackHashCode) { + public static HashedItemStack of(final ItemStack stack) { + ItemStack copied = stack.copy(); + return new HashedItemStack(copied, Objects.hash(copied.getItem().getRegistryName(), copied.getItemDamage(), copied.getTagCompound())); + } + + public static String stackToString(final ItemStack stack) { + String stackTagStr = null; + String registryName = Objects.requireNonNull(stack.getItem().getRegistryName()).toString(); + if (stack.getTagCompound() != null) { + stackTagStr = stack.getTagCompound().toString(); + } + return strToBase64(registryName) + "_" + stack.getItemDamage() + (stackTagStr == null ? "" : "_" + strToBase64(stackTagStr)); + } + + public static String strToBase64(final String str) { + return Base64.getEncoder().encodeToString(str.getBytes()); + } + + @Override + public boolean equals(final Object o) { + if (o instanceof HashedItemStack hashedItemStack) { + return ItemStack.areItemStacksEqual(stack, hashedItemStack.stack); + } + return false; + } + + @Override + public int hashCode() { + return stackHashCode; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/util/RandomUtils.java b/src/main/java/github/kasuminova/stellarcore/common/util/RandomUtils.java new file mode 100644 index 0000000..bfcc8ef --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/util/RandomUtils.java @@ -0,0 +1,14 @@ +package github.kasuminova.stellarcore.common.util; + +import java.util.concurrent.ThreadLocalRandom; + +public class RandomUtils { + + public static int nextInt(int bound) { + return ThreadLocalRandom.current().nextInt(bound); + } + + public static float nextFloat() { + return ThreadLocalRandom.current().nextFloat(); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreEarlyMixinLoader.java b/src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreEarlyMixinLoader.java new file mode 100644 index 0000000..3e5d9d0 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreEarlyMixinLoader.java @@ -0,0 +1,48 @@ +package github.kasuminova.stellarcore.mixin; + +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; +import zone.rong.mixinbooter.IEarlyMixinLoader; + +import javax.annotation.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +@SuppressWarnings("unused") +public class StellarCoreEarlyMixinLoader implements IFMLLoadingPlugin, IEarlyMixinLoader { + + @Override + public List getMixinConfigs() { + return Arrays.asList( + "mixins.jep.vanilla.json" + ); + } + + // Noop + + @Override + public String[] getASMTransformerClass() { + return new String[0]; + } + + @Override + public String getModContainerClass() { + return null; + } + + @Nullable + @Override + public String getSetupClass() { + return null; + } + + @Override + public void injectData(final Map data) { + + } + + @Override + public String getAccessTransformerClass() { + return null; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreLateMixinLoader.java b/src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreLateMixinLoader.java new file mode 100644 index 0000000..3cba911 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreLateMixinLoader.java @@ -0,0 +1,84 @@ +package github.kasuminova.stellarcore.mixin; + +import net.minecraftforge.fml.common.Loader; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import zone.rong.mixinbooter.ILateMixinLoader; + +import java.util.*; +import java.util.function.BooleanSupplier; + +@SuppressWarnings("unused") +public class StellarCoreLateMixinLoader implements ILateMixinLoader { + + public static final Logger LOG = LogManager.getLogger("STELLAR_CORE"); + public static final String LOG_PREFIX = "[STELLAR_CORE]" + ' '; + private static final Map MIXIN_CONFIGS = new LinkedHashMap<>(); + + static { + addModdedMixinCFG("mixins.stellar_core_ae.json", "appliedenergistics2"); + addModdedMixinCFG("mixins.stellar_core_armourers_workshop.json", "armourers_workshop"); + addModdedMixinCFG("mixins.stellar_core_astralsorcery.json", "astralsorcery"); + addModdedMixinCFG("mixins.stellar_core_athenaeum.json", "athenaeum"); + addModdedMixinCFG("mixins.stellar_core_avaritia.json", "avaritia"); + addModdedMixinCFG("mixins.stellar_core_betterchat.json", "betterchat"); + addModdedMixinCFG("mixins.stellar_core_biomesoplenty.json", "biomesoplenty"); + addModdedMixinCFG("mixins.stellar_core_bloodmagic.json", "bloodmagic"); + addModdedMixinCFG("mixins.stellar_core_botania.json", "botania"); + addModdedMixinCFG("mixins.stellar_core_cfm.json", "cfm"); + addModdedMixinCFG("mixins.stellar_core_chisel.json", "chisel"); + addModdedMixinCFG("mixins.stellar_core_eio.json", "enderio"); + addModdedMixinCFG("mixins.stellar_core_eio_conduit.json", "enderio", "enderioconduits"); + addModdedMixinCFG("mixins.stellar_core_extrabotany.json", "extrabotany"); + addModdedMixinCFG("mixins.stellar_core_fluxnetworks.json", "fluxnetworks"); + addModdedMixinCFG("mixins.stellar_core_ic2.json", "ic2"); + addModdedMixinCFG("mixins.stellar_core_igi.json", "ingameinfoxml"); + addModdedMixinCFG("mixins.stellar_core_immersiveengineering.json", "immersiveengineering"); + addModdedMixinCFG("mixins.stellar_core_legendarytooltips.json", "legendarytooltips"); + addModdedMixinCFG("mixins.stellar_core_mek_top.json", "mekanism", "theoneprobe"); + addModdedMixinCFG("mixins.stellar_core_mekanism.json", "mekanism"); + addModdedMixinCFG("mixins.stellar_core_mets.json", "mets"); + addModdedMixinCFG("mixins.stellar_core_nco.json", "nuclearcraft"); + addModdedMixinCFG("mixins.stellar_core_oreexcavation.json", "oreexcavation"); + addModdedMixinCFG("mixins.stellar_core_rgb_chat.json", "jianghun"); + addModdedMixinCFG("mixins.stellar_core_scalingguis.json", "scalingguis"); + addModdedMixinCFG("mixins.stellar_core_techguns.json", "techguns"); + addModdedMixinCFG("mixins.stellar_core_theoneprobe.json", "theoneprobe"); + addModdedMixinCFG("mixins.stellar_core_thermaldynamics.json", "thermaldynamics"); + } + + @Override + public List getMixinConfigs() { + return new ArrayList<>(MIXIN_CONFIGS.keySet()); + } + + @Override + public boolean shouldMixinConfigQueue(final String mixinConfig) { + BooleanSupplier supplier = MIXIN_CONFIGS.get(mixinConfig); + if (supplier == null) { + LOG.warn(LOG_PREFIX + "Mixin config {} is not found in config map! It will never be loaded.", mixinConfig); + return false; + } + return supplier.getAsBoolean(); + } + + private static boolean modLoaded(final String modID) { + return Loader.isModLoaded(modID); + } + + private static void addModdedMixinCFG(final String mixinConfig, final String modID) { + MIXIN_CONFIGS.put(mixinConfig, () -> modLoaded(modID)); + } + + private static void addModdedMixinCFG(final String mixinConfig, final String modID, final String... modIDs) { + MIXIN_CONFIGS.put(mixinConfig, () -> modLoaded(modID) && Arrays.stream(modIDs).allMatch(Loader::isModLoaded)); + } + + private static void addMixinCFG(final String mixinConfig) { + MIXIN_CONFIGS.put(mixinConfig, () -> true); + } + + private static void addMixinCFG(final String mixinConfig, final BooleanSupplier conditions) { + MIXIN_CONFIGS.put(mixinConfig, conditions); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/appeng/MixinStackSizeRenderer.java b/src/main/java/github/kasuminova/stellarcore/mixin/appeng/MixinStackSizeRenderer.java new file mode 100644 index 0000000..5ff4fa0 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/appeng/MixinStackSizeRenderer.java @@ -0,0 +1,39 @@ +package github.kasuminova.stellarcore.mixin.appeng; + +import appeng.client.render.StackSizeRenderer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +/** + * 优化当安装了 SmoothFont 时物品数量渲染字体过小的问题。 + */ +@Mixin(StackSizeRenderer.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinStackSizeRenderer { + + @ModifyConstant( + method = "renderStackSize", + constant = {@Constant(floatValue = 0.85F), @Constant(floatValue = 0.5F)}, + remap = false + ) + public float onRenderStackSize(final float ci) { + if (ci == 0.5F) { + return 0.7F; + } + return ci; + } + + @ModifyConstant( + method = "renderStackSize", + constant = {@Constant(intValue = 0), @Constant(intValue = -1)}, + remap = false + ) + public int onRenderStackSize(final int ci) { + if (ci == -1) { + return 0; + } + return ci; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/armourersworkshop/MixinSkinTexture.java b/src/main/java/github/kasuminova/stellarcore/mixin/armourersworkshop/MixinSkinTexture.java new file mode 100644 index 0000000..5317ab1 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/armourersworkshop/MixinSkinTexture.java @@ -0,0 +1,29 @@ +package github.kasuminova.stellarcore.mixin.armourersworkshop; + +import moe.plushie.armourers_workshop.common.skin.data.SkinTexture; +import net.minecraft.client.Minecraft; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(SkinTexture.class) +public abstract class MixinSkinTexture { + + @Shadow(remap = false) protected abstract void deleteTexture(); + + @Shadow(remap = false) private int textureId; + + @Redirect(method = "finalize", + at = @At( + value = "INVOKE", + target = "Lmoe/plushie/armourers_workshop/common/skin/data/SkinTexture;deleteTexture()V", + remap = false), + remap = false) + private void onDeleteTexture(final SkinTexture instance) { + if (textureId != -1) { + Minecraft.getMinecraft().addScheduledTask(this::deleteTexture); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/AccessorResearchManager.java b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/AccessorResearchManager.java new file mode 100644 index 0000000..1f2db8c --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/AccessorResearchManager.java @@ -0,0 +1,22 @@ +package github.kasuminova.stellarcore.mixin.astralsorcery; + +import hellfirepvp.astralsorcery.common.data.research.PlayerProgress; +import hellfirepvp.astralsorcery.common.data.research.ResearchManager; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import javax.annotation.Nonnull; +import java.util.Map; +import java.util.UUID; + +@Mixin(ResearchManager.class) +public interface AccessorResearchManager { + + @Nonnull + @Accessor(remap = false) + @SuppressWarnings("DataFlowIssue") + static Map getPlayerProgressServer() { + return null; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/InvokerPerkEffectHelper.java b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/InvokerPerkEffectHelper.java new file mode 100644 index 0000000..9fb1baa --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/InvokerPerkEffectHelper.java @@ -0,0 +1,19 @@ +package github.kasuminova.stellarcore.mixin.astralsorcery; + +import hellfirepvp.astralsorcery.common.constellation.perk.AbstractPerk; +import hellfirepvp.astralsorcery.common.constellation.perk.PerkEffectHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.fml.relauncher.Side; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(PerkEffectHelper.class) +public interface InvokerPerkEffectHelper { + + @Invoker(remap = false) + void invokeHandlePerkModification(EntityPlayer player, Side side, boolean remove); + + @Invoker(remap = false) + void invokeHandlePerkRemoval(AbstractPerk perk, EntityPlayer player, Side side); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinKeyChainMining.java b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinKeyChainMining.java new file mode 100644 index 0000000..0bf6739 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinKeyChainMining.java @@ -0,0 +1,22 @@ +package github.kasuminova.stellarcore.mixin.astralsorcery; + +import hellfirepvp.astralsorcery.common.constellation.perk.tree.nodes.key.KeyChainMining; +import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +@Mixin(KeyChainMining.class) +public class MixinKeyChainMining { + + /** + * @author Kasumi_Nova + * @reason 配置文件不让禁用，那就把方法爆了。 + */ + @Overwrite(remap = false) + @SubscribeEvent(priority = EventPriority.LOW) + public void onBreak(BlockEvent.BreakEvent event) { + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerAttributeMap.java b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerAttributeMap.java new file mode 100644 index 0000000..610998f --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerAttributeMap.java @@ -0,0 +1,52 @@ +package github.kasuminova.stellarcore.mixin.astralsorcery; + +import com.google.common.collect.Lists; +import hellfirepvp.astralsorcery.common.constellation.perk.PlayerAttributeMap; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Map; +import java.util.function.Function; + +@SuppressWarnings({"rawtypes", "unchecked", "MethodMayBeStatic"}) +@Mixin(PlayerAttributeMap.class) +public class MixinPlayerAttributeMap { + + @Redirect( + method = "applyModifier", + at = @At( + value = "INVOKE", + target = "Ljava/util/Map;computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;", + remap = false + ), + remap = false) + public Object redirectApplyModifierComputeIfAbsent(final Map map, final Object key, final Function _f) { + return map.computeIfAbsent(key, t -> Lists.newCopyOnWriteArrayList()); + } + + @Redirect( + method = "removeModifier", + at = @At( + value = "INVOKE", + target = "Ljava/util/Map;computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;", + remap = false + ), + remap = false) + public Object redirectRemoveModifierComputeIfAbsent(final Map map, final Object key, final Function _f) { + return map.computeIfAbsent(key, t -> Lists.newCopyOnWriteArrayList()); + } + + @Redirect( + method = "getModifiersByType", + at = @At( + value = "INVOKE", + target = "Ljava/util/Map;computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;", + remap = false + ), + remap = false) + public Object redirectGetModifiersByTypeComputeIfAbsent(final Map map, final Object key, final Function _f) { + return map.computeIfAbsent(key, t -> Lists.newCopyOnWriteArrayList()); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerProgress.java b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerProgress.java new file mode 100644 index 0000000..77be825 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerProgress.java @@ -0,0 +1,89 @@ +package github.kasuminova.stellarcore.mixin.astralsorcery; + +import github.kasuminova.stellarcore.StellarCore; +import hellfirepvp.astralsorcery.common.constellation.perk.AbstractPerk; +import hellfirepvp.astralsorcery.common.constellation.perk.PerkEffectHelper; +import hellfirepvp.astralsorcery.common.data.research.PlayerProgress; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +/** + * 尝试兼容 PlayerDataSQL 的申必还原机制导致服务器崩溃的问题。 + */ +@Mixin(PlayerProgress.class) +public abstract class MixinPlayerProgress { + @Shadow(remap = false) public abstract Collection getAppliedPerks(); + + @Shadow(remap = false) public abstract List getSealedPerks(); + + @Inject(method = "load", at = @At("HEAD"), remap = false) + private void onLoadPre(final NBTTagCompound compound, final CallbackInfo ci) { + EntityPlayerMP player = stellarcore$getCurrentPlayer(); + if (player == null) { + return; + } + + StellarCore.log.info("Try to removing all perk data for player " + player.getGameProfile().getName() + "."); + try { + for (final AbstractPerk perk : getAppliedPerks()) { + ((InvokerPerkEffectHelper) PerkEffectHelper.EVENT_INSTANCE).invokeHandlePerkRemoval(perk, player, Side.SERVER); + } + for (final AbstractPerk perk : getSealedPerks()) { + ((InvokerPerkEffectHelper) PerkEffectHelper.EVENT_INSTANCE).invokeHandlePerkRemoval(perk, player, Side.SERVER); + } + } catch (Throwable e) { + StellarCore.log.warn("Remove failed!", e); + } + } + + @Inject(method = "load", at = @At("TAIL"), remap = false) + private void onLoadPost(final NBTTagCompound compound, final CallbackInfo ci) { + EntityPlayerMP player = stellarcore$getCurrentPlayer(); + if (player == null) { + return; + } + + StellarCore.log.info("Try to restoring new perk data for player " + player.getGameProfile().getName() + "."); + try { + ((InvokerPerkEffectHelper) PerkEffectHelper.EVENT_INSTANCE).invokeHandlePerkModification(player, Side.SERVER, false); + } catch (Throwable e) { + StellarCore.log.warn("Restore failed!", e); + } + } + + @Unique + @Nullable + private EntityPlayerMP stellarcore$getCurrentPlayer() { + if (FMLCommonHandler.instance().getSide().isClient()) { + return null; + } + Map playerProgress = AccessorResearchManager.getPlayerProgressServer(); + + UUID playerUUID = null; + for (final Map.Entry entry : playerProgress.entrySet()) { + if (entry.getValue() == (Object) this) { + playerUUID = entry.getKey(); + } + } + //noinspection ConstantValue + if (playerUUID == null) { + return null; + } + return FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(playerUUID); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/athenaeum/MixinEnchantmentHelper.java b/src/main/java/github/kasuminova/stellarcore/mixin/athenaeum/MixinEnchantmentHelper.java new file mode 100644 index 0000000..59f54ff --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/athenaeum/MixinEnchantmentHelper.java @@ -0,0 +1,20 @@ +package github.kasuminova.stellarcore.mixin.athenaeum; + +import com.codetaylor.mc.athenaeum.util.EnchantmentHelper; +import com.llamalad7.mixinextras.injector.ModifyReturnValue; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +@Mixin(EnchantmentHelper.class) +public class MixinEnchantmentHelper { + + /** + * 返回值绝对不可能小于 0，唯一的可能是数值溢出。 + * 修复玩家经验等级大于 15466 时经验溢出导致无法完成配方的问题。 + */ + @ModifyReturnValue(method = "getPlayerExperienceTotal", at = @At("RETURN"), remap = false) + private static int checkGetPlayerExperienceTotalRange(int value) { + return value < 0 ? Integer.MAX_VALUE : value; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/avaritia/MixinTileBase.java b/src/main/java/github/kasuminova/stellarcore/mixin/avaritia/MixinTileBase.java new file mode 100644 index 0000000..952a40c --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/avaritia/MixinTileBase.java @@ -0,0 +1,20 @@ +package github.kasuminova.stellarcore.mixin.avaritia; + +import morph.avaritia.tile.TileBase; +import net.minecraft.tileentity.TileEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +@Mixin(TileBase.class) +public class MixinTileBase extends TileEntity { + + /** + * @author Kasumi_Nova + * @reason 移除不必要的同步。 + */ + @Overwrite + public void markDirty() { + super.markDirty(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/betterchat/MixinGuiBetterChat.java b/src/main/java/github/kasuminova/stellarcore/mixin/betterchat/MixinGuiBetterChat.java new file mode 100644 index 0000000..13d260a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/betterchat/MixinGuiBetterChat.java @@ -0,0 +1,87 @@ +package github.kasuminova.stellarcore.mixin.betterchat; + +import com.llamalad7.betterchat.gui.GuiBetterChat; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ChatLine; +import net.minecraft.client.gui.GuiUtilRenderComponents; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextFormatting; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + +/** + * 复制自 UniversalTweaks 的消息压缩，并兼容 BetterChat。 + */ +@Mixin(GuiBetterChat.class) +public abstract class MixinGuiBetterChat { + @Unique + private final Pattern universalTweaks$pattern = Pattern.compile("(?:§7)?\\s+\\[+\\d+]"); + + @Shadow(remap = false) @Final private List drawnChatLines = new ArrayList<>(); + + @Shadow(remap = false) @Final private List chatLines = new ArrayList<>(); + + @Shadow(remap = false) @Final private Minecraft mc; + + @Shadow + public abstract float getChatScale(); + + @Shadow + public abstract int getChatWidth(); + + @Inject(method = "setChatLine", at = @At("HEAD"), remap = false) + private void compactMessage(ITextComponent chatComponent, int chatLineId, int updateCounter, boolean displayOnly, CallbackInfo ci) { + int count = 1; + int chatSize = MathHelper.floor((float) this.getChatWidth() / this.getChatScale()); + List split = GuiUtilRenderComponents.splitText(chatComponent, chatSize, this.mc.fontRenderer, false, false); + ITextComponent textComponent = split.get(split.size() - 1); + for (int i = 0; i < drawnChatLines.size(); i++) { + ChatLine chatLine = drawnChatLines.get(i); + ITextComponent lineComponent = chatLine.getChatComponent(); + if (lineComponent.getFormattedText().trim().isEmpty()) { + continue; + } + if (!universalTweaks$isMessageEqual(lineComponent.createCopy(), textComponent.createCopy())) { + continue; + } + if (!lineComponent.getSiblings().isEmpty()) { + for (ITextComponent sibling : lineComponent.getSiblings()) { + if (universalTweaks$pattern.matcher(sibling.getUnformattedComponentText()).matches()) { + count += Integer.parseInt(sibling.getUnformattedComponentText().replaceAll("(?:§7)?\\D?", "")); + break; + } + } + } + this.drawnChatLines.removeIf(chatLine1 -> split.contains(chatLine1.getChatComponent()) || chatLine1.equals(chatLine)); + this.chatLines.removeIf(chatLine1 -> chatLine1.getChatComponent().getUnformattedComponentText().equals(chatComponent.getUnformattedComponentText())); + chatComponent.appendSibling(new TextComponentString(" [" + count + "]").setStyle(new Style().setColor(TextFormatting.GRAY))); + break; + } + } + + @Unique + private boolean universalTweaks$isMessageEqual(ITextComponent left, ITextComponent right) { + if (left.equals(right) || left.getUnformattedText().equals(right.getUnformattedText())) { + return true; + } + if (left.getSiblings().isEmpty()) { + return false; + } + + left.getSiblings().removeIf(sibling -> universalTweaks$pattern.matcher(sibling.getUnformattedComponentText()).matches()); + + return left.equals(right) || left.getUnformattedText().equals(right.getUnformattedText()); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/biomesoplenty/MixinBiomesOPlenty.java b/src/main/java/github/kasuminova/stellarcore/mixin/biomesoplenty/MixinBiomesOPlenty.java new file mode 100644 index 0000000..41b94d4 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/biomesoplenty/MixinBiomesOPlenty.java @@ -0,0 +1,29 @@ +package github.kasuminova.stellarcore.mixin.biomesoplenty; + +import biomesoplenty.common.remote.TrailManager; +import biomesoplenty.core.BiomesOPlenty; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.concurrent.CompletableFuture; + + +@Mixin(BiomesOPlenty.class) +public class MixinBiomesOPlenty { + + /** + * 主线程执行网络操作，罪大恶极！ + */ + @Redirect(method = "preInit", + at = @At( + value = "INVOKE", + target = "Lbiomesoplenty/common/remote/TrailManager;retrieveTrails()V", + remap = false), + remap = false) + @SuppressWarnings("MethodMayBeStatic") + private void onPreInit() { + CompletableFuture.runAsync(TrailManager::retrieveTrails); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/bloodmagic/MixinBloodAltar.java b/src/main/java/github/kasuminova/stellarcore/mixin/bloodmagic/MixinBloodAltar.java new file mode 100644 index 0000000..d2947ef --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/bloodmagic/MixinBloodAltar.java @@ -0,0 +1,72 @@ +package github.kasuminova.stellarcore.mixin.bloodmagic; + +import WayofTime.bloodmagic.altar.BloodAltar; +import WayofTime.bloodmagic.tile.TileAltar; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(BloodAltar.class) +public class MixinBloodAltar { + + @Shadow(remap = false) private TileAltar tileAltar; + + private static void sendUpdatePacketToNearPlayers(final TileAltar altar, final World world, final BlockPos blockPos) { + MinecraftServer server = world.getMinecraftServer(); + if (server == null) { + return; + } + + server.addScheduledTask(() -> { + if (altar.isInvalid()) { + return; + } + for (EntityPlayerMP player : server.getPlayerList().getPlayers()) { + if (player.world != world) { + continue; + } + double distance = player.getPosition().getDistance(blockPos.getX(), blockPos.getY(), blockPos.getZ()); + if (distance <= 32) { + player.connection.sendPacket(altar.getUpdatePacket()); + } + } + }); + } + + @Redirect(method = "startCycle", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/World;notifyBlockUpdate(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/block/state/IBlockState;I)V", + remap = true), + remap = false) + public void onStartCycleNotifyUpdate(final World world, final BlockPos blockPos, final IBlockState pos, final IBlockState oldState, final int newState) { + sendUpdatePacketToNearPlayers(tileAltar, world, blockPos); + } + + @Redirect(method = "update", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/World;notifyBlockUpdate(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/block/state/IBlockState;I)V", + remap = true), + remap = false) + public void onUpdateNotifyUpdate(final World world, final BlockPos blockPos, final IBlockState pos, final IBlockState oldState, final int newState) { + sendUpdatePacketToNearPlayers(tileAltar, world, blockPos); + } + + @Redirect(method = "updateAltar", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/World;notifyBlockUpdate(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/block/state/IBlockState;I)V", + remap = true), + remap = false) + public void onUpdateAltarCycleNotifyUpdate(final World world, final BlockPos blockPos, final IBlockState pos, final IBlockState oldState, final int newState) { + sendUpdatePacketToNearPlayers(tileAltar, world, blockPos); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticAttachRecipe.java b/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticAttachRecipe.java new file mode 100644 index 0000000..560f210 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticAttachRecipe.java @@ -0,0 +1,26 @@ +package github.kasuminova.stellarcore.mixin.botania; + +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(CosmeticAttachRecipe.class) +public class MixinCosmeticAttachRecipe { + + @Inject(method = "matches", at = @At("HEAD"), cancellable = true) + private void removeMatches(final InventoryCrafting var1, final World var2, final CallbackInfoReturnable cir) { + cir.setReturnValue(false); + } + + @Inject(method = "getCraftingResult", at = @At("HEAD"), cancellable = true) + private void removeGetCraftingResult(final InventoryCrafting var1, final CallbackInfoReturnable cir) { + cir.setReturnValue(ItemStack.EMPTY); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticRemoveRecipe.java b/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticRemoveRecipe.java new file mode 100644 index 0000000..1db4810 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticRemoveRecipe.java @@ -0,0 +1,26 @@ +package github.kasuminova.stellarcore.mixin.botania; + +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(CosmeticRemoveRecipe.class) +public class MixinCosmeticRemoveRecipe { + + @Inject(method = "matches", at = @At("HEAD"), cancellable = true) + private void removeMatches(final InventoryCrafting var1, final World var2, final CallbackInfoReturnable cir) { + cir.setReturnValue(false); + } + + @Inject(method = "getCraftingResult", at = @At("HEAD"), cancellable = true) + private void removeGetCraftingResult(final InventoryCrafting var1, final CallbackInfoReturnable cir) { + cir.setReturnValue(ItemStack.EMPTY); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinEntitySpark.java b/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinEntitySpark.java new file mode 100644 index 0000000..9d50814 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinEntitySpark.java @@ -0,0 +1,53 @@ +package github.kasuminova.stellarcore.mixin.botania; + +import net.minecraft.entity.Entity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import vazkii.botania.api.mana.spark.ISparkAttachable; +import vazkii.botania.common.entity.EntitySpark; + +@Mixin(EntitySpark.class) +public abstract class MixinEntitySpark { + + @Unique private boolean stellarcore$receiveLeastOne = false; + @Unique private int stellarcore$failureCounter = 1; + + @Inject( + method = "onUpdate", + at = @At( + value = "INVOKE", + target = "Lvazkii/botania/common/entity/EntitySpark;getUpgrade()Lvazkii/botania/api/mana/spark/SparkUpgradeType;", + remap = false + ), + cancellable = true + ) + private void injectOnUpdatePre(final CallbackInfo ci) { + if (((Entity) (Object) this).world.getTotalWorldTime() % stellarcore$failureCounter != 0) { + ci.cancel(); + } + } + + @Redirect(method = "onUpdate", at = @At(value = "INVOKE", target = "Lvazkii/botania/api/mana/spark/ISparkAttachable;recieveMana(I)V", remap = false)) + private void redirectReceiveMana(final ISparkAttachable attachable, final int mana) { + attachable.recieveMana(mana); + if (mana != 0) { + stellarcore$receiveLeastOne = true; + } + } + + @Inject(method = "onUpdate", at = @At("TAIL")) + private void injectOnUpdateTail(final CallbackInfo ci) { + if (stellarcore$receiveLeastOne) { + if (stellarcore$failureCounter > 1) { + stellarcore$failureCounter--; + } + } else if (stellarcore$failureCounter < 10) { + stellarcore$failureCounter++; + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/cfm/MixinImageCache.java b/src/main/java/github/kasuminova/stellarcore/mixin/cfm/MixinImageCache.java new file mode 100644 index 0000000..ef61be3 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/cfm/MixinImageCache.java @@ -0,0 +1,144 @@ +package github.kasuminova.stellarcore.mixin.cfm; + +import com.mrcrayfish.furniture.MrCrayfishFurnitureMod; +import com.mrcrayfish.furniture.client.ImageCache; +import com.mrcrayfish.furniture.client.Texture; +import net.minecraft.client.Minecraft; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.io.FileUtils; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import javax.annotation.Nullable; +import java.io.File; +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +@Mixin(ImageCache.class) +public abstract class MixinImageCache { + + @Shadow(remap = false) + private Map cacheMap; + + @Shadow(remap = false) + public abstract File getCache(); + + @Inject(method = "", at = @At("TAIL"), remap = false) + public void overwriteInit(final CallbackInfo ci) { + cacheMap = new ConcurrentHashMap<>(); + } + + /** + * @author Kasumi_Nova + * @reason 这怎么写出来的死锁？ + */ + @Overwrite(remap = false) + public boolean loadCached(String url) { + if (cacheMap.containsKey(url)) { + return true; + } + + String id = DigestUtils.sha1Hex(url.getBytes()); + File file = new File(getCache(), id); + if (file.exists()) { + this.add(url, file); + return true; + } + return false; + } + + /** + * @author Kasumi_Nova + * @reason 这怎么写出来的死锁？ + */ + @Overwrite(remap = false) + @Nullable + public Texture get(String url) { + if (url == null) { + return null; + } + Texture texture = cacheMap.get(url); + if (texture != null) { + return texture; + } + synchronized (this) { + return cacheMap.get(url); + } + } + + /** + * @author Kasumi_Nova + * @reason 这怎么写出来的死锁？ + */ + @Overwrite(remap = false) + public void add(String url, File file) { + if (cacheMap.containsKey(url)) { + return; + } + synchronized (this) { + if (!cacheMap.containsKey(url)) { + Texture texture = new Texture(file); + cacheMap.put(url, texture); + } + } + } + + /** + * @author Kasumi_Nova + * @reason 这怎么写出来的死锁？ + */ + @Overwrite(remap = false) + public boolean add(String url, byte[] data) { + if (cacheMap.containsKey(url)) { + return true; + } + + Texture texture; + String id = DigestUtils.sha1Hex(url.getBytes()); + File image = new File(getCache(), id); + + synchronized (this) { + if (cacheMap.containsKey(url)) { + return true; + } + cacheMap.put(url, texture = new Texture(image)); + } + + try { + FileUtils.writeByteArrayToFile(image, data); + } catch (IOException e) { + MrCrayfishFurnitureMod.logger().warn(e); + } + Minecraft.getMinecraft().addScheduledTask(texture::update); + return true; + } + + /** + * @author Kasumi_Nova + * @reason 这怎么写出来的死锁？ + */ + @Overwrite(remap = false) + private void tick() { + cacheMap.values().forEach(Texture::update); + } + + /** + * @author Kasumi_Nova + * @reason 这怎么写出来的死锁？ + */ + @Overwrite(remap = false) + public boolean isCached(String url) { + if (cacheMap.containsKey(url)) { + return true; + } + synchronized (this) { + return cacheMap.containsKey(url); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/chisel/MixinTileAutoChisel.java b/src/main/java/github/kasuminova/stellarcore/mixin/chisel/MixinTileAutoChisel.java new file mode 100644 index 0000000..50bd46e --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/chisel/MixinTileAutoChisel.java @@ -0,0 +1,54 @@ +package github.kasuminova.stellarcore.mixin.chisel; + +import github.kasuminova.stellarcore.common.util.HashedItemStack; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.*; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import team.chisel.api.carving.ICarvingGroup; +import team.chisel.api.carving.ICarvingRegistry; +import team.chisel.common.block.TileAutoChisel; + +import java.util.Map; +import java.util.WeakHashMap; + +@Mixin(TileAutoChisel.class) +public class MixinTileAutoChisel { + + @Unique + private static final Map CACHED_CARVING_GROUP = new WeakHashMap<>(); + + @Unique + private long stellar_core$interval = 20; + + @ModifyConstant(method = "update", constant = @Constant(longValue = 20L)) + private long modifyUpdateInterval(long __) { + return stellar_core$interval; + } + + @Redirect( + method = "update", + at = @At( + value = "INVOKE", + target = "Lteam/chisel/api/carving/ICarvingRegistry;getGroup(Lnet/minecraft/item/ItemStack;)Lteam/chisel/api/carving/ICarvingGroup;", + remap = false + )) + @SuppressWarnings("MethodMayBeStatic") + private ICarvingGroup redirectGetGroup(final ICarvingRegistry instance, final ItemStack stack) { + return CACHED_CARVING_GROUP.computeIfAbsent(HashedItemStack.of(stack), _g -> instance.getGroup(stack)); + } + + @Inject(method = "mergeOutput", at = @At("HEAD"), remap = false) + private void injectMergeOutput(final ItemStack stack, final CallbackInfo ci) { + stellar_core$interval = Math.max(stellar_core$interval - 5, 20); + } + + @Inject(method = "setSourceSlot", at = @At("HEAD"), remap = false) + private void injectSetSourceSlot(final int slot, final CallbackInfo ci) { + if (slot == -1) { + stellar_core$interval = Math.min(stellar_core$interval + 5, 100); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinItemTools.java b/src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinItemTools.java new file mode 100644 index 0000000..feaac15 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinItemTools.java @@ -0,0 +1,39 @@ +package github.kasuminova.stellarcore.mixin.eio; + +import crazypants.enderio.base.capability.ItemTools; +import net.minecraft.profiler.Profiler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(ItemTools.class) +public class MixinItemTools { + + @Redirect( + method = "move(Lcrazypants/enderio/base/capability/ItemTools$Limit;Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;)Lcrazypants/enderio/base/capability/ItemTools$MoveResult;", + at = @At(value = "INVOKE", target = "Lcrazypants/enderio/base/diagnostics/Prof;start(Lnet/minecraft/profiler/Profiler;Ljava/lang/String;Ljava/lang/Object;)V"), + remap = false + ) + private static void redirectProfStart(final Profiler profiler, final String section, final Object param) { + // noop + } + + @Redirect( + method = "move(Lcrazypants/enderio/base/capability/ItemTools$Limit;Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;)Lcrazypants/enderio/base/capability/ItemTools$MoveResult;", + at = @At(value = "INVOKE", target = "Lcrazypants/enderio/base/diagnostics/Prof;stop(Lnet/minecraft/profiler/Profiler;)V"), + remap = false + ) + private static void redirectProfStop(final Profiler profiler) { + // noop + } + + @Redirect( + method = "move(Lcrazypants/enderio/base/capability/ItemTools$Limit;Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;)Lcrazypants/enderio/base/capability/ItemTools$MoveResult;", + at = @At(value = "INVOKE", target = "Lcrazypants/enderio/base/diagnostics/Prof;stop(Lnet/minecraft/profiler/Profiler;I)V"), + remap = false + ) + private static void redirectProfStop(final Profiler i, final int profiler) { + // noop + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinTileEntityBase.java b/src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinTileEntityBase.java new file mode 100644 index 0000000..8f63928 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinTileEntityBase.java @@ -0,0 +1,24 @@ +package github.kasuminova.stellarcore.mixin.eio; + +import com.enderio.core.common.TileEntityBase; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(TileEntityBase.class) +public class MixinTileEntityBase extends TileEntity { + + @Redirect( + method = "update", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/World;getTileEntity(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/tileentity/TileEntity;" + )) + private TileEntity redirectGetTileEntity(final World instance, final BlockPos blockPos) { + return this; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/AccessorTarget.java b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/AccessorTarget.java new file mode 100644 index 0000000..36059b9 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/AccessorTarget.java @@ -0,0 +1,16 @@ +package github.kasuminova.stellarcore.mixin.eioconduit; + +import crazypants.enderio.conduits.conduit.item.NetworkedInventory; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(targets = "crazypants.enderio.conduits.conduit.item.NetworkedInventory$Target") +public interface AccessorTarget { + + @Accessor(remap = false) + boolean getStickyInput(); + + @Accessor(remap = false) + NetworkedInventory getInv(); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/InvokerNetworkedInventory.java b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/InvokerNetworkedInventory.java new file mode 100644 index 0000000..47bd3fc --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/InvokerNetworkedInventory.java @@ -0,0 +1,17 @@ +package github.kasuminova.stellarcore.mixin.eioconduit; + +import crazypants.enderio.conduits.conduit.item.NetworkedInventory; +import net.minecraftforge.items.IItemHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(NetworkedInventory.class) +public interface InvokerNetworkedInventory { + + @Invoker(remap = false) + boolean callCanInsert(); + + @Invoker(remap = false) + IItemHandler callGetInventory(); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinAbstractConduit.java b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinAbstractConduit.java new file mode 100644 index 0000000..68e0e31 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinAbstractConduit.java @@ -0,0 +1,43 @@ +package github.kasuminova.stellarcore.mixin.eioconduit; + +import crazypants.enderio.base.conduit.IConduitBundle; +import crazypants.enderio.conduits.conduit.AbstractConduit; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; + +import javax.annotation.Nonnull; + +@Mixin(AbstractConduit.class) +public abstract class MixinAbstractConduit { + + @Shadow(remap = false) protected abstract void updateNetwork(final World world); + + @Shadow(remap = false) protected abstract void updateConnections(); + + @Shadow(remap = false) protected boolean readFromNbt; + + @Shadow(remap = false)private boolean clientStateDirty; + + @Shadow(remap = false) @Nonnull public abstract IConduitBundle getBundle(); + + /** + * @author Kasumi_Nova + * @reason 移除 Profiler 部分。 + */ + @Overwrite(remap = false) + public void updateEntity(@Nonnull World world) { + if (world.isRemote) { + return; + } + updateNetwork(world); + updateConnections(); + readFromNbt = false; // the two update*()s react to this on their first run + if (clientStateDirty) { + getBundle().dirty(); + clientStateDirty = false; + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinItemConduit.java b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinItemConduit.java new file mode 100644 index 0000000..8d3e3b0 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinItemConduit.java @@ -0,0 +1,63 @@ +package github.kasuminova.stellarcore.mixin.eioconduit; + +import com.enderio.core.common.util.NNList; +import crazypants.enderio.conduits.conduit.item.ItemConduit; +import github.kasuminova.stellarcore.mixin.util.CachedItemConduit; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(ItemConduit.class) +public abstract class MixinItemConduit implements CachedItemConduit { + + @Unique + private ItemStack stellarcore$cachedStack = ItemStack.EMPTY; + + @Inject(method = "writeToNBT", at = @At("TAIL"), remap = false) + public void onWriteToNBT(final NBTTagCompound nbtRoot, final CallbackInfo ci) { + if (!stellarcore$cachedStack.isEmpty()) { + NBTTagCompound cachedStackTag = new NBTTagCompound(); + + stellarcore$cachedStack.writeToNBT(cachedStackTag); + if (stellarcore$cachedStack.getCount() > 64) { + cachedStackTag.setInteger("Count", stellarcore$cachedStack.getCount()); + } + + nbtRoot.setTag("cachedStack", cachedStackTag); + } + } + + @Inject(method = "readFromNBT", at = @At("TAIL"), remap = false) + public void onReadFromNBT(final NBTTagCompound nbtRoot, final CallbackInfo ci) { + if (nbtRoot.hasKey("cachedStack")) { + NBTTagCompound cachedStackTag = nbtRoot.getCompoundTag("cachedStack"); + stellarcore$cachedStack = new ItemStack(cachedStackTag); + stellarcore$cachedStack.setCount(cachedStackTag.getInteger("Count")); + } + } + + @Inject(method = "getDrops", at = @At("RETURN"), remap = false) + public void onGetDrops(final CallbackInfoReturnable> cir) { + if (!stellarcore$cachedStack.isEmpty()) { + cir.getReturnValue().add(stellarcore$cachedStack); + } + } + + @Override + @SuppressWarnings("AddedMixinMembersNamePattern") + public ItemStack getCachedStack() { + return stellarcore$cachedStack; + } + + @Override + @SuppressWarnings("AddedMixinMembersNamePattern") + public void setCachedStack(final ItemStack cachedStack) { + this.stellarcore$cachedStack = cachedStack; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinNetworkedInventory.java b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinNetworkedInventory.java new file mode 100644 index 0000000..bdc647f --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinNetworkedInventory.java @@ -0,0 +1,189 @@ +package github.kasuminova.stellarcore.mixin.eioconduit; + +import crazypants.enderio.base.capability.ItemTools; +import crazypants.enderio.base.filter.item.IItemFilter; +import crazypants.enderio.conduits.conduit.item.IItemConduit; +import crazypants.enderio.conduits.conduit.item.NetworkedInventory; +import crazypants.enderio.util.Prep; +import github.kasuminova.stellarcore.mixin.util.CachedItemConduit; +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.IItemHandler; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +@Mixin(NetworkedInventory.class) +public abstract class MixinNetworkedInventory { + @Nonnull + @Shadow(remap = false) @Final private IItemConduit con; + + @SuppressWarnings({"StaticVariableMayNotBeInitialized", "NonConstantFieldWithUpperCaseName"}) + @Shadow(remap = false) @Final private static boolean EXECUTE; + + @Shadow(remap = false) + protected abstract int insertIntoTargets(@Nonnull final ItemStack toInsert); + + @Shadow(remap = false) + protected abstract void onItemExtracted(final int slot, final int numInserted); + + @Shadow(remap = false) + protected abstract Iterable getTargetIterator(); + + @Shadow(remap = false) + private static IItemFilter valid(final IItemFilter filter) { + return null; + } + + @Shadow(remap = false) + private static int positive(final int x) { + return 0; + } + + @Unique + private static int stellarcore$insertItemSimulate(NetworkedInventory targetInv, @Nonnull ItemStack item, IItemFilter filter) { + InvokerNetworkedInventory inv = (InvokerNetworkedInventory) targetInv; + if (!inv.callCanInsert() || Prep.isInvalid(item)) { + return 0; + } + final IItemHandler inventory = inv.callGetInventory(); + if (inventory == null) { + return 0; + } + if (filter == null) { + return stellarcore$simulateInsertItem(inventory, item); + } + if (filter.isLimited()) { + final int count = filter.getMaxCountThatPassesFilter(inventory, item); + if (count <= 0) { + return 0; + } + final int maxInsert = ItemTools.getInsertLimit(inventory, item, count); + if (maxInsert <= 0) { + return 0; + } + if (maxInsert < item.getCount()) { + item = item.copy(); + item.setCount(maxInsert); + } + } else if (!filter.doesItemPassFilter(inventory, item)) { + return 0; + } + return stellarcore$simulateInsertItem(inventory, item); + } + + @Unique + private static int stellarcore$simulateInsertItem(@Nullable IItemHandler inventory, @Nonnull ItemStack item) { + if (inventory == null || Prep.isInvalid(item)) { + return 0; + } + int startSize = item.getCount(); + ItemStack res = ItemTools.insertItemStacked(inventory, item.copy(), true); + return startSize - res.getCount(); + } + + @Inject(method = "doTransfer", at = @At("HEAD"), cancellable = true, remap = false) + public void doTransfer(final IItemHandler inventory, + final ItemStack extractedItem, + final int slot, + final CallbackInfoReturnable cir) { + if (!(con instanceof CachedItemConduit cachedItemConduit)) { + return; + } + if (!cachedItemConduit.getCachedStack().isEmpty()) { + cir.setReturnValue(false); + return; + } + int simulateInserted = stellarcore$insertIntoTargetsSimulate(extractedItem.copy()); + if (simulateInserted <= 0) { + cir.setReturnValue(false); + return; + } + + ItemStack extracted = inventory.extractItem(slot, simulateInserted, EXECUTE); + int inserted = insertIntoTargets(extracted.copy()); + int notInserted = extracted.getCount() - inserted; + + if (notInserted > 0) { + ItemStack notInsertedStack = extracted.copy(); + notInsertedStack.setCount(notInserted); + cachedItemConduit.setCachedStack(notInsertedStack); + } + + onItemExtracted(slot, inserted); + + cir.setReturnValue(inserted > 0); + } + + @Inject( + method = "transferItems", + at = @At( + value = "INVOKE", + target = "Lcrazypants/enderio/conduits/conduit/item/IItemConduit;getMaximumExtracted(Lnet/minecraft/util/EnumFacing;)I", + remap = false + ), + cancellable = true, + remap = false) + public void onTransferItems(final CallbackInfoReturnable cir) { + if (!(con instanceof CachedItemConduit cachedItemConduit)) { + return; + } + + ItemStack cachedStack = cachedItemConduit.getCachedStack(); + if (cachedStack.isEmpty()) { + return; + } + + int inserted = insertIntoTargets(cachedStack.copy()); + if (inserted == cachedStack.getCount()) { + cachedItemConduit.setCachedStack(ItemStack.EMPTY); + return; + } + if (inserted == 0) { + cir.setReturnValue(false); + return; + } + cachedStack.shrink(inserted); + } + + @Unique + private int stellarcore$insertIntoTargetsSimulate(@Nonnull ItemStack toInsert) { + if (Prep.isInvalid(toInsert)) { + return 0; + } + + final int totalToInsert = toInsert.getCount(); + // when true, a sticky filter has claimed this item and so only sticky outputs are allowed to handle it. sticky outputs are first in the target + // list, so all sticky outputs are queried before any non-sticky one. + boolean matchedStickyOutput = false; + + for (Object targetObj : getTargetIterator()) { + AccessorTarget target = (AccessorTarget) targetObj; + NetworkedInventory inv = target.getInv(); + final IItemFilter filter = valid(inv.getCon().getOutputFilter(inv.getConDir())); + if (target.getStickyInput() && !matchedStickyOutput && filter != null) { + matchedStickyOutput = filter.doesItemPassFilter(inv.getInventory(), toInsert); + } + if (target.getStickyInput() || !matchedStickyOutput) { + toInsert.shrink(positive(stellarcore$insertItemSimulate(inv, toInsert, filter))); + if (Prep.isInvalid(toInsert)) { + // everything has been inserted. we're done. + break; + } + continue; + } + if (!target.getStickyInput()) { + // item has been claimed by a sticky output but there are no sticky outputs left in targets, so we can stop checking + break; + } + } + + return totalToInsert - toInsert.getCount(); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/extrabotany/MixinClientProxy.java b/src/main/java/github/kasuminova/stellarcore/mixin/extrabotany/MixinClientProxy.java new file mode 100644 index 0000000..44e128f --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/extrabotany/MixinClientProxy.java @@ -0,0 +1,32 @@ +package github.kasuminova.stellarcore.mixin.extrabotany; + +import com.google.common.util.concurrent.ListenableFuture; +import com.meteor.extrabotany.client.ClientProxy; +import net.minecraft.client.Minecraft; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.concurrent.CompletableFuture; + +@Mixin(ClientProxy.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinClientProxy { + + /** + * addScheduledTask 不代表异步。 + */ + @Redirect( + method = "preInit", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/Minecraft;addScheduledTask(Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;", + remap = true + ), + remap = false) + private ListenableFuture redirectAddScheduledTask(final Minecraft instance, final Runnable runnableToSchedule) { + CompletableFuture.runAsync(runnableToSchedule); + // 返回 null，完全用不到。 + return null; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/fluxnetworks/MixinTOPIntegration.java b/src/main/java/github/kasuminova/stellarcore/mixin/fluxnetworks/MixinTOPIntegration.java new file mode 100644 index 0000000..a947302 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/fluxnetworks/MixinTOPIntegration.java @@ -0,0 +1,70 @@ +package github.kasuminova.stellarcore.mixin.fluxnetworks; + +import net.minecraft.util.text.TextFormatting; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; +import sonar.fluxnetworks.api.network.ConnectionType; +import sonar.fluxnetworks.api.translate.FluxTranslate; +import sonar.fluxnetworks.api.translate.Translation; +import sonar.fluxnetworks.api.utils.EnergyType; +import sonar.fluxnetworks.common.core.FluxUtils; +import sonar.fluxnetworks.common.integration.TOPIntegration; + +@Mixin(TOPIntegration.FluxConnectorInfoProvider.class) +public class MixinTOPIntegration { + + @SuppressWarnings("MethodMayBeStatic") + @Redirect(method = "addProbeInfo", + at = @At( + value = "INVOKE", + target = "Lsonar/fluxnetworks/api/translate/Translation;t()Ljava/lang/String;", + remap = false), + remap = false) + public String redirectAddProbeInfoTrans(final Translation instance) { + return stellar_core$getTOPTransKey(instance); + } + + @SuppressWarnings("MethodMayBeStatic") + @Redirect(method = "addProbeInfo", + at = @At( + value = "INVOKE", + target = "Lsonar/fluxnetworks/common/core/FluxUtils;getTransferInfo(Lsonar/fluxnetworks/api/network/ConnectionType;Lsonar/fluxnetworks/api/utils/EnergyType;J)Ljava/lang/String;", + remap = false), + remap = false) + public String redirectAddProbeInfoGetTransferInfo(final ConnectionType connectionType, final EnergyType energyType, final long change) { + return stellar_core$getTransferInfo(connectionType, energyType, change); + } + + @Unique + private static String stellar_core$getTransferInfo(ConnectionType type, EnergyType energyType, long change) { + if (type.isPlug()) { + String formatted = FluxUtils.format(change, FluxUtils.TypeNumberFormat.COMMAS, energyType, true); + return change == 0L ? stellar_core$getTOPTransKey(FluxTranslate.INPUT) + ": " + TextFormatting.GOLD + formatted : stellar_core$getTOPTransKey(FluxTranslate.INPUT) + ": " + TextFormatting.GREEN + "+" + formatted; + } + if (!type.isPoint() && !type.isController()) { + if (type != ConnectionType.STORAGE) { + return ""; + } + if (change == 0L) { + return stellar_core$getTOPTransKey(FluxTranslate.CHANGE) + ": " + TextFormatting.GOLD + change + energyType.getUsageSuffix(); + } + if (change > 0L) { + return stellar_core$getTOPTransKey(FluxTranslate.CHANGE) + ": " + TextFormatting.RED + "-" + FluxUtils.format(change, FluxUtils.TypeNumberFormat.COMMAS, energyType, true); + } + return stellar_core$getTOPTransKey(FluxTranslate.CHANGE) + ": " + TextFormatting.GREEN + "+" + FluxUtils.format(-change, FluxUtils.TypeNumberFormat.COMMAS, energyType, true); + } + String formatted = FluxUtils.format(-change, FluxUtils.TypeNumberFormat.COMMAS, energyType, true); + if (change == 0L) { + return stellar_core$getTOPTransKey(FluxTranslate.OUTPUT) + ": " + TextFormatting.GOLD + formatted; + } + return stellar_core$getTOPTransKey(FluxTranslate.OUTPUT) + ": " + TextFormatting.RED + "-" + formatted; + } + + @Unique + private static String stellar_core$getTOPTransKey(Translation translation) { + return "{*" + translation.key + "*}"; + } + +} \ No newline at end of file diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinEnergyCalculatorLeg.java b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinEnergyCalculatorLeg.java new file mode 100644 index 0000000..ad89642 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinEnergyCalculatorLeg.java @@ -0,0 +1,32 @@ +package github.kasuminova.stellarcore.mixin.ic2; + +import ic2.core.energy.grid.Grid; +import ic2.core.energy.grid.Node; +import ic2.core.energy.leg.EnergyCalculatorLeg; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Collection; +import java.util.Collections; + +@Mixin(EnergyCalculatorLeg.class) +public class MixinEnergyCalculatorLeg { + + @Redirect( + method = "runCalculation", + at = @At( + value = "INVOKE", + target = "Lic2/core/energy/grid/Grid;getNodes()Ljava/util/Collection;", + remap = false), + remap = false + ) + private static Collection injectRunCalculation(final Grid instance) { + Collection nodes = instance.getNodes(); + if (nodes.size() <= 1) { + return Collections.emptyList(); + } + return nodes; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinGradualRecipe.java b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinGradualRecipe.java new file mode 100644 index 0000000..7bb2638 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinGradualRecipe.java @@ -0,0 +1,27 @@ +package github.kasuminova.stellarcore.mixin.ic2; + +import ic2.core.recipe.GradualRecipe; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(GradualRecipe.class) +public class MixinGradualRecipe { + + @Redirect( + method = "getCraftingResult", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/item/ItemStack;copy()Lnet/minecraft/item/ItemStack;" + ) + ) + public ItemStack redirectItemStackCopy(final ItemStack instance) { + ItemStack copied = instance.copy(); + if (copied.getCount() > 1) { + copied.setCount(1); + } + return copied; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinItemUpgradeModule.java b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinItemUpgradeModule.java new file mode 100644 index 0000000..101ce8a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinItemUpgradeModule.java @@ -0,0 +1,32 @@ +package github.kasuminova.stellarcore.mixin.ic2; + +import ic2.api.upgrade.IUpgradableBlock; +import ic2.core.item.upgrade.ItemUpgradeModule; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(ItemUpgradeModule.class) +public class MixinItemUpgradeModule { + + @Inject( + method = "onTick", + at = @At( + value = "INVOKE", + target = "Lic2/core/util/StackUtil;getSize(Lnet/minecraft/item/ItemStack;)I", + remap = false), + remap = false, + cancellable = true + ) + private void injectOnTick(final ItemStack stack, final IUpgradableBlock parent, final CallbackInfoReturnable cir) { + TileEntity te = (TileEntity) parent; + if (te.getWorld().getTotalWorldTime() % 5 != 0) { + cir.setReturnValue(false); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityMatter.java b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityMatter.java new file mode 100644 index 0000000..367857d --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityMatter.java @@ -0,0 +1,19 @@ +package github.kasuminova.stellarcore.mixin.ic2; + +import github.kasuminova.stellarcore.mixin.util.ITaskExecutor; +import hellfirepvp.modularmachinery.ModularMachinery; +import ic2.core.block.machine.tileentity.TileEntityMatter; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(TileEntityMatter.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinTileEntityMatter { + + @Redirect(method = "updateEntityServer", at = @At(value = "INVOKE", target = "Lic2/core/block/machine/tileentity/TileEntityMatter;markDirty()V")) + public void redirectMarkDirty(final TileEntityMatter instance) { + ((ITaskExecutor) ModularMachinery.EXECUTE_MANAGER).addTEMarkTask(instance); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityReplicator.java b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityReplicator.java new file mode 100644 index 0000000..a56a3e5 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityReplicator.java @@ -0,0 +1,19 @@ +package github.kasuminova.stellarcore.mixin.ic2; + +import github.kasuminova.stellarcore.mixin.util.ITaskExecutor; +import hellfirepvp.modularmachinery.ModularMachinery; +import ic2.core.block.machine.tileentity.TileEntityReplicator; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(TileEntityReplicator.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinTileEntityReplicator { + + @Redirect(method = "updateEntityServer", at = @At(value = "INVOKE", target = "Lic2/core/block/machine/tileentity/TileEntityReplicator;markDirty()V")) + public void redirectMarkDirty(final TileEntityReplicator instance) { + ((ITaskExecutor) ModularMachinery.EXECUTE_MANAGER).addTEMarkTask(instance); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInGameInfoCore.java b/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInGameInfoCore.java new file mode 100644 index 0000000..53458f9 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInGameInfoCore.java @@ -0,0 +1,113 @@ +package github.kasuminova.stellarcore.mixin.igi; + +import com.github.lunatrius.ingameinfo.InGameInfoCore; +import com.github.lunatrius.ingameinfo.client.gui.overlay.Info; +import github.kasuminova.stellarcore.client.util.RenderUtils; +import github.kasuminova.stellarcore.mixin.util.IMixinInGameInfoCore; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.shader.Framebuffer; +import org.lwjgl.opengl.GL11; +import org.spongepowered.asm.mixin.*; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.LinkedList; +import java.util.List; + +@Mixin(InGameInfoCore.class) +public class MixinInGameInfoCore implements IMixinInGameInfoCore { + + @Unique + private final List stellarcore$postDrawList = new LinkedList<>(); + + @Shadow(remap = false) @Final private List info; + @Unique + private Framebuffer stellarcore$fbo = null; + @Unique + private boolean stellarcore$refreshFBO = true; + @Unique + private boolean stellarcore$postDrawing = true; + + @Unique + private int stellarcore$tickCounter = 0; + @Unique + private int stellarcore$displayWidth = 0; + @Unique + private int stellarcore$displayHeight = 0; + + @Inject(method = "onTickClient", at = @At("HEAD"), remap = false) + private void onTickClient(final CallbackInfo ci) { + stellarcore$tickCounter++; + if (stellarcore$tickCounter % 2 == 0) { + stellarcore$refreshFBO = true; + } + } + + /** + * @author Kasumi_Nova + * @reason 使用 FBO 优化 IGI 渲染性能，帧率越高效果越好。 + */ + @Overwrite(remap = false) + public void onTickRender() { + if (!OpenGlHelper.framebufferSupported) { + return; + } + + Minecraft minecraft = Minecraft.getMinecraft(); + stellarcore$postDrawing = false; + + if (stellarcore$fbo == null) { + stellarcore$displayWidth = minecraft.displayWidth; + stellarcore$displayHeight = minecraft.displayHeight; + stellarcore$fbo = new Framebuffer(stellarcore$displayWidth, stellarcore$displayHeight, false); + stellarcore$fbo.framebufferColor[0] = 0.0F; + stellarcore$fbo.framebufferColor[1] = 0.0F; + stellarcore$fbo.framebufferColor[2] = 0.0F; + } + + if (stellarcore$refreshFBO) { + stellarcore$postDrawList.clear(); + stellar_core$renderToFBO(minecraft); + stellarcore$refreshFBO = false; + } + + RenderUtils.renderFramebuffer(minecraft, stellarcore$fbo); + stellarcore$postDrawing = true; + stellarcore$postDrawList.forEach(Runnable::run); + } + + @Unique + private void stellar_core$renderToFBO(final Minecraft minecraft) { + if (stellarcore$displayWidth != minecraft.displayWidth || stellarcore$displayHeight != minecraft.displayHeight) { + stellarcore$displayWidth = minecraft.displayWidth; + stellarcore$displayHeight = minecraft.displayHeight; + stellarcore$fbo.createBindFramebuffer(stellarcore$displayWidth, stellarcore$displayHeight); + } else { + stellarcore$fbo.framebufferClear(); + } + stellarcore$fbo.bindFramebuffer(false); + + GlStateManager.disableBlend(); + GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + info.forEach(Info::draw); + + Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false); + } + + @Override + @SuppressWarnings("AddedMixinMembersNamePattern") + public void addPostDrawAction(final Runnable action) { + stellarcore$postDrawList.add(action); + } + + @Override + @SuppressWarnings("AddedMixinMembersNamePattern") + public boolean isPostDrawing() { + return stellarcore$postDrawing; + } + +} \ No newline at end of file diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInfoItem.java b/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInfoItem.java new file mode 100644 index 0000000..119b978 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInfoItem.java @@ -0,0 +1,26 @@ +package github.kasuminova.stellarcore.mixin.igi; + +import com.github.lunatrius.ingameinfo.InGameInfoCore; +import com.github.lunatrius.ingameinfo.client.gui.overlay.InfoItem; +import github.kasuminova.stellarcore.mixin.util.IMixinInGameInfoCore; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(InfoItem.class) +public abstract class MixinInfoItem { + + @Shadow(remap = false) public abstract void drawInfo(); + + @Inject(method = "drawInfo", at = @At("HEAD"), cancellable = true, remap = false) + private void injectDrawInfo(final CallbackInfo ci) { + IMixinInGameInfoCore instance = (IMixinInGameInfoCore) InGameInfoCore.INSTANCE; + if (!instance.isPostDrawing()) { + instance.addPostDrawAction(this::drawInfo); + ci.cancel(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinPlayerHandler.java b/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinPlayerHandler.java new file mode 100644 index 0000000..ff349af --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinPlayerHandler.java @@ -0,0 +1,18 @@ +package github.kasuminova.stellarcore.mixin.igi; + +import com.github.lunatrius.ingameinfo.handler.PlayerHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(PlayerHandler.class) +public class MixinPlayerHandler { + + @SuppressWarnings("MethodMayBeStatic") + @Inject(method = "onPlayerLogin", at = @At("HEAD"), cancellable = true, remap = false) + private void prevOnPlayerLogin(final CallbackInfo ci) { + ci.cancel(); + } + +} \ No newline at end of file diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIEMultiblock.java b/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIEMultiblock.java new file mode 100644 index 0000000..d46049a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIEMultiblock.java @@ -0,0 +1,33 @@ +package github.kasuminova.stellarcore.mixin.immersiveengineering; + +import blusunrize.immersiveengineering.common.blocks.BlockIEMultiblock; +import blusunrize.immersiveengineering.common.util.inventory.IIEInventory; +import com.llamalad7.mixinextras.sugar.Local; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Collections; +import java.util.Iterator; + +@Mixin(BlockIEMultiblock.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinBlockIEMultiblock { + + @Redirect( + method = "breakBlock", + at = @At(value = "INVOKE", target = "Ljava/util/Iterator;hasNext()Z", remap = false) + ) + @SuppressWarnings("rawtypes") + private boolean onBreakBlock(final Iterator instance, @Local(name = "master") IIEInventory master) { + if (instance.hasNext()) { + return true; + } + NonNullList inventory = master.getInventory(); + Collections.fill(inventory, ItemStack.EMPTY); + return false; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIETileProvider.java b/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIETileProvider.java new file mode 100644 index 0000000..b2e4ce7 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIETileProvider.java @@ -0,0 +1,37 @@ +package github.kasuminova.stellarcore.mixin.immersiveengineering; + +import blusunrize.immersiveengineering.common.blocks.BlockIETileProvider; +import blusunrize.immersiveengineering.common.util.inventory.IIEInventory; +import com.llamalad7.mixinextras.sugar.Local; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Collections; +import java.util.Iterator; + +@Mixin(BlockIETileProvider.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinBlockIETileProvider { + + @Redirect( + method = "getDrops", + at = @At(value = "INVOKE", target = "Ljava/util/Iterator;hasNext()Z", remap = false), + remap = false + ) + @SuppressWarnings("rawtypes") + private boolean onGetDrops(final Iterator instance, @Local(name = "tile") TileEntity tile) { + if (instance.hasNext()) { + return true; + } + if (tile instanceof IIEInventory ieInv) { + NonNullList inventory = ieInv.getInventory(); + Collections.fill(inventory, ItemStack.EMPTY); + } + return false; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinRecipeJerrycan.java b/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinRecipeJerrycan.java new file mode 100644 index 0000000..3c59c00 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinRecipeJerrycan.java @@ -0,0 +1,31 @@ +package github.kasuminova.stellarcore.mixin.immersiveengineering; + +import blusunrize.immersiveengineering.common.IEContent; +import blusunrize.immersiveengineering.common.crafting.RecipeJerrycan; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fluids.capability.IFluidHandlerItem; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(RecipeJerrycan.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinRecipeJerrycan { + + @Redirect( + method = "getRelevantSlots", + at = @At( + value = "INVOKE", + target = "Lnet/minecraftforge/fluids/FluidUtil;getFluidHandler(Lnet/minecraft/item/ItemStack;)Lnet/minecraftforge/fluids/capability/IFluidHandlerItem;", + remap = false + ), + remap = false) + private IFluidHandlerItem redirectGetRelevantSlotsGetFluidHandler(final ItemStack itemStack) { + if (IEContent.itemJerrycan.equals(itemStack.getItem())) { + return null; + } + return FluidUtil.getFluidHandler(itemStack); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/legendarytooltips/MixinTooltipDecor.java b/src/main/java/github/kasuminova/stellarcore/mixin/legendarytooltips/MixinTooltipDecor.java new file mode 100644 index 0000000..0f21c24 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/legendarytooltips/MixinTooltipDecor.java @@ -0,0 +1,29 @@ +package github.kasuminova.stellarcore.mixin.legendarytooltips; + +import com.anthonyhilyard.legendarytooltips.render.TooltipDecor; +import net.minecraft.client.gui.FontRenderer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Collections; +import java.util.List; + +@Mixin(TooltipDecor.class) +public class MixinTooltipDecor { + + /** + * 换行有问题捏。 + */ + @Redirect(method = "drawBorder", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/gui/FontRenderer;listFormattedStringToWidth(Ljava/lang/String;I)Ljava/util/List;", + remap = true + ), + remap = false) + private static List redirectDrawBorderListFormattedStringToWidth(final FontRenderer instance, final String str, final int wrapWidth) { + return Collections.singletonList(str); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinEnergyAcceptorWrapper.java b/src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinEnergyAcceptorWrapper.java new file mode 100644 index 0000000..a342e53 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinEnergyAcceptorWrapper.java @@ -0,0 +1,27 @@ +package github.kasuminova.stellarcore.mixin.mek_top; + +import github.kasuminova.stellarcore.common.integration.fluxnetworks.FluxPlugAcceptor; +import mekanism.api.Coord4D; +import mekanism.common.base.EnergyAcceptorWrapper; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import sonar.fluxnetworks.common.tileentity.TileFluxPlug; + +@Mixin(EnergyAcceptorWrapper.class) +public class MixinEnergyAcceptorWrapper { + + @Inject(method = "get", at = @At("HEAD"), cancellable = true, remap = false) + private static void injectGet(final TileEntity te, final EnumFacing side, final CallbackInfoReturnable cir) { + //noinspection ConstantValue + if (te instanceof TileFluxPlug plug && te.getWorld() != null) { + FluxPlugAcceptor wrapper = new FluxPlugAcceptor(plug, side); + wrapper.coord = Coord4D.get(te); + cir.setReturnValue(wrapper); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinIStrictEnergyStorage.java b/src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinIStrictEnergyStorage.java new file mode 100644 index 0000000..62bfed3 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinIStrictEnergyStorage.java @@ -0,0 +1,35 @@ +package github.kasuminova.stellarcore.mixin.mek_top; + +import mcjty.lib.api.power.IBigPower; +import mekanism.api.energy.IStrictEnergyStorage; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; + +@Mixin(IStrictEnergyStorage.class) +public interface MixinIStrictEnergyStorage extends IBigPower { + + @Shadow(remap = false) double getEnergy(); + + @Shadow(remap = false) double getMaxEnergy(); + + @Unique + @Override + default long getStoredPower() { + double converted = getEnergy() / 2.5D; + if (converted >= Long.MAX_VALUE) { + return Long.MAX_VALUE; + } + return Math.round(converted); + } + + @Unique + @Override + default long getCapacity() { + double converted = getMaxEnergy() / 2.5D; + if (converted >= Long.MAX_VALUE) { + return Long.MAX_VALUE; + } + return Math.round(converted); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mekanism/MixinPipeUtils.java b/src/main/java/github/kasuminova/stellarcore/mixin/mekanism/MixinPipeUtils.java new file mode 100644 index 0000000..f009244 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mekanism/MixinPipeUtils.java @@ -0,0 +1,48 @@ +package github.kasuminova.stellarcore.mixin.mekanism; + +import mekanism.common.base.target.FluidHandlerTarget; +import mekanism.common.util.CapabilityUtils; +import mekanism.common.util.EmitUtils; +import mekanism.common.util.PipeUtils; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import java.util.Collections; +import java.util.Set; + +@Mixin(PipeUtils.class) +public class MixinPipeUtils { + + /** + * @author Kasumi_Nova + * @reason 没有 HashSet 就没有伤害。 + */ + @Overwrite(remap = false) + public static int emit(Set sides, FluidStack stack, TileEntity from) { + if (stack == null || stack.amount == 0) { + return 0; + } + + FluidHandlerTarget target = new FluidHandlerTarget(stack); + EmitUtils.forEachSide(from.getWorld(), from.getPos(), sides, (acceptor, side) -> { + EnumFacing accessSide = side.getOpposite(); + CapabilityUtils.runIfCap(acceptor, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, accessSide, (handler) -> { + if (PipeUtils.canFill(handler, stack)) { + target.addHandler(accessSide, handler); + } + }); + }); + + int curHandlers = target.getHandlers().size(); + if (curHandlers == 0) { + return 0; + } + + return EmitUtils.sendToAcceptors(Collections.singleton(target), curHandlers, stack.amount, stack); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEnchantmentManager.java b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEnchantmentManager.java new file mode 100644 index 0000000..f463c42 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEnchantmentManager.java @@ -0,0 +1,22 @@ +package github.kasuminova.stellarcore.mixin.mets; + +import net.lrsoft.mets.manager.EnchantmentManager; +import net.minecraft.enchantment.Enchantment; +import net.minecraftforge.event.RegistryEvent; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +/** + * 移除节能附魔，实际作用接近无。 + */ +@Mixin(EnchantmentManager.class) +public class MixinEnchantmentManager { + + @Inject(method = "onEnchantmentInit", at = @At("HEAD"), cancellable = true, remap = false) + private static void removeEnchantment(final RegistryEvent.Register event, final CallbackInfo ci) { + ci.cancel(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEntityTachyonBullet.java b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEntityTachyonBullet.java new file mode 100644 index 0000000..4e717c0 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEntityTachyonBullet.java @@ -0,0 +1,35 @@ +package github.kasuminova.stellarcore.mixin.mets; + +import github.kasuminova.stellarcore.mixin.util.EntityLivingBaseValues; +import net.lrsoft.mets.entity.EntityTachyonBullet; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.util.math.MathHelper; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(EntityTachyonBullet.class) +public class MixinEntityTachyonBullet { + + /** + * 杀杀杀杀杀 + */ + @Redirect( + method = "onUpdate", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/entity/EntityLivingBase;setHealth(F)V" + ) + ) + private void redirectSetHealth(final EntityLivingBase instance, final float health) { + DataParameter healthType = EntityLivingBaseValues.HEALTH; + if (healthType != null) { + instance.getDataManager().set(healthType, MathHelper.clamp(health, 0, instance.getMaxHealth())); + return; + } + instance.setHealth(health); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinFirstAidLifeSupport.java b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinFirstAidLifeSupport.java new file mode 100644 index 0000000..591843a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinFirstAidLifeSupport.java @@ -0,0 +1,27 @@ +package github.kasuminova.stellarcore.mixin.mets; + +import net.lrsoft.mets.item.ElectricFirstAidLifeSupport; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(ElectricFirstAidLifeSupport.class) +public class MixinFirstAidLifeSupport { + + /** + * 电力生命维护仪。 + * （急救失败！） + */ + @Inject(method = "onUpdate", at = @At("HEAD"), cancellable = true) + private void injectOnWorkTick(final ItemStack stack, final World worldIn, final Entity entity, final int itemSlot, final boolean isSelected, final CallbackInfo ci) { + if (entity == null || !entity.isEntityAlive()) { + ci.cancel(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinForceFieldGenerator.java b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinForceFieldGenerator.java new file mode 100644 index 0000000..e57bb22 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinForceFieldGenerator.java @@ -0,0 +1,27 @@ +package github.kasuminova.stellarcore.mixin.mets; + +import net.lrsoft.mets.item.ElectricForceFieldGenerator; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(ElectricForceFieldGenerator.class) +public class MixinForceFieldGenerator { + + /** + * 电力伤害吸收仪 + * （虽然死灵护盾挺合理的，但是还是有点不太对劲...） + */ + @Inject(method = "onUpdate", at = @At("HEAD"), cancellable = true) + private void injectOnWorkTick(final ItemStack stack, final World worldIn, final Entity entity, final int itemSlot, final boolean isSelected, final CallbackInfo ci) { + if (entity == null || !entity.isEntityAlive()) { + ci.cancel(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinLifeSupportRing.java b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinLifeSupportRing.java new file mode 100644 index 0000000..3a4e126 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinLifeSupportRing.java @@ -0,0 +1,26 @@ +package github.kasuminova.stellarcore.mixin.mets; + +import net.lrsoft.mets.item.bauble.ElectricLifeSupportRing; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(ElectricLifeSupportRing.class) +public class MixinLifeSupportRing { + + /** + * 终极维生指环 + * （神已经跌落神坛了。） + */ + @Inject(method = "onWornTick", at = @At("HEAD"), cancellable = true, remap = false) + private void injectOnWorkTick(final ItemStack itemstack, final EntityLivingBase entity, final CallbackInfo ci) { + if (entity == null || !entity.isEntityAlive()) { + ci.cancel(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinNutritionSupply.java b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinNutritionSupply.java new file mode 100644 index 0000000..6277af5 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinNutritionSupply.java @@ -0,0 +1,27 @@ +package github.kasuminova.stellarcore.mixin.mets; + +import net.lrsoft.mets.item.ElectricNutritionSupply; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(ElectricNutritionSupply.class) +public class MixinNutritionSupply { + + /** + * 电力营养供应器 + * （死因是撑死。） + */ + @Inject(method = "onUpdate", at = @At("HEAD"), cancellable = true) + private void injectOnWorkTick(final ItemStack stack, final World worldIn, final Entity entity, final int itemSlot, final boolean isSelected, final CallbackInfo ci) { + if (entity == null || !entity.isEntityAlive()) { + ci.cancel(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinChunk.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinChunk.java new file mode 100644 index 0000000..10ae0cc --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinChunk.java @@ -0,0 +1,26 @@ +package github.kasuminova.stellarcore.mixin.minecraft; + +import github.kasuminova.stellarcore.common.util.BlockPos2ValueMap; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.chunk.Chunk; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Map; + +@Mixin(value = Chunk.class, priority = 1001) +public class MixinChunk { + + @Shadow @Final @Mutable private Map tileEntities; + + @Redirect(method = "(Lnet/minecraft/world/World;II)V", at = @At(value = "FIELD", target = "Lnet/minecraft/world/chunk/Chunk;tileEntities:Ljava/util/Map;")) + private void redirectNewHashMap(final Chunk instance, final Map value) { + this.tileEntities = new BlockPos2ValueMap<>(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinFontRenderer.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinFontRenderer.java new file mode 100644 index 0000000..e0e8819 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinFontRenderer.java @@ -0,0 +1,48 @@ +package github.kasuminova.stellarcore.mixin.minecraft; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.settings.GameSettings; +import net.minecraft.util.ResourceLocation; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.awt.*; + +@Mixin(FontRenderer.class) +public class MixinFontRenderer { + + @Shadow @Final private int[] colorCode; + + @Inject(method = "", at = @At("TAIL")) + private void onInit(final GameSettings gameSettingsIn, final ResourceLocation location, final TextureManager textureManagerIn, final boolean unicode, final CallbackInfo ci) { + // 修改字体颜色喵 + colorCode[0] = 0x000000; + colorCode[1] = 0x1e90ff; + colorCode[2] = 0x00c853; + colorCode[3] = 0x4db6ac; + colorCode[4] = 0xd32f2f; + colorCode[5] = 0xe040fb; + colorCode[6] = 0xffa726; + colorCode[7] = 0xbdbdbd; + colorCode[8] = 0x546e7a; + colorCode[9] = 0x03a9f4; + colorCode[10] = 0x69f0ae; + colorCode[11] = 0x18ffff; + colorCode[12] = 0xff5e62; + colorCode[13] = 0xff80ab; + colorCode[14] = 0xffeb3b; + colorCode[15] = 0xffffff; + + for (int i = 0; i < 16; i++) { + Color color = new Color(colorCode[i]); + Color backgroundColor = new Color(color.getRed() / 4, color.getGreen() / 4, color.getBlue() / 4); + colorCode[i + 16] = backgroundColor.getRGB(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyCompressionDecoder.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyCompressionDecoder.java new file mode 100644 index 0000000..89fafde --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyCompressionDecoder.java @@ -0,0 +1,42 @@ +package github.kasuminova.stellarcore.mixin.minecraft; + +import github.kasuminova.stellarcore.client.profiler.PacketProfiler; +import io.netty.buffer.ByteBuf; +import net.minecraft.network.NettyCompressionDecoder; +import net.minecraft.network.PacketBuffer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(NettyCompressionDecoder.class) +public class MixinNettyCompressionDecoder { + + @Redirect(method = "decode", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/network/PacketBuffer;readBytes(I)Lio/netty/buffer/ByteBuf;") + ) + private ByteBuf onDecodeLen(final PacketBuffer packetBuffer, final int len) { + final int prevIndex = packetBuffer.readerIndex(); + + ByteBuf decoded = packetBuffer.readBytes(len); + + PacketProfiler.onPacketDecoded(packetBuffer.readerIndex() - prevIndex); + return decoded; + } + + @Redirect(method = "decode", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/network/PacketBuffer;readBytes([B)Lio/netty/buffer/ByteBuf;") + ) + private ByteBuf onDecodeByteArray(final PacketBuffer packetBuffer, final byte[] data) { + final int prevIndex = packetBuffer.readerIndex(); + + ByteBuf decoded = packetBuffer.readBytes(data); + + PacketProfiler.onPacketDecoded(packetBuffer.readerIndex() - prevIndex); + return decoded; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyPacketDecoder.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyPacketDecoder.java new file mode 100644 index 0000000..ef2daf1 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyPacketDecoder.java @@ -0,0 +1,28 @@ +package github.kasuminova.stellarcore.mixin.minecraft; + +import github.kasuminova.stellarcore.client.profiler.PacketProfiler; +import net.minecraft.network.NettyPacketDecoder; +import net.minecraft.network.Packet; +import net.minecraft.network.PacketBuffer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(NettyPacketDecoder.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinNettyPacketDecoder { + + @Redirect(method = "decode", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/network/Packet;readPacketData(Lnet/minecraft/network/PacketBuffer;)V") + ) + private void onDecode(final Packet packet, final PacketBuffer packetBuffer) throws Exception { + final int prevIndex = packetBuffer.readerIndex(); + + packet.readPacketData(packetBuffer); + + PacketProfiler.onPacketReceived(packet, packetBuffer.readerIndex() - prevIndex); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinTessellator.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinTessellator.java new file mode 100644 index 0000000..db2a3cc --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinTessellator.java @@ -0,0 +1,43 @@ +package github.kasuminova.stellarcore.mixin.minecraft; + +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.vertex.VertexFormat; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import javax.annotation.Nonnull; + +@Mixin(Tessellator.class) +public class MixinTessellator { + + @Redirect(method = "", at = @At(value = "NEW", target = "(I)Lnet/minecraft/client/renderer/BufferBuilder;")) + private BufferBuilder redirectNewBuffer(final int bufferSizeIn) { + return new BufferBuilder(bufferSizeIn) { + + Thread thread = null; + + @Override + public void begin(final int glMode, @Nonnull final VertexFormat format) { + if (thread != null && thread != Thread.currentThread()) { + thread = null; + throw new IllegalStateException("Using Tessellator buffer in another thread."); + } + thread = Thread.currentThread(); + super.begin(glMode, format); + } + + @Override + public void finishDrawing() { + if (thread != null && thread != Thread.currentThread()) { + thread = null; + throw new IllegalStateException("Using Tessellator buffer in another thread."); + } + thread = null; + super.finishDrawing(); + } + }; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinWorld.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinWorld.java new file mode 100644 index 0000000..895991a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinWorld.java @@ -0,0 +1,41 @@ +package github.kasuminova.stellarcore.mixin.minecraft; + +import github.kasuminova.stellarcore.mixin.util.BlockSnapShotProvider; +import net.minecraft.world.World; +import net.minecraftforge.common.util.BlockSnapshot; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.ArrayList; +import java.util.LinkedList; + +@Mixin(World.class) +public class MixinWorld implements BlockSnapShotProvider { + + @Unique public LinkedList stellarcore$capturedBlockSnapshots = new LinkedList<>(); + + @SuppressWarnings("rawtypes") + @Redirect(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;I)Z", + at = @At(value = "INVOKE", target = "Ljava/util/ArrayList;add(Ljava/lang/Object;)Z") + ) + public boolean onSetBlockStateAddSnapshot(final ArrayList instance, final Object e) { + return stellarcore$capturedBlockSnapshots.add((BlockSnapshot) e); + } + + @SuppressWarnings("rawtypes") + @Redirect(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;I)Z", + at = @At(value = "INVOKE", target = "Ljava/util/ArrayList;remove(Ljava/lang/Object;)Z") + ) + public boolean onSetBlockStateRemoveSnapshot(final ArrayList instance, final Object e) { + return stellarcore$capturedBlockSnapshots.remove((BlockSnapshot) e); + } + + @Override + @SuppressWarnings("AddedMixinMembersNamePattern") + public LinkedList getCapturedBlockSnapshots() { + return stellarcore$capturedBlockSnapshots; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinForgeHooks.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinForgeHooks.java new file mode 100644 index 0000000..0bba771 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinForgeHooks.java @@ -0,0 +1,134 @@ +package github.kasuminova.stellarcore.mixin.minecraft.forge; + +import com.google.common.collect.Lists; +import github.kasuminova.stellarcore.mixin.util.BlockSnapShotProvider; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBucket; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.stats.StatList; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.util.BlockSnapshot; +import net.minecraftforge.event.ForgeEventFactory; +import net.minecraftforge.event.world.BlockEvent; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import javax.annotation.Nonnull; +import java.util.List; + +@Mixin(ForgeHooks.class) +public class MixinForgeHooks { + + /** + * @author Kasumi_Nova + * @reason 重写获取的 capturedBlockSnapshots 捏，有一定危险性。 + */ + @Overwrite(remap = false) + @SuppressWarnings("unchecked") + public static EnumActionResult onPlaceItemIntoWorld(@Nonnull ItemStack itemstack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull EnumHand hand) { + // handle all placement events here + int meta = itemstack.getItemDamage(); + int size = itemstack.getCount(); + NBTTagCompound nbt = null; + if (itemstack.getTagCompound() != null) + { + nbt = itemstack.getTagCompound().copy(); + } + + if (!(itemstack.getItem() instanceof ItemBucket)) // if not bucket + { + world.captureBlockSnapshots = true; + } + + EnumActionResult ret = itemstack.getItem().onItemUse(player, world, pos, hand, side, hitX, hitY, hitZ); + world.captureBlockSnapshots = false; + + if (ret == EnumActionResult.SUCCESS) + { + // save new item data + int newMeta = itemstack.getItemDamage(); + int newSize = itemstack.getCount(); + NBTTagCompound newNBT = null; + if (itemstack.getTagCompound() != null) + { + newNBT = itemstack.getTagCompound().copy(); + } + BlockEvent.PlaceEvent placeEvent = null; + List blockSnapshots; + if (world instanceof BlockSnapShotProvider snapShotProvider) { + blockSnapshots = (List) snapShotProvider.getCapturedBlockSnapshots().clone(); + snapShotProvider.getCapturedBlockSnapshots().clear(); + } else { + blockSnapshots = (List) world.capturedBlockSnapshots.clone(); + world.capturedBlockSnapshots.clear(); + } + + // make sure to set pre-placement item data for event + itemstack.setItemDamage(meta); + itemstack.setCount(size); + if (nbt != null) + { + itemstack.setTagCompound(nbt); + } + if (blockSnapshots.size() > 1) + { + placeEvent = ForgeEventFactory.onPlayerMultiBlockPlace(player, blockSnapshots, side, hand); + } + else if (blockSnapshots.size() == 1) + { + placeEvent = ForgeEventFactory.onPlayerBlockPlace(player, blockSnapshots.get(0), side, hand); + } + + if (placeEvent != null && placeEvent.isCanceled()) + { + ret = EnumActionResult.FAIL; // cancel placement + // revert back all captured blocks + for (BlockSnapshot blocksnapshot : Lists.reverse(blockSnapshots)) + { + world.restoringBlockSnapshots = true; + blocksnapshot.restore(true, false); + world.restoringBlockSnapshots = false; + } + } + else + { + // Change the stack to its new content + itemstack.setItemDamage(newMeta); + itemstack.setCount(newSize); + if (nbt != null) + { + itemstack.setTagCompound(newNBT); + } + + for (BlockSnapshot snap : blockSnapshots) + { + int updateFlag = snap.getFlag(); + IBlockState oldBlock = snap.getReplacedBlock(); + IBlockState newBlock = world.getBlockState(snap.getPos()); + if (!newBlock.getBlock().hasTileEntity(newBlock)) // Containers get placed automatically + { + newBlock.getBlock().onBlockAdded(world, snap.getPos(), newBlock); + } + + world.markAndNotifyBlock(snap.getPos(), null, oldBlock, newBlock, updateFlag); + } + player.addStat(StatList.getObjectUseStats(itemstack.getItem())); + } + } + if (world instanceof BlockSnapShotProvider snapShotProvider) { + snapShotProvider.getCapturedBlockSnapshots().clear(); + } else { + world.capturedBlockSnapshots.clear(); + } + + return ret; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSimpleIndexedCodec.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSimpleIndexedCodec.java new file mode 100644 index 0000000..4674385 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSimpleIndexedCodec.java @@ -0,0 +1,29 @@ +package github.kasuminova.stellarcore.mixin.minecraft.forge; + +import github.kasuminova.stellarcore.client.profiler.PacketProfiler; +import io.netty.buffer.ByteBuf; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.SimpleIndexedCodec; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(SimpleIndexedCodec.class) +public class MixinSimpleIndexedCodec { + + @Redirect(method = "decodeInto(Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Lnet/minecraftforge/fml/common/network/simpleimpl/IMessage;)V", + at = @At( + value = "INVOKE", + target = "Lnet/minecraftforge/fml/common/network/simpleimpl/IMessage;fromBytes(Lio/netty/buffer/ByteBuf;)V", + remap = false), + remap = false + ) + private void onDecodePre(final IMessage message, final ByteBuf byteBuf) { + final int prevIndex = byteBuf.readerIndex(); + + message.fromBytes(byteBuf); + + PacketProfiler.onPacketReceived(message, byteBuf.readerIndex() - prevIndex); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSplashProgress.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSplashProgress.java new file mode 100644 index 0000000..502836a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSplashProgress.java @@ -0,0 +1,22 @@ +package github.kasuminova.stellarcore.mixin.minecraft.forge; + +import github.kasuminova.stellarcore.mixin.util.CustomLoadingScreenUtils; +import net.minecraftforge.fml.client.SplashProgress; +import net.minecraftforge.fml.common.Loader; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + + +@Mixin(SplashProgress.class) +public class MixinSplashProgress { + + @Inject(method = "finish", at = @At("TAIL"), remap = false) + private static void injectFinish(final CallbackInfo ci) { + if (Loader.isModLoaded("customloadingscreen")) { + CustomLoadingScreenUtils.cleanCLSTextures(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/nco/MixinRadiationCapabilityHandler.java b/src/main/java/github/kasuminova/stellarcore/mixin/nco/MixinRadiationCapabilityHandler.java new file mode 100644 index 0000000..403f21c --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/nco/MixinRadiationCapabilityHandler.java @@ -0,0 +1,34 @@ +package github.kasuminova.stellarcore.mixin.nco; + +import nc.capability.radiation.RadiationCapabilityHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +/** + * 禁用 Nuclearcraft Overhauled 的辐射能力系统。 + */ +@SuppressWarnings("MethodMayBeStatic") +@Mixin(RadiationCapabilityHandler.class) +public class MixinRadiationCapabilityHandler { + @Inject(method = "attachEntityRadiationCapability", at = @At("HEAD"), cancellable = true, remap = false) + public void onAttachEntityRadiationCapability(CallbackInfo ci) { + ci.cancel(); + } + + @Inject(method = "attachChunkRadiationCapability", at = @At("HEAD"), cancellable = true, remap = false) + public void onAttachChunkRadiationCapability(CallbackInfo ci) { + ci.cancel(); + } + + @Inject(method = "attachTileRadiationCapability", at = @At("HEAD"), cancellable = true, remap = false) + public void onAttachTileRadiationCapability(CallbackInfo ci) { + ci.cancel(); + } + + @Inject(method = "attachStackRadiationCapability", at = @At("HEAD"), cancellable = true, remap = false) + public void onAttachStackRadiationCapability(CallbackInfo ci) { + ci.cancel(); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/oreexcavation/MixinMiningAgent.java b/src/main/java/github/kasuminova/stellarcore/mixin/oreexcavation/MixinMiningAgent.java new file mode 100644 index 0000000..725d6a0 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/oreexcavation/MixinMiningAgent.java @@ -0,0 +1,63 @@ +package github.kasuminova.stellarcore.mixin.oreexcavation; + +import github.kasuminova.stellarcore.mixin.util.BlockSnapShotProvider; +import net.minecraft.entity.player.EntityPlayerMP; +import oreexcavation.handlers.MiningAgent; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.ArrayList; + +@Mixin(MiningAgent.class) +public class MixinMiningAgent { + + @Shadow(remap = false) @Final public EntityPlayerMP player; + + @SuppressWarnings("rawtypes") + @Redirect(method = "tickMiner", + at = @At( + value = "INVOKE", + target = "Ljava/util/ArrayList;remove(I)Ljava/lang/Object;", + remap = false), + remap = false) + private Object onTickMinerRemoveSnapshots(final ArrayList instance, final int i) { + return ((BlockSnapShotProvider) player.world).getCapturedBlockSnapshots().remove(i); + } + + @SuppressWarnings("rawtypes") + @Redirect(method = "tickMiner", + at = @At( + value = "INVOKE", + target = "Ljava/util/ArrayList;size()I", + remap = false), + remap = false) + private int onTickMinerGetSnapshotsSize(final ArrayList instance) { + return ((BlockSnapShotProvider) player.world).getCapturedBlockSnapshots().size(); + } + + @SuppressWarnings("rawtypes") + @Redirect(method = "tickMiner", + at = @At( + value = "INVOKE", + target = "Ljava/util/ArrayList;get(I)Ljava/lang/Object;", + remap = false), + remap = false) + private Object onTickMinerGetSnapshot(final ArrayList instance, final int i) { + return ((BlockSnapShotProvider) player.world).getCapturedBlockSnapshots().get(i); + } + + @SuppressWarnings("rawtypes") + @Redirect(method = "tickMiner", + at = @At( + value = "INVOKE", + target = "Ljava/util/ArrayList;clear()V", + remap = false), + remap = false) + private void onTickMinerClearSnapshots(final ArrayList instance) { + ((BlockSnapShotProvider) player.world).getCapturedBlockSnapshots().clear(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBChat.java b/src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBChat.java new file mode 100644 index 0000000..dbef35c --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBChat.java @@ -0,0 +1,21 @@ +package github.kasuminova.stellarcore.mixin.rgbchat; + +import com.fred.jianghun.Main; +import github.kasuminova.stellarcore.client.gui.font.CachedRGBFontRenderer; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(Main.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinRGBChat { + + @Inject(method = "postInit", at = @At("HEAD"), cancellable = true, remap = false) + public void onPostInit(final FMLPostInitializationEvent event, final CallbackInfo ci) { + CachedRGBFontRenderer.overrideFontRenderer(); + ci.cancel(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBSettings.java b/src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBSettings.java new file mode 100644 index 0000000..f0388bd --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBSettings.java @@ -0,0 +1,16 @@ +package github.kasuminova.stellarcore.mixin.rgbchat; + +import com.fred.jianghun.truergb.IColor; +import com.fred.jianghun.truergb.RGBSettings; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import java.util.List; + +@Mixin(RGBSettings.class) +public interface MixinRGBSettings { + + @Accessor(remap = false) + List getColors(); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/scalingguis/MixinJsonHelper.java b/src/main/java/github/kasuminova/stellarcore/mixin/scalingguis/MixinJsonHelper.java new file mode 100644 index 0000000..4d5f32e --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/scalingguis/MixinJsonHelper.java @@ -0,0 +1,47 @@ +package github.kasuminova.stellarcore.mixin.scalingguis; + +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import spazley.scalingguis.ScalingGUIs; +import spazley.scalingguis.config.JsonHelper; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +@Mixin(JsonHelper.class) +public class MixinJsonHelper { + + @Shadow(remap = false) private static Gson GSON; + + /** + * @author Kasumi_Nova + * @reason 在迭代器里面用 {@link List#remove(Object)} 是不行的捏。 + */ + @Overwrite(remap = false) + @SuppressWarnings("unchecked") + public static List getKeyList(JsonObject jsonObjectIn) { + Map map = (Map) GSON.fromJson(jsonObjectIn, LinkedHashMap.class); + List keyList = new ArrayList<>(map.keySet()); + keyList.removeIf(s -> !isClassExists(s)); + return keyList; + } + + @Unique + @SuppressWarnings("AddedMixinMembersNamePattern") + private static boolean isClassExists(final String className) { + try { + Class.forName(className); + return true; + } catch (Exception var6) { + ScalingGUIs.logger.error("Unknown class '" + className + "'. Removing from check list. Will be left in json assets.scalingguis.file.", var6); + return false; + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinAmmoSumRecipe.java b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinAmmoSumRecipe.java new file mode 100644 index 0000000..91bbc0f --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinAmmoSumRecipe.java @@ -0,0 +1,64 @@ +package github.kasuminova.stellarcore.mixin.techguns; + +import com.google.gson.JsonObject; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.JsonUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.common.crafting.JsonContext; +import net.minecraftforge.oredict.ShapedOreRecipe; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; +import techguns.items.guns.GenericGun; +import techguns.recipes.AmmoSumRecipeFactory; + +import javax.annotation.Nonnull; + +@Mixin(AmmoSumRecipeFactory.class) +public class MixinAmmoSumRecipe { + + @Shadow(remap = false) @Final protected static ResourceLocation GROUP; + + /** + * @author Kasumi_Nova + * @reason getCraftingResult mixin 不掉，那就只能 extend 一个了捏。 + */ + @Overwrite(remap = false) + public IRecipe parse(JsonContext context, JsonObject json) { + ShapedOreRecipe rec = ShapedOreRecipe.factory(context, json); + CraftingHelper.ShapedPrimer primer = new CraftingHelper.ShapedPrimer(); + primer.height = rec.getRecipeHeight(); + primer.width = rec.getRecipeWidth(); + primer.mirrored = JsonUtils.getBoolean(json, "mirrored", true); + primer.input = rec.getIngredients(); + + return new ShapedOreRecipe(GROUP, rec.getRecipeOutput(), primer) { + @Nonnull + @Override + public ItemStack getCraftingResult(@Nonnull final InventoryCrafting inv) { + int ammoSum = 0; + + for (int i = 0; i < inv.getSizeInventory(); ++i) { + if (!inv.getStackInSlot(i).isEmpty() && inv.getStackInSlot(i).getItem() instanceof final GenericGun g) { + ammoSum += g.getCurrentAmmo(inv.getStackInSlot(i)); + } + } + + ItemStack out = super.getCraftingResult(inv); + NBTTagCompound tags = out.getTagCompound(); + if (tags == null) { + tags = new NBTTagCompound(); + out.setTagCompound(tags); + } + tags.setShort("ammo", (short) ammoSum); + return out; + } + }; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGDamageSource.java b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGDamageSource.java new file mode 100644 index 0000000..a21424a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGDamageSource.java @@ -0,0 +1,17 @@ +package github.kasuminova.stellarcore.mixin.techguns; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import techguns.damagesystem.TGDamageSource; + +@Mixin(TGDamageSource.class) +public class MixinTGDamageSource { + + @Inject(method = "setBehaviourForVanilla", at = @At("HEAD"), remap = false) + private void onSetBehaviourForVanilla(final CallbackInfo ci) { + ((TGDamageSource) ((Object) this)).setProjectile(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGExtendedPlayer.java b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGExtendedPlayer.java new file mode 100644 index 0000000..5547bc7 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGExtendedPlayer.java @@ -0,0 +1,21 @@ +package github.kasuminova.stellarcore.mixin.techguns; + +import net.minecraft.entity.player.EntityPlayer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import techguns.capabilities.TGExtendedPlayer; + +@Mixin(TGExtendedPlayer.class) +public class MixinTGExtendedPlayer { + + @Shadow(remap = false) public boolean enableSafemode; + + @Inject(method = "", at = @At("TAIL"), remap = false) + private void onInit(final EntityPlayer entity, final CallbackInfo ci) { + enableSafemode = true; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGPermissions.java b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGPermissions.java new file mode 100644 index 0000000..0839604 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGPermissions.java @@ -0,0 +1,18 @@ +package github.kasuminova.stellarcore.mixin.techguns; + +import net.minecraft.entity.player.EntityPlayer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import techguns.TGPermissions; + +@Mixin(TGPermissions.class) +public class MixinTGPermissions { + + @Inject(method = "isPlayerOp", at = @At("HEAD"), cancellable = true, remap = false) + private static void onIsPlayerOp(final EntityPlayer player, final CallbackInfoReturnable cir) { + cir.setReturnValue(player.canUseCommand(4, "")); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/theoneprobe/MixinRenderHelper.java b/src/main/java/github/kasuminova/stellarcore/mixin/theoneprobe/MixinRenderHelper.java new file mode 100644 index 0000000..3aa6b76 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/theoneprobe/MixinRenderHelper.java @@ -0,0 +1,64 @@ +package github.kasuminova.stellarcore.mixin.theoneprobe; + +import mcjty.theoneprobe.TheOneProbe; +import mcjty.theoneprobe.rendering.RenderHelper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +@Mixin(RenderHelper.class) +public class MixinRenderHelper { + + /** + * @author Kasumi_Nova + * @reason 防止渲染实体后头部乱动。 + */ + @Overwrite(remap = false) + public static void renderEntity(final Entity entity, final int xPos, final int yPos, final float scale) { + if (!(entity instanceof EntityPlayer)) { + return; + } + + GlStateManager.pushMatrix(); + GlStateManager.color(1.0F, 1.0F, 1.0F); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableColorMaterial(); + GlStateManager.pushMatrix(); + GlStateManager.translate((float)(xPos + 8), (float)(yPos + 24), 50.0F); + GlStateManager.scale(-scale, scale, scale); + GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(135.0F, 0.0F, 1.0F, 0.0F); + net.minecraft.client.renderer.RenderHelper.enableStandardItemLighting(); + GlStateManager.rotate(-135.0F, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(RenderHelper.rot, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(0.0F, 1.0F, 0.0F, 0.0F); + GlStateManager.translate(0.0F, (float) entity.getYOffset(), 0.0F); + Minecraft.getMinecraft().getRenderManager().playerViewY = 180.0F; + float prevPitch = entity.rotationPitch; + entity.rotationPitch = 0.0F; + + try { + Minecraft.getMinecraft().getRenderManager().renderEntity(entity, 0.0, 0.0, 0.0, 0.0F, 1.0F, false); + } catch (Exception var5) { + TheOneProbe.logger.error("Error rendering entity!", var5); + } + + entity.rotationPitch = prevPitch; + GlStateManager.popMatrix(); + net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); + GlStateManager.disableRescaleNormal(); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.disableLighting(); + GlStateManager.popMatrix(); + GlStateManager.enableDepth(); + GlStateManager.disableColorMaterial(); + GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GlStateManager.disableTexture2D(); + GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/thermaldynamics/MixinDuctUnitFluidSuper.java b/src/main/java/github/kasuminova/stellarcore/mixin/thermaldynamics/MixinDuctUnitFluidSuper.java new file mode 100644 index 0000000..16c557e --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/thermaldynamics/MixinDuctUnitFluidSuper.java @@ -0,0 +1,52 @@ +package github.kasuminova.stellarcore.mixin.thermaldynamics; + +import cofh.thermaldynamics.duct.fluid.DuctUnitFluidSuper; +import com.llamalad7.mixinextras.injector.ModifyReturnValue; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; +import net.minecraftforge.fluids.capability.templates.EmptyFluidHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +import javax.annotation.Nullable; + +@Mixin(DuctUnitFluidSuper.class) +public class MixinDuctUnitFluidSuper { + + @ModifyReturnValue(method = "getFluidCapability", at = @At("RETURN"), remap = false) + private IFluidHandler modifyFluidCapability(final IFluidHandler handler, final EnumFacing from) { + if (handler == EmptyFluidHandler.INSTANCE) { + return handler; + } + + DuctUnitFluidSuper duct = (DuctUnitFluidSuper) (Object) this; + //noinspection AnonymousInnerClassMayBeStatic + return new IFluidHandler() { + @Override + public IFluidTankProperties[] getTankProperties() { + return handler.getTankProperties(); + } + + @Override + public int fill(final FluidStack resource, final boolean doFill) { + return handler.fill(resource, doFill); + } + + @Nullable + @Override + public FluidStack drain(final FluidStack resource, final boolean doDrain) { + //noinspection DataFlowIssue + return duct.isOpen(from) ? duct.getGrid().myTank.drain(resource, doDrain) : null; + } + + @Nullable + @Override + public FluidStack drain(final int maxDrain, final boolean doDrain) { + return handler.drain(maxDrain, doDrain); + } + }; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/util/BlockSnapShotProvider.java b/src/main/java/github/kasuminova/stellarcore/mixin/util/BlockSnapShotProvider.java new file mode 100644 index 0000000..d94240a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/util/BlockSnapShotProvider.java @@ -0,0 +1,11 @@ +package github.kasuminova.stellarcore.mixin.util; + +import net.minecraftforge.common.util.BlockSnapshot; + +import java.util.LinkedList; + +public interface BlockSnapShotProvider { + + LinkedList getCapturedBlockSnapshots(); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/util/CachedItemConduit.java b/src/main/java/github/kasuminova/stellarcore/mixin/util/CachedItemConduit.java new file mode 100644 index 0000000..a07a14d --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/util/CachedItemConduit.java @@ -0,0 +1,11 @@ +package github.kasuminova.stellarcore.mixin.util; + +import net.minecraft.item.ItemStack; + +public interface CachedItemConduit { + + ItemStack getCachedStack(); + + void setCachedStack(final ItemStack cachedStack); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/util/CustomLoadingScreenUtils.java b/src/main/java/github/kasuminova/stellarcore/mixin/util/CustomLoadingScreenUtils.java new file mode 100644 index 0000000..dc1065f --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/util/CustomLoadingScreenUtils.java @@ -0,0 +1,19 @@ +package github.kasuminova.stellarcore.mixin.util; + +import alexiil.mc.mod.load.ClsManager; +import alexiil.mc.mod.load.render.MinecraftDisplayerRenderer; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.common.Optional; + +public class CustomLoadingScreenUtils { + + @Optional.Method(modid = "customloadingscreen") + public static void cleanCLSTextures() { + try { + MinecraftDisplayerRenderer instance = ObfuscationReflectionHelper.getPrivateValue(ClsManager.class, null, "instance"); + ObfuscationReflectionHelper.setPrivateValue(MinecraftDisplayerRenderer.class, instance, null, "renderingParts"); + } catch (Exception ignored) { + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/util/EntityLivingBaseValues.java b/src/main/java/github/kasuminova/stellarcore/mixin/util/EntityLivingBaseValues.java new file mode 100644 index 0000000..5122bcb --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/util/EntityLivingBaseValues.java @@ -0,0 +1,25 @@ +package github.kasuminova.stellarcore.mixin.util; + +import github.kasuminova.stellarcore.StellarCore; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.network.datasync.DataParameter; + +import java.lang.reflect.Field; + +public class EntityLivingBaseValues { + + public static final DataParameter HEALTH; + + static { + DataParameter health = null; + try { + Field filedHealth = EntityLivingBase.class.getDeclaredField("HEALTH"); + filedHealth.setAccessible(true); + health = (DataParameter) filedHealth.get(null); + } catch (Exception e) { + StellarCore.log.warn("Cannot get field EntityLivingBase.HEALTH!", e); + } + HEALTH = health; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/util/IMixinInGameInfoCore.java b/src/main/java/github/kasuminova/stellarcore/mixin/util/IMixinInGameInfoCore.java new file mode 100644 index 0000000..64c2907 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/util/IMixinInGameInfoCore.java @@ -0,0 +1,9 @@ +package github.kasuminova.stellarcore.mixin.util; + +public interface IMixinInGameInfoCore { + + void addPostDrawAction(Runnable action); + + boolean isPostDrawing(); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/util/ITaskExecutor.java b/src/main/java/github/kasuminova/stellarcore/mixin/util/ITaskExecutor.java new file mode 100644 index 0000000..b8e5624 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/util/ITaskExecutor.java @@ -0,0 +1,9 @@ +package github.kasuminova.stellarcore.mixin.util; + +import net.minecraft.tileentity.TileEntity; + +public interface ITaskExecutor { + + void addTEMarkTask(final TileEntity te); + +} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info new file mode 100644 index 0000000..aeddf58 --- /dev/null +++ b/src/main/resources/mcmod.info @@ -0,0 +1,23 @@ +{ + "modListVersion": 2, + "modList": [ + { + "modid": "stellar_core", + "name": "Stellar Core", + "description": "Stellar Core，An optimization mod.\n星核，一个普通的优化模组。", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "https://github.com/NovaEngineering-Source/StellarCore", + "updateUrl": "", + "authorList": [ + "Kasumi_Nova" + ], + "credits": "", + "logoFile": "", + "screenshots": [], + "dependencies": [], + "requiredMods": [], + "useDependencyInformation": true + } + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_ae.json b/src/main/resources/mixins.stellar_core_ae.json new file mode 100644 index 0000000..985cc8c --- /dev/null +++ b/src/main/resources/mixins.stellar_core_ae.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.appeng", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinStackSizeRenderer" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_armourers_workshop.json b/src/main/resources/mixins.stellar_core_armourers_workshop.json new file mode 100644 index 0000000..15f004e --- /dev/null +++ b/src/main/resources/mixins.stellar_core_armourers_workshop.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.armourersworkshop", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinSkinTexture" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_astralsorcery.json b/src/main/resources/mixins.stellar_core_astralsorcery.json new file mode 100644 index 0000000..5820c52 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_astralsorcery.json @@ -0,0 +1,14 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.astralsorcery", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "AccessorResearchManager", + "InvokerPerkEffectHelper", + "MixinKeyChainMining", + "MixinPlayerAttributeMap", + "MixinPlayerProgress" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_athenaeum.json b/src/main/resources/mixins.stellar_core_athenaeum.json new file mode 100644 index 0000000..260d585 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_athenaeum.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.athenaeum", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinEnchantmentHelper" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_avaritia.json b/src/main/resources/mixins.stellar_core_avaritia.json new file mode 100644 index 0000000..53b1d29 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_avaritia.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.avaritia", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinTileBase" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_betterchat.json b/src/main/resources/mixins.stellar_core_betterchat.json new file mode 100644 index 0000000..4b547f4 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_betterchat.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.betterchat", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinGuiBetterChat" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_biomesoplenty.json b/src/main/resources/mixins.stellar_core_biomesoplenty.json new file mode 100644 index 0000000..64c3f1f --- /dev/null +++ b/src/main/resources/mixins.stellar_core_biomesoplenty.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.biomesoplenty", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinBiomesOPlenty" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_bloodmagic.json b/src/main/resources/mixins.stellar_core_bloodmagic.json new file mode 100644 index 0000000..62965a9 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_bloodmagic.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.bloodmagic", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinBloodAltar" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_botania.json b/src/main/resources/mixins.stellar_core_botania.json new file mode 100644 index 0000000..bc6a128 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_botania.json @@ -0,0 +1,12 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.botania", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinCosmeticAttachRecipe", + "MixinCosmeticRemoveRecipe", + "MixinEntitySpark" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_cfm.json b/src/main/resources/mixins.stellar_core_cfm.json new file mode 100644 index 0000000..e483eaa --- /dev/null +++ b/src/main/resources/mixins.stellar_core_cfm.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.cfm", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinImageCache" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_chisel.json b/src/main/resources/mixins.stellar_core_chisel.json new file mode 100644 index 0000000..0efac01 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_chisel.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.chisel", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinTileAutoChisel" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_eio.json b/src/main/resources/mixins.stellar_core_eio.json new file mode 100644 index 0000000..ad2d8be --- /dev/null +++ b/src/main/resources/mixins.stellar_core_eio.json @@ -0,0 +1,11 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.eio", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinItemTools", + "MixinTileEntityBase" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_eio_conduit.json b/src/main/resources/mixins.stellar_core_eio_conduit.json new file mode 100644 index 0000000..fdacb5b --- /dev/null +++ b/src/main/resources/mixins.stellar_core_eio_conduit.json @@ -0,0 +1,14 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.eioconduit", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "AccessorTarget", + "InvokerNetworkedInventory", + "MixinAbstractConduit", + "MixinItemConduit", + "MixinNetworkedInventory" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_extrabotany.json b/src/main/resources/mixins.stellar_core_extrabotany.json new file mode 100644 index 0000000..05613e9 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_extrabotany.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.extrabotany", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinClientProxy" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_fluxnetworks.json b/src/main/resources/mixins.stellar_core_fluxnetworks.json new file mode 100644 index 0000000..4539c14 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_fluxnetworks.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.fluxnetworks", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinTOPIntegration" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_ic2.json b/src/main/resources/mixins.stellar_core_ic2.json new file mode 100644 index 0000000..b5cff83 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_ic2.json @@ -0,0 +1,14 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.ic2", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinEnergyCalculatorLeg", + "MixinGradualRecipe", + "MixinItemUpgradeModule", + "MixinTileEntityMatter", + "MixinTileEntityReplicator" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_igi.json b/src/main/resources/mixins.stellar_core_igi.json new file mode 100644 index 0000000..4b20b46 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_igi.json @@ -0,0 +1,14 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.igi", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "server": [ + "MixinPlayerHandler" + ], + "client": [ + "MixinInfoItem", + "MixinInGameInfoCore" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_immersiveengineering.json b/src/main/resources/mixins.stellar_core_immersiveengineering.json new file mode 100644 index 0000000..13c4ecc --- /dev/null +++ b/src/main/resources/mixins.stellar_core_immersiveengineering.json @@ -0,0 +1,12 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.immersiveengineering", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinBlockIEMultiblock", + "MixinBlockIETileProvider", + "MixinRecipeJerrycan" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_legendarytooltips.json b/src/main/resources/mixins.stellar_core_legendarytooltips.json new file mode 100644 index 0000000..d6cfff2 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_legendarytooltips.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.legendarytooltips", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinTooltipDecor" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_mek_top.json b/src/main/resources/mixins.stellar_core_mek_top.json new file mode 100644 index 0000000..f324292 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_mek_top.json @@ -0,0 +1,11 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.mek_top", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinEnergyAcceptorWrapper", + "MixinIStrictEnergyStorage" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_mekanism.json b/src/main/resources/mixins.stellar_core_mekanism.json new file mode 100644 index 0000000..01f9f83 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_mekanism.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.mekanism", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinPipeUtils" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_mets.json b/src/main/resources/mixins.stellar_core_mets.json new file mode 100644 index 0000000..c2311ad --- /dev/null +++ b/src/main/resources/mixins.stellar_core_mets.json @@ -0,0 +1,15 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.mets", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinEnchantmentManager", + "MixinEntityTachyonBullet", + "MixinFirstAidLifeSupport", + "MixinForceFieldGenerator", + "MixinLifeSupportRing", + "MixinNutritionSupply" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_nco.json b/src/main/resources/mixins.stellar_core_nco.json new file mode 100644 index 0000000..1670507 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_nco.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.nco", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinRadiationCapabilityHandler" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_oreexcavation.json b/src/main/resources/mixins.stellar_core_oreexcavation.json new file mode 100644 index 0000000..75d71f0 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_oreexcavation.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.oreexcavation", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinMiningAgent" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_rgb_chat.json b/src/main/resources/mixins.stellar_core_rgb_chat.json new file mode 100644 index 0000000..0b28bc5 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_rgb_chat.json @@ -0,0 +1,11 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.rgbchat", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinRGBChat", + "MixinRGBSettings" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_scalingguis.json b/src/main/resources/mixins.stellar_core_scalingguis.json new file mode 100644 index 0000000..4ecf6ce --- /dev/null +++ b/src/main/resources/mixins.stellar_core_scalingguis.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.scalingguis", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinJsonHelper" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_techguns.json b/src/main/resources/mixins.stellar_core_techguns.json new file mode 100644 index 0000000..6764878 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_techguns.json @@ -0,0 +1,13 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.techguns", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinAmmoSumRecipe", + "MixinTGDamageSource", + "MixinTGExtendedPlayer", + "MixinTGPermissions" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_theoneprobe.json b/src/main/resources/mixins.stellar_core_theoneprobe.json new file mode 100644 index 0000000..24300cc --- /dev/null +++ b/src/main/resources/mixins.stellar_core_theoneprobe.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.theoneprobe", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinRenderHelper" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_thermaldynamics.json b/src/main/resources/mixins.stellar_core_thermaldynamics.json new file mode 100644 index 0000000..dec8517 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_thermaldynamics.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.thermaldynamics", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinDuctUnitFluidSuper" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_vanilla.json b/src/main/resources/mixins.stellar_core_vanilla.json new file mode 100644 index 0000000..3343256 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_vanilla.json @@ -0,0 +1,20 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.minecraft", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinChunk", + "MixinWorld", + "forge.MixinForgeHooks" + ], + "client": [ + "MixinFontRenderer", + "MixinNettyCompressionDecoder", + "MixinNettyPacketDecoder", + "MixinTessellator", + "forge.MixinSimpleIndexedCodec", + "forge.MixinSplashProgress" + ] +} \ No newline at end of file