Skip to content

Port to 1.19.4 #11

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

Draft
byquanton wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Port to 1.19.4 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bd6d6f
feat: water transparency config
wiidotmom Mar 11, 2023
e13653e
misc: move config init to main class
wiidotmom Mar 11, 2023
d94a7ac
Started Porting to 1.19.4
byquanton Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.0-SNAPSHOT'
id 'fabric-loom' version '1.1-SNAPSHOT'
id 'maven-publish'
}

Expand Down Expand Up @@ -33,31 +33,34 @@ repositories {
url = 'https://ladysnake.jfrog.io/artifactory/mods'
}
maven { url 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/' }
maven { url "https://maven.shedaniel.me/" }
maven { url "https://maven.terraformersmc.com/releases/" }
}

dependencies {
modImplementation 'software.bernie.geckolib:geckolib-fabric-1.19:3.1.5'

minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

modImplementation 'software.bernie.geckolib:geckolib-fabric-1.19:3.1.5'

modImplementation "software.bernie.geckolib:geckolib-fabric-1.19.4:${project.geckolib_version}"
modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cca_version}"
modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${project.cca_version}"
include "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cca_version}"
include "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${project.cca_version}"

implementation "com.github.LlamaLad7:MixinExtras:${mixin_extras_version}"
annotationProcessor "com.github.LlamaLad7:MixinExtras:${mixin_extras_version}"
include "com.github.LlamaLad7:MixinExtras:${mixin_extras_version}"
implementation "com.github.LlamaLad7:MixinExtras:${project.mixin_extras_version}"
annotationProcessor "com.github.LlamaLad7:MixinExtras:${project.mixin_extras_version}"
include "com.github.LlamaLad7:MixinExtras:${project.mixin_extras_version}"

modCompileOnly "maven.modrinth:sodium:${sodium_version}"
modRuntimeOnly "maven.modrinth:sodium:${sodium_version}"
implementation "org.joml:joml:1.10.4"
modCompileOnly "maven.modrinth:sodium:${project.sodium_version}"
modRuntimeOnly "maven.modrinth:sodium:${project.sodium_version}"

modApi ("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {
exclude(group: "net.fabricmc.fabric-api")
}
modApi "com.terraformersmc:modmenu:${project.modmenu_version}"
}

