Motschen/VisualOverhaul
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/VisualOverhaul.git synced 2025-12-16 14:05:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: get colored water buckets working again

Browse Source
This commit is contained in:
Martin Prokoph
2025-01-26 18:18:10 +01:00
parent 132d05a1d2
commit 18d1f5af76
7 changed files with 99 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/eu/midnightdust/visualoverhaul/mixin/MixinPotionTintSource.java
View File

@@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion; import net.minecraft.potion.Potion;
import net.minecraft.potion.Potions; import net.minecraft.potion.Potions;
import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.util.math.ColorHelper;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@@ -31,7 +32,8 @@ public class MixinPotionTintSource {
if (!WATER_POTIONS.contains(contents.potion().get())) if (!WATER_POTIONS.contains(contents.potion().get()))
return; // Skip all potions with effects return; // Skip all potions with effects
} }
cir.setReturnValue(VisualOverhaulClient.potionColor); if (cir.getReturnValue() == -1) cir.setReturnValue(ColorHelper.fullAlpha(VisualOverhaulClient.potionColor));
else cir.setReturnValue(VisualOverhaulClient.potionColor);
} }
} }
} }

16
common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/axolotl_bucket.json Normal file
View File

@@ -0,0 +1,16 @@
{
"model": {
"type": "minecraft:model",
"model": "minecraft:item/axolotl_bucket",
"tints": [
{
"type": "minecraft:constant",
"value": -1
},
{
"type": "minecraft:potion",
"default": -1
}
]
}
}

16
common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/cod_bucket.json Normal file
View File

@@ -0,0 +1,16 @@
{
"model": {
"type": "minecraft:model",
"model": "minecraft:item/cod_bucket",
"tints": [
{
"type": "minecraft:constant",
"value": -1
},
{
"type": "minecraft:potion",
"default": -1
}
]
}
}

16
common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/pufferfish_bucket.json Normal file
View File

@@ -0,0 +1,16 @@
{
"model": {
"type": "minecraft:model",
"model": "minecraft:item/pufferfish_bucket",
"tints": [
{
"type": "minecraft:constant",
"value": -1
},
{
"type": "minecraft:potion",
"default": -1
}
]
}
}

16
common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/salmon_bucket.json Normal file
View File

@@ -0,0 +1,16 @@
{
"model": {
"type": "minecraft:model",
"model": "minecraft:item/salmon_bucket",
"tints": [
{
"type": "minecraft:constant",
"value": -1
},
{
"type": "minecraft:potion",
"default": -1
}
]
}
}

16
common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/tropical_fish_bucket.json Normal file
View File

@@ -0,0 +1,16 @@
{
"model": {
"type": "minecraft:model",
"model": "minecraft:item/tropical_fish_bucket",
"tints": [
{
"type": "minecraft:constant",
"value": -1
},
{
"type": "minecraft:potion",
"default": -1
}
]
}
}

16
common/src/main/resources/resourcepacks/coloredwaterbucket/assets/minecraft/items/water_bucket.json Normal file
View File

@@ -0,0 +1,16 @@
{
"model": {
"type": "minecraft:model",
"model": "minecraft:item/water_bucket",
"tints": [
{
"type": "minecraft:constant",
"value": -1
},
{
"type": "minecraft:potion",
"default": -1
}
]
}
}