Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix some achievements and the ambiant sound playing too long, and version bump

Browse source
This commit is contained in:
gamma-delta 2022-01-20 16:01:02 -06:00
parent 41d8179d64
commit 1ea0560085
7 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -17,7 +17,7 @@ apply plugin: 'maven-publish'
apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.parchmentmc.librarian.forgegradle'
version = '0.1.0'
version = '0.1.1'
group = 'at.petra-k.hex' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'hex'

4
src/generated/resources/.cache/cache
View file

@ -29,8 +29,8 @@ f0cce957861ee854cbd68984015da2c530c9ef6d assets/hex/models/item/trinket_filled.j
2ac42506f03235f4335dd62f0d6a0c4f23ca61b9 data/forge/loot_modifiers/global_loot_modifiers.json
40eee88282c6d02518aab36a1da1d2f7d5c0a051 data/hex/advancements/aaa_wasteful_cast.json
f6d43f5b05b88aeebb1529aa700cc3dcc24bbc32 data/hex/advancements/aab_big_cast.json
d341fdd252063ed5355a161f0e50f1c425e84d7b data/hex/advancements/enlightenment.json
bf38859bbc413252bca5f271a56c3f8dde1f0457 data/hex/advancements/opened_eyes.json
7a7e26a15a44ce55b2258bb023ae1c8f0c9a7e95 data/hex/advancements/enlightenment.json
9e285fdc595c83e2b72c1ad363e8aafff8b642f1 data/hex/advancements/opened_eyes.json
912115e8811b07c3484f5ac781143c450d561023 data/hex/advancements/recipes/hex/artifact.json
33d503ee36d30d6fac2c96000faba800521130ac data/hex/advancements/recipes/hex/cypher.json
4a8e31487e2b1a74166af3e31e706b1534adbca7 data/hex/advancements/recipes/hex/focus.json

1
src/generated/resources/data/hex/advancements/enlightenment.json
View file

@ -23,6 +23,7 @@
"min": 17.95
},
"mojang_i_am_begging_and_crying_please_add_an_entity_health_criterion": {
"min": 0.1,
"max": 2.05
}
}

6
src/generated/resources/data/hex/advancements/opened_eyes.json
View file

@ -18,7 +18,11 @@
"criteria": {
"health_used": {
"trigger": "hex:overcast",
"conditions": {}
"conditions": {
"mojang_i_am_begging_and_crying_please_add_an_entity_health_criterion": {
"min": 0.1
}
}
}
},
"requirements": [

1
src/main/java/at/petrak/hex/client/gui/GuiSpellcasting.kt
View file

@ -156,6 +156,7 @@ class GuiSpellcasting(private val handOpenedWith: InteractionHand) : Screen(Text
this.drawState = PatternDrawState.BetweenPatterns
if (this.patterns.isEmpty()) {
Minecraft.getInstance().setScreen(null)
Minecraft.getInstance().soundManager.stop(HexSounds.CASTING_AMBIANCE.id, null)
}
}
is PatternDrawState.Drawing -> {

7
src/main/java/at/petrak/hex/common/network/MsgNewSpellPatternAck.java
View file

@ -51,12 +51,15 @@ public record MsgNewSpellPatternAck(boolean quitCasting, List<String> stackDesc)
public void handle(Supplier<NetworkEvent.Context> ctx) {
ctx.get().enqueueWork(() ->
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
var mc = Minecraft.getInstance();
if (this.quitCasting) {
// don't pay attention to the screen, so it also stops when we die
mc.getSoundManager().stop(HexSounds.CASTING_AMBIANCE.getId(), null);
}
var screen = Minecraft.getInstance().screen;
if (screen instanceof GuiSpellcasting) {
if (this.quitCasting) {
var mc = Minecraft.getInstance();
mc.setScreen(null);
mc.getSoundManager().stop(HexSounds.CASTING_AMBIANCE.getId(), null);
} else {
var spellGui = (GuiSpellcasting) screen;
spellGui.setStackDescs(this.stackDesc);

2
src/main/java/at/petrak/hex/datagen/Advancements.java
View file

@ -95,7 +95,7 @@ public class Advancements extends AdvancementProvider {
MinMaxBounds.Ints.ANY,
// add a little bit of slop here
MinMaxBounds.Doubles.atLeast(17.95),
MinMaxBounds.Doubles.atMost(2.05)))
MinMaxBounds.Doubles.between(0.1, 2.05)))
.save(consumer, prefix("enlightenment"));
// super.registerAdvancements(consumer, fileHelper);