Skip to content

Commit

Permalink
Additional changes and fixes to werewolf stuff after pull request.
Browse files Browse the repository at this point in the history
Updated LibGui to 8.1.1 to fix crashing with 1.20.1 (hopefully).

I have a bit of time free right now, so I'll attempt to get some stuff done, I don't know if I'll figure out the syncing issue with the vanity hide buttons but that's very minor and can be fixed later.

I will release this update I think, the three crash fixes is already enough reason to release this update.

Next update I want to practice making boss AI, I want to get at least the Eye of Cthulhu and Eater of Worlds finished alongside a full boss system for handling multiplayer stuff (a teams system, anti-grief, per-player loot, fancy health bars, etc.)

Other bosses will come later (Skeletron and Wall of Flesh would most likely be the update after along with maybe an improved dungeon)
This will take some time though, but once I have a hang of enemy AI i should be able to get a lot more done in less time.
  • Loading branch information
jakeb072001 committed Jan 27, 2024
1 parent c729f4e commit e154ada
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 10 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.7.2-1.20] - 2023-10-02
## [1.7.2-1.20.1] - 2024-01-27
### Changed
- Skulls and Pumpkin now work with vanity system
- Metal detector now detects Hellstone and Meteorite

### Fixed
- Changing dimension forgets equipped accessories and vanity until reequipped
- Hiding accessories not displaying for other players on server
- Hiding accessories not displaying for other players on server (currently has an issue where joining a world unhides everything even if it says its hidden)
- Crash with Apoli (Origins mod)
- Crash caused by LibGui
- Crash with Werewolf accessories

## [1.7.1-1.20] - 2023-09-30
### Changed
Expand Down Expand Up @@ -257,6 +259,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Initial release

[1.7.2-1.20.1]: https://github.com/jakeb072001/TerraMine/compare/v1.7.1-1.20...v1.7.2-1.20.1
[1.7.1-1.20]: https://github.com/jakeb072001/TerraMine/compare/v1.7.0-1.20...v1.7.1-1.20
[1.7.0-1.20]: https://github.com/jakeb072001/TerraMine/compare/v1.6.0-1.19...v1.7.0-1.20
[1.6.0-1.19]: https://github.com/jakeb072001/TerraMine/compare/v1.5.1...v1.6.0-1.19
Expand Down
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ dependencies {
modImplementation include("dev.onyxstudios.cardinal-components-api:cardinal-components-level:${project.cca_version}")
modImplementation include("dev.onyxstudios.cardinal-components-api:cardinal-components-world:${project.cca_version}")
modImplementation include("be.florens:expandability-fabric:${project.expandability_version}")
modImplementation include("io.github.cottonmc:LibGui:${project.libgui_version}+${project.fake_minecraft_version}")
// modImplementation include("io.github.fabricators_of_create:Porting-Lib:${project.porting_lib_version}")
modImplementation include("io.github.cottonmc:LibGui:${project.libgui_version}+${project.minecraft_version}")
modImplementation include("com.jamieswhiteshirt:reach-entity-attributes:${project.reach_entity_attr_version}")
modImplementation include("com.github.emilyploszaj:step-height-entity-attribute:${project.step_height_attr_version}") {
transitive = false
Expand Down Expand Up @@ -177,7 +176,7 @@ curseforge {
}

mainArtifact(remapJar.archiveFile) {
displayName = "[" + project.fake_minecraft_version + "] " + "TerraMine " + project.mod_version
displayName = "[" + project.minecraft_version + "] " + "TerraMine " + project.mod_version
}

afterEvaluate {
Expand All @@ -194,7 +193,7 @@ curseforge {
modrinth {
token = System.getenv("MODRINTH_TOKEN")
projectId = "terramine"
versionName = "[" + project.fake_minecraft_version + "] " + "TerraMine " + project.mod_version
versionName = "[" + project.minecraft_version + "] " + "TerraMine " + project.mod_version
versionNumber = project.mod_version
versionType = "beta"
uploadFile = remapJar
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ archives_base_name=terramine
# Dependencies
fabric_version=0.85.0
cca_version=5.2.1
libgui_version=8.0.0
libgui_version=8.1.1
expandability_version=9.0.0
terrablender_version=3.0.0.163
cloth_config_version=11.0.99
Expand Down
1 change: 0 additions & 1 deletion src/main/java/terramine/TerraMine.java
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ public void onInitialize() {
LOGGER.info("Finished initialization");
}

// todo: causing nbt problems right now
// maybe move into inventory itself or something? works perfectly like this though, so I'll just leave it for now
// probably not the best way of doing this, but it works for now, maybe look into improving later though
private void syncInventory(ServerPlayer player) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private void invokeDoubleJump(CallbackInfo info) {
public void addWerewolfJump(CallbackInfoReturnable<Float> info) {
LivingEntity self = (LivingEntity) (Object) this;
if (self.hasEffect(ModMobEffects.WEREWOLF)) {
info.setReturnValue(info.getReturnValue() + 0.1);
info.setReturnValue(info.getReturnValue() + 0.11f);
}
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/terramine/mixin/player/PlayerMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import terramine.common.init.ModComponents;
import terramine.common.init.ModMobEffects;
import terramine.common.item.accessories.AccessoryTerrariaItem;
import terramine.common.misc.TerrariaInventory;
import terramine.extensions.ItemExtensions;
Expand Down Expand Up @@ -51,6 +52,9 @@ private void onTick(CallbackInfo ci) {
accessoryItem.tick(terrariaInventory.getItem(i), (Player) (Object) this);
}
}
} else {
removeEffect(ModMobEffects.WEREWOLF);
removeEffect(ModMobEffects.MERFOLK);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"accessWidener": "terramine.accesswidener",

"depends": {
"minecraft": ">=1.20",
"minecraft": ">=1.20.1",
"fabricloader": ">=0.14.0",
"fabric": ">=0.83.0",
"expandability": ">=9.0.0",
Expand Down

0 comments on commit e154ada

Please sign in to comment.