From dad2064486521c33d1c398978966c89d2a09f9c0 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Mon, 25 Jan 2021 07:46:03 +0300 Subject: [PATCH] Lantern color correction --- .../blocks/BulbVineLanternColoredBlock.java | 14 ++++++++++++-- .../{bulb_lantern.json => gold_bulb_lantern.json} | 0 ...ern_black.json => gold_bulb_lantern_black.json} | 0 ...ntern_blue.json => gold_bulb_lantern_blue.json} | 0 ...ern_brown.json => gold_bulb_lantern_brown.json} | 0 ...ntern_cyan.json => gold_bulb_lantern_cyan.json} | 0 ...ntern_gray.json => gold_bulb_lantern_gray.json} | 0 ...ern_green.json => gold_bulb_lantern_green.json} | 0 ...blue.json => gold_bulb_lantern_light_blue.json} | 0 ...gray.json => gold_bulb_lantern_light_gray.json} | 0 ...ntern_lime.json => gold_bulb_lantern_lime.json} | 0 ...magenta.json => gold_bulb_lantern_magenta.json} | 0 ...n_orange.json => gold_bulb_lantern_orange.json} | 0 ...ntern_pink.json => gold_bulb_lantern_pink.json} | 0 ...n_purple.json => gold_bulb_lantern_purple.json} | 0 ...lantern_red.json => gold_bulb_lantern_red.json} | 0 ...ern_white.json => gold_bulb_lantern_white.json} | 0 ...n_yellow.json => gold_bulb_lantern_yellow.json} | 0 .../betterend/lights/item/iron_bulb_lantern.json | 7 +++++++ .../lights/item/iron_bulb_lantern_black.json | 7 +++++++ .../lights/item/iron_bulb_lantern_blue.json | 7 +++++++ .../lights/item/iron_bulb_lantern_brown.json | 7 +++++++ .../lights/item/iron_bulb_lantern_cyan.json | 7 +++++++ .../lights/item/iron_bulb_lantern_gray.json | 7 +++++++ .../lights/item/iron_bulb_lantern_green.json | 7 +++++++ .../lights/item/iron_bulb_lantern_light_blue.json | 7 +++++++ .../lights/item/iron_bulb_lantern_light_gray.json | 7 +++++++ .../lights/item/iron_bulb_lantern_lime.json | 7 +++++++ .../lights/item/iron_bulb_lantern_magenta.json | 7 +++++++ .../lights/item/iron_bulb_lantern_orange.json | 7 +++++++ .../lights/item/iron_bulb_lantern_pink.json | 7 +++++++ .../lights/item/iron_bulb_lantern_purple.json | 7 +++++++ .../lights/item/iron_bulb_lantern_red.json | 7 +++++++ .../lights/item/iron_bulb_lantern_white.json | 7 +++++++ .../lights/item/iron_bulb_lantern_yellow.json | 7 +++++++ .../lights/item/thallasium_bulb_lantern.json | 7 +++++++ .../lights/item/thallasium_bulb_lantern_black.json | 7 +++++++ .../lights/item/thallasium_bulb_lantern_blue.json | 7 +++++++ .../lights/item/thallasium_bulb_lantern_brown.json | 7 +++++++ .../lights/item/thallasium_bulb_lantern_cyan.json | 7 +++++++ .../lights/item/thallasium_bulb_lantern_gray.json | 7 +++++++ .../lights/item/thallasium_bulb_lantern_green.json | 7 +++++++ .../item/thallasium_bulb_lantern_light_blue.json | 7 +++++++ .../item/thallasium_bulb_lantern_light_gray.json | 7 +++++++ .../lights/item/thallasium_bulb_lantern_lime.json | 7 +++++++ .../item/thallasium_bulb_lantern_magenta.json | 7 +++++++ .../item/thallasium_bulb_lantern_orange.json | 7 +++++++ .../lights/item/thallasium_bulb_lantern_pink.json | 7 +++++++ .../item/thallasium_bulb_lantern_purple.json | 7 +++++++ .../lights/item/thallasium_bulb_lantern_red.json | 7 +++++++ .../lights/item/thallasium_bulb_lantern_white.json | 7 +++++++ .../item/thallasium_bulb_lantern_yellow.json | 7 +++++++ .../materialmaps/block/gold_bulb_lantern.json | 10 ++++++++++ .../block/gold_bulb_lantern_black.json | 10 ++++++++++ .../materialmaps/block/gold_bulb_lantern_blue.json | 10 ++++++++++ .../block/gold_bulb_lantern_brown.json | 10 ++++++++++ .../materialmaps/block/gold_bulb_lantern_cyan.json | 10 ++++++++++ .../materialmaps/block/gold_bulb_lantern_gray.json | 10 ++++++++++ .../block/gold_bulb_lantern_green.json | 10 ++++++++++ .../block/gold_bulb_lantern_light_blue.json | 10 ++++++++++ .../block/gold_bulb_lantern_light_gray.json | 10 ++++++++++ .../materialmaps/block/gold_bulb_lantern_lime.json | 10 ++++++++++ .../block/gold_bulb_lantern_magenta.json | 10 ++++++++++ .../block/gold_bulb_lantern_orange.json | 10 ++++++++++ .../materialmaps/block/gold_bulb_lantern_pink.json | 10 ++++++++++ .../block/gold_bulb_lantern_purple.json | 10 ++++++++++ .../materialmaps/block/gold_bulb_lantern_red.json | 10 ++++++++++ .../block/gold_bulb_lantern_white.json | 10 ++++++++++ .../block/gold_bulb_lantern_yellow.json | 10 ++++++++++ 69 files changed, 420 insertions(+), 2 deletions(-) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern.json => gold_bulb_lantern.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_black.json => gold_bulb_lantern_black.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_blue.json => gold_bulb_lantern_blue.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_brown.json => gold_bulb_lantern_brown.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_cyan.json => gold_bulb_lantern_cyan.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_gray.json => gold_bulb_lantern_gray.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_green.json => gold_bulb_lantern_green.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_light_blue.json => gold_bulb_lantern_light_blue.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_light_gray.json => gold_bulb_lantern_light_gray.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_lime.json => gold_bulb_lantern_lime.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_magenta.json => gold_bulb_lantern_magenta.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_orange.json => gold_bulb_lantern_orange.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_pink.json => gold_bulb_lantern_pink.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_purple.json => gold_bulb_lantern_purple.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_red.json => gold_bulb_lantern_red.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_white.json => gold_bulb_lantern_white.json} (100%) rename src/main/resources/assets/betterend/lights/item/{bulb_lantern_yellow.json => gold_bulb_lantern_yellow.json} (100%) create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_black.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_blue.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_brown.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_cyan.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_gray.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_green.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_light_blue.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_light_gray.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_lime.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_magenta.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_orange.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_pink.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_purple.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_red.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_white.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_yellow.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_black.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_blue.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_brown.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_cyan.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_gray.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_green.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_light_blue.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_light_gray.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_lime.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_magenta.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_orange.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_pink.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_purple.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_red.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_white.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_yellow.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_black.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_blue.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_brown.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_cyan.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_gray.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_green.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_light_blue.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_light_gray.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_lime.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_magenta.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_orange.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_pink.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_purple.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_red.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_white.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_yellow.json diff --git a/src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java b/src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java index 99d18dd5..cc72d55a 100644 --- a/src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java +++ b/src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java @@ -4,6 +4,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.client.color.block.BlockColorProvider; import net.minecraft.client.color.item.ItemColorProvider; import ru.betterend.interfaces.IColorProvider; +import ru.betterend.util.MHelper; public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements IColorProvider { public BulbVineLanternColoredBlock(FabricBlockSettings settings) { @@ -13,17 +14,26 @@ public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements @Override public BlockColorProvider getProvider() { return (state, world, pos, tintIndex) -> { - return this.getDefaultMaterialColor().color; + return getColor(); }; } @Override public ItemColorProvider getItemProvider() { return (stack, tintIndex) -> { - return this.getDefaultMaterialColor().color; + return getColor(); }; } + private int getColor() { + int color = this.getDefaultMaterialColor().color; + int b = (color & 255); + int g = ((color >> 8) & 255); + int r = ((color >> 16) & 255); + float[] hsv = MHelper.fromRGBtoHSB(r, g, b); + return MHelper.fromHSBtoRGB(hsv[0], hsv[1], hsv[1] > 0.2 ? 1 : hsv[2]); + } + @Override protected String getGlowTexture() { return "bulb_vine_lantern_overlay"; diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_black.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_black.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_black.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_black.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_blue.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_blue.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_blue.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_blue.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_brown.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_brown.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_brown.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_brown.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_cyan.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_cyan.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_cyan.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_cyan.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_gray.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_gray.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_gray.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_gray.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_green.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_green.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_green.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_green.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_light_blue.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_light_blue.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_light_blue.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_light_blue.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_light_gray.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_light_gray.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_light_gray.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_light_gray.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_lime.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_lime.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_lime.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_lime.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_magenta.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_magenta.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_magenta.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_magenta.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_orange.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_orange.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_orange.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_orange.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_pink.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_pink.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_pink.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_pink.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_purple.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_purple.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_purple.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_purple.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_red.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_red.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_red.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_red.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_white.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_white.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_white.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_white.json diff --git a/src/main/resources/assets/betterend/lights/item/bulb_lantern_yellow.json b/src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_yellow.json similarity index 100% rename from src/main/resources/assets/betterend/lights/item/bulb_lantern_yellow.json rename to src/main/resources/assets/betterend/lights/item/gold_bulb_lantern_yellow.json diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern.json new file mode 100644 index 00000000..f8f55c76 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 1.0, + "blue": 1.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_black.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_black.json new file mode 100644 index 00000000..26b54a96 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_black.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.1, + "green": 0.1, + "blue": 0.1, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_blue.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_blue.json new file mode 100644 index 00000000..5e61fc7d --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_blue.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.0, + "green": 0.0, + "blue": 1.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_brown.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_brown.json new file mode 100644 index 00000000..0936aeb3 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_brown.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.32, + "green": 0.18, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_cyan.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_cyan.json new file mode 100644 index 00000000..f21fd061 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_cyan.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.0, + "green": 1.0, + "blue": 0.5, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_gray.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_gray.json new file mode 100644 index 00000000..38131230 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_gray.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.3, + "green": 0.3, + "blue": 0.3, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_green.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_green.json new file mode 100644 index 00000000..fa215316 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_green.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.0, + "green": 1.0, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_light_blue.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_light_blue.json new file mode 100644 index 00000000..55a59fe6 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_light_blue.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.5, + "green": 0.5, + "blue": 1.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_light_gray.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_light_gray.json new file mode 100644 index 00000000..4d9bc9b4 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_light_gray.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.5, + "green": 0.5, + "blue": 0.5, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_lime.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_lime.json new file mode 100644 index 00000000..44c23281 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_lime.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.5, + "green": 1.0, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_magenta.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_magenta.json new file mode 100644 index 00000000..4884ec74 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_magenta.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 0.0, + "blue": 1.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_orange.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_orange.json new file mode 100644 index 00000000..adffdd3a --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_orange.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 0.5, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_pink.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_pink.json new file mode 100644 index 00000000..9aaba1df --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_pink.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 0.5, + "blue": 1.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_purple.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_purple.json new file mode 100644 index 00000000..11d0542e --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_purple.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.5, + "green": 0.0, + "blue": 0.5, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_red.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_red.json new file mode 100644 index 00000000..801dd380 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_red.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 0.0, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_white.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_white.json new file mode 100644 index 00000000..f8f55c76 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_white.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 1.0, + "blue": 1.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_yellow.json b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_yellow.json new file mode 100644 index 00000000..92c63bba --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_bulb_lantern_yellow.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 1.0, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern.json new file mode 100644 index 00000000..f8f55c76 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 1.0, + "blue": 1.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_black.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_black.json new file mode 100644 index 00000000..26b54a96 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_black.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.1, + "green": 0.1, + "blue": 0.1, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_blue.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_blue.json new file mode 100644 index 00000000..5e61fc7d --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_blue.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.0, + "green": 0.0, + "blue": 1.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_brown.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_brown.json new file mode 100644 index 00000000..0936aeb3 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_brown.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.32, + "green": 0.18, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_cyan.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_cyan.json new file mode 100644 index 00000000..f21fd061 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_cyan.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.0, + "green": 1.0, + "blue": 0.5, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_gray.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_gray.json new file mode 100644 index 00000000..38131230 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_gray.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.3, + "green": 0.3, + "blue": 0.3, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_green.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_green.json new file mode 100644 index 00000000..fa215316 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_green.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.0, + "green": 1.0, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_light_blue.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_light_blue.json new file mode 100644 index 00000000..55a59fe6 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_light_blue.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.5, + "green": 0.5, + "blue": 1.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_light_gray.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_light_gray.json new file mode 100644 index 00000000..4d9bc9b4 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_light_gray.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.5, + "green": 0.5, + "blue": 0.5, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_lime.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_lime.json new file mode 100644 index 00000000..44c23281 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_lime.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.5, + "green": 1.0, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_magenta.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_magenta.json new file mode 100644 index 00000000..4884ec74 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_magenta.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 0.0, + "blue": 1.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_orange.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_orange.json new file mode 100644 index 00000000..adffdd3a --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_orange.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 0.5, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_pink.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_pink.json new file mode 100644 index 00000000..9aaba1df --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_pink.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 0.5, + "blue": 1.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_purple.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_purple.json new file mode 100644 index 00000000..11d0542e --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_purple.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 0.5, + "green": 0.0, + "blue": 0.5, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_red.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_red.json new file mode 100644 index 00000000..801dd380 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_red.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 0.0, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_white.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_white.json new file mode 100644 index 00000000..f8f55c76 --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_white.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 1.0, + "blue": 1.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_yellow.json b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_yellow.json new file mode 100644 index 00000000..92c63bba --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_bulb_lantern_yellow.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.5, + "red": 1.0, + "green": 1.0, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern.json new file mode 100644 index 00000000..f84c70f5 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_bulb", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_black.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_black.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_black.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_blue.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_blue.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_blue.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_brown.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_brown.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_brown.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_cyan.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_cyan.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_cyan.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_gray.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_gray.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_gray.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_green.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_green.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_green.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_light_blue.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_light_blue.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_light_blue.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_light_gray.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_light_gray.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_light_gray.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_lime.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_lime.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_lime.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_magenta.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_magenta.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_magenta.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_orange.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_orange.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_orange.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_pink.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_pink.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_pink.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_purple.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_purple.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_purple.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_red.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_red.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_red.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_white.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_white.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_white.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_yellow.json b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_yellow.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_bulb_lantern_yellow.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file