Skip to content

Commit

Permalink
Merge branch '1.20.1-main' into lakefix
Browse files Browse the repository at this point in the history
  • Loading branch information
@f-raZ0R
f-raZ0R authored Sep 28, 2024
2 parents 6d2dcc9 + e5d19c9 commit 6f85597
Show file tree
Hide file tree
Showing 12 changed files with 109 additions and 279 deletions.
42 changes: 1 addition & 41 deletions src/main/java/de/dafuqs/spectrum/items/tools/NectarLanceItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

import java.util.*;

public class NectarLanceItem extends LightGreatswordItem implements SlotBackgroundEffectProvider, ArmorPiercingItem, ExpandedStatTooltip {
public class NectarLanceItem extends LightGreatswordItem implements SlotBackgroundEffectProvider {

public NectarLanceItem(ToolMaterial material, int attackDamage, float attackSpeed, float crit, float reach, int barColor, Settings settings) {
super(material, attackDamage, attackSpeed, crit, reach, barColor, settings);
Expand Down Expand Up @@ -160,44 +160,4 @@ public SlotEffect backgroundType(@Nullable PlayerEntity player, ItemStack stack)
public int getBackgroundColor(@Nullable PlayerEntity player, ItemStack stack, float tickDelta) {
return InkColors.PURPLE_COLOR;
}

@Override
public float getDefenseMultiplier(LivingEntity target, ItemStack stack) {
return 0.75F;
}

@Override
public float getToughnessMultiplier(LivingEntity target, ItemStack stack) {
return 1;
}

@Override
public float getProtReduction(LivingEntity target, ItemStack stack) {
return 0.5F;
}

@Override
public DamageComposition getDamageComposition(LivingEntity attacker, LivingEntity target, ItemStack stack, float damage) {
var composition = new DamageComposition();
var source = composition.getPlayerOrEntity(attacker);

if (attacker instanceof PlayerEntity player && MiscPlayerDataComponent.get(player).isLunging()) {
source = SpectrumDamageTypes.impaling(player.getWorld(), player);
}

SpectrumDamageTypes.wrapWithStackTracking(source, stack);
composition.add(source, damage);
return composition;
}

@Override
public void expandTooltip(ItemStack stack, @Nullable PlayerEntity player, List<Text> tooltip, TooltipContext context) {
if (Screen.hasShiftDown()) {
tooltip.add(Text.translatable("item.spectrum.bident.postToolTip.ap", 25).formatted(Formatting.BLUE));

tooltip.add(Text.translatable("item.spectrum.bident.postToolTip.pp", 50).formatted(Formatting.BLUE));
} else {
tooltip.add(Text.translatable("spectrum.tooltip.press_shift_for_more").formatted(Formatting.DARK_GRAY, Formatting.ITALIC));
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ public Map<Enchantment, Integer> getDefaultEnchantments() {
public static final Item NIGHTFALLS_BLADE = new NightfallsBladeItem(SpectrumToolMaterials.ToolMaterial.NIGHTFALL, 0, -3.4F, IS.of(1, Rarity.UNCOMMON));
public static final DraconicTwinswordItem DRACONIC_TWINSWORD = new DraconicTwinswordItem(SpectrumToolMaterials.ToolMaterial.DRACONIC, 6, -3.0F, IS.of(1, Rarity.RARE));
public static final DragonTalonItem DRAGON_TALON = new DragonTalonItem(SpectrumToolMaterials.ToolMaterial.DRACONIC, -3.0, -1.0, IS.of(1, Rarity.RARE).maxDamage(SpectrumToolMaterials.ToolMaterial.DRACONIC.getDurability()));
public static final LightGreatswordItem KNOTTED_SWORD = new LightGreatswordItem(SpectrumToolMaterials.ToolMaterial.VERDIGRIS, 3, -2.4F, 0.25F, 1F, 0xFFd4d6ff, IS.of(1, Rarity.UNCOMMON).maxDamage(SpectrumToolMaterials.ToolMaterial.VERDIGRIS.getDurability()));
public static final LightGreatswordItem NECTAR_LANCE = new NectarLanceItem(SpectrumToolMaterials.ToolMaterial.NECTAR, 0, -2.4F, 0.5F, 2F, 0xFFf8e8ff, IS.of(1, Rarity.EPIC).maxDamage(SpectrumToolMaterials.ToolMaterial.NECTAR.getDurability()));
public static final LightGreatswordItem KNOTTED_SWORD = new LightGreatswordItem(SpectrumToolMaterials.ToolMaterial.VERDIGRIS, 3, -2.4F, 0.25F, 0.5F, 0xFFd4d6ff, IS.of(1, Rarity.UNCOMMON).maxDamage(SpectrumToolMaterials.ToolMaterial.VERDIGRIS.getDurability()));
public static final LightGreatswordItem NECTAR_LANCE = new NectarLanceItem(SpectrumToolMaterials.ToolMaterial.NECTAR, 0, -2.4F, 0.5F, 1.5F, 0xFFf8e8ff, IS.of(1, Rarity.EPIC).maxDamage(SpectrumToolMaterials.ToolMaterial.NECTAR.getDurability()));

// Bedrock Armor
public static final Item BEDROCK_HELMET = new BedrockArmorItem(SpectrumArmorMaterials.BEDROCK, ArmorItem.Type.HELMET, IS.of(Rarity.UNCOMMON).fireproof().maxDamage(-1)) {
Expand Down
66 changes: 33 additions & 33 deletions src/main/resources/assets/spectrum/lang/en_us.json
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/main/resources/assets/spectrum/models/block/weeping_gala_light.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"base": "spectrum:block/weeping_gala_light_base",
"glass": "spectrum:block/weeping_gala_light_glass",
"shell": "spectrum:block/weeping_gala_light_shell",
"filament": "spectrum:block/weeping_gala_light_filament",
"ends": "spectrum:block/weeping_gala_light_ends"
}
}
126 changes: 0 additions & 126 deletions src/main/resources/assets/spectrum/models/templates/base_trans_lamp_core.json
View file

This file was deleted.

140 changes: 68 additions & 72 deletions src/main/resources/assets/spectrum/models/templates/base_trans_light_core.json
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,33 @@
{
"credit": "~ XOXO Azzyypaaras ~",
"parent": "block/block",
"textures": {
"0": "#glass",
"1": "#case",
"2": "#base",
"3": "#ends",
"4": "#shell",
"5": "#filament",
"particle": "#case"
},
"elements": [
{
"name": "filament",
"from": [6, 0.225, 6],
"to": [10, 15.775, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [1, 0, -1]},
"faces": {
"north": {"uv": [0, 8, 16, 12], "rotation": 90, "texture": "#2"},
"east": {"uv": [0, 8, 16, 12], "rotation": 90, "texture": "#2"},
"south": {"uv": [0, 8, 16, 12], "rotation": 90, "texture": "#2"},
"west": {"uv": [0, 8, 16, 12], "rotation": 90, "texture": "#2"},
"up": {"uv": [0, 4, 4, 8], "texture": "#2", "cullface": "up"},
"down": {"uv": [0, 4, 4, 8], "texture": "#2", "cullface": "down"}
}
},
{
"name": "glass inner",
"from": [15.5, 16, 15.5],
"to": [0.5, 0, 0.5],
"from": [15.5, 15.9, 15.5],
"to": [0.5, 0.1, 0.5],
"rotation": {"angle": 0, "axis": "y", "origin": [15.5, 16, 15.5]},
"faces": {
"north": {"uv": [0, 16, 15, 0], "texture": "#0"},
"east": {"uv": [0, 16, 15, 0], "texture": "#0"},
"south": {"uv": [0, 16, 15, 0], "texture": "#0"},
"west": {"uv": [0, 16, 15, 0], "texture": "#0"},
"up": {"uv": [15, 15, 16, 16], "texture": "#1"},
"down": {"uv": [15, 15, 16, 16], "texture": "#1"}
"up": {"uv": [0, 0, 15, 15], "texture": "#4"},
"down": {"uv": [0, 0, 15, 15], "texture": "#4"}
}
},
{
"name": "glow",
"from": [15.7, 15.95, 15.7],
"to": [0.3, 0.05, 0.3],
"from": [15.7, 15.9, 15.7],
"to": [0.3, 0.1, 0.3],
"rotation": {"angle": 0, "axis": "y", "origin": [15.5, 16, 15.5]},
"faces": {
"north": {"uv": [15, 16, 16, 0], "texture": "#0"},
Expand All @@ -52,75 +38,85 @@
"down": {"uv": [15, 16, 16, 15], "texture": "#1"}
}
},
{
"name": "filament",
"from": [6.5, 0.1, 6.5],
"to": [9.5, 15.9, 9.5],
"rotation": {"angle": 0, "axis": "y", "origin": [1.5, 0, -0.5]},
"faces": {
"north": {"uv": [0, 9, 16, 12], "rotation": 90, "texture": "#5"},
"east": {"uv": [0, 9, 16, 12], "rotation": 90, "texture": "#5"},
"south": {"uv": [0, 9, 16, 12], "rotation": 90, "texture": "#5"},
"west": {"uv": [0, 9, 16, 12], "rotation": 90, "texture": "#5"},
"up": {"uv": [0, 4, 4, 8], "texture": "#5"},
"down": {"uv": [0, 4, 4, 8], "texture": "#5"}
}
},
{
"name": "case",
"from": [0.5, 0.325, 0.5],
"to": [15.5, 15.475, 15.5],
"from": [0.5, 0.1, 0.5],
"to": [15.5, 15.9, 15.5],
"rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0.5]},
"faces": {
"north": {"uv": [0, 0, 15, 16], "texture": "#1"},
"east": {"uv": [0, 0, 15, 16], "texture": "#1"},
"south": {"uv": [0, 0, 15, 16], "texture": "#1"},
"west": {"uv": [0, 0, 15, 16], "texture": "#1"},
"up": {"uv": [15, 15, 16, 16], "texture": "#1", "cullface": "up"},
"down": {"uv": [15, 15, 16, 16], "texture": "#1", "cullface": "down"}
"up": {"uv": [15, 15, 16, 16], "texture": "#1"},
"down": {"uv": [15, 15, 16, 16], "texture": "#1"}
}
},
{
"name": "shell",
"from": [0, -0.1, 0],
"to": [16, 3.9, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -0.1, 0]},
"from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 12, 16, 16], "texture": "#2", "cullface": "north"},
"east": {"uv": [0, 12, 16, 16], "texture": "#2", "cullface": "east"},
"south": {"uv": [0, 12, 16, 16], "texture": "#2", "cullface": "south"},
"west": {"uv": [0, 12, 16, 16], "texture": "#2", "cullface": "west"},
"up": {"uv": [0, 0, 16, 4], "texture": "#2"},
"down": {"uv": [0, 0, 16, 16], "texture": "#3", "cullface": "down"}
"north": {"uv": [0, 0, 16, 16], "texture": "#2"},
"east": {"uv": [0, 0, 16, 16], "texture": "#2"},
"south": {"uv": [0, 0, 16, 16], "texture": "#2"},
"west": {"uv": [0, 0, 16, 16], "texture": "#2"},
"up": {"uv": [0, 0, 16, 16], "texture": "#3"},
"down": {"uv": [0, 0, 16, 16], "texture": "#3"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
{
"name": "floor",
"from": [16, 4.05, 16],
"to": [0, 0.05, 0],
"rotation": {"angle": 0, "axis": "y", "origin": [16, 4.05, 16]},
"faces": {
"north": {"uv": [0, 16, 16, 12], "texture": "#2"},
"east": {"uv": [0, 16, 16, 12], "texture": "#2"},
"south": {"uv": [0, 16, 16, 12], "texture": "#2"},
"west": {"uv": [0, 16, 16, 12], "texture": "#2"},
"up": {"uv": [0, 16, 16, 0], "texture": "#4"},
"down": {"uv": [0, 0, 16, 4], "texture": "#2"}
}
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
{
"name": "shell",
"from": [0, 12, 0],
"to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [0, 16, 16, 12], "texture": "#2", "cullface": "north"},
"east": {"uv": [0, 16, 16, 12], "texture": "#2", "cullface": "east"},
"south": {"uv": [0, 16, 16, 12], "texture": "#2", "cullface": "south"},
"west": {"uv": [0, 16, 16, 12], "texture": "#2", "cullface": "west"},
"up": {"uv": [0, 16, 16, 0], "texture": "#3", "cullface": "up"},
"down": {"uv": [0, 4, 16, 0], "texture": "#2"}
}
"firstperson_righthand": {
"rotation": [0, 45, 0],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_lefthand": {
"rotation": [0, 225, 0],
"scale": [0.4, 0.4, 0.4]
},
"ground": {
"translation": [0, 3, 0],
"scale": [0.25, 0.25, 0.25]
},
"gui": {
"rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"scale": [0.5, 0.5, 0.5]
}
},
"groups": [
{
"name": "floor",
"from": [16, 15.95, 16],
"to": [0, 11.95, 0],
"rotation": {"angle": 0, "axis": "y", "origin": [16, 11.95, 16]},
"faces": {
"north": {"uv": [0, 12, 16, 16], "texture": "#2"},
"east": {"uv": [0, 12, 16, 16], "texture": "#2"},
"south": {"uv": [0, 12, 16, 16], "texture": "#2"},
"west": {"uv": [0, 12, 16, 16], "texture": "#2"},
"up": {"uv": [0, 4, 16, 0], "texture": "#2"},
"down": {"uv": [0, 16, 16, 0], "texture": "#4"}
}
"name": "light",
"origin": [0.5, 0, 0.5],
"color": 0,
"children": [0, 1, 2, 3, 4]
}
]
}
Binary file modified src/main/resources/assets/spectrum/textures/block/weeping_gala_light_base.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/spectrum/textures/block/weeping_gala_light_filament.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/spectrum/textures/block/weeping_gala_light_shell.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6f85597

Please sign in to comment.