From 2550b63d2ae86188fc6e91e5205f3eecd56a05b6 Mon Sep 17 00:00:00 2001 From: HypherionMC Date: Sun, 25 Sep 2022 12:01:53 +0200 Subject: [PATCH] Candle in a Jar is back --- .../hyperlighting/common/init/HLItems.java | 4 ++++ .../common/items/CandleInAJar.java | 19 ++++++++++++++++++ .../shimmer/HyperLightingShimmer.java | 3 +++ .../assets/hyperlighting/lang/en_us.json | 1 + .../hyperlighting/models/item/candle_jar.json | 6 ++++++ .../textures/item/handheld_lantern.png | Bin 0 -> 2168 bytes 6 files changed, 33 insertions(+) create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/common/items/CandleInAJar.java create mode 100644 Common/src/main/resources/assets/hyperlighting/models/item/candle_jar.json create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/item/handheld_lantern.png diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLItems.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLItems.java index a50bd17..a329721 100644 --- a/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLItems.java +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLItems.java @@ -3,6 +3,7 @@ package me.hypherionmc.hyperlighting.common.init; import me.hypherionmc.craterlib.systems.reg.RegistrationProvider; import me.hypherionmc.craterlib.systems.reg.RegistryObject; import me.hypherionmc.hyperlighting.Constants; +import me.hypherionmc.hyperlighting.common.items.CandleInAJar; import me.hypherionmc.hyperlighting.common.items.LighterTool; import me.hypherionmc.hyperlighting.common.items.WirelessBattery; import net.minecraft.core.Registry; @@ -19,6 +20,9 @@ public class HLItems { /* Machines */ public static RegistryObject WIRELESS_BATTERY = register("wireless_battery", WirelessBattery::new); + /* Lights */ + public static RegistryObject CANDLE_IN_A_JAR = register("candle_jar", CandleInAJar::new); + public static void loadAll() {} public static RegistryObject register(String name, Supplier item) { diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/CandleInAJar.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/CandleInAJar.java new file mode 100644 index 0000000..bc251f1 --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/CandleInAJar.java @@ -0,0 +1,19 @@ +package me.hypherionmc.hyperlighting.common.items; + +import me.hypherionmc.craterlib.platform.Platform; +import me.hypherionmc.hyperlighting.common.init.CommonRegistration; +import net.minecraft.world.item.Item; + +/** + * @author HypherionSA + * @date 25/09/2022 + */ +public class CandleInAJar extends Item { + + private static final Properties shimmerLoaded = new Properties().tab(CommonRegistration.LIGHTS_TAB); + + public CandleInAJar() { + super(Platform.LOADER.isModLoaded("shimmer") ? shimmerLoaded : new Properties()); + } + +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/integration/shimmer/HyperLightingShimmer.java b/Common/src/main/java/me/hypherionmc/hyperlighting/integration/shimmer/HyperLightingShimmer.java index 3629893..87ddbf5 100644 --- a/Common/src/main/java/me/hypherionmc/hyperlighting/integration/shimmer/HyperLightingShimmer.java +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/integration/shimmer/HyperLightingShimmer.java @@ -10,6 +10,7 @@ import me.hypherionmc.hyperlighting.common.blocks.AdvancedLanternBlock; import me.hypherionmc.hyperlighting.common.blocks.AdvancedTorchBlock; import me.hypherionmc.hyperlighting.common.init.CommonRegistration; import me.hypherionmc.hyperlighting.common.init.HLBlocks; +import me.hypherionmc.hyperlighting.common.init.HLItems; import net.minecraft.world.item.DyeColor; /** @@ -26,6 +27,8 @@ public class HyperLightingShimmer { private static void registerItems() { LightManager.INSTANCE.registerItemLight(HLBlocks.ADVANCED_TORCH.asItem(), stack -> new ColorPointLight.Template(stack.getCount() / 10 + 6, RenderUtils.alphaColorFromDye(((BlockItemDyable)stack.getItem()).getColor(stack), 1f))); LightManager.INSTANCE.registerItemLight(HLBlocks.ADVANCED_LANTERN.asItem(), stack -> new ColorPointLight.Template(stack.getCount() / 10 + 6, RenderUtils.alphaColorFromDye(((BlockItemDyable)stack.getItem()).getColor(stack), 1f))); + + LightManager.INSTANCE.registerItemLight(HLItems.CANDLE_IN_A_JAR.get(), stack -> new ColorPointLight.Template(10, RenderUtils.alphaColorFromDye(DyeColor.WHITE, 1f))); } private static void registerBlocks() { diff --git a/Common/src/main/resources/assets/hyperlighting/lang/en_us.json b/Common/src/main/resources/assets/hyperlighting/lang/en_us.json index ea961ac..faa2e1c 100644 --- a/Common/src/main/resources/assets/hyperlighting/lang/en_us.json +++ b/Common/src/main/resources/assets/hyperlighting/lang/en_us.json @@ -8,6 +8,7 @@ "item.hyperlighting.lighter_tool": "Torch Lighter Tool", "item.hyperlighting.wireless_battery": "Wireless Battery", + "item.hyperlighting.candle_jar": "Candle In A Jar", "subtitles.torch_ignite": "Flame Ignite Sound", diff --git a/Common/src/main/resources/assets/hyperlighting/models/item/candle_jar.json b/Common/src/main/resources/assets/hyperlighting/models/item/candle_jar.json new file mode 100644 index 0000000..290c570 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/item/candle_jar.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "hyperlighting:item/handheld_lantern" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/textures/item/handheld_lantern.png b/Common/src/main/resources/assets/hyperlighting/textures/item/handheld_lantern.png new file mode 100644 index 0000000000000000000000000000000000000000..18c60629e5da7f68ebdca2e893ca72a01f6c825c GIT binary patch literal 2168 zcmcImX-pJn7+w{qTnz$>QYGVP)fQ*x*kz9?3&mY7!y@1spvB1S%>{5#1jI6Z6?gVIwBr&7a}lRiDF6=mmwHVVhU2GhI|JMytx_#u zw~J;|%UFjnW5gLl`)!?Wmu)CghDKQ%YX>kM2*drZoEA>tcnkN6IQ-lGXq=?h#Zm(2 zGH{%2q)<5{ERa?!7Dffl$+tQfuAF~I6y>vFb(FwrU;-mB1d}5KVZbm_t|aB^c#I%1 zY#6Est-w$MH99cISWT6qf$H^Srh^wK2hC>cG%ye)wOSccmO#jjjG94=7(*cxCC3mW zPN@)rrd14v(F~0#lhC08aW5gD#jAwZ%EQL9WQkTq73pd?t6 zQLcs|h9*s%%T9q-vDzs!i#i=<82VR@ma}m#J;#8Y%fyBT>>!E^D-Wty>H9<$vZcP2 z%?b_m9ZAt*yK7)ttTPLuAAW6pN%lskbJ)Jz!UEFQ6n_}Tb0(pjaW<^B8>+AdByqb1qmU~l2>0sNX-PPZ2xUsP|Wo6;MyGI)?ob0J? z&@DQA3R7NgK-**bLI(nW9beVTO4n9>-@4US=Wf~_`^lN+ z4th?_^xM5nDNh3X$_ENyY9jmEC1_~Mz@$*O^$Lt4CzecK{F zXf;od3EA$wxau~Pcg>qj?7M~OZ{BJc8*3q+{!p7S{-b~#SMbHq6**xUO`k>8Mz>1d z&0HPi?0diH*rR#H?DH-8yBk$&HKr@Gmv}#~PY)Yx$86#8fAvla9=LdaiTUpJt(naa R7K;A{nW@>jz4MA!{sRrN1nB?( literal 0 HcmV?d00001