Skip to content

Commit

Permalink
More 1.17 porting and fixes - Forge works, Fabric does not outside dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@itsmeow
itsmeow committed Dec 22, 2021
1 parent 969d665 commit 83ba03e
Show file tree
Hide file tree
Showing 41 changed files with 254 additions and 251 deletions.
2 changes: 1 addition & 1 deletion common/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ afterEvaluate {
}
}
dependencies {
modImplementation("dev.itsmeow.imdlib:imdlib-common:${rootProject.imdlib_version}") {
modCompileOnlyApi("dev.itsmeow.imdlib:imdlib-common:${rootProject.imdlib_version}") {
transitive = false
}
}
1 change: 0 additions & 1 deletion common/src/main/java/dev/itsmeow/betteranimalsplus/BetterAnimalsPlusMod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ public static void construct() {
PlayerEvent.PLAYER_JOIN.register(BetterAnimalsPlusMod::onPlayerJoin);
PlayerEvent.PLAYER_QUIT.register(BetterAnimalsPlusMod::onPlayerLeave);
CommonEventHandler.init();
//ClassLoadHacks.runWhenLoaded("curios", () -> () -> CuriosModCompat.subscribe(modBus));
}

public static void init(Consumer<Runnable> enqueue) {
Expand Down
225 changes: 116 additions & 109 deletions common/src/main/java/dev/itsmeow/betteranimalsplus/client/ClientLifecycleHandler.java
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions ...c/main/java/dev/itsmeow/betteranimalsplus/client/model/block/head/ModelBlackBearHead.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public static LayerDefinition createBodyLayer() {
MeshDefinition meshdefinition = new MeshDefinition();
PartDefinition partdefinition = meshdefinition.getRoot();
PartDefinition head = partdefinition.addOrReplaceChild("head", CubeListBuilder.create().texOffs(93, 37).addBox(-4.0F, -5.5F, -7.25F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.0F))
.texOffs(0, 7).addBox(-1.75F, -7.5F, -4.25F, 3.0F, 3.0F, 2.0F, new CubeDeformation(0.0F))
.texOffs(0, 7).mirror().addBox(-8.75F, -7.5F, -4.25F, 3.0F, 3.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false)
.texOffs(0, 54).addBox(-6.5F, -2.5F, -11.25F, 5.0F, 3.0F, 4.0F, new CubeDeformation(0.0F))
.texOffs(50, 18).addBox(-6.5F, 0.25F, -11.25F, 5.0F, 2.0F, 4.0F, new CubeDeformation(-0.2F)), PartPose.offset(0.0F, 0.0F, 0.0F));
PartDefinition nose_r1 = head.addOrReplaceChild("nose_r1", CubeListBuilder.create().texOffs(45, 0).addBox(-1.5F, -1.0F, -13.5F, 3.0F, 3.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-4.0F, -5.0F, 1.75F, 0.2182F, 0.0F, 0.0F));
.texOffs(0, 7).addBox(2.25F, -7.5F, -4.25F, 3.0F, 3.0F, 2.0F, new CubeDeformation(0.0F))
.texOffs(0, 7).mirror().addBox(-4.75F, -7.5F, -4.25F, 3.0F, 3.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false)
.texOffs(0, 54).addBox(-2.5F, -2.5F, -11.25F, 5.0F, 3.0F, 4.0F, new CubeDeformation(0.0F))
.texOffs(50, 18).addBox(-2.5F, 0.25F, -11.25F, 5.0F, 2.0F, 4.0F, new CubeDeformation(-0.2F)), PartPose.offset(0.0F, 24.0F, 0.0F));
PartDefinition nose_r1 = head.addOrReplaceChild("nose_r1", CubeListBuilder.create().texOffs(45, 0).addBox(-1.5F, -5.5F, -11.25F, 3.0F, 3.0F, 5.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.2182F, 0.0F, 0.0F));
PartDefinition lowerJaw = head.addOrReplaceChild("lowerJaw", CubeListBuilder.create().texOffs(21, 55).addBox(-2.0F, -1.0F, -4.0F, 4.0F, 2.0F, 5.0F, new CubeDeformation(0.0F))
.texOffs(46, 27).addBox(-2.0F, -2.5F, -4.0F, 4.0F, 2.0F, 5.0F, new CubeDeformation(-0.2F)), PartPose.offsetAndRotation(-4.0F, 1.0F, -6.5F, 0.5672F, 0.0F, 0.0F));
.texOffs(46, 27).addBox(-2.0F, -2.5F, -4.0F, 4.0F, 2.0F, 5.0F, new CubeDeformation(-0.2F)), PartPose.offsetAndRotation(0.0F, 1.0F, -6.5F, 0.5672F, 0.0F, 0.0F));
return LayerDefinition.create(meshdefinition, 128, 64);
}

Expand All @@ -40,7 +40,7 @@ public ModelPart basePart() {

@Override
public float wallOffsetX() {
return 4.1F;
return 3.25F;
}

@Override
Expand Down
14 changes: 7 additions & 7 deletions ...c/main/java/dev/itsmeow/betteranimalsplus/client/model/block/head/ModelBrownBearHead.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public static LayerDefinition createBodyLayer() {
MeshDefinition meshdefinition = new MeshDefinition();
PartDefinition partdefinition = meshdefinition.getRoot();
PartDefinition head = partdefinition.addOrReplaceChild("head", CubeListBuilder.create().texOffs(0, 87).addBox(-5.0F, -7.5F, -8.25F, 10.0F, 10.0F, 9.0F, new CubeDeformation(0.0F))
.texOffs(0, 9).addBox(-3.25F, -10.0F, -5.25F, 3.0F, 3.0F, 2.0F, new CubeDeformation(0.0F))
.texOffs(0, 9).mirror().addBox(-9.75F, -10.0F, -5.25F, 3.0F, 3.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false)
.texOffs(45, 81).addBox(-8.0F, -2.5F, -13.25F, 6.0F, 3.0F, 5.0F, new CubeDeformation(0.0F))
.texOffs(70, 83).addBox(-8.0F, 0.25F, -13.25F, 6.0F, 2.0F, 5.0F, new CubeDeformation(-0.2F)), PartPose.offset(0.0F, 0.0F, 0.0F));
PartDefinition nose_r1 = head.addOrReplaceChild("nose_r1", CubeListBuilder.create().texOffs(45, 0).addBox(-1.5F, 0.0F, -14.5F, 3.0F, 3.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-5.0F, -5.0F, 0.75F, 0.0873F, 0.0F, 0.0F));
.texOffs(0, 9).addBox(1.75F, -10.0F, -5.25F, 3.0F, 3.0F, 2.0F, new CubeDeformation(0.0F))
.texOffs(0, 9).mirror().addBox(-4.75F, -10.0F, -5.25F, 3.0F, 3.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false)
.texOffs(45, 81).addBox(-3.0F, -2.5F, -13.25F, 6.0F, 3.0F, 5.0F, new CubeDeformation(0.0F))
.texOffs(70, 83).addBox(-3.0F, 0.25F, -13.25F, 6.0F, 2.0F, 5.0F, new CubeDeformation(-0.2F)), PartPose.offset(0.0F, 24.0F, 0.0F));
PartDefinition nose_r1 = head.addOrReplaceChild("nose_r1", CubeListBuilder.create().texOffs(45, 0).addBox(-1.5F, -4.75F, -13.5F, 3.0F, 3.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.0873F, 0.0F, 0.0F));
PartDefinition lowerJaw = head.addOrReplaceChild("lowerJaw", CubeListBuilder.create().texOffs(45, 94).addBox(-2.5F, -1.0F, -5.0F, 5.0F, 2.0F, 6.0F, new CubeDeformation(0.0F))
.texOffs(70, 93).addBox(-2.5F, -2.5F, -5.0F, 5.0F, 2.0F, 6.0F, new CubeDeformation(-0.2F)), PartPose.offsetAndRotation(-5.0F, 1.0F, -7.0F, 0.5672F, 0.0F, 0.0F));
.texOffs(70, 93).addBox(-2.5F, -2.5F, -5.0F, 5.0F, 2.0F, 6.0F, new CubeDeformation(-0.2F)), PartPose.offsetAndRotation(0.0F, 1.0F, -7.0F, 0.5672F, 0.0F, 0.0F));
return LayerDefinition.create(meshdefinition, 128, 128);
}

