Skip to content
Snippets Groups Projects
Commit 05a83862 authored by Sargun Vohra's avatar Sargun Vohra
Browse files

Updated to MC 1.14.4 and also added a message in

the config screen for people who refuse to read
the CurseForge page
parent edde392c
Branches 1.14
Tags 4.4.0
No related merge requests found
Showing with 70 additions and 68 deletions
......@@ -13,10 +13,10 @@ val modMavenGroup: String by project
plugins {
java
kotlin("jvm") version "1.3.30"
kotlin("jvm") version "1.3.40"
idea
`maven-publish`
id("fabric-loom") version "0.2.4-SNAPSHOT"
id("fabric-loom") version "0.2.3-SNAPSHOT"
id("com.palantir.git-version") version "0.11.0"
id("com.matthewprenger.cursegradle") version "1.2.0"
}
......@@ -52,7 +52,7 @@ minecraft {
}
configurations {
listOf(mappings, modImplementation, include).forEach {
listOf(mappings, modCompile, include).forEach {
it {
resolutionStrategy.activateDependencyLocking()
}
......@@ -61,19 +61,19 @@ configurations {
dependencies {
minecraft("com.mojang:minecraft:$minecraftVersion")
mappings("net.fabricmc:yarn:$minecraftVersion+")
modImplementation("net.fabricmc:fabric-loader:0.4.+")
mappings("net.fabricmc:yarn:$minecraftVersion+build.3")
modCompile("net.fabricmc:fabric-loader:0.4.8+")
modImplementation("net.fabricmc.fabric-api:fabric-api:0.3.+")
modImplementation("net.fabricmc:fabric-language-kotlin:1.3.+")
modCompile("net.fabricmc.fabric-api:fabric-api:0.3.0+build.206")
modCompile("net.fabricmc:fabric-language-kotlin:1.3.40+")
modImplementation("cloth-config:ClothConfig:0.2.1.14")
modImplementation("me.sargunvohra.mcmods:auto-config:1.+")
modCompile("cloth-config:ClothConfig:0.2.4.17")
modCompile("me.sargunvohra.mcmods:auto-config:1.2.+")
include("cloth-config:ClothConfig:0.2.4.17")
include("me.sargunvohra.mcmods:auto-config:1.+")
include("me.sargunvohra.mcmods:auto-config:1.2.+")
modRuntime("io.github.prospector.modmenu:ModMenu:1.+")
modCompile("io.github.prospector.modmenu:ModMenu:1.+")
}
......@@ -113,7 +113,7 @@ if (versionDetails().isCleanTag) {
releaseType = "release"
addGameVersion(curseMinecraftVersion)
relations(closureOf<CurseRelation>{
requiredDependency("fabric")
requiredDependency("fabric-api")
requiredDependency("fabric-language-kotlin")
embeddedLibrary("cloth-config")
embeddedLibrary("auto-config")
......
* built against MC 1.14.2
* added advancements for first and max hp levels
* changed `/leveluphp set*` commands to not implicitly target self
* changed `/leveluphp config` command to not take a player argument
* added failsafe to force a crash in case data loading silently fails
* Updated to MC 1.14.4
* Added a message in the config screen for people who refuse to read the CurseForge page
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G
minecraftVersion=1.14.2
minecraftVersion=1.14.4
curseProjectId = 255871
curseMinecraftVersion=1.14.2
curseMinecraftVersion=1.14.4
modMavenGroup = me.sargunvohra.mcmods
modJarBaseName = level-up-hp
......@@ -2,4 +2,4 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
cloth-config:ClothConfig:0.2.4.17
me.sargunvohra.mcmods:auto-config:1.1.2+mc1.14.1
me.sargunvohra.mcmods:auto-config:1.2.0+mc1.14.4
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
net.fabricmc:yarn:1.14.2+build.2
net.fabricmc:yarn:1.14.4+build.3
......@@ -3,45 +3,47 @@
# This file is expected to be part of source control.
cloth-config:ClothConfig:0.2.4.17
com.google.jimfs:jimfs:1.1
io.github.prospector.modmenu:ModMenu:1.5.4-85
me.sargunvohra.mcmods:auto-config:1.1.2+mc1.14.1
net.fabricmc.fabric-api:fabric-api-base:0.1.0+59147463
net.fabricmc.fabric-api:fabric-api:0.3.0-pre+build.169
net.fabricmc.fabric-api:fabric-commands-v0:0.1.1+25fd0c52
net.fabricmc.fabric-api:fabric-containers-v0:0.1.2+25fd0c52
net.fabricmc.fabric-api:fabric-content-registries-v0:0.1.1+45e1a1c8
net.fabricmc.fabric-api:fabric-crash-report-info-v1:0.1.0+59147463
net.fabricmc.fabric-api:fabric-events-interaction-v0:0.1.0+59147463
net.fabricmc.fabric-api:fabric-events-lifecycle-v0:0.1.0+59147463
net.fabricmc.fabric-api:fabric-item-groups-v0:0.1.0+59147463
net.fabricmc.fabric-api:fabric-keybindings-v0:0.1.0+59147463
net.fabricmc.fabric-api:fabric-mining-levels-v0:0.1.0+59147463
net.fabricmc.fabric-api:fabric-models-v0:0.1.0+59147463
net.fabricmc.fabric-api:fabric-networking-blockentity-v0:0.1.1+25fd0c52
net.fabricmc.fabric-api:fabric-networking-v0:0.1.2+200eb5c2
net.fabricmc.fabric-api:fabric-object-builders-v0:0.1.1+9fe2f882
net.fabricmc.fabric-api:fabric-registry-sync-v0:0.1.2+25fd0c52
net.fabricmc.fabric-api:fabric-renderer-api-v1:0.1.0+02a46d5b
net.fabricmc.fabric-api:fabric-renderer-indigo:0.1.2+4076d79a
net.fabricmc.fabric-api:fabric-rendering-data-attachment-v1:0.1.0+02a46d5b
net.fabricmc.fabric-api:fabric-rendering-fluids-v1:0.1.0+dc4c57c2
net.fabricmc.fabric-api:fabric-rendering-v0:0.1.0+59147463
net.fabricmc.fabric-api:fabric-resource-loader-v0:0.1.1+59147463
net.fabricmc.fabric-api:fabric-tag-extensions-v0:0.1.0+59147463
net.fabricmc.fabric-api:fabric-textures-v0:0.1.2+25fd0c52
net.fabricmc:fabric-language-kotlin:1.3.31+build.4
io.github.prospector.modmenu:ModMenu:1.6.3-95
me.sargunvohra.mcmods:auto-config:1.2.0+mc1.14.4
net.fabricmc.fabric-api:fabric-api-base:0.1.0+5914746342
net.fabricmc.fabric-api:fabric-api:0.3.0+build.206
net.fabricmc.fabric-api:fabric-biomes-v1:0.1.0+896c7fbb42
net.fabricmc.fabric-api:fabric-commands-v0:0.1.1+25fd0c5242
net.fabricmc.fabric-api:fabric-containers-v0:0.1.2+25fd0c5242
net.fabricmc.fabric-api:fabric-content-registries-v0:0.1.1+05f11b7542
net.fabricmc.fabric-api:fabric-crash-report-info-v1:0.1.0+5914746342
net.fabricmc.fabric-api:fabric-events-interaction-v0:0.1.0+ea100f6142
net.fabricmc.fabric-api:fabric-events-lifecycle-v0:0.1.0+5914746342
net.fabricmc.fabric-api:fabric-item-groups-v0:0.1.0+1e69a0a542
net.fabricmc.fabric-api:fabric-keybindings-v0:0.1.1+7dfef87c42
net.fabricmc.fabric-api:fabric-loot-tables-v1:0.1.0+43028fa642
net.fabricmc.fabric-api:fabric-mining-levels-v0:0.1.0+ab421b9c42
net.fabricmc.fabric-api:fabric-models-v0:0.1.0+5914746342
net.fabricmc.fabric-api:fabric-networking-blockentity-v0:0.1.1+25fd0c5242
net.fabricmc.fabric-api:fabric-networking-v0:0.1.2+ea100f6142
net.fabricmc.fabric-api:fabric-object-builders-v0:0.1.1+592d1d2242
net.fabricmc.fabric-api:fabric-registry-sync-v0:0.2.2+ea100f6142
net.fabricmc.fabric-api:fabric-renderer-api-v1:0.1.1+9486cfbf42
net.fabricmc.fabric-api:fabric-renderer-indigo:0.1.9+9486cfbf42
net.fabricmc.fabric-api:fabric-rendering-data-attachment-v1:0.1.0+02a46d5b42
net.fabricmc.fabric-api:fabric-rendering-fluids-v1:0.1.0+dc4c57c242
net.fabricmc.fabric-api:fabric-rendering-v0:0.1.1+6dad974e42
net.fabricmc.fabric-api:fabric-resource-loader-v0:0.1.1+7495ea2842
net.fabricmc.fabric-api:fabric-tag-extensions-v0:0.1.1+c189dc5c42
net.fabricmc.fabric-api:fabric-textures-v0:0.1.4+792c1c3542
net.fabricmc:fabric-language-kotlin:1.3.40+build.1
net.fabricmc:fabric-loader-sat4j:2.3.5.4
net.fabricmc:fabric-loader:0.4.8+build.154
net.fabricmc:fabric-loader:0.4.8+build.158
net.fabricmc:sponge-mixin:0.7.11.20
net.fabricmc:tiny-mappings-parser:0.1.1.8
net.fabricmc:tiny-remapper:0.1.0.33
org.jetbrains.kotlin:kotlin-reflect:1.3.31
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.31
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.31
org.jetbrains.kotlin:kotlin-stdlib:1.3.31
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1
org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.2.1
org.jetbrains.kotlin:kotlin-reflect:1.3.40
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.40
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.40
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.40
org.jetbrains.kotlin:kotlin-stdlib:1.3.40
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.2
org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.2.2
org.jetbrains:annotations:16.0.3
org.ow2.asm:asm-analysis:7.1
org.ow2.asm:asm-commons:7.1
......
......@@ -6,15 +6,15 @@ import me.sargunvohra.mcmods.leveluphp.LevelUpHp
import me.sargunvohra.mcmods.leveluphp.hpLevelHandler
import me.sargunvohra.mcmods.leveluphp.level.HpLevelHandler
import net.minecraft.command.arguments.EntityArgumentType
import net.minecraft.network.chat.Component
import net.minecraft.network.chat.TextComponent
import net.minecraft.server.command.CommandManager
import net.minecraft.server.command.CommandManager.literal
import net.minecraft.server.command.ServerCommandSource
import net.minecraft.text.LiteralText
import net.minecraft.text.Text
fun getter(
literal: String,
response: (HpLevelHandler) -> Component
response: (HpLevelHandler) -> Text
): LiteralArgumentBuilder<ServerCommandSource> {
return literal(literal)
.executes { ctx ->
......@@ -63,12 +63,12 @@ fun buildLevelUpHpCommand(): LiteralArgumentBuilder<ServerCommandSource> {
setter("setlevel") { obj, level -> obj.level = level },
setter("addlevel") { obj, levels -> obj.level += levels },
getter("check") {
TextComponent("level: ${it.level}, xp: ${it.xp}/${it.currentXpTarget}")
LiteralText("level: ${it.level}, xp: ${it.xp}/${it.currentXpTarget}")
},
literal("config")
.executes {
it.source.sendFeedback(
TextComponent(LevelUpHp.reloadListener.config.toString()),
LiteralText(LevelUpHp.reloadListener.config.toString()),
false
)
return@executes 0
......
......@@ -2,10 +2,12 @@ package me.sargunvohra.mcmods.leveluphp.config
import me.sargunvohra.mcmods.autoconfig1.ConfigData
import me.sargunvohra.mcmods.autoconfig1.annotation.Config
import me.sargunvohra.mcmods.autoconfig1.annotation.ConfigEntry
@Config(name = "leveluphp")
@Config.Gui.Background("textures/block/spruce_planks.png")
data class ClientConfig(
@ConfigEntry.Gui.PrefixText
val enableXpBarOverride: Boolean = true
) : ConfigData {
override fun validatePostLoad() {}
......
......@@ -15,7 +15,7 @@ import net.minecraft.util.TypedActionResult
import net.minecraft.util.UseAction
import net.minecraft.world.World
class HeartContainerItem : Item(Item.Settings().itemGroup(ItemGroup.MISC).stackSize(1)) {
class HeartContainerItem : Item(Item.Settings().group(ItemGroup.MISC).maxCount(1)) {
override fun hasEnchantmentGlint(stack: ItemStack) = true
......@@ -34,7 +34,7 @@ class HeartContainerItem : Item(Item.Settings().itemGroup(ItemGroup.MISC).stackS
return ret
}
override fun onItemFinishedUsing(
override fun finishUsing(
stack: ItemStack,
world: World,
entity: LivingEntity
......@@ -43,7 +43,7 @@ class HeartContainerItem : Item(Item.Settings().itemGroup(ItemGroup.MISC).stackS
it.level++
entity.incrementStat(Stats.USED.getOrCreateStat(this))
Criterions.CONSUME_ITEM.handle(entity, stack)
stack.subtractAmount(1)
stack.decrement(1)
}
return stack
}
......
......@@ -13,7 +13,7 @@ import net.minecraft.nbt.CompoundTag
import net.minecraft.nbt.Tag
import net.minecraft.server.network.ServerPlayerEntity
import net.minecraft.sound.SoundCategory
import net.minecraft.network.chat.TextComponent
import net.minecraft.text.LiteralText
import net.minecraft.util.registry.Registry
import java.util.UUID
......@@ -129,7 +129,7 @@ class HpLevelHandler {
LevelUpCriterion.handle(player)
player.addChatMessage(TextComponent("§c§lHP up!"), true)
player.addChatMessage(LiteralText("§c§lHP up!"), true)
player.world.playSound(
null,
......
......@@ -4,6 +4,7 @@
"text.autoconfig.leveluphp.title": "Level Up HP",
"text.autoconfig.leveluphp.category.default": "General",
"text.autoconfig.leveluphp.option.enableXpBarOverride": "Enable custom XP bar",
"text.autoconfig.leveluphp.option.enableXpBarOverride.@PrefixText": "Values like starting health, xp gain, and death penalties are customizable with data packs, not with this config. See the mod's wiki for more information, including instructions.",
"advancements.leveluphp.level_up.title": "Level Up HP",
"advancements.leveluphp.level_up.description": "Earn your first HP level",
"advancements.leveluphp.level_up_max.title": "Maxed Out HP",
......
......@@ -33,11 +33,11 @@
"me.sargunvohra.mcmods.leveluphp.ModMenuCompat"
]
},
"requires": {
"depends": {
"fabricloader": ">=0.4.0",
"fabric": ">=0.3.0",
"fabric-language-kotlin": ">=1.3.30",
"autoconfig": ">=1.0.0"
"autoconfig1": ">=1.0.0"
},
"mixins": [
"leveluphp.mixins.json"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment