Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various fixes #4245

Merged
merged 12 commits into from
Oct 15, 2021
Merged

Various fixes #4245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8ec5b86
Updated the required version of forge to 34.X
TheBv Sep 20, 2021
88e40b2
When a stone statue get's created it no longer writes the players NBT…
TheBv Sep 20, 2021
af8c758
Added maxRange value to stop crashings related to players teleporting…
TheBv Sep 24, 2021
6bba46c
Improved logic (+ readability) for checking if an entity is stuck or …
TheBv Oct 14, 2021
cc380e2
Added boolean to make sure only one ice dragon can be spawned from an…
TheBv Oct 14, 2021
32b606a
Renamed `getScale` to `getDeathwormScale` to prevent mapping conflicts.
TheBv Oct 14, 2021
d7c4ee3
Added check to make sure the myrmex staff has the unique id "HiveUUID"
TheBv Oct 14, 2021
461c076
Removed code related to "baking" animations from DragonTabulaModelAni…
TheBv Aug 9, 2021
7da04b2
Prevent unnecessary log spam related to the error message of "Excepti…
TheBv Oct 14, 2021
09bf862
Fixed animation issues related to dragons membrane as well as the rot…
TheBv Oct 14, 2021
eeed4f5
Fixed cockatrice targeting players in spectator mode Resolves #4069, …
TheBv Oct 14, 2021
37c60b2
Updated min required forge version to 35.X or higher as well as the r…
TheBv Oct 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 24 additions & 24 deletions src/main/java/com/github/alexthe666/iceandfire/IceAndFire.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class IceAndFire {
public static final String MODID = "iceandfire";
public static final SimpleChannel NETWORK_WRAPPER;
public static boolean DEBUG = true;
public static final String VERSION = "2.1.6-1.16.4";
public static final String VERSION = "2.1.9-1.16.4";
private static final String PROTOCOL_VERSION = Integer.toString(1);
public static ItemGroup TAB_ITEMS = new ItemGroup(MODID) {
@Override
Expand Down Expand Up @@ -134,29 +134,29 @@ public static <MSG> void sendNonLocal(MSG msg, ServerPlayerEntity player) {
}*/

private void setup(final FMLCommonSetupEvent event) {
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageAddChainedEntity.class, MessageAddChainedEntity::write, MessageAddChainedEntity::read, MessageAddChainedEntity.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageDaytime.class, MessageDaytime::write, MessageDaytime::read, MessageDaytime.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageDeathWormHitbox.class, MessageDeathWormHitbox::write, MessageDeathWormHitbox::read, MessageDeathWormHitbox.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageDragonControl.class, MessageDragonControl::write, MessageDragonControl::read, MessageDragonControl.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageDragonSetBurnBlock.class, MessageDragonSetBurnBlock::write, MessageDragonSetBurnBlock::read, MessageDragonSetBurnBlock.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageDragonSyncFire.class, MessageDragonSyncFire::write, MessageDragonSyncFire::read, MessageDragonSyncFire.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageGetMyrmexHive.class, MessageGetMyrmexHive::write, MessageGetMyrmexHive::read, MessageGetMyrmexHive.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageMyrmexSettings.class, MessageMyrmexSettings::write, MessageMyrmexSettings::read, MessageMyrmexSettings.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageHippogryphArmor.class, MessageHippogryphArmor::write, MessageHippogryphArmor::read, MessageHippogryphArmor.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageMultipartInteract.class, MessageMultipartInteract::write, MessageMultipartInteract::read, MessageMultipartInteract.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessagePlayerHitMultipart.class, MessagePlayerHitMultipart::write, MessagePlayerHitMultipart::read, MessagePlayerHitMultipart.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageRemoveChainedEntity.class, MessageRemoveChainedEntity::write, MessageRemoveChainedEntity::read, MessageRemoveChainedEntity.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageSetMyrmexHiveNull.class, MessageSetMyrmexHiveNull::write, MessageSetMyrmexHiveNull::read, MessageSetMyrmexHiveNull.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageSirenSong.class, MessageSirenSong::write, MessageSirenSong::read, MessageSirenSong.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageSpawnParticleAt.class, MessageSpawnParticleAt::write, MessageSpawnParticleAt::read, MessageSpawnParticleAt.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageStartRidingMob.class, MessageStartRidingMob::write, MessageStartRidingMob::read, MessageStartRidingMob.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdatePixieHouse.class, MessageUpdatePixieHouse::write, MessageUpdatePixieHouse::read, MessageUpdatePixieHouse.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdatePixieHouseModel.class, MessageUpdatePixieHouseModel::write, MessageUpdatePixieHouseModel::read, MessageUpdatePixieHouseModel.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdatePixieJar.class, MessageUpdatePixieJar::write, MessageUpdatePixieJar::read, MessageUpdatePixieJar.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdatePodium.class, MessageUpdatePodium::write, MessageUpdatePodium::read, MessageUpdatePodium.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdateDragonforge.class, MessageUpdateDragonforge::write, MessageUpdateDragonforge::read, MessageUpdateDragonforge.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdateLectern.class, MessageUpdateLectern::write, MessageUpdateLectern::read, MessageUpdateLectern.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageSwingArm.class, MessageSwingArm::write, MessageSwingArm::read, MessageSwingArm.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageAddChainedEntity.class, MessageAddChainedEntity::write, MessageAddChainedEntity::read, MessageAddChainedEntity.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageDaytime.class, MessageDaytime::write, MessageDaytime::read, MessageDaytime.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageDeathWormHitbox.class, MessageDeathWormHitbox::write, MessageDeathWormHitbox::read, MessageDeathWormHitbox.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageDragonControl.class, MessageDragonControl::write, MessageDragonControl::read, MessageDragonControl.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageDragonSetBurnBlock.class, MessageDragonSetBurnBlock::write, MessageDragonSetBurnBlock::read, MessageDragonSetBurnBlock.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageDragonSyncFire.class, MessageDragonSyncFire::write, MessageDragonSyncFire::read, MessageDragonSyncFire.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageGetMyrmexHive.class, MessageGetMyrmexHive::write, MessageGetMyrmexHive::read, MessageGetMyrmexHive.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageMyrmexSettings.class, MessageMyrmexSettings::write, MessageMyrmexSettings::read, MessageMyrmexSettings.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageHippogryphArmor.class, MessageHippogryphArmor::write, MessageHippogryphArmor::read, MessageHippogryphArmor.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageMultipartInteract.class, MessageMultipartInteract::write, MessageMultipartInteract::read, MessageMultipartInteract.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessagePlayerHitMultipart.class, MessagePlayerHitMultipart::write, MessagePlayerHitMultipart::read, MessagePlayerHitMultipart.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageRemoveChainedEntity.class, MessageRemoveChainedEntity::write, MessageRemoveChainedEntity::read, MessageRemoveChainedEntity.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageSetMyrmexHiveNull.class, MessageSetMyrmexHiveNull::write, MessageSetMyrmexHiveNull::read, MessageSetMyrmexHiveNull.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageSirenSong.class, MessageSirenSong::write, MessageSirenSong::read, MessageSirenSong.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageSpawnParticleAt.class, MessageSpawnParticleAt::write, MessageSpawnParticleAt::read, MessageSpawnParticleAt.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageStartRidingMob.class, MessageStartRidingMob::write, MessageStartRidingMob::read, MessageStartRidingMob.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdatePixieHouse.class, MessageUpdatePixieHouse::write, MessageUpdatePixieHouse::read, MessageUpdatePixieHouse.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdatePixieHouseModel.class, MessageUpdatePixieHouseModel::write, MessageUpdatePixieHouseModel::read, MessageUpdatePixieHouseModel.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdatePixieJar.class, MessageUpdatePixieJar::write, MessageUpdatePixieJar::read, MessageUpdatePixieJar.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdatePodium.class, MessageUpdatePodium::write, MessageUpdatePodium::read, MessageUpdatePodium.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdateDragonforge.class, MessageUpdateDragonforge::write, MessageUpdateDragonforge::read, MessageUpdateDragonforge.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageUpdateLectern.class, MessageUpdateLectern::write, MessageUpdateLectern::read, MessageUpdateLectern.Handler::handle);
NETWORK_WRAPPER.registerMessage(packetsRegistered++, MessageSwingArm.class, MessageSwingArm::write, MessageSwingArm::read, MessageSwingArm.Handler::handle);
event.enqueueWork(() ->{
PROXY.setup();
IafProcessors.registerProcessors();
Expand Down
187 changes: 96 additions & 91 deletions src/main/java/com/github/alexthe666/iceandfire/client/model/ModelAmphithere.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,97 +310,102 @@ public Iterable<AdvancedModelBox> getAllParts() {

public void animate(IAnimatedEntity entity, float f, float f1, float f2, float f3, float f4, float f5) {
animator.update(entity);
animator.setAnimation(EntityAmphithere.ANIMATION_BITE);
animator.startKeyframe(5);
this.rotate(animator, Neck1, -39, 0, 0);
this.rotate(animator, Neck2, -18, 0, 0);
this.rotate(animator, Neck3, -11, 0, 0);
this.rotate(animator, Head, 60, 0, 0);
this.rotate(animator, Jaw, 41, 0, 0);
animator.endKeyframe();
animator.startKeyframe(5);
this.rotate(animator, Neck1, -19, 0, 0);
this.rotate(animator, Neck2, 23, 0, 0);
this.rotate(animator, Neck3, 7, 0, 0);
this.rotate(animator, Head, 20, 0, 0);
animator.endKeyframe();
animator.resetKeyframe(5);
animator.setAnimation(EntityAmphithere.ANIMATION_BITE_RIDER);
animator.startKeyframe(5);
this.rotate(animator, Neck1, 8, 0, 63);
this.rotate(animator, Neck2, -5, 35, 13);
this.rotate(animator, Neck3, -10, 70, 0);
this.rotate(animator, Head, 20, 30, 95);
this.rotate(animator, Jaw, 40, 0, 0);
animator.endKeyframe();
animator.startKeyframe(5);
this.rotate(animator, Neck1, 8, 0, 63);
this.rotate(animator, Neck2, -5, 35, 13);
this.rotate(animator, Neck3, -10, 70, 0);
this.rotate(animator, Head, 50, 40, 95);
animator.endKeyframe();
animator.resetKeyframe(5);
animator.setAnimation(EntityAmphithere.ANIMATION_WING_BLAST);
animator.startKeyframe(5);
wingBlastPose();
this.rotateMinus(animator, WingR, 32, 0, 170);
this.rotateMinus(animator, WingL, 32, 0, -170);
animator.endKeyframe();
animator.startKeyframe(5);
wingBlastPose();
this.rotateMinus(animator, WingR, 15, 0, 45);
this.rotateMinus(animator, WingL, 15, 0, -45);
animator.endKeyframe();
animator.startKeyframe(5);
wingBlastPose();
this.rotateMinus(animator, WingR, 32, 0, 170);
this.rotateMinus(animator, WingL, 32, 0, -170);
animator.endKeyframe();
animator.startKeyframe(5);
wingBlastPose();
this.rotateMinus(animator, WingR, 15, 0, 45);
this.rotateMinus(animator, WingL, 15, 0, -45);
animator.endKeyframe();
animator.resetKeyframe(10);
animator.setAnimation(EntityAmphithere.ANIMATION_TAIL_WHIP);
animator.startKeyframe(10);
this.rotate(animator, BodyUpper, 0, 30, 0);
this.rotate(animator, BodyLower, 0, 10, 0);
this.rotate(animator, Tail1, 0, 15, 0);
this.rotate(animator, Tail2, 0, 10, 0);
this.rotate(animator, Tail2, 0, 10, 0);
this.rotate(animator, Tail3, 0, 20, 0);
this.rotate(animator, Tail4, 0, 15, -20);
this.rotate(animator, Neck1, 0, -18, -20);
this.rotate(animator, Neck2, 0, -29, 0);
this.rotate(animator, Neck3, 0, -44, 0);
this.rotate(animator, Head, 31, -28, 0);
this.rotate(animator, WingL, 0, 18, 0);
this.rotate(animator, WingR, 0, -18, 0);
animator.endKeyframe();
animator.startKeyframe(5);
this.rotate(animator, BodyUpper, 0, -214, 0);
this.rotate(animator, BodyLower, 0, -10, 0);
this.rotate(animator, Tail1, 0, -15, 0);
this.rotate(animator, Tail2, 0, -7, 0);
this.rotate(animator, Tail2, 0, -7, 0);
this.rotate(animator, Tail3, 0, -7, 0);
this.rotate(animator, Tail4, 0, -15, -20);
this.rotate(animator, Neck1, 0, 18, -20);
this.rotate(animator, Neck2, 0, 29, 0);
this.rotate(animator, Neck3, 0, 44, 0);
this.rotate(animator, Head, 31, -28, 0);
this.rotate(animator, WingL, 0, 18, 0);
this.rotate(animator, WingR, 0, -18, 0);
animator.endKeyframe();
animator.setStaticKeyframe(3);
animator.resetKeyframe(7);
animator.endKeyframe();
animator.setAnimation(EntityAmphithere.ANIMATION_SPEAK);
animator.startKeyframe(5);
this.rotate(animator, Jaw, 31, 0, 0);
animator.endKeyframe();
animator.resetKeyframe(5);
if (animator.setAnimation(EntityAmphithere.ANIMATION_BITE)) {
animator.startKeyframe(5);
this.rotate(animator, Neck1, -39, 0, 0);
this.rotate(animator, Neck2, -18, 0, 0);
this.rotate(animator, Neck3, -11, 0, 0);
this.rotate(animator, Head, 60, 0, 0);
this.rotate(animator, Jaw, 41, 0, 0);
animator.endKeyframe();
animator.startKeyframe(5);
this.rotate(animator, Neck1, -19, 0, 0);
this.rotate(animator, Neck2, 23, 0, 0);
this.rotate(animator, Neck3, 7, 0, 0);
this.rotate(animator, Head, 20, 0, 0);
animator.endKeyframe();
animator.resetKeyframe(5);
}
if (animator.setAnimation(EntityAmphithere.ANIMATION_BITE_RIDER)) {
animator.startKeyframe(5);
this.rotate(animator, Neck1, 8, 0, 63);
this.rotate(animator, Neck2, -5, 35, 13);
this.rotate(animator, Neck3, -10, 70, 0);
this.rotate(animator, Head, 20, 30, 95);
this.rotate(animator, Jaw, 40, 0, 0);
animator.endKeyframe();
animator.startKeyframe(5);
this.rotate(animator, Neck1, 8, 0, 63);
this.rotate(animator, Neck2, -5, 35, 13);
this.rotate(animator, Neck3, -10, 70, 0);
this.rotate(animator, Head, 50, 40, 95);
animator.endKeyframe();
animator.resetKeyframe(5);
}
if (animator.setAnimation(EntityAmphithere.ANIMATION_WING_BLAST)) {
animator.startKeyframe(5);
wingBlastPose();
this.rotateMinus(animator, WingR, 32, 0, 170);
this.rotateMinus(animator, WingL, 32, 0, -170);
animator.endKeyframe();
animator.startKeyframe(5);
wingBlastPose();
this.rotateMinus(animator, WingR, 15, 0, 45);
this.rotateMinus(animator, WingL, 15, 0, -45);
animator.endKeyframe();
animator.startKeyframe(5);
wingBlastPose();
this.rotateMinus(animator, WingR, 32, 0, 170);
this.rotateMinus(animator, WingL, 32, 0, -170);
animator.endKeyframe();
animator.startKeyframe(5);
wingBlastPose();
this.rotateMinus(animator, WingR, 15, 0, 45);
this.rotateMinus(animator, WingL, 15, 0, -45);
animator.endKeyframe();
animator.resetKeyframe(10);
}
if (animator.setAnimation(EntityAmphithere.ANIMATION_TAIL_WHIP)) {
animator.startKeyframe(10);
this.rotate(animator, BodyUpper, 0, 30, 0);
this.rotate(animator, BodyLower, 0, 10, 0);
this.rotate(animator, Tail1, 0, 15, 0);
this.rotate(animator, Tail2, 0, 10, 0);
this.rotate(animator, Tail2, 0, 10, 0);
this.rotate(animator, Tail3, 0, 20, 0);
this.rotate(animator, Tail4, 0, 15, -20);
this.rotate(animator, Neck1, 0, -18, -20);
this.rotate(animator, Neck2, 0, -29, 0);
this.rotate(animator, Neck3, 0, -44, 0);
this.rotate(animator, Head, 31, -28, 0);
this.rotate(animator, WingL, 0, 18, 0);
this.rotate(animator, WingR, 0, -18, 0);
animator.endKeyframe();
animator.startKeyframe(5);
this.rotate(animator, BodyUpper, 0, -214, 0);
this.rotate(animator, BodyLower, 0, -10, 0);
this.rotate(animator, Tail1, 0, -15, 0);
this.rotate(animator, Tail2, 0, -7, 0);
this.rotate(animator, Tail2, 0, -7, 0);
this.rotate(animator, Tail3, 0, -7, 0);
this.rotate(animator, Tail4, 0, -15, -20);
this.rotate(animator, Neck1, 0, 18, -20);
this.rotate(animator, Neck2, 0, 29, 0);
this.rotate(animator, Neck3, 0, 44, 0);
this.rotate(animator, Head, 31, -28, 0);
this.rotate(animator, WingL, 0, 18, 0);
this.rotate(animator, WingR, 0, -18, 0);
animator.endKeyframe();
animator.setStaticKeyframe(3);
animator.resetKeyframe(7);
animator.endKeyframe();
}
if (animator.setAnimation(EntityAmphithere.ANIMATION_SPEAK)) {
animator.startKeyframe(5);
this.rotate(animator, Jaw, 31, 0, 0);
animator.endKeyframe();
animator.resetKeyframe(5);
}
}

private void wingBlastPose() {
Expand Down