Expand All @@ -40,7 +40,7 @@ public ModelPart basePart() {

@Override
public float wallOffsetX() {
return 3.1F;
return 3.25F;
}

@Override
Expand Down
32 changes: 14 additions & 18 deletions .../src/main/java/dev/itsmeow/betteranimalsplus/client/model/block/head/ModelCoyoteHead.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,24 @@ public ModelCoyoteHead(ModelPart root) {
public static LayerDefinition createBodyLayer() {
MeshDefinition meshdefinition = new MeshDefinition();
PartDefinition partdefinition = meshdefinition.getRoot();
PartDefinition head = partdefinition.addOrReplaceChild("head", CubeListBuilder.create().texOffs(0, 46).addBox(-2.5F, 19.0F, -2.0F, 5.0F, 5.0F, 4.0F, new CubeDeformation(-0.1F)), PartPose.offset(0.0F, 0.0F, 0.0F));
PartDefinition rCheekFur_r1 = head.addOrReplaceChild("rCheekFur_r1", CubeListBuilder.create().texOffs(0, 56).mirror().addBox(-2.5F, -3.75F, 0.0F, 4.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(-2.0F, 24.0F, 0.0F, 0.0F, 0.3927F, -0.4363F));
PartDefinition lCheekFur_r1 = head.addOrReplaceChild("lCheekFur_r1", CubeListBuilder.create().texOffs(0, 56).addBox(-2.5F, -3.5F, 0.0F, 4.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(3.0F, 24.0F, 0.0F, 0.0F, -0.3927F, 0.4363F));
PartDefinition head = partdefinition.addOrReplaceChild("head", CubeListBuilder.create().texOffs(0, 46).addBox(-2.5F, -4.75F, -2.0F, 5.0F, 5.0F, 4.0F, new CubeDeformation(-0.1F)), PartPose.offset(0.0F, 0.0F, 0.0F));
PartDefinition rCheekFur_r1 = head.addOrReplaceChild("rCheekFur_r1", CubeListBuilder.create().texOffs(0, 56).mirror().addBox(-4.5F, -4.75F, -0.5F, 4.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.0F, 0.3927F, -0.4363F));
PartDefinition lCheekFur_r1 = head.addOrReplaceChild("lCheekFur_r1", CubeListBuilder.create().texOffs(0, 56).addBox(0.5F, -4.5F, -0.5F, 4.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.0F, -0.3927F, 0.4363F));
PartDefinition lowerJaw = head.addOrReplaceChild("lowerJaw", CubeListBuilder.create().texOffs(19, 59).addBox(-1.0F, 0.0F, -2.5F, 2.0F, 1.0F, 3.0F, new CubeDeformation(-0.2F))
.texOffs(9, 56).addBox(-0.1F, -0.5F, -2.0F, 1.0F, 1.0F, 0.0F, new CubeDeformation(-0.2F))
.texOffs(9, 56).mirror().addBox(-0.9F, -0.5F, -2.0F, 1.0F, 1.0F, 0.0F, new CubeDeformation(-0.2F)).mirror(false), PartPose.offsetAndRotation(0.25F, 22.75F, -2.0F, 0.7418F, 0.0F, 0.0F));
PartDefinition muzzle = head.addOrReplaceChild("muzzle", CubeListBuilder.create().texOffs(19, 49).addBox(-1.0F, -0.5F, -2.5F, 2.0F, 1.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 21.5F, -2.0F, 0.1745F, 0.0F, 0.0F));
PartDefinition mUpperFang_r1 = muzzle.addOrReplaceChild("mUpperFang_r1", CubeListBuilder.create().texOffs(13, 56).mirror().addBox(-0.5F, -0.5F, 0.05F, 2.0F, 1.0F, 0.0F, new CubeDeformation(-0.1F)).mirror(false), PartPose.offsetAndRotation(-0.5F, 1.0F, -2.25F, -0.0873F, 0.0F, 0.0F));
PartDefinition rUpperFang_r1 = muzzle.addOrReplaceChild("rUpperFang_r1", CubeListBuilder.create().texOffs(9, 56).mirror().addBox(-0.5F, -0.25F, 0.0F, 1.0F, 1.0F, 0.0F, new CubeDeformation(-0.1F)).mirror(false), PartPose.offsetAndRotation(-0.5F, 1.0F, -2.25F, 0.0F, 1.5708F, 0.0F));
PartDefinition lUpperFang_r1 = muzzle.addOrReplaceChild("lUpperFang_r1", CubeListBuilder.create().texOffs(9, 56).addBox(-0.5F, -0.25F, 0.0F, 1.0F, 1.0F, 0.0F, new CubeDeformation(-0.1F)), PartPose.offsetAndRotation(0.5F, 1.0F, -2.25F, 0.0F, -1.5708F, 0.0F));
PartDefinition rLip_r1 = muzzle.addOrReplaceChild("rLip_r1", CubeListBuilder.create().texOffs(5, 59).mirror().addBox(-1.4F, 0.25F, -2.35F, 1.0F, 1.0F, 4.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, -0.1309F, -0.1745F, 0.0F));
PartDefinition lLip_r1 = muzzle.addOrReplaceChild("lLip_r1", CubeListBuilder.create().texOffs(5, 59).addBox(0.4F, 0.25F, -2.35F, 1.0F, 1.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, -0.1309F, 0.1745F, 0.0F));
PartDefinition lEar01 = head.addOrReplaceChild("lEar01", CubeListBuilder.create().texOffs(31, 50).addBox(-1.0F, -2.0F, 0.0F, 2.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(1.75F, 19.5F, 0.0F, 0.0F, -0.0873F, 0.2182F));
.texOffs(9, 56).mirror().addBox(-0.9F, -0.5F, -2.0F, 1.0F, 1.0F, 0.0F, new CubeDeformation(-0.2F)).mirror(false), PartPose.offsetAndRotation(0.0F, -1.25F, -2.0F, 0.7418F, 0.0F, 0.0F));
PartDefinition muzzle = head.addOrReplaceChild("muzzle", CubeListBuilder.create().texOffs(19, 49).addBox(-1.0F, -0.5F, -2.5F, 2.0F, 1.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -2.5F, -2.0F, 0.1745F, 0.0F, 0.0F));
PartDefinition mUpperFang_r1 = muzzle.addOrReplaceChild("mUpperFang_r1", CubeListBuilder.create().texOffs(13, 56).mirror().addBox(-1.0F, -1.5F, -4.45F, 2.0F, 1.0F, 0.0F, new CubeDeformation(-0.1F)).mirror(false), PartPose.offsetAndRotation(0.0F, 2.5F, 2.0F, -0.0873F, 0.0F, 0.0F));
PartDefinition rUpperFang_r1 = muzzle.addOrReplaceChild("rUpperFang_r1", CubeListBuilder.create().texOffs(9, 56).mirror().addBox(3.5F, -1.75F, -0.75F, 1.0F, 1.0F, 0.0F, new CubeDeformation(-0.1F)).mirror(false), PartPose.offsetAndRotation(0.0F, 2.5F, 2.0F, 0.0F, 1.5708F, 0.0F));
PartDefinition lUpperFang_r1 = muzzle.addOrReplaceChild("lUpperFang_r1", CubeListBuilder.create().texOffs(9, 56).addBox(-4.5F, -1.75F, -0.75F, 1.0F, 1.0F, 0.0F, new CubeDeformation(-0.1F)), PartPose.offsetAndRotation(0.0F, 2.5F, 2.0F, 0.0F, -1.5708F, 0.0F));
PartDefinition rLip_r1 = muzzle.addOrReplaceChild("rLip_r1", CubeListBuilder.create().texOffs(5, 59).mirror().addBox(-1.75F, -2.0F, -4.6F, 1.0F, 1.0F, 4.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 2.5F, 2.0F, -0.1309F, -0.1745F, 0.0F));
PartDefinition lLip_r1 = muzzle.addOrReplaceChild("lLip_r1", CubeListBuilder.create().texOffs(5, 59).addBox(0.75F, -2.0F, -4.6F, 1.0F, 1.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 2.5F, 2.0F, -0.1309F, 0.1745F, 0.0F));
PartDefinition lEar01 = head.addOrReplaceChild("lEar01", CubeListBuilder.create().texOffs(31, 50).addBox(-1.0F, -2.0F, 0.0F, 2.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(1.75F, -4.5F, 0.0F, 0.0F, -0.0873F, 0.2182F));
PartDefinition lEar02 = lEar01.addOrReplaceChild("lEar02", CubeListBuilder.create(), PartPose.offsetAndRotation(0.0F, 0.25F, -0.75F, 0.1745F, 0.0F, 0.0F));
PartDefinition cube_r1 = lEar02.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(31, 54).addBox(-0.25F, -3.5F, -0.25F, 2.0F, 4.0F, 2.0F, new CubeDeformation(-0.1F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.0F, -0.829F, 0.0F));
PartDefinition rEar01 = head.addOrReplaceChild("rEar01", CubeListBuilder.create().texOffs(31, 50).mirror().addBox(-1.0F, -2.0F, 0.0F, 2.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(-1.5F, 19.75F, 0.0F, 0.0F, 0.0873F, -0.2182F));
PartDefinition cube_r1 = lEar02.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(31, 54).addBox(0.5F, -7.75F, -2.0F, 2.0F, 4.0F, 2.0F, new CubeDeformation(-0.1F)), PartPose.offsetAndRotation(-1.75F, 4.25F, 0.75F, 0.0F, -0.829F, 0.0F));
PartDefinition rEar01 = head.addOrReplaceChild("rEar01", CubeListBuilder.create().texOffs(31, 50).mirror().addBox(-1.0F, -2.0F, 0.0F, 2.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(-1.5F, -4.25F, 0.0F, 0.0F, 0.0873F, -0.2182F));
PartDefinition rEar02 = rEar01.addOrReplaceChild("rEar02", CubeListBuilder.create(), PartPose.offsetAndRotation(0.0F, 0.0F, -0.75F, 0.2182F, 0.0F, 0.0F));
PartDefinition cube_r2 = rEar02.addOrReplaceChild("cube_r2", CubeListBuilder.create().texOffs(31, 54).mirror().addBox(-1.75F, -3.5F, -0.25F, 2.0F, 4.0F, 2.0F, new CubeDeformation(-0.1F)).mirror(false), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 0.0F, 0.829F, 0.0F));
PartDefinition cube_r2 = rEar02.addOrReplaceChild("cube_r2", CubeListBuilder.create().texOffs(31, 54).mirror().addBox(-2.25F, -7.75F, -2.0F, 2.0F, 4.0F, 2.0F, new CubeDeformation(-0.1F)).mirror(false), PartPose.offsetAndRotation(1.5F, 4.25F, 0.75F, 0.0F, 0.829F, 0.0F));
return LayerDefinition.create(meshdefinition, 64, 64);
}

Expand All @@ -79,8 +79,4 @@ public float wallOffsetX() {
return 2F;
}

@Override
public float globalOffsetY() {
return 24F;
}
}
Loading

0 comments on commit 83ba03e

Please sign in to comment.