Skip to content

Commit

Permalink
all except worlgen i think
Browse files Browse the repository at this point in the history
  • Loading branch information
mrsterner committed Oct 27, 2023
1 parent fd5d1ff commit 711bee2
Show file tree
Hide file tree
Showing 78 changed files with 1,270 additions and 771 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ modAuthors=Sammy Semicolon
# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
modDescription=A dark magic mod focused on soul and spirit magic.
# Mod Dependency Versions
lodestoneVersion=1.4.19
lodestoneVersion=1.4.20
jeiVersion=15.2.0.22
curiosVersion=5.2.0-beta.3+1.20.1
Binary file added lib/lodestone-1.20.1-1.4.20.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package com.sammy.malum.client.renderer.block;

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis;
import com.sammy.malum.common.block.storage.*;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.*;
Expand All @@ -28,9 +30,9 @@ public void render(MalumItemHolderBlockEntity blockEntityIn, float partialTicks,
poseStack.pushPose();
Vec3 itemOffset = blockEntityIn.getItemOffset(partialTicks);
poseStack.translate(itemOffset.x(), itemOffset.y(), itemOffset.z());
poseStack.mulPose(Vector3f.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.mulPose(Axis.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.scale(0.6f, 0.6f, 0.6f);
itemRenderer.renderStatic(stack, ItemTransforms.TransformType.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, 0);
itemRenderer.renderStatic(stack, ItemDisplayContext.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, level, 0);
poseStack.popPose();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import net.minecraft.client.renderer.blockentity.*;
import net.minecraft.resources.*;
import net.minecraft.util.*;
import org.joml.Vector3f;
import team.lodestar.lodestone.handlers.*;
import team.lodestar.lodestone.setup.*;
import team.lodestar.lodestone.systems.rendering.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.sammy.malum.client.renderer.block;

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Vector3f;
import com.mojang.math.Axis;
import com.sammy.malum.client.renderer.entity.*;
import com.sammy.malum.common.block.curiosities.spirit_altar.SpiritAltarBlockEntity;
import com.sammy.malum.common.item.spirit.*;
Expand All @@ -12,9 +12,11 @@
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec3;
import org.joml.Vector3f;
import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntityInventory;

import static net.minecraft.client.renderer.texture.OverlayTexture.NO_OVERLAY;
Expand All @@ -33,12 +35,12 @@ public void render(SpiritAltarBlockEntity blockEntityIn, float partialTicks, Pos
ItemStack item = inventory.getStackInSlot(i);
if (item.getItem() instanceof SpiritShardItem shardItem) {
poseStack.pushPose();
Vector3f offset = new Vector3f(blockEntityIn.getSpiritItemOffset(spiritsRendered++, partialTicks));
Vector3f offset = blockEntityIn.getSpiritItemOffset(spiritsRendered++, partialTicks).toVector3f();
poseStack.translate(offset.x(), offset.y(), offset.z());
FloatingItemEntityRenderer.renderSpiritGlimmer(poseStack, shardItem.type, partialTicks);
poseStack.mulPose(Vector3f.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.mulPose(Axis.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.scale(0.5f, 0.5f, 0.5f);
itemRenderer.renderStatic(item, ItemTransforms.TransformType.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, 0);
itemRenderer.renderStatic(item, ItemDisplayContext.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, level, 0);
poseStack.popPose();
}
}
Expand All @@ -47,9 +49,9 @@ public void render(SpiritAltarBlockEntity blockEntityIn, float partialTicks, Pos
poseStack.pushPose();
Vec3 offset = blockEntityIn.getCentralItemOffset();
poseStack.translate(offset.x, offset.y, offset.z);
poseStack.mulPose(Vector3f.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.mulPose(Axis.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.scale(0.45f, 0.45f, 0.45f);
itemRenderer.renderStatic(stack, ItemTransforms.TransformType.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, 0);
itemRenderer.renderStatic(stack, ItemDisplayContext.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, level, 0);
poseStack.popPose();
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.sammy.malum.client.renderer.block;

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis;
import com.mojang.math.Vector3f;
import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCatalyzerCoreBlockEntity;
import net.minecraft.client.Minecraft;
Expand All @@ -9,6 +10,7 @@
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec3;
Expand All @@ -29,9 +31,9 @@ public void render(SpiritCatalyzerCoreBlockEntity blockEntityIn, float partialTi
poseStack.pushPose();
Vec3 offset = blockEntityIn.itemOffset();
poseStack.translate(offset.x, offset.y, offset.z);
poseStack.mulPose(Vector3f.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.mulPose(Axis.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.scale(0.45f, 0.45f, 0.45f);
itemRenderer.renderStatic(stack, ItemTransforms.TransformType.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, 0);
itemRenderer.renderStatic(stack, ItemDisplayContext.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, level, 0);
poseStack.popPose();
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
package com.sammy.malum.client.renderer.block;

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Vector3f;
import com.mojang.math.Axis;
import com.sammy.malum.common.block.curiosities.spirit_crucible.SpiritCrucibleCoreBlockEntity;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec3;
import org.joml.Vector3f;
import team.lodestar.lodestone.systems.blockentity.LodestoneBlockEntityInventory;

import static net.minecraft.client.renderer.texture.OverlayTexture.NO_OVERLAY;
Expand All @@ -32,11 +34,11 @@ public void render(SpiritCrucibleCoreBlockEntity blockEntityIn, float partialTic
ItemStack item = inventory.getStackInSlot(i);
if (!item.isEmpty()) {
poseStack.pushPose();
Vector3f offset = new Vector3f(blockEntityIn.spiritOffset(spiritsRendered++, partialTicks));
Vector3f offset = blockEntityIn.spiritOffset(spiritsRendered++, partialTicks).toVector3f();
poseStack.translate(offset.x(), offset.y(), offset.z());
poseStack.mulPose(Vector3f.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.mulPose(Axis.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.scale(0.5f, 0.5f, 0.5f);
itemRenderer.renderStatic(item, ItemTransforms.TransformType.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, 0);
itemRenderer.renderStatic(item, ItemDisplayContext.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, level, 0);
poseStack.popPose();
}
}
Expand All @@ -46,9 +48,9 @@ public void render(SpiritCrucibleCoreBlockEntity blockEntityIn, float partialTic
poseStack.pushPose();
Vec3 offset = blockEntityIn.itemOffset();
poseStack.translate(offset.x, offset.y, offset.z);
poseStack.mulPose(Vector3f.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.mulPose(Axis.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.scale(0.45f, 0.45f, 0.45f);
itemRenderer.renderStatic(stack, ItemTransforms.TransformType.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, 0);
itemRenderer.renderStatic(stack, ItemDisplayContext.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, level, 0);
poseStack.popPose();
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.sammy.malum.client.renderer.block;

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis;
import com.mojang.math.Vector3f;
import com.sammy.malum.client.renderer.entity.*;
import com.sammy.malum.common.block.storage.jar.SpiritJarBlockEntity;
Expand All @@ -11,6 +12,7 @@
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.level.Level;

import static net.minecraft.client.renderer.texture.OverlayTexture.NO_OVERLAY;
Expand All @@ -31,9 +33,9 @@ public void render(SpiritJarBlockEntity blockEntityIn, float partialTicks, PoseS
poseStack.pushPose();
poseStack.translate(0.5f, y, 0.5f);
FloatingItemEntityRenderer.renderSpiritGlimmer(poseStack, type, partialTicks);
poseStack.mulPose(Vector3f.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.mulPose(Axis.YP.rotationDegrees(((level.getGameTime() % 360) + partialTicks) * 3));
poseStack.scale(0.6f, 0.6f, 0.6f);
itemRenderer.renderStatic(type.spiritShard.get().getDefaultInstance(), ItemTransforms.TransformType.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, 0);
itemRenderer.renderStatic(type.spiritShard.get().getDefaultInstance(), ItemDisplayContext.FIXED, combinedLightIn, NO_OVERLAY, poseStack, bufferIn, level, 0);
poseStack.popPose();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.math.Vector3f;
import com.mojang.math.Axis;
import com.sammy.malum.common.block.curiosities.totem.TotemPoleBlockEntity;
import com.sammy.malum.core.systems.spirit.MalumSpiritType;
import com.sammy.malum.registry.common.SpiritTypeRegistry;
Expand All @@ -15,6 +15,7 @@
import net.minecraft.core.Direction;
import net.minecraft.resources.*;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import org.joml.Vector3f;
import team.lodestar.lodestone.handlers.RenderHandler;
import team.lodestar.lodestone.setup.LodestoneRenderTypeRegistry;
import team.lodestar.lodestone.systems.rendering.VFXBuilders;
Expand Down Expand Up @@ -45,7 +46,7 @@ public void renderQuad(ResourceLocation resourceLocation, Color color, float alp

poseStack.pushPose();
poseStack.translate(0.5f, 0.5f, 0.5f);
poseStack.mulPose(Vector3f.YN.rotationDegrees(direction.toYRot()));
poseStack.mulPose(Axis.YN.rotationDegrees(direction.toYRot()));
poseStack.translate(-0.5f, -0.5f, -0.5f);
VFXBuilders.createWorld()
.setPosColorTexLightmapDefaultFormat()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.math.Vector3f;
import com.sammy.malum.MalumMod;
import com.sammy.malum.common.block.curiosities.weeping_well.VoidConduitBlockEntity;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.resources.ResourceLocation;
import org.joml.Vector3f;
import team.lodestar.lodestone.handlers.RenderHandler;
import team.lodestar.lodestone.setup.LodestoneRenderTypeRegistry;
import team.lodestar.lodestone.systems.rendering.VFXBuilders;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.math.Axis;
import com.mojang.math.Vector3f;
import com.sammy.malum.MalumMod;
import com.sammy.malum.common.item.cosmetic.curios.CurioTokenOfGratitude;
Expand Down Expand Up @@ -93,13 +94,13 @@ public static void renderTail(ItemStack stack, ResourceLocation texture, PoseSta
Vec3 desiredDirection = look.yRot((float) Math.toRadians(90)).normalize();
Vec3 sidewaysVelocity = desiredDirection.scale(movement.dot(desiredDirection));
double speedAndDirection = (sidewaysVelocity.length() * -Math.signum(desiredDirection.dot(sidewaysVelocity))) / wagSpeed;
poseStack.mulPose(Vector3f.YP.rotationDegrees((float) (speedAndDirection * factor)));
poseStack.mulPose(Axis.YP.rotationDegrees((float) (speedAndDirection * factor)));
}
float ambientFactor = playerEntity.isShiftKeyDown() ? 2 : 6;
double ambientXRotation = Math.sin(playerEntity.level.getGameTime() / 18f) * ambientFactor;
poseStack.mulPose(Vector3f.XP.rotationDegrees((float) ambientXRotation));
double ambientYRotation = Math.cos(playerEntity.level.getGameTime() / 24f) * -ambientFactor;
poseStack.mulPose(Vector3f.YP.rotationDegrees((float) ambientYRotation));
double ambientXRotation = Math.sin(playerEntity.level().getGameTime() / 18f) * ambientFactor;
poseStack.mulPose(Axis.XP.rotationDegrees((float) ambientXRotation));
double ambientYRotation = Math.cos(playerEntity.level().getGameTime() / 24f) * -ambientFactor;
poseStack.mulPose(Axis.YP.rotationDegrees((float) ambientYRotation));
VertexConsumer vertexconsumer = ItemRenderer.getArmorFoilBuffer(renderTypeBuffer, RenderType.armorCutoutNoCull(texture), false, stack.hasFoil());
ModelRegistry.TAIL_MODEL.setupAnim(playerEntity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch);
ModelRegistry.TAIL_MODEL.prepareMobModel(playerEntity, limbSwing, limbSwingAmount, partialTicks);
Expand Down
Loading

0 comments on commit 711bee2

Please sign in to comment.