Skip to content

Commit

Permalink
Move the stupid models
Browse files Browse the repository at this point in the history
  • Loading branch information
SammySemicolon committed Dec 16, 2024
1 parent 30ce56c commit 0d4ed07
Show file tree
Hide file tree
Showing 28 changed files with 17 additions and 8 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ neoForge {
}

accessTransformers.from(
project.files("src/main/resources/META-INF/recipebuilders.cfg", "src/main/resources/META-INF/blockproperties.cfg")
project.files("src/main/resources/META-INF/accesstransformer.cfg", "src/main/resources/META-INF/recipebuilders.cfg", "src/main/resources/META-INF/blockproperties.cfg")
)

runs {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ mod_authors=Sammy Semicolon
mod_description=A dark magic mod focused on soul and spirit magic.

# Mandatory
lodestone_version=1.7.0.109
lodestone_version=1.7.0.118
curios_version=9.0.15+1.21.1

# Iron's Spellbooks
Expand Down
1 change: 1 addition & 0 deletions src/generated/resources/assets/malum/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -967,6 +967,7 @@
"malum.gui.book.entry.page.headline.void.weight_of_worlds": "The Weight of Worlds",
"malum.gui.book.entry.page.headline.voodoo_magic": "Voodoo magic",
"malum.gui.book.entry.page.headline.warping_engine": "Warping Engine",
"malum.gui.book.entry.page.info.runeworking": "Runeworking. \nRequires a slate for the inscription process. Spirit Arcana must be inserted afterwards.",
"malum.gui.book.entry.page.info.spirit_focusing": "Spirit Focusing. \nRequires a Catalyst and Spirit Arcana to be held within The Crucible. The Catalyst is not consumed, but does get damaged.",
"malum.gui.book.entry.page.info.spirit_focusing.spirit": "Spirit Arcana is to be stored directly within the Spirit Crucible.",
"malum.gui.book.entry.page.info.spirit_infusion": "Spirit Infusion. \nRequires a Prime Item and Spirit Arcana to be held within The Altar.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.sammy.malum.registry.common.recipe.*;
import net.minecraft.client.*;
import net.minecraft.client.gui.*;
import net.minecraft.network.chat.*;
import net.minecraft.world.item.*;
import team.lodestar.lodestone.systems.recipe.*;

Expand All @@ -16,6 +17,8 @@
import static com.sammy.malum.client.screen.codex.ArcanaCodexHelper.*;

public class RuneworkingPage extends BookPage {
private static final Component BASE = Component.translatable("malum.gui.book.entry.page.info.runeworking");

private final RunicWorkbenchRecipe recipe;

public RuneworkingPage(Predicate<RunicWorkbenchRecipe> predicate) {
Expand All @@ -32,6 +35,11 @@ public void render(EntryScreen screen, GuiGraphics guiGraphics, int left, int to
renderIngredient(screen, guiGraphics, recipe.primaryInput, left + 63, top + 59, mouseX, mouseY);
renderIngredient(screen, guiGraphics, recipe.secondaryInput, left + 63, top + 16, mouseX, mouseY);
renderItem(screen, guiGraphics, recipe.output, left + 63, top + 126, mouseX, mouseY);
screen.renderLater(() -> {
if (screen.isHovering(mouseX, mouseY, left + 62, top + 78, 18, 18)) {
guiGraphics.renderComponentTooltip(Minecraft.getInstance().font, wrapComponent(BASE, 180), mouseX, mouseY);
}
});
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ public static void renderHiddenBladeCooldown(GuiGraphics guiGraphics, DeltaTrack
shaderInstance.safeGetUniform("XFrequency").set(15f);
shaderInstance.safeGetUniform("Speed").set(550f);
shaderInstance.safeGetUniform("Intensity").set(120f);
var builder = VFXBuilders.createScreen()
.setPosTexColorDefaultFormat()
.setShader(() -> shaderInstance);
var builder = VFXBuilders.createScreen().setShader(() -> shaderInstance);

float size = 16;
double delta = Mth.clamp((CurioHiddenBladeNecklace.COOLDOWN_DURATION - cooldown) / (float) CurioHiddenBladeNecklace.COOLDOWN_DURATION, 0, 1);
Expand All @@ -77,11 +75,11 @@ public static void renderHiddenBladeCooldown(GuiGraphics guiGraphics, DeltaTrack
}
builder.setPositionWithWidth(left, top, size, size)
.setUVWithWidth(xOffset, yOffset, 16, 16, 64)
.draw(poseStack);
.blit(poseStack);
if (fadeOut > 0 && fadeOut < 20) {
float glow = (10 - Math.abs(10 - fadeOut)) / 10f;
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
builder.setAlpha(glow).draw(poseStack);
builder.setAlpha(glow).blit(poseStack);
}

shaderInstance.setUniformDefaults();
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/sammy/malum/data/MalumLang.java
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ protected void addTranslations() {
add("malum.gui.book.entry.page.info.spirit_infusion.spirit", "Spirit Arcana is to be stored directly within the Spirit Altar.");
add("malum.gui.book.entry.page.info.spirit_infusion.item", "Additional Items must be held on nearby Item Pedestals or Stands.");

add("malum.gui.book.entry.page.info.runeworking", "Runeworking. \nRequires a slate for the inscription process. Spirit Arcana must be inserted afterwards.");

add("malum.gui.book.entry.page.info.spirit_focusing", "Spirit Focusing. \nRequires a Catalyst and Spirit Arcana to be held within The Crucible. The Catalyst is not consumed, but does get damaged.");
add("malum.gui.book.entry.page.info.spirit_focusing.spirit", "Spirit Arcana is to be stored directly within the Spirit Crucible.");

Expand Down Expand Up @@ -602,7 +604,7 @@ protected void addTranslations() {

addSimpleEntryHeader("soulwoven_silk", "Soulwoven Silk", "Wicked weaves");
addPages("soulwoven_silk", "Soulwoven Silk is a light yet sturdy material that acts as an insulator for spirit energies. While other materials do exhibit matching interactions with the arcane, this bond between magic and cloth should make for a unique material.");
addPages("soulwoven_silk.soulwoven_banner", "To further study and confirm the insulating properties of the cloth, I've heft together a set of Soulwoven Banners with patterns based on each of the spirits I've been met with thus far. If further imbued with Arcana, the Banners will gain a dim, and them powerful glow when met with an additional shard.");
addPages("soulwoven_silk.soulwoven_banner", "To further study and confirm the insulating properties of the cloth, I've heft together a set of Soulwoven Banners with patterns based on each of the spirits I've been met with thus far. When imbued with Arcana, the Banners will gain a dim, and them powerful glow when met with an additional shard.");

addSimpleEntryHeader("soulwoven_pouch", "Soulwoven Pouch", "Made real through supposition");
addPages("soulwoven_pouch", "In my studies one of the most cumbersome experiences so far has been the sheer amount of magical reagents and residue I have to deal with. To solve this issue, I've designed the Soulwoven Pouch with the bundle's design in mind. The pouch hungers for the magically aligned, reserving extra room for and collecting it habitually.");
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0d4ed07

Please sign in to comment.