Skip to content

Commit

Permalink
I miss their beautiful eyes :pleading:
Browse files Browse the repository at this point in the history
  • Loading branch information
SammySemicolon committed Apr 18, 2024
1 parent dfa54c8 commit 5f6da86
Show file tree
Hide file tree
Showing 27 changed files with 23 additions and 190 deletions.

This file was deleted.

2 changes: 0 additions & 2 deletions src/generated/resources/assets/malum/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"block.malum.block_of_blazing_quartz": "Block of Blazing Quartz",
"block.malum.block_of_brilliance": "Block of Brilliance",
"block.malum.block_of_cthonic_gold": "Block of Cthonic Gold",
"block.malum.block_of_cursed_grit": "Block of Cursed Grit",
"block.malum.block_of_grim_talc": "Block of Grim Talc",
"block.malum.block_of_hallowed_gold": "Block of Hallowed Gold",
"block.malum.block_of_hex_ash": "Block of Hex Ash",
Expand Down Expand Up @@ -372,7 +371,6 @@
"item.malum.crushed_soulstone": "Crushed Soulstone",
"item.malum.cthonic_gold": "Cthonic Gold",
"item.malum.cthonic_gold_fragment": "Cthonic Gold Fragment",
"item.malum.cursed_grit": "Cursed Grit",
"item.malum.cursed_sap": "Cursed Sap",
"item.malum.cursed_sapball": "Cursed Sapball",
"item.malum.demiboy_prideweave": "Demiboy Prideweave",
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"malum:block_of_grim_talc",
"malum:block_of_astral_weave",
"malum:block_of_mnemonic_fragment",
"malum:block_of_cursed_grit",
"malum:block_of_cthonic_gold",
"malum:block_of_alchemical_calx",
"malum:mass_of_blighted_gunk",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"malum:block_of_grim_talc",
"malum:block_of_astral_weave",
"malum:block_of_mnemonic_fragment",
"malum:block_of_cursed_grit",
"malum:block_of_cthonic_gold",
"malum:block_of_alchemical_calx",
"malum:mass_of_blighted_gunk",
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"input": {
"count": 1,
"item": "minecraft:iron_boots"
"item": "malum:soul_stained_steel_boots"
},
"output": {
"item": "malum:malignant_stronghold_boots"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"input": {
"count": 1,
"item": "minecraft:iron_chestplate"
"item": "malum:soul_stained_steel_chestplate"
},
"output": {
"item": "malum:malignant_stronghold_chestplate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"input": {
"count": 1,
"item": "minecraft:iron_helmet"
"item": "malum:soul_stained_steel_helmet"
},
"output": {
"item": "malum:malignant_stronghold_helmet"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"input": {
"count": 1,
"item": "minecraft:iron_leggings"
"item": "malum:soul_stained_steel_leggings"
},
"output": {
"item": "malum:malignant_stronghold_leggings"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "malum:favor_of_the_void",
"input": {
"item": "minecraft:black_wool"
},
"output": {
"item": "malum:tophat"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"malum:weeping_well_core",
"malum:tainted_iridescent_ether_brazier",
"malum:block_of_mnemonic_fragment",
"malum:block_of_cursed_grit",
"malum:tainted_rock_wall",
"malum:twisted_rock_column",
"malum:soulstone_ore",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"values": [
"malum:block_of_cursed_grit",
"malum:mass_of_blighted_gunk",
"malum:blighted_earth",
"malum:block_of_void_salts",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class ArrowObject extends BookObject<EntryScreen> {
public final boolean flipped;

public ArrowObject(int posX, int posY, boolean flipped) {
super(posX, posY, 36, 22);
super(posX, posY, 36, 26);
this.flipped = flipped;
}

Expand All @@ -26,7 +26,7 @@ public void render(EntryScreen screen, GuiGraphics guiGraphics, int mouseX, int
final int arrowY = getOffsetYPosition();
ResourceLocation texture = isHoveredOver ? ARROWS_LIT_UP : ARROWS;
final PoseStack poseStack = guiGraphics.pose();
renderTexture(texture, poseStack, arrowX, arrowY, 0, flipped ? 22 : 0, 36, 22, 36, 44);
renderTexture(texture, poseStack, arrowX, arrowY, 0, flipped ? 26 : 0, width, height, 36, 52);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class LinkedEntryObject extends AbstractSelectableEntryObject {
public final boolean flipped;

public LinkedEntryObject(int posX, int posY, boolean flipped, EntryReference entryReference) {
super(posX, posY, 36, 22, entryReference);
super(posX, posY, 36, 26, entryReference);
this.flipped = flipped;
}

Expand All @@ -25,7 +25,7 @@ public void render(EntryScreen screen, GuiGraphics guiGraphics, int mouseX, int
final int entryX = getOffsetXPosition();
final int entryY = getOffsetYPosition();
final PoseStack poseStack = guiGraphics.pose();
renderTexture(LINK, poseStack, entryX, entryY, 0, flipped ? 22 : 0, 36, 22, 36, 44);
guiGraphics.renderItem(entryReference.icon, entryX + 8, entryY + 3);
renderTexture(LINK, poseStack, entryX, entryY, 0, flipped ? 26 : 0, width, height, 36, 52);
guiGraphics.renderItem(entryReference.icon, entryX + 5, entryY + 5);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void onDealDamage(LivingEntity target) {
target.addEffect(new MobEffectInstance(silenced, 300, 0, true, true, true));
} else {
EntityHelper.amplifyEffect(effect, target, 1, 9);
EntityHelper.extendEffect(effect, target, 60, 600);
EntityHelper.extendEffect(effect, target, 30, 600);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ public int getProjectileCount(Level level, LivingEntity livingEntity, float pct)
public void fireProjectile(LivingEntity player, ItemStack stack, Level level, InteractionHand hand, float chargePercentage, int count) {
int spawnDelay = count * 5;
float velocity = 4f;
float magicDamage = 1.2f;
float magicDamage = 2.4f;
Vec3 pos = getProjectileSpawnPos(player, hand, 0.5f, 0.5f);
for (int i = 0; i < 8; i++) {
float xSpread = RandomHelper.randomBetween(level.random, -0.25f, 0.25f);
float ySpread = RandomHelper.randomBetween(level.random, -0.05f, 0.05f);
for (int i = 0; i < 4; i++) {
float xSpread = RandomHelper.randomBetween(level.random, -0.125f, 0.125f);
float ySpread = RandomHelper.randomBetween(level.random, -0.025f, 0.025f);
DrainingBoltEntity entity = new DrainingBoltEntity(level, pos.x, pos.y, pos.z);
if (i > 1) {
entity.setSilent(true);
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.
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 5f6da86

Please sign in to comment.