56 changes: 56 additions & 0 deletions .github/workflows/tag.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,3 +447,59 @@ jobs:
name: ${{github.ref_name}}-1.20.6 - Fabric
files: 'versions/1.20.6-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
game-versions: 1.20.6
- name: Publish-1.21-forge-Curseforge
uses: Kir-Antipov/mc-publish@v3.3.0
with:
curseforge-id: 433760
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
loaders: forge
name: ${{github.ref_name}}-1.21 - Forge
version-type: beta
files: 'versions/1.21-forge/build/libs/!(*-@(dev|sources|javadoc)).jar'
game-versions: 1.21
- name: Publish-1.21-forge-Modrinth
uses: Kir-Antipov/mc-publish@v3.3.0
with:
modrinth-id: MPCX6s5C
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
loaders: forge
name: ${{github.ref_name}}-1.21 - Forge
files: 'versions/1.21-forge/build/libs/!(*-@(dev|sources|javadoc)).jar'
game-versions: 1.21
- name: Publish-1.21-neoforge-Curseforge
uses: Kir-Antipov/mc-publish@v3.3.0
with:
curseforge-id: 433760
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
loaders: neoforge
name: ${{github.ref_name}}-1.21 - NeoForge
version-type: beta
files: 'versions/1.21-neoforge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
game-versions: 1.21
- name: Publish-1.21-neoforge-Modrinth
uses: Kir-Antipov/mc-publish@v3.3.0
with:
modrinth-id: MPCX6s5C
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
loaders: neoforge
name: ${{github.ref_name}}-1.21 - NeoForge
files: 'versions/1.21-neoforge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
game-versions: 1.21
- name: Publish-1.21-fabric-Curseforge
uses: Kir-Antipov/mc-publish@v3.3.0
with:
curseforge-id: 433760
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
loaders: fabric
name: ${{github.ref_name}}-1.21 - Fabric
files: 'versions/1.21-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
game-versions: 1.21
- name: Publish-1.21-fabric-Modrinth
uses: Kir-Antipov/mc-publish@v3.3.0
with:
modrinth-id: MPCX6s5C
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
loaders: fabric
name: ${{github.ref_name}}-1.21 - Fabric
files: 'versions/1.21-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
game-versions: 1.21
2 changes: 1 addition & 1 deletion gradle-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source: "https://github.com/tr7zw/ProcessedModTemplate/tree/master"
replacements:
name: "NotEnoughAnimations"
id: "notenoughanimations"
version: "1.7.3"
version: "1.7.4"
description: "Adding and improving animations in Third-Person."
homepageUrl: "https://modrinth.com/mod/not-enough-animations"
sourcesUrl: "https://github.com/tr7zw/NotEnoughAnimations"
Expand Down
Binary file modified gradle/gradle-compose.jar
View file
Binary file not shown.
5 changes: 4 additions & 1 deletion settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
"1.20.4-fabric",
"1.20.6-forge",
"1.20.6-neoforge",
"1.20.6-fabric"
"1.20.6-fabric",
"1.21-forge",
"1.21-neoforge",
"1.21-fabric"
]
}
6 changes: 4 additions & 2 deletions src/main/java/dev/tr7zw/notenoughanimations/NEABootstrap.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@
//$$package dev.tr7zw.notenoughanimations;
//$$
//$$import net.neoforged.api.distmarker.Dist;
//$$import net.neoforged.fml.DistExecutor;
//$$import net.neoforged.fml.loading.FMLEnvironment;
//$$import net.neoforged.fml.common.Mod;
//$$
//$$@Mod("notenoughanimations")
//$$public class NEABootstrap {
//$$
//$$ public NEABootstrap() {
//$$ DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> NEAnimationsMod::new);
//$$ if(FMLEnvironment.dist == Dist.CLIENT) {
//$$ new NEAnimationsMod();
//$$ }
//$$ }
//$$
//$$}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/dev/tr7zw/notenoughanimations/animations/hands/LookAtItemAnimation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import dev.tr7zw.util.NMSHelper;
import net.minecraft.client.model.PlayerModel;
import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.HumanoidArm;
Expand All @@ -31,10 +30,11 @@ public boolean isEnabled() {

private void bind() {
holdingItems.clear();
Item invalid = NMSHelper.getItem(new ResourceLocation("minecraft", "air"));
Item invalid = NMSHelper.getItem(NMSHelper.getResourceLocation("minecraft", "air"));
for (String itemId : NEABaseMod.config.holdingItems) {
try {
Item item = NMSHelper.getItem(new ResourceLocation(itemId.split(":")[0], itemId.split(":")[1]));
Item item = NMSHelper
.getItem(NMSHelper.getResourceLocation(itemId.split(":")[0], itemId.split(":")[1]));
if (invalid != item)
holdingItems.add(item);
} catch (Exception ex) {
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/dev/tr7zw/notenoughanimations/animations/hands/MapHoldingAnimation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import dev.tr7zw.util.NMSHelper;
import net.minecraft.client.model.PlayerModel;
import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.HumanoidArm;
Expand All @@ -31,9 +30,9 @@ public boolean isEnabled() {

private void bind() {
compatibleMaps.clear();
Item invalid = NMSHelper.getItem(new ResourceLocation("minecraft", "air"));
compatibleMaps.add(NMSHelper.getItem(new ResourceLocation("minecraft", "filled_map")));
Item antiqueAtlas = NMSHelper.getItem(new ResourceLocation("antiqueatlas", "antique_atlas"));
Item invalid = NMSHelper.getItem(NMSHelper.getResourceLocation("minecraft", "air"));
compatibleMaps.add(NMSHelper.getItem(NMSHelper.getResourceLocation("minecraft", "filled_map")));
Item antiqueAtlas = NMSHelper.getItem(NMSHelper.getResourceLocation("antiqueatlas", "antique_atlas"));
if (invalid != antiqueAtlas) {
compatibleMaps.add(antiqueAtlas);
NEABaseMod.LOGGER.info("Added AntiqueAtlas support to Not Enough Animations!");
Expand Down
27 changes: 14 additions & 13 deletions src/main/java/dev/tr7zw/notenoughanimations/logic/HeldItemHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
import dev.tr7zw.notenoughanimations.versionless.NEABaseMod;
import dev.tr7zw.util.NMSHelper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.inventory.BookViewScreen;
import net.minecraft.client.gui.screens.inventory.BookViewScreen.BookAccess;
import net.minecraft.client.model.ArmedModel;
import net.minecraft.client.model.BookModel;
import net.minecraft.client.model.EntityModel;
Expand All @@ -37,8 +35,6 @@
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;

// spotless:off
//#if MC >= 11700
import net.minecraft.client.model.geom.ModelLayers;
Expand All @@ -47,18 +43,18 @@

public class HeldItemHandler {

private Item filledMap = NMSHelper.getItem(new ResourceLocation("minecraft", "filled_map"));
private Item book = NMSHelper.getItem(new ResourceLocation("minecraft", "book"));
private Item writtenBook = NMSHelper.getItem(new ResourceLocation("minecraft", "written_book"));
private Item writableBook = NMSHelper.getItem(new ResourceLocation("minecraft", "writable_book"));
private Item enchantedBook = NMSHelper.getItem(new ResourceLocation("minecraft", "enchanted_book"));
private Item knowledgeBook = NMSHelper.getItem(new ResourceLocation("minecraft", "knowledge_book"));
private Item filledMap = NMSHelper.getItem(NMSHelper.getResourceLocation("minecraft", "filled_map"));
private Item book = NMSHelper.getItem(NMSHelper.getResourceLocation("minecraft", "book"));
private Item writtenBook = NMSHelper.getItem(NMSHelper.getResourceLocation("minecraft", "written_book"));
private Item writableBook = NMSHelper.getItem(NMSHelper.getResourceLocation("minecraft", "writable_book"));
private Item enchantedBook = NMSHelper.getItem(NMSHelper.getResourceLocation("minecraft", "enchanted_book"));
private Item knowledgeBook = NMSHelper.getItem(NMSHelper.getResourceLocation("minecraft", "knowledge_book"));
public Set<Item> books = new HashSet<>(
Arrays.asList(writableBook, writtenBook, enchantedBook, knowledgeBook, book));
@SuppressWarnings("serial")
public Map<Item, ResourceLocation> bookTextures = new HashMap<Item, ResourceLocation>() {
{
put(knowledgeBook, new ResourceLocation("notenoughanimations", "textures/recipe_book.png"));
put(knowledgeBook, NMSHelper.getResourceLocation("notenoughanimations", "textures/recipe_book.png"));
}
};
public Set<Item> glintingBooks = new HashSet<>(Arrays.asList(enchantedBook));
Expand Down Expand Up @@ -194,8 +190,13 @@ private void renderBook(LivingEntity entity, float delta, ItemStack itemStack, H
} else {
vertexConsumer = EnchantTableRenderer.BOOK_LOCATION.buffer(vertexConsumers, RenderType::entitySolid, glow);
}

bookModel.render(matrices, vertexConsumer, light, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F);
// spotless:off
//#if MC >= 12100
bookModel.render(matrices, vertexConsumer, light, OverlayTexture.NO_OVERLAY, Integer.MAX_VALUE);
//#else
//$$ bookModel.render(matrices, vertexConsumer, light, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F);
//#endif
//spotless:on
matrices.popPose();
if (item == writtenBook) {
matrices.pushPose();
Expand Down
14 changes: 10 additions & 4 deletions src/main/java/dev/tr7zw/notenoughanimations/mixins/LevelRendererMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
import net.minecraft.client.renderer.LightTexture;

//spotless:off
//#if MC >= 12100
import net.minecraft.client.DeltaTracker;
//#endif
//#if MC <= 12004
//$$ import com.mojang.blaze3d.vertex.PoseStack;
//#endif
Expand All @@ -29,13 +32,16 @@ public class LevelRendererMixin {
// spotless:off
//#if MC <= 12004
//$$ private void beforeRender(PoseStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline,
//$$ Camera camera, GameRenderer gameRenderer, LightTexture lightmapTextureManager, Matrix4f matrix4f,
//$$ Camera camera, GameRenderer gameRenderer, LightTexture lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci) {
//#elseif MC < 12100
//$$ private void beforeRender(float tickDelta, long l, boolean bl, Camera camera, GameRenderer gameRenderer,
//$$ LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
//#else
private void beforeRender(float tickDelta, long l, boolean bl, Camera camera, GameRenderer gameRenderer,
LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2,
private void beforeRender(DeltaTracker deltaTracker, boolean bl, Camera camera, GameRenderer gameRenderer,
LightTexture lightTexture, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci) {
float tickDelta = deltaTracker.getGameTimeDeltaPartialTick(false);
//#endif
//spotless:on
CallbackInfo ci) {
NEAnimationsLoader.INSTANCE.playerTransformer.setDeltaTick(tickDelta);
// NEAnimationsLoader.INSTANCE.playerTransformer.nextFrame();
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/dev/tr7zw/notenoughanimations/renderlayer/SwordRenderLayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.entity.RenderLayerParent;
import net.minecraft.client.renderer.entity.layers.RenderLayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.HumanoidArm;
import net.minecraft.world.entity.player.Player;
Expand Down Expand Up @@ -123,7 +122,8 @@ public void render(PoseStack poseStack, MultiBufferSource multiBufferSource, int
private void init() {
for (String itemKey : NEABaseMod.config.sheathSwords) {
if (itemKey.contains(":")) {
Item item = NMSHelper.getItem(new ResourceLocation(itemKey.split(":")[0], itemKey.split(":")[1]));
Item item = NMSHelper
.getItem(NMSHelper.getResourceLocation(itemKey.split(":")[0], itemKey.split(":")[1]));
if (item != Items.AIR) {
items.add(item);
}
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/dev/tr7zw/notenoughanimations/util/AnimationUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import net.minecraft.client.model.PlayerModel;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.HumanoidArm;
import net.minecraft.world.entity.player.Player;
Expand All @@ -17,7 +16,7 @@

public class AnimationUtil {

private static Item crossbow = NMSHelper.getItem(new ResourceLocation("minecraft", "crossbow"));
private static Item crossbow = NMSHelper.getItem(NMSHelper.getResourceLocation("minecraft", "crossbow"));

public static boolean isUsingboothHands(ArmPose pose) {
return pose == ArmPose.BOW_AND_ARROW || pose == ArmPose.CROSSBOW_CHARGE || pose == ArmPose.CROSSBOW_HOLD;
Expand Down
29 changes: 11 additions & 18 deletions src/main/java/dev/tr7zw/notenoughanimations/util/MapRenderer.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dev.tr7zw.notenoughanimations.util;

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;

import dev.tr7zw.util.NMSHelper;
import net.minecraft.client.Minecraft;
Expand All @@ -22,9 +23,9 @@
public class MapRenderer {

private static final RenderType MAP_BACKGROUND = RenderType
.text(new ResourceLocation("textures/map/map_background.png"));
.text(NMSHelper.getResourceLocation("textures/map/map_background.png"));
private static final RenderType MAP_BACKGROUND_CHECKERBOARD = RenderType
.text(new ResourceLocation("textures/map/map_background_checkerboard.png"));
.text(NMSHelper.getResourceLocation("textures/map/map_background_checkerboard.png"));

public static void renderFirstPersonMap(PoseStack matrices, MultiBufferSource vertexConsumers, int light,
ItemStack stack, boolean small, boolean lefthanded) {
Expand Down Expand Up @@ -65,24 +66,16 @@ public static void renderFirstPersonMap(PoseStack matrices, MultiBufferSource ve
com.mojang.blaze3d.vertex.VertexConsumer vertexConsumer = vertexConsumers
.getBuffer(mapState == null ? MAP_BACKGROUND : MAP_BACKGROUND_CHECKERBOARD);
Matrix4f matrix4f = matrices.last().pose();
vertexConsumer.vertex(matrix4f, -7.0f, 135.0f, 0.0f).color(255, 255, 255, 255).uv(0.0f, 1.0f).uv2(light)
.endVertex();
vertexConsumer.vertex(matrix4f, 135.0f, 135.0f, 0.0f).color(255, 255, 255, 255).uv(1.0f, 1.0f).uv2(light)
.endVertex();
vertexConsumer.vertex(matrix4f, 135.0f, -7.0f, 0.0f).color(255, 255, 255, 255).uv(1.0f, 0.0f).uv2(light)
.endVertex();
vertexConsumer.vertex(matrix4f, -7.0f, -7.0f, 0.0f).color(255, 255, 255, 255).uv(0.0f, 0.0f).uv2(light)
.endVertex();
NMSHelper.addVertex(vertexConsumer, matrix4f, -7.0f, 135.0f, 0.0f, 255, 255, 255, 255, 0, 1, light);
NMSHelper.addVertex(vertexConsumer, matrix4f, 135.0f, 135.0f, 0.0f, 255, 255, 255, 255, 1, 1, light);
NMSHelper.addVertex(vertexConsumer, matrix4f, 135.0f, -7.0f, 0.0f, 255, 255, 255, 255, 1, 0, light);
NMSHelper.addVertex(vertexConsumer, matrix4f, -7.0f, -7.0f, 0.0f, 255, 255, 255, 255, 0, 0, light);
// mirrored back site
vertexConsumer = vertexConsumers.getBuffer(MAP_BACKGROUND);
vertexConsumer.vertex(matrix4f, -7.0f, -7.0f, 0.0f).color(255, 255, 255, 255).uv(0.0f, 0.0f).uv2(light)
.endVertex();
vertexConsumer.vertex(matrix4f, 135.0f, -7.0f, 0.0f).color(255, 255, 255, 255).uv(1.0f, 0.0f).uv2(light)
.endVertex();
vertexConsumer.vertex(matrix4f, 135.0f, 135.0f, 0.0f).color(255, 255, 255, 255).uv(1.0f, 1.0f).uv2(light)
.endVertex();
vertexConsumer.vertex(matrix4f, -7.0f, 135.0f, 0.0f).color(255, 255, 255, 255).uv(0.0f, 1.0f).uv2(light)
.endVertex();
NMSHelper.addVertex(vertexConsumer, matrix4f, -7.0f, -7.0f, 0.0f, 255, 255, 255, 255, 0, 0, light);
NMSHelper.addVertex(vertexConsumer, matrix4f, 135.0f, -7.0f, 0.0f, 255, 255, 255, 255, 1, 0, light);
NMSHelper.addVertex(vertexConsumer, matrix4f, 135.0f, 135.0f, 0.0f, 255, 255, 255, 255, 1, 1, light);
NMSHelper.addVertex(vertexConsumer, matrix4f, -7.0f, 135.0f, 0.0f, 255, 255, 255, 255, 0, 1, light);

if (mapState != null) {
// spotless:off
Expand Down
Loading