-
-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update gradle.properties * Update gradle.properties * Backport Things to 1.20.1 * Update Chinese Translations * Fix Unused Mixins * Config should toggle old Boat model * Delete unused mixin block * Remove unused Codes * Remove unused import * Update Example gradle include * Change 1.20.3 to 23w41a --------- Co-authored-by: EnZaXD <[email protected]>
- Loading branch information
1 parent
c1558c4
commit c64287a
Showing
50 changed files
with
849 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
src/main/java/de/florianmichael/viafabricplus/definition/boat/BoatModel_1_8.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus | ||
| * Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package de.florianmichael.viafabricplus.definition.boat; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import net.minecraft.client.model.*; | ||
| import net.minecraft.client.render.entity.model.CompositeEntityModel; | ||
| import net.minecraft.client.render.entity.model.EntityModelLayer; | ||
| import net.minecraft.entity.vehicle.BoatEntity; | ||
| import net.minecraft.util.Identifier; | ||
|
|
||
| public class BoatModel_1_8 extends CompositeEntityModel<BoatEntity> { | ||
| public static final EntityModelLayer MODEL_LAYER = new EntityModelLayer(new Identifier("viafabricplus", "boat_1_8"), "main"); | ||
| private final ImmutableList<ModelPart> parts; | ||
|
|
||
| public BoatModel_1_8(ModelPart root) { | ||
| this.parts = ImmutableList.of(root.getChild("bottom"), root.getChild("back"), root.getChild("front"), root.getChild("right"), root.getChild("left")); | ||
| } | ||
|
|
||
| public static TexturedModelData getTexturedModelData() { | ||
| ModelData modelData = new ModelData(); | ||
| ModelPartData root = modelData.getRoot(); | ||
| final float width = 24; | ||
| final float wallHeight = 6; | ||
| final float baseWidth = 20; | ||
| final float pivotY = 4; | ||
| root.addChild("bottom", ModelPartBuilder.create().uv(0, 8).cuboid(-width / 2, -baseWidth / 2 + 2, -3, width, baseWidth - 4, 4), ModelTransform.of(0, pivotY, 0, (float) Math.PI / 2, 0, 0)); | ||
| root.addChild("back", ModelPartBuilder.create().uv(0, 0).cuboid(-width / 2 + 2, -wallHeight - 1, -1, width - 4, wallHeight, 2), ModelTransform.of(-width / 2 + 1, pivotY, 0, 0, (float) Math.PI * 1.5f, 0)); | ||
| root.addChild("front", ModelPartBuilder.create().uv(0, 0).cuboid(-width / 2 + 2, -wallHeight - 1, -1, width - 4, wallHeight, 2), ModelTransform.of(width / 2 - 1, pivotY, 0, 0, (float) Math.PI / 2, 0)); | ||
| root.addChild("right", ModelPartBuilder.create().uv(0, 0).cuboid(-width / 2 + 2, -wallHeight - 1, -1, width - 4, wallHeight, 2), ModelTransform.of(0, pivotY, -baseWidth / 2 + 1, 0, (float) Math.PI, 0)); | ||
| root.addChild("left", ModelPartBuilder.create().uv(0, 0).cuboid(-width / 2 + 2, -wallHeight - 1, -1, width - 4, wallHeight, 2), ModelTransform.pivot(0, pivotY, baseWidth / 2 - 1)); | ||
| return TexturedModelData.of(modelData, 64, 32); | ||
| } | ||
|
|
||
| @Override | ||
| public Iterable<ModelPart> getParts() { | ||
| return parts; | ||
| } | ||
|
|
||
| @Override | ||
| public void setAngles(BoatEntity entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { | ||
| } | ||
| } |
69 changes: 69 additions & 0 deletions
69
src/main/java/de/florianmichael/viafabricplus/definition/boat/BoatRenderer_1_8.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus | ||
| * Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package de.florianmichael.viafabricplus.definition.boat; | ||
|
|
||
| import net.minecraft.client.render.OverlayTexture; | ||
| import net.minecraft.client.render.VertexConsumer; | ||
| import net.minecraft.client.render.VertexConsumerProvider; | ||
| import net.minecraft.client.render.entity.EntityRenderer; | ||
| import net.minecraft.client.render.entity.EntityRendererFactory; | ||
| import net.minecraft.client.util.math.MatrixStack; | ||
| import net.minecraft.entity.vehicle.BoatEntity; | ||
| import net.minecraft.util.Identifier; | ||
| import net.minecraft.util.math.MathHelper; | ||
| import net.minecraft.util.math.RotationAxis; | ||
|
|
||
| public class BoatRenderer_1_8 extends EntityRenderer<BoatEntity> { | ||
| private static final Identifier TEXTURE = new Identifier("viafabricplus", "textures/boat_1_8.png"); | ||
| private final BoatModel_1_8 model; | ||
|
|
||
| public BoatRenderer_1_8(EntityRendererFactory.Context ctx) { | ||
| super(ctx); | ||
| shadowRadius = 0.5f; | ||
| model = new BoatModel_1_8(ctx.getPart(BoatModel_1_8.MODEL_LAYER)); | ||
| } | ||
|
|
||
| @Override | ||
| public Identifier getTexture(BoatEntity entity) { | ||
| return TEXTURE; | ||
| } | ||
|
|
||
| @Override | ||
| public void render(BoatEntity entity, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light) { | ||
| matrices.push(); | ||
| matrices.translate(0, 0.25, 0); | ||
| matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(180 - yaw)); | ||
| float damageWobbleTicks = entity.getDamageWobbleTicks() - tickDelta; | ||
| float damageWobbleStrength = entity.getDamageWobbleStrength() - tickDelta; | ||
| if (damageWobbleStrength < 0) { | ||
| damageWobbleStrength = 0; | ||
| } | ||
|
|
||
| if (damageWobbleTicks > 0) { | ||
| matrices.multiply(RotationAxis.POSITIVE_X.rotationDegrees(MathHelper.sin(damageWobbleTicks) * damageWobbleTicks * damageWobbleStrength / 10 * entity.getDamageWobbleSide())); | ||
| } | ||
|
|
||
| matrices.scale(-1, -1, 1); | ||
| model.setAngles(entity, tickDelta, 0, -0.1f, 0, 0); | ||
| VertexConsumer vertexConsumer = vertexConsumers.getBuffer(model.getLayer(TEXTURE)); | ||
| model.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV, 1, 1, 1, 1); | ||
|
|
||
| matrices.pop(); | ||
| super.render(entity, yaw, tickDelta, matrices, vertexConsumers, light); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
src/main/java/de/florianmichael/viafabricplus/injection/access/IBoatEntity_1_8.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| /* | ||
| * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus | ||
| * Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package de.florianmichael.viafabricplus.injection.access; | ||
|
|
||
| public interface IBoatEntity_1_8 { | ||
|
|
||
| void viafabricplus_setBoatEmpty(boolean boatEmpty); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.