processResources {
Expand Down
17 changes: 10 additions & 7 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@
org.gradle.jvmargs=-Xmx4G
org.gradle.parallel=true

minecraft_version=1.19.2
yarn_mappings=1.19.2+build.28
loader_version=0.14.11
minecraft_version=1.19.4
yarn_mappings=1.19.4+build.2
loader_version=0.14.19

mod_version = 1.0.0
mod_version = 1.1.0
maven_group = com.eightsidedsquare
archives_base_name = angling

fabric_version=0.68.0+1.19.2
fabric_version=0.78.0+1.19.4
mixin_extras_version=0.1.1
sodium_version=mc1.19.2-0.4.4
cca_version=5.0.0
sodium_version=mc1.19.4-0.4.10
cca_version=5.1.0
geckolib_version=4.1.3
cloth_config_version=10.0.96
modmenu_version=6.1.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions gradlew
100644 → 100755
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions src/main/java/com/eightsidedsquare/angling/client/AnglingClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry;
import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.item.ModelPredicateProviderRegistry;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.passive.TropicalFishEntity;
Expand All @@ -33,11 +33,12 @@
import net.minecraft.nbt.NbtElement;
import net.minecraft.util.DyeColor;
import net.minecraft.util.Identifier;
import software.bernie.geckolib3.core.util.Color;
import software.bernie.geckolib.core.object.Color;

import static com.eightsidedsquare.angling.core.AnglingMod.MOD_ID;

public class AnglingClient implements ClientModInitializer {

@Override
public void onInitializeClient() {
BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),
Expand All @@ -61,12 +62,12 @@ public void onInitializeClient() {
EntityRendererRegistry.register(AnglingEntities.ANGLERFISH, AnglerfishEntityRenderer::new);
EntityRendererRegistry.register(AnglingEntities.MAHI_MAHI, BasicEntityRenderer.create("mahi_mahi", true));

BlockEntityRendererRegistry.register(AnglingEntities.STARFISH, StarfishBlockEntityRenderer::new);
BlockEntityRendererRegistry.register(AnglingEntities.ANEMONE, AnemoneBlockEntityRenderer::new);
BlockEntityRendererRegistry.register(AnglingEntities.URCHIN, UrchinBlockEntityRenderer::new);
BlockEntityRendererFactories.register(AnglingEntities.STARFISH, StarfishBlockEntityRenderer::new);
BlockEntityRendererFactories.register(AnglingEntities.ANEMONE, AnemoneBlockEntityRenderer::new);
BlockEntityRendererFactories.register(AnglingEntities.URCHIN, UrchinBlockEntityRenderer::new);
if(FabricLoader.getInstance().isModLoaded("sodium")) {
BlockEntityRendererRegistry.register(AnglingEntities.ROE, RoeBlockEntityRenderer::new);
BlockEntityRendererRegistry.register(AnglingEntities.SEA_SLUG_EGGS, SeaSlugEggsBlockEntityRenderer::new);
BlockEntityRendererFactories.register(AnglingEntities.ROE, RoeBlockEntityRenderer::new);
BlockEntityRendererFactories.register(AnglingEntities.SEA_SLUG_EGGS, SeaSlugEggsBlockEntityRenderer::new);
}

ColorProviderRegistry.BLOCK.register(RoeBlockEntity::getColor, AnglingBlocks.ROE);
Expand All @@ -84,7 +85,6 @@ public void onInitializeClient() {
ParticleFactoryRegistry.getInstance().register(AnglingParticles.WORM, WormParticle.Factory::new);

ModelPredicateProviderRegistry.register(AnglingItems.DONGFISH_BUCKET, new Identifier(MOD_ID, "has_horngus"), this::dongfishBucketItemHasHorngus);

}

private float dongfishBucketItemHasHorngus(ItemStack stack, ClientWorld clientWorld, LivingEntity livingEntity, int i) {
Expand Down
10 changes: 2 additions & 8 deletions src/main/java/com/eightsidedsquare/angling/client/model/AnemoneBlockEntityModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import com.eightsidedsquare.angling.common.entity.AnemoneBlockEntity;
import net.minecraft.util.Identifier;
import software.bernie.geckolib3.model.AnimatedGeoModel;
import software.bernie.geckolib.model.GeoModel;

import static com.eightsidedsquare.angling.core.AnglingMod.MOD_ID;

public class AnemoneBlockEntityModel extends AnimatedGeoModel<AnemoneBlockEntity> {
public class AnemoneBlockEntityModel extends GeoModel<AnemoneBlockEntity> {
@Override
public Identifier getModelResource(AnemoneBlockEntity object) {
return new Identifier(MOD_ID, "geo/anemone.geo.json");
Expand All @@ -21,10 +21,4 @@ public Identifier getTextureResource(AnemoneBlockEntity entity) {
public Identifier getAnimationResource(AnemoneBlockEntity animatable) {
return new Identifier(MOD_ID, "animations/anemone.animation.json");
}

@Override
public void setLivingAnimations(AnemoneBlockEntity entity, Integer uniqueID) {

super.setLivingAnimations(entity, uniqueID);
}
}
36 changes: 18 additions & 18 deletions src/main/java/com/eightsidedsquare/angling/client/model/BasicEntityModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
import com.eightsidedsquare.angling.core.AnglingUtil;
import net.minecraft.entity.LivingEntity;
import net.minecraft.util.Identifier;
import software.bernie.geckolib3.core.IAnimatable;
import software.bernie.geckolib3.core.event.predicate.AnimationEvent;
import software.bernie.geckolib3.core.processor.IBone;
import software.bernie.geckolib3.model.AnimatedGeoModel;
import software.bernie.geckolib3.model.provider.data.EntityModelData;

import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import software.bernie.geckolib.constant.DataTickets;
import software.bernie.geckolib.core.animatable.GeoAnimatable;
import software.bernie.geckolib.core.animatable.model.CoreGeoBone;
import software.bernie.geckolib.core.animation.AnimationState;
import software.bernie.geckolib.model.GeoModel;
import software.bernie.geckolib.model.data.EntityModelData;

import static com.eightsidedsquare.angling.core.AnglingMod.MOD_ID;

public class BasicEntityModel<A extends LivingEntity & IAnimatable> extends AnimatedGeoModel<A> {
public class BasicEntityModel<A extends LivingEntity & GeoAnimatable> extends GeoModel<A> {

private final Identifier model;
private final Identifier texture;
Expand Down Expand Up @@ -57,24 +57,24 @@ public Identifier getAnimationResource(A entity) {
}

@Override
@SuppressWarnings("unchecked")
public void setLivingAnimations(A entity, Integer uniqueID, AnimationEvent event) {
public void setCustomAnimations(A animatable, long instanceId, AnimationState<A> animationState) {
if(!AnglingUtil.isReloadingResources()) {
super.setLivingAnimations(entity, uniqueID, event);
super.setCustomAnimations(animatable, instanceId, animationState);
if(liesOutOfWater) {
IBone root = getAnimationProcessor().getBone("root");
if (!entity.isTouchingWater() && root != null) {
root.setRotationZ((float) (Math.PI / 2d));
CoreGeoBone root = getAnimationProcessor().getBone("root");
if (!animatable.isTouchingWater() && root != null) {
root.setRotZ((float) (Math.PI / 2d));
}
}
if(head != null) {
IBone headBone = this.getAnimationProcessor().getBone(head);
EntityModelData extraData = (EntityModelData) event.getExtraDataOfType(EntityModelData.class).get(0);
CoreGeoBone headBone = this.getAnimationProcessor().getBone(head);
EntityModelData extraData = animationState.getData(DataTickets.ENTITY_MODEL_DATA);
if (headBone != null) {
headBone.setRotationX(extraData.headPitch * ((float) Math.PI / 180F));
headBone.setRotationY(extraData.netHeadYaw * ((float) Math.PI / 180F));
headBone.setRotX(extraData.headPitch() * ((float) Math.PI / 180F));
headBone.setRotY(extraData.netHeadYaw() * ((float) Math.PI / 180F));
}
}
}
}

}
29 changes: 15 additions & 14 deletions src/main/java/com/eightsidedsquare/angling/client/model/CrabEntityModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
import com.eightsidedsquare.angling.common.entity.CrabEntity;
import com.eightsidedsquare.angling.core.AnglingUtil;
import net.minecraft.util.Identifier;
import software.bernie.geckolib3.core.event.predicate.AnimationEvent;
import software.bernie.geckolib3.core.processor.IBone;
import software.bernie.geckolib3.model.AnimatedGeoModel;
import software.bernie.geckolib3.model.provider.data.EntityModelData;
import software.bernie.geckolib.constant.DataTickets;
import software.bernie.geckolib.core.animatable.model.CoreGeoBone;
import software.bernie.geckolib.core.animation.AnimationState;
import software.bernie.geckolib.model.GeoModel;
import software.bernie.geckolib.model.data.EntityModelData;

import static com.eightsidedsquare.angling.core.AnglingMod.MOD_ID;

public class CrabEntityModel extends AnimatedGeoModel<CrabEntity> {
public class CrabEntityModel extends GeoModel<CrabEntity> {

@Override
public Identifier getModelResource(CrabEntity entity) {
Expand All @@ -27,21 +28,21 @@ public Identifier getAnimationResource(CrabEntity entity) {
return new Identifier(MOD_ID, "animations/crab.animation.json");
}

@Override @SuppressWarnings("unchecked")
public void setLivingAnimations(CrabEntity entity, Integer uniqueID, AnimationEvent event) {
@Override
public void setCustomAnimations(CrabEntity animatable, long instanceId, AnimationState<CrabEntity> animationState) {
if(!AnglingUtil.isReloadingResources()) {
super.setLivingAnimations(entity, uniqueID, event);
IBone root = getAnimationProcessor().getBone("root");
IBone eyes = getAnimationProcessor().getBone("eyes");
EntityModelData extraData = (EntityModelData) event.getExtraDataOfType(EntityModelData.class).get(0);
super.setCustomAnimations(animatable, instanceId, animationState);
CoreGeoBone root = getAnimationProcessor().getBone("root");
CoreGeoBone eyes = getAnimationProcessor().getBone("eyes");
EntityModelData extraData = animationState.getData(DataTickets.ENTITY_MODEL_DATA);
if (eyes != null) {
eyes.setRotationX(extraData.headPitch * ((float) Math.PI / 180F));
eyes.setRotX(extraData.headPitch() * ((float) Math.PI / 180F));
}
if(extraData.isChild && root != null) {
if(extraData.isChild() && root != null) {
root.setScaleX(0.35f);
root.setScaleY(0.35f);
root.setScaleZ(0.35f);
root.setPositionY(-1.75f);
root.setPosY(-1.75f);
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/eightsidedsquare/angling/client/model/DongfishEntityModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import com.eightsidedsquare.angling.common.entity.DongfishEntity;
import com.eightsidedsquare.angling.core.AnglingUtil;
import software.bernie.geckolib3.core.event.predicate.AnimationEvent;
import software.bernie.geckolib3.core.processor.IBone;
import software.bernie.geckolib.core.animatable.model.CoreGeoBone;
import software.bernie.geckolib.core.animation.AnimationState;

public class DongfishEntityModel extends BasicEntityModel<DongfishEntity> {

Expand All @@ -12,12 +12,12 @@ public DongfishEntityModel() {
}

@Override
public void setLivingAnimations(DongfishEntity entity, Integer uniqueID, AnimationEvent customPredicate) {
super.setLivingAnimations(entity, uniqueID, customPredicate);
public void setCustomAnimations(DongfishEntity animatable, long instanceId, AnimationState<DongfishEntity> animationState) {
super.setCustomAnimations(animatable, instanceId, animationState);
if(!AnglingUtil.isReloadingResources()) {
IBone scungle = getAnimationProcessor().getBone("scungle");
CoreGeoBone scungle = getAnimationProcessor().getBone("scungle");
if(scungle != null) {
scungle.setHidden(!entity.hasHorngus());
scungle.setHidden(!animatable.hasHorngus());
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/eightsidedsquare/angling/client/model/NautilusEntityModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

import com.eightsidedsquare.angling.common.entity.NautilusEntity;
import com.eightsidedsquare.angling.core.AnglingUtil;
import software.bernie.geckolib3.core.event.predicate.AnimationEvent;
import software.bernie.geckolib3.core.processor.IBone;
import software.bernie.geckolib.core.animatable.model.CoreGeoBone;
import software.bernie.geckolib.core.animation.AnimationState;

public class NautilusEntityModel extends BasicEntityModel<NautilusEntity> {
public NautilusEntityModel() {
super("nautilus", true);
}

@Override
public void setLivingAnimations(NautilusEntity entity, Integer uniqueID, AnimationEvent customPredicate) {
public void setCustomAnimations(NautilusEntity animatable, long instanceId, AnimationState<NautilusEntity> animationState) {
if(!AnglingUtil.isReloadingResources()) {
super.setLivingAnimations(entity, uniqueID, customPredicate);
IBone root = getAnimationProcessor().getBone("root");
if(!entity.isTouchingWater() && root != null) {
root.setRotationZ((float) (Math.PI / -2d));
root.setPositionY(-1.5f);
super.setCustomAnimations(animatable, instanceId, animationState);
CoreGeoBone root = getAnimationProcessor().getBone("root");
if(!animatable.isTouchingWater() && root != null) {
root.setRotZ((float) (Math.PI / -2d));
root.setPosY(-1.5f);
}
}
}
Expand Down
Loading