From 7a6e9fa3f5bcf7701bb8725bb42650da8634fefe Mon Sep 17 00:00:00 2001 From: pietro-lopes <97140255+pietro-lopes@users.noreply.github.com> Date: Sun, 21 Jul 2024 15:43:32 -0300 Subject: [PATCH] ported to ModDev --- build.gradle | 73 +++++----- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- interfaces.json | 83 ++++++++++++ settings.gradle | 16 ++- .../resources/META-INF/accesstransformer.cfg | 127 ++++++++++++++++++ src/main/resources/architectury.common.json | 85 ------------ src/main/resources/kubejs.accesswidener | 127 ------------------ 8 files changed, 267 insertions(+), 248 deletions(-) create mode 100644 interfaces.json create mode 100644 src/main/resources/META-INF/accesstransformer.cfg delete mode 100644 src/main/resources/architectury.common.json delete mode 100644 src/main/resources/kubejs.accesswidener diff --git a/build.gradle b/build.gradle index e51988141..0d97c660e 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id 'base' id 'java' id 'maven-publish' - id "dev.architectury.loom" version "1.6-SNAPSHOT" + id 'net.neoforged.moddev' version "1.0.14" id "me.shedaniel.unified-publishing" version "0.1.+" } @@ -15,28 +15,49 @@ version = "${mod_version}-${isLocal ? "local.${Instant.now().epochSecond}" : "bu group = project.maven_group base.archivesBaseName = project.archives_base_name -loom { - silentMojangMappingsLicense() - - accessWidenerPath = file("src/main/resources/kubejs.accesswidener") - interfaceInjection { - interfaceInjectionSourceSets.add sourceSets.main - } +neoForge { + version = project.neoforge_version + interfaceInjectionData = files("interfaces.json") runs { + configureEach { + logLevel = org.slf4j.event.Level.INFO + } client { + client() if (ENV.MC_CLIENT_ARGS) { - programArgs ENV.MC_CLIENT_ARGS.split(' ') + programArguments.addAll(ENV.MC_CLIENT_ARGS.split(' ')) } - vmArgs("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition") - runDir = 'run' + jvmArguments.addAll("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition") + gameDirectory = file 'run' + } + client2 { + client() + programArguments.addAll('--username', 'Dev2') + if (ENV.MC_CLIENT_ARGS) { + programArguments.addAll(ENV.MC_CLIENT_ARGS.split(' ')) + } + jvmArguments.addAll("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition") + gameDirectory = file 'run' } - server { - runDir = 'run_server' + server() + programArgument("--nogui") + gameDirectory = file 'run_server' } } + + mods { + kubejs { + sourceSet sourceSets.main + } + } + + parchment { + minecraftVersion = minecraft_version + mappingsVersion = parchment_version + } } compileJava { @@ -95,21 +116,12 @@ repositories { } dependencies { - minecraft "com.mojang:minecraft:$minecraft_version" - //mappings loom.officialMojangMappings() - mappings loom.layered() { - officialMojangMappings() - parchment("org.parchmentmc.data:parchment-1.21:$parchment_version@zip") - } + api ("dev.latvian.mods:rhino:$rhino_version") { transitive(false) } - neoForge("net.neoforged:neoforge:$neoforge_version") - - modApi("dev.latvian.mods:rhino:$rhino_version") { transitive(false) } - - modCompileOnly("dev.architectury:architectury-neoforge:$architectury_version") - modCompileOnly("mezz.jei:jei-1.21-neoforge:$jei_version") - modCompileOnly("me.shedaniel:RoughlyEnoughItems-neoforge:$rei_version") - modCompileOnly("dev.emi:emi-neoforge:$emi_version:api") + compileOnly("dev.architectury:architectury-neoforge:$architectury_version") + compileOnly("mezz.jei:jei-1.21-neoforge:$jei_version") + compileOnly("me.shedaniel:RoughlyEnoughItems-neoforge:$rei_version") + compileOnly("dev.emi:emi-neoforge:$emi_version:api") } processResources { @@ -140,10 +152,6 @@ jar { } } -remapJar { - atAccessWideners.add "kubejs.accesswidener" -} - unifiedPublishing { project { releaseType = "${ENV.RELEASE_TYPE ?: 'release'}" @@ -153,7 +161,8 @@ unifiedPublishing { gameLoaders = ["neoforge"] displayName = "$mod_name NeoForge $project.version" changelog = "https://kubejs.com/changelog?mc=${project.minecraft_version}" - mainPublication remapJar + // FIXME this is a guess, it was loom's remapJar + mainPublication jar relations { depends { diff --git a/gradle.properties b/gradle.properties index 3d35dd728..3ba2689da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -loom.platform=neoforge +# loom.platform=neoforge mod_id=kubejs archives_base_name=kubejs diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..09523c0e5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/interfaces.json b/interfaces.json new file mode 100644 index 000000000..ede367168 --- /dev/null +++ b/interfaces.json @@ -0,0 +1,83 @@ +{ + "net/minecraft/server/MinecraftServer": [ + "dev/latvian/mods/kubejs/core/MinecraftServerKJS" + ], + "net/minecraft/client/Minecraft": [ + "dev/latvian/mods/kubejs/core/MinecraftClientKJS" + ], + "net/minecraft/world/level/block/Block": [ + "dev/latvian/mods/kubejs/core/BlockKJS" + ], + "net/minecraft/world/level/block/state/BlockBehaviour": [ + "dev/latvian/mods/kubejs/core/BlockBehaviourKJS" + ], + "net/minecraft/world/level/block/state/BlockState": [ + "dev/latvian/mods/kubejs/core/BlockStateKJS" + ], + "net/minecraft/world/item/Item": [ + "dev/latvian/mods/kubejs/core/ItemKJS" + ], + "net/minecraft/world/item/ItemStack": [ + "dev/latvian/mods/kubejs/core/ItemStackKJS" + ], + "net/minecraft/network/chat/MutableComponent": [ + "dev/latvian/mods/kubejs/core/ComponentKJS" + ], + "net/minecraft/world/level/Level": [ + "dev/latvian/mods/kubejs/core/LevelKJS" + ], + "net/minecraft/client/multiplayer/ClientLevel": [ + "dev/latvian/mods/kubejs/core/ClientLevelKJS" + ], + "net/minecraft/server/level/ServerLevel": [ + "dev/latvian/mods/kubejs/core/ServerLevelKJS" + ], + "net/minecraft/world/entity/player/Player": [ + "dev/latvian/mods/kubejs/core/PlayerKJS" + ], + "net/minecraft/client/player/AbstractClientPlayer": [ + "dev/latvian/mods/kubejs/core/ClientPlayerKJS" + ], + "net/minecraft/server/level/ServerPlayer": [ + "dev/latvian/mods/kubejs/core/ServerPlayerKJS" + ], + "net/minecraft/world/entity/Entity": [ + "dev/latvian/mods/kubejs/core/EntityKJS" + ], + "net/minecraft/world/entity/LivingEntity": [ + "dev/latvian/mods/kubejs/core/LivingEntityKJS" + ], + "net/minecraft/world/item/crafting/Ingredient": [ + "dev/latvian/mods/kubejs/core/IngredientKJS" + ], + "net/minecraft/world/entity/item/ItemEntity": [ + "dev/latvian/mods/kubejs/core/ItemEntityKJS" + ], + "net/minecraft/world/entity/decoration/ItemFrame": [ + "dev/latvian/mods/kubejs/core/ItemFrameEntityKJS" + ], + "net/minecraft/world/Container": [ + "dev/latvian/mods/kubejs/core/ContainerKJS" + ], + "net/minecraft/world/item/crafting/RecipeHolder": [ + "dev/latvian/mods/kubejs/core/RecipeHolderKJS" + ], + "net/minecraft/server/ReloadableServerResources": [ + "dev/latvian/mods/kubejs/core/ReloadableServerResourcesKJS" + ], + "net/minecraft/world/item/crafting/RecipeManager": [ + "dev/latvian/mods/kubejs/core/RecipeManagerKJS" + ], + "net/minecraft/tags/TagManager": [ + "dev/latvian/mods/kubejs/core/TagManagerKJS" + ], + "net/minecraft/world/level/material/Fluid": [ + "dev/latvian/mods/kubejs/core/FluidKJS" + ], + "net/minecraft/world/inventory/MenuType": [ + "dev/latvian/mods/kubejs/core/MenuTypeKJS" + ], + "net/minecraft/world/entity/EntityType": [ + "dev/latvian/mods/kubejs/core/EntityTypeKJS" + ] +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 40cb18496..676437a18 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,22 @@ pluginManagement { repositories { + gradlePluginPortal() + mavenCentral() maven { url "https://maven.creeperhost.net/" } - maven { url "https://maven.architectury.dev/" } + // maven { url "https://maven.architectury.dev/" } maven { url "https://maven.minecraftforge.net/" } - gradlePluginPortal() + maven { + name = "NeoForged" + url = 'https://maven.neoforged.net/releases' + content { + includeGroup "net.neoforged" + } + } } } +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} + rootProject.name = 'KubeJS-1.21' diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg new file mode 100644 index 000000000..ae41d2792 --- /dev/null +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -0,0 +1,127 @@ +public net.minecraft.server.MinecraftServer$ReloadableResources +public net.minecraft.world.item.Item$Properties COMPONENT_INTERNER # Lcom.google.common.collect.Interner; + +# nbt related +public net.minecraft.nbt.CompoundTag tags # Ljava.util.Map; +public net.minecraft.nbt.CompoundTag readNamedTagData(Lnet.minecraft.nbt.TagType;Ljava.lang.String;Ljava.io.DataInput;Lnet.minecraft.nbt.NbtAccounter;)Lnet.minecraft.nbt.Tag; +public net.minecraft.nbt.ListTag (Ljava.util.List;B)V + +# tag-related +public net.minecraft.tags.TagBuilder entries # Ljava.util.List; +public net.minecraft.tags.TagEntry elementOrTag()Lnet.minecraft.util.ExtraCodecs$TagOrElementLocation; +public net.minecraft.util.ExtraCodecs$TagOrElementLocation decoratedId()Ljava.lang.String; +public net.minecraft.tags.TagEntry id # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.tags.TagEntry required # Z +public net.minecraft.tags.TagEntry tag # Z + +public net.minecraft.world.item.crafting.ShapelessRecipe$Serializer CODEC # Lcom.mojang.serialization.MapCodec; +# public net.minecraft.world.item.crafting.ShapedRecipe$Serializer CODEC Lcom.mojang.serialization.MapCodec; +# public net.minecraft.world.item.crafting.ShapedRecipePattern symmetrical # Z +public-f net.minecraft.world.item.crafting.ShapedRecipePattern symmetrical # Z + +# attributes +public net.minecraft.world.effect.MobEffect$AttributeTemplate +public net.minecraft.world.effect.MobEffect attributeModifiers # Ljava.util.Map; +public net.minecraft.world.effect.MobEffect$AttributeTemplate (Lnet.minecraft.resources.ResourceLocation;DLnet.minecraft.world.entity.ai.attributes.AttributeModifier$Operation;)V +# public net.minecraft.world.item.ArmorItem defaultModifiers # Ljava.util.function.Supplier; +public-f net.minecraft.world.item.ArmorItem defaultModifiers # Ljava.util.function.Supplier; + +# public net.minecraft.world.item.TieredItem tier # Lnet.minecraft.world.item.Tier; +public-f net.minecraft.world.item.TieredItem tier # Lnet.minecraft.world.item.Tier; + +public net.minecraft.world.level.block.state.BlockBehaviour$Properties ()V + +# public net.minecraft.world.entity.ai.village.poi.PoiType (Ljava.lang.String;Ljava.util.Set;II)V +# public net.minecraft.world.entity.npc.VillagerType (Ljava.lang.String;)V +# public net.minecraft.world.entity.npc.VillagerProfession (Ljava.lang.String;Lnet.minecraft.world.entity.ai.village.poi.PoiType;Lcom.google.common.collect.ImmutableSet;Lcom.google.common.collect.ImmutableSet;Lnet.minecraft.sounds.SoundEvent;)V + +public net.minecraft.server.packs.resources.MultiPackResourceManager namespacedManagers # Ljava.util.Map; +public net.minecraft.server.packs.resources.MultiPackResourceManager packs # Ljava.util.List; +public net.minecraft.resources.RegistryDataLoader$Loader +public net.minecraft.resources.RegistryDataLoader$LoadingFunction + +public net.minecraft.commands.Commands$CommandSelection includeIntegrated # Z +public net.minecraft.commands.Commands$CommandSelection includeDedicated # Z +public net.minecraft.commands.synchronization.ArgumentTypeInfos BY_CLASS # Ljava.util.Map; +public net.minecraft.world.level.GameRules$Value deserialize(Ljava.lang.String;)V +public net.minecraft.world.level.GameRules$BooleanValue deserialize(Ljava.lang.String;)V +public net.minecraft.world.level.GameRules$IntegerValue deserialize(Ljava.lang.String;)V +public net.minecraft.world.level.GameRules$Value onChanged(Lnet.minecraft.server.MinecraftServer;)V + +public net.minecraft.world.inventory.TransientCraftingContainer menu # Lnet.minecraft.world.inventory.AbstractContainerMenu; +public net.minecraft.world.inventory.CraftingMenu player # Lnet.minecraft.world.entity.player.Player; +public net.minecraft.world.inventory.InventoryMenu owner # Lnet.minecraft.world.entity.player.Player; +public net.minecraft.world.item.CreativeModeTabs CACHED_PARAMETERS # Lnet.minecraft.world.item.CreativeModeTab$ItemDisplayParameters; + +# recipes +public net.minecraft.world.item.crafting.ShapelessRecipe ingredients # Lnet.minecraft.core.NonNullList; +public net.minecraft.world.item.crafting.ShapelessRecipe group # Ljava.lang.String; +public net.minecraft.world.item.crafting.ShapelessRecipe result # Lnet.minecraft.world.item.ItemStack; +public-f net.minecraft.world.item.crafting.Ingredient +public net.minecraft.world.item.crafting.Ingredient (Ljava.util.stream.Stream;)V +# public net.minecraft.world.item.crafting.Ingredient values # [Lnet.minecraft.world.item.crafting.Ingredient$Value; +public-f net.minecraft.world.item.crafting.Ingredient values # [Lnet.minecraft.world.item.crafting.Ingredient$Value; +public net.minecraft.world.item.crafting.Ingredient itemStacks # [Lnet.minecraft.world.item.ItemStack; +public net.minecraft.world.item.crafting.Ingredient stackingIds # Lit.unimi.dsi.fastutil.ints.IntList; +public-f net.minecraft.world.item.crafting.Ingredient$Value + +public net.minecraft.world.item.crafting.ShapedRecipe pattern # Lnet.minecraft.world.item.crafting.ShapedRecipePattern; +public net.minecraft.world.item.crafting.ShapedRecipe result # Lnet.minecraft.world.item.ItemStack; +public net.minecraft.world.item.crafting.ShapedRecipe showNotification # Z +# public net.minecraft.world.item.crafting.ShapedRecipePattern matches(Lnet.minecraft.world.inventory.CraftingContainer;IIZ)Z + +public net.minecraft.server.level.ServerPlayerGameMode isDestroyingBlock # Z +public net.minecraft.server.commands.TeleportCommand performTeleport(Lnet.minecraft.commands.CommandSourceStack;Lnet.minecraft.world.entity.Entity;Lnet.minecraft.server.level.ServerLevel;DDDLjava.util.Set;FFLnet.minecraft.server.commands.TeleportCommand$LookAt;)V +public net.minecraft.commands.arguments.selector.EntitySelector contextFreePredicates # Ljava.util.List; +public net.minecraft.world.level.storage.loot.LootContext$EntityTarget name # Ljava.lang.String; +public net.minecraft.world.level.storage.loot.LootDataType codec # Lcom.mojang.serialization.Codec; +public net.minecraft.world.level.storage.loot.functions.SetComponentsFunction (Ljava.util.List;Lnet.minecraft.core.component.DataComponentPatch;)V +public net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction simpleBuilder(Ljava.util.function.Function;)Lnet.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction$Builder; + +public net.minecraft.world.entity.npc.VillagerType (Ljava.lang.String;)V +public net.minecraft.world.entity.item.ItemEntity LIFETIME # I +public net.minecraft.world.entity.item.ItemEntity age # I +# public net.minecraft.world.level.Explosion radius # F +public-f net.minecraft.world.level.Explosion radius # F + +# client stuff +public net.minecraft.client.gui.components.AbstractSelectionList$Entry +public net.minecraft.client.gui.components.ImageButton sprites # Lnet.minecraft.client.gui.components.WidgetSprites; +public net.minecraft.client.Minecraft$GameLoadCookie +public net.minecraft.client.gui.screens.Screen narratables # Ljava.util.List; +public net.minecraft.client.renderer.RenderType$OutlineProperty + +# smithing table text components and icons +public net.minecraft.world.item.SmithingTemplateItem APPLIES_TO_TITLE # Lnet.minecraft.network.chat.Component; +public net.minecraft.world.item.SmithingTemplateItem INGREDIENTS_TITLE # Lnet.minecraft.network.chat.Component; +public net.minecraft.world.item.SmithingTemplateItem ARMOR_TRIM_ADDITIONS_SLOT_DESCRIPTION # Lnet.minecraft.network.chat.Component; +public net.minecraft.world.item.SmithingTemplateItem ARMOR_TRIM_BASE_SLOT_DESCRIPTION # Lnet.minecraft.network.chat.Component; +public net.minecraft.world.item.SmithingTemplateItem ARMOR_TRIM_INGREDIENTS # Lnet.minecraft.network.chat.Component; +public net.minecraft.world.item.SmithingTemplateItem ARMOR_TRIM_APPLIES_TO # Lnet.minecraft.network.chat.Component; +public net.minecraft.world.item.SmithingTemplateItem NETHERITE_UPGRADE # Lnet.minecraft.network.chat.Component; +public net.minecraft.world.item.SmithingTemplateItem NETHERITE_UPGRADE_APPLIES_TO # Lnet.minecraft.network.chat.Component; +public net.minecraft.world.item.SmithingTemplateItem NETHERITE_UPGRADE_ADDITIONS_SLOT_DESCRIPTION # Lnet.minecraft.network.chat.Component; +public net.minecraft.world.item.SmithingTemplateItem NETHERITE_UPGRADE_BASE_SLOT_DESCRIPTION # Lnet.minecraft.network.chat.Component; +public net.minecraft.world.item.SmithingTemplateItem NETHERITE_UPGRADE_INGREDIENTS # Lnet.minecraft.network.chat.Component; +public net.minecraft.world.item.SmithingTemplateItem createTrimmableArmorIconList()Ljava.util.List; +public net.minecraft.world.item.SmithingTemplateItem createNetheriteUpgradeIconList()Ljava.util.List; +public net.minecraft.world.item.SmithingTemplateItem createTrimmableMaterialIconList()Ljava.util.List; +public net.minecraft.world.item.SmithingTemplateItem createNetheriteUpgradeMaterialList()Ljava.util.List; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_HELMET # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_CHESTPLATE # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_LEGGINGS # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_BOOTS # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_HOE # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_AXE # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_SWORD # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_SHOVEL # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_PICKAXE # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_INGOT # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_REDSTONE_DUST # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_QUARTZ # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_EMERALD # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_DIAMOND # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_LAPIS_LAZULI # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem EMPTY_SLOT_AMETHYST_SHARD # Lnet.minecraft.resources.ResourceLocation; +public net.minecraft.world.item.SmithingTemplateItem DESCRIPTION_FORMAT # Lnet.minecraft.ChatFormatting; +public net.minecraft.world.item.SmithingTemplateItem TITLE_FORMAT # Lnet.minecraft.ChatFormatting; \ No newline at end of file diff --git a/src/main/resources/architectury.common.json b/src/main/resources/architectury.common.json deleted file mode 100644 index 1bdf80411..000000000 --- a/src/main/resources/architectury.common.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "injected_interfaces": { - "net/minecraft/server/MinecraftServer": [ - "dev/latvian/mods/kubejs/core/MinecraftServerKJS" - ], - "net/minecraft/class_310": [ - "dev/latvian/mods/kubejs/core/MinecraftClientKJS" - ], - "net/minecraft/class_2248": [ - "dev/latvian/mods/kubejs/core/BlockKJS" - ], - "net/minecraft/class_4970": [ - "dev/latvian/mods/kubejs/core/BlockBehaviourKJS" - ], - "net/minecraft/class_2680": [ - "dev/latvian/mods/kubejs/core/BlockStateKJS" - ], - "net/minecraft/class_1792": [ - "dev/latvian/mods/kubejs/core/ItemKJS" - ], - "net/minecraft/class_1799": [ - "dev/latvian/mods/kubejs/core/ItemStackKJS" - ], - "net/minecraft/class_5250": [ - "dev/latvian/mods/kubejs/core/ComponentKJS" - ], - "net/minecraft/class_1937": [ - "dev/latvian/mods/kubejs/core/LevelKJS" - ], - "net/minecraft/class_638": [ - "dev/latvian/mods/kubejs/core/ClientLevelKJS" - ], - "net/minecraft/class_3218": [ - "dev/latvian/mods/kubejs/core/ServerLevelKJS" - ], - "net/minecraft/class_1657": [ - "dev/latvian/mods/kubejs/core/PlayerKJS" - ], - "net/minecraft/class_742": [ - "dev/latvian/mods/kubejs/core/ClientPlayerKJS" - ], - "net/minecraft/class_3222": [ - "dev/latvian/mods/kubejs/core/ServerPlayerKJS" - ], - "net/minecraft/class_1297": [ - "dev/latvian/mods/kubejs/core/EntityKJS" - ], - "net/minecraft/class_1309": [ - "dev/latvian/mods/kubejs/core/LivingEntityKJS" - ], - "net/minecraft/class_1856": [ - "dev/latvian/mods/kubejs/core/IngredientKJS" - ], - "net/minecraft/class_1542": [ - "dev/latvian/mods/kubejs/core/ItemEntityKJS" - ], - "net/minecraft/class_1533": [ - "dev/latvian/mods/kubejs/core/ItemFrameEntityKJS" - ], - "net/minecraft/class_1263": [ - "dev/latvian/mods/kubejs/core/ContainerKJS" - ], - "net/minecraft/class_8786": [ - "dev/latvian/mods/kubejs/core/RecipeHolderKJS" - ], - "net/minecraft/class_5350": [ - "dev/latvian/mods/kubejs/core/ReloadableServerResourcesKJS" - ], - "net/minecraft/class_1863": [ - "dev/latvian/mods/kubejs/core/RecipeManagerKJS" - ], - "net/minecraft/class_3505": [ - "dev/latvian/mods/kubejs/core/TagManagerKJS" - ], - "net/minecraft/class_3611": [ - "dev/latvian/mods/kubejs/core/FluidKJS" - ], - "net/minecraft/class_3917": [ - "dev/latvian/mods/kubejs/core/MenuTypeKJS" - ], - "net/minecraft/class_1299": [ - "dev/latvian/mods/kubejs/core/EntityTypeKJS" - ] - } -} \ No newline at end of file diff --git a/src/main/resources/kubejs.accesswidener b/src/main/resources/kubejs.accesswidener deleted file mode 100644 index 913e285eb..000000000 --- a/src/main/resources/kubejs.accesswidener +++ /dev/null @@ -1,127 +0,0 @@ -accessWidener v2 named - -accessible class net/minecraft/server/MinecraftServer$ReloadableResources -accessible field net/minecraft/world/item/Item$Properties COMPONENT_INTERNER Lcom/google/common/collect/Interner; - -# nbt related -accessible field net/minecraft/nbt/CompoundTag tags Ljava/util/Map; -accessible method net/minecraft/nbt/CompoundTag readNamedTagData (Lnet/minecraft/nbt/TagType;Ljava/lang/String;Ljava/io/DataInput;Lnet/minecraft/nbt/NbtAccounter;)Lnet/minecraft/nbt/Tag; -accessible method net/minecraft/nbt/ListTag (Ljava/util/List;B)V - -# tag-related -accessible field net/minecraft/tags/TagBuilder entries Ljava/util/List; -accessible method net/minecraft/tags/TagEntry elementOrTag ()Lnet/minecraft/util/ExtraCodecs$TagOrElementLocation; -accessible method net/minecraft/util/ExtraCodecs$TagOrElementLocation decoratedId ()Ljava/lang/String; -accessible field net/minecraft/tags/TagEntry id Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/tags/TagEntry required Z -accessible field net/minecraft/tags/TagEntry tag Z - -accessible field net/minecraft/world/item/crafting/ShapelessRecipe$Serializer CODEC Lcom/mojang/serialization/MapCodec; -# accessible field net/minecraft/world/item/crafting/ShapedRecipe$Serializer CODEC Lcom/mojang/serialization/MapCodec; -accessible field net/minecraft/world/item/crafting/ShapedRecipePattern symmetrical Z -mutable field net/minecraft/world/item/crafting/ShapedRecipePattern symmetrical Z - -# attributes -accessible class net/minecraft/world/effect/MobEffect$AttributeTemplate -accessible field net/minecraft/world/effect/MobEffect attributeModifiers Ljava/util/Map; -accessible method net/minecraft/world/effect/MobEffect$AttributeTemplate (Lnet/minecraft/resources/ResourceLocation;DLnet/minecraft/world/entity/ai/attributes/AttributeModifier$Operation;)V -accessible field net/minecraft/world/item/ArmorItem defaultModifiers Ljava/util/function/Supplier; -mutable field net/minecraft/world/item/ArmorItem defaultModifiers Ljava/util/function/Supplier; - -accessible field net/minecraft/world/item/TieredItem tier Lnet/minecraft/world/item/Tier; -mutable field net/minecraft/world/item/TieredItem tier Lnet/minecraft/world/item/Tier; - -accessible method net/minecraft/world/level/block/state/BlockBehaviour$Properties ()V - -# accessible method net/minecraft/world/entity/ai/village/poi/PoiType (Ljava/lang/String;Ljava/util/Set;II)V -# accessible method net/minecraft/world/entity/npc/VillagerType (Ljava/lang/String;)V -# accessible method net/minecraft/world/entity/npc/VillagerProfession (Ljava/lang/String;Lnet/minecraft/world/entity/ai/village/poi/PoiType;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/sounds/SoundEvent;)V - -accessible field net/minecraft/server/packs/resources/MultiPackResourceManager namespacedManagers Ljava/util/Map; -accessible field net/minecraft/server/packs/resources/MultiPackResourceManager packs Ljava/util/List; -accessible class net/minecraft/resources/RegistryDataLoader$Loader -accessible class net/minecraft/resources/RegistryDataLoader$LoadingFunction - -accessible field net/minecraft/commands/Commands$CommandSelection includeIntegrated Z -accessible field net/minecraft/commands/Commands$CommandSelection includeDedicated Z -accessible field net/minecraft/commands/synchronization/ArgumentTypeInfos BY_CLASS Ljava/util/Map; -accessible method net/minecraft/world/level/GameRules$Value deserialize (Ljava/lang/String;)V -accessible method net/minecraft/world/level/GameRules$Value onChanged (Lnet/minecraft/server/MinecraftServer;)V - -accessible field net/minecraft/world/inventory/TransientCraftingContainer menu Lnet/minecraft/world/inventory/AbstractContainerMenu; -accessible field net/minecraft/world/inventory/CraftingMenu player Lnet/minecraft/world/entity/player/Player; -accessible field net/minecraft/world/inventory/InventoryMenu owner Lnet/minecraft/world/entity/player/Player; -accessible field net/minecraft/world/item/CreativeModeTabs CACHED_PARAMETERS Lnet/minecraft/world/item/CreativeModeTab$ItemDisplayParameters; - -# recipes -accessible field net/minecraft/world/item/crafting/ShapelessRecipe ingredients Lnet/minecraft/core/NonNullList; -accessible field net/minecraft/world/item/crafting/ShapelessRecipe group Ljava/lang/String; -accessible field net/minecraft/world/item/crafting/ShapelessRecipe result Lnet/minecraft/world/item/ItemStack; -transitive-extendable class net/minecraft/world/item/crafting/Ingredient -transitive-accessible method net/minecraft/world/item/crafting/Ingredient (Ljava/util/stream/Stream;)V -transitive-accessible field net/minecraft/world/item/crafting/Ingredient values [Lnet/minecraft/world/item/crafting/Ingredient$Value; -transitive-mutable field net/minecraft/world/item/crafting/Ingredient values [Lnet/minecraft/world/item/crafting/Ingredient$Value; -transitive-accessible field net/minecraft/world/item/crafting/Ingredient itemStacks [Lnet/minecraft/world/item/ItemStack; -transitive-accessible field net/minecraft/world/item/crafting/Ingredient stackingIds Lit/unimi/dsi/fastutil/ints/IntList; -transitive-extendable class net/minecraft/world/item/crafting/Ingredient$Value - -accessible field net/minecraft/world/item/crafting/ShapedRecipe pattern Lnet/minecraft/world/item/crafting/ShapedRecipePattern; -accessible field net/minecraft/world/item/crafting/ShapedRecipe result Lnet/minecraft/world/item/ItemStack; -accessible field net/minecraft/world/item/crafting/ShapedRecipe showNotification Z -# accessible method net/minecraft/world/item/crafting/ShapedRecipePattern matches (Lnet/minecraft/world/inventory/CraftingContainer;IIZ)Z - -accessible field net/minecraft/server/level/ServerPlayerGameMode isDestroyingBlock Z -accessible method net/minecraft/server/commands/TeleportCommand performTeleport (Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/server/level/ServerLevel;DDDLjava/util/Set;FFLnet/minecraft/server/commands/TeleportCommand$LookAt;)V -accessible field net/minecraft/commands/arguments/selector/EntitySelector contextFreePredicates Ljava/util/List; -accessible field net/minecraft/world/level/storage/loot/LootContext$EntityTarget name Ljava/lang/String; -accessible field net/minecraft/world/level/storage/loot/LootDataType codec Lcom/mojang/serialization/Codec; -accessible method net/minecraft/world/level/storage/loot/functions/SetComponentsFunction (Ljava/util/List;Lnet/minecraft/core/component/DataComponentPatch;)V -accessible method net/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction simpleBuilder (Ljava/util/function/Function;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder; - -accessible method net/minecraft/world/entity/npc/VillagerType (Ljava/lang/String;)V -accessible field net/minecraft/world/entity/item/ItemEntity LIFETIME I -accessible field net/minecraft/world/entity/item/ItemEntity age I -accessible field net/minecraft/world/level/Explosion radius F -mutable field net/minecraft/world/level/Explosion radius F - -# client stuff -accessible class net/minecraft/client/gui/components/AbstractSelectionList$Entry -accessible field net/minecraft/client/gui/components/ImageButton sprites Lnet/minecraft/client/gui/components/WidgetSprites; -accessible class net/minecraft/client/Minecraft$GameLoadCookie -accessible field net/minecraft/client/gui/screens/Screen narratables Ljava/util/List; -accessible class net/minecraft/client/renderer/RenderType$OutlineProperty - -# smithing table text components and icons -accessible field net/minecraft/world/item/SmithingTemplateItem APPLIES_TO_TITLE Lnet/minecraft/network/chat/Component; -accessible field net/minecraft/world/item/SmithingTemplateItem INGREDIENTS_TITLE Lnet/minecraft/network/chat/Component; -accessible field net/minecraft/world/item/SmithingTemplateItem ARMOR_TRIM_ADDITIONS_SLOT_DESCRIPTION Lnet/minecraft/network/chat/Component; -accessible field net/minecraft/world/item/SmithingTemplateItem ARMOR_TRIM_BASE_SLOT_DESCRIPTION Lnet/minecraft/network/chat/Component; -accessible field net/minecraft/world/item/SmithingTemplateItem ARMOR_TRIM_INGREDIENTS Lnet/minecraft/network/chat/Component; -accessible field net/minecraft/world/item/SmithingTemplateItem ARMOR_TRIM_APPLIES_TO Lnet/minecraft/network/chat/Component; -accessible field net/minecraft/world/item/SmithingTemplateItem NETHERITE_UPGRADE Lnet/minecraft/network/chat/Component; -accessible field net/minecraft/world/item/SmithingTemplateItem NETHERITE_UPGRADE_APPLIES_TO Lnet/minecraft/network/chat/Component; -accessible field net/minecraft/world/item/SmithingTemplateItem NETHERITE_UPGRADE_ADDITIONS_SLOT_DESCRIPTION Lnet/minecraft/network/chat/Component; -accessible field net/minecraft/world/item/SmithingTemplateItem NETHERITE_UPGRADE_BASE_SLOT_DESCRIPTION Lnet/minecraft/network/chat/Component; -accessible field net/minecraft/world/item/SmithingTemplateItem NETHERITE_UPGRADE_INGREDIENTS Lnet/minecraft/network/chat/Component; -accessible method net/minecraft/world/item/SmithingTemplateItem createTrimmableArmorIconList ()Ljava/util/List; -accessible method net/minecraft/world/item/SmithingTemplateItem createNetheriteUpgradeIconList ()Ljava/util/List; -accessible method net/minecraft/world/item/SmithingTemplateItem createTrimmableMaterialIconList ()Ljava/util/List; -accessible method net/minecraft/world/item/SmithingTemplateItem createNetheriteUpgradeMaterialList ()Ljava/util/List; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_HELMET Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_CHESTPLATE Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_LEGGINGS Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_BOOTS Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_HOE Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_AXE Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_SWORD Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_SHOVEL Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_PICKAXE Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_INGOT Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_REDSTONE_DUST Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_QUARTZ Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_EMERALD Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_DIAMOND Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_LAPIS_LAZULI Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem EMPTY_SLOT_AMETHYST_SHARD Lnet/minecraft/resources/ResourceLocation; -accessible field net/minecraft/world/item/SmithingTemplateItem DESCRIPTION_FORMAT Lnet/minecraft/ChatFormatting; -accessible field net/minecraft/world/item/SmithingTemplateItem TITLE_FORMAT Lnet/minecraft/ChatFormatting; \ No newline at end of file