From ff4df5d59ff566f94bc605d36c6ba8020d0ecddd Mon Sep 17 00:00:00 2001 From: HypherionMC Date: Sun, 31 Jul 2022 21:54:28 +0200 Subject: [PATCH] Initial Commit with Torches. Missing LangKeys and Recipes --- .gitattributes | 15 ++ .gitignore | 25 ++ ASSETS_LICENSE.txt | 5 + Common/build.gradle | 54 +++++ .../hypherionmc/hyperlighting/Constants.java | 20 ++ .../hyperlighting/api/LightableBlock.java | 17 ++ .../client/init/ClientRegistration.java | 28 +++ .../particles/ColoredFlameParticle.java | 75 ++++++ .../particles/ParticleRegistryHandler.java | 18 ++ .../common/blocks/AdvancedTorchBlock.java | 217 ++++++++++++++++++ .../common/config/HyperLightingConfig.java | 36 +++ .../common/init/CommonRegistration.java | 22 ++ .../hyperlighting/common/init/HLBlocks.java | 27 +++ .../hyperlighting/common/init/HLItems.java | 24 ++ .../common/init/HLParticles.java | 25 ++ .../hyperlighting/common/init/HLSounds.java | 25 ++ .../common/items/LighterTool.java | 26 +++ .../hyperlighting/util/StackUtil.java | 24 ++ .../blockstates/advanced_torch.json | 164 +++++++++++++ .../assets/hyperlighting/lang/en_us.json | 5 + .../models/block/torch/black_torch.json | 6 + .../models/block/torch/black_wall_torch.json | 6 + .../models/block/torch/blue_torch.json | 6 + .../models/block/torch/blue_wall_torch.json | 6 + .../models/block/torch/brown_torch.json | 6 + .../models/block/torch/brown_wall_torch.json | 6 + .../models/block/torch/cyan_torch.json | 6 + .../models/block/torch/cyan_wall_torch.json | 6 + .../models/block/torch/gray_torch.json | 6 + .../models/block/torch/gray_wall_torch.json | 6 + .../models/block/torch/green_torch.json | 6 + .../models/block/torch/green_wall_torch.json | 6 + .../models/block/torch/light_blue_torch.json | 6 + .../block/torch/light_blue_wall_torch.json | 6 + .../models/block/torch/light_gray_torch.json | 6 + .../block/torch/light_gray_wall_torch.json | 6 + .../models/block/torch/lime_torch.json | 6 + .../models/block/torch/lime_wall_torch.json | 6 + .../models/block/torch/magenta_torch.json | 6 + .../block/torch/magenta_wall_torch.json | 6 + .../models/block/torch/orange_torch.json | 6 + .../models/block/torch/orange_wall_torch.json | 6 + .../models/block/torch/pink_torch.json | 6 + .../models/block/torch/pink_wall_torch.json | 6 + .../models/block/torch/purple_torch.json | 6 + .../models/block/torch/purple_wall_torch.json | 6 + .../models/block/torch/red_torch.json | 6 + .../models/block/torch/red_wall_torch.json | 6 + .../models/block/torch/white_torch.json | 6 + .../models/block/torch/white_wall_torch.json | 6 + .../models/block/torch/yellow_torch.json | 6 + .../models/block/torch/yellow_wall_torch.json | 6 + .../models/block/torch_base.json | 35 +++ .../models/block/torch_wall_base.json | 83 +++++++ .../models/item/advanced_torch.json | 21 ++ .../models/item/lighter_tool.json | 6 + .../particles/colored_flame.json | 5 + .../assets/hyperlighting/sounds.json | 9 + .../hyperlighting/sounds/torch_ignite.ogg | Bin 0 -> 10265 bytes .../textures/block/torch/color/black.png | Bin 0 -> 495 bytes .../textures/block/torch/color/blue.png | Bin 0 -> 494 bytes .../textures/block/torch/color/brown.png | Bin 0 -> 495 bytes .../textures/block/torch/color/cyan.png | Bin 0 -> 494 bytes .../textures/block/torch/color/gray.png | Bin 0 -> 495 bytes .../textures/block/torch/color/green.png | Bin 0 -> 495 bytes .../textures/block/torch/color/light_blue.png | Bin 0 -> 494 bytes .../textures/block/torch/color/light_gray.png | Bin 0 -> 495 bytes .../textures/block/torch/color/lime.png | Bin 0 -> 495 bytes .../textures/block/torch/color/magenta.png | Bin 0 -> 495 bytes .../textures/block/torch/color/orange.png | Bin 0 -> 495 bytes .../textures/block/torch/color/pink.png | Bin 0 -> 495 bytes .../textures/block/torch/color/purple.png | Bin 0 -> 494 bytes .../textures/block/torch/color/red.png | Bin 0 -> 495 bytes .../textures/block/torch/color/white.png | Bin 0 -> 495 bytes .../textures/block/torch/color/white_base.png | Bin 0 -> 109 bytes .../textures/block/torch/color/yellow.png | Bin 0 -> 495 bytes .../textures/block/torch_base_on.png | Bin 0 -> 254 bytes .../textures/item/torch_tool.png | Bin 0 -> 1829 bytes .../textures/overlay/black_overlay.png | Bin 0 -> 267 bytes .../textures/overlay/blue_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/brown_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/cyan_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/gray_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/green_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/light_blue_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/light_gray_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/lime_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/magenta_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/orange_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/pink_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/purple_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/red_overlay.png | Bin 0 -> 261 bytes .../textures/overlay/white_overlay.png | Bin 0 -> 267 bytes .../textures/overlay/yellow_overlay.png | Bin 0 -> 261 bytes .../textures/particle/bubble_particle.png | Bin 0 -> 154 bytes .../textures/particle/colored_flame.png | Bin 0 -> 142 bytes .../textures/particle/flame_base.png | Bin 0 -> 169 bytes .../textures/particle/fog_particle.png | Bin 0 -> 3317 bytes .../textures/particle/fog_particle.png.mcmeta | 5 + .../textures/particle/splash_0.png | Bin 0 -> 109 bytes .../textures/particle/splash_1.png | Bin 0 -> 101 bytes .../textures/particle/splash_2.png | Bin 0 -> 95 bytes .../textures/particle/splash_3.png | Bin 0 -> 104 bytes Common/src/main/resources/hyperlighting.aw | 3 + .../main/resources/hyperlighting.mixins.json | 16 ++ Common/src/main/resources/pack.mcmeta | 6 + Fabric/build.gradle | 95 ++++++++ .../hyperlighting/HyperLightingFabric.java | 12 + .../client/HyperLightingFabricClient.java | 24 ++ Fabric/src/main/resources/fabric.mod.json | 41 ++++ .../hyperlighting.fabric.mixins.json | 15 ++ Forge/build.gradle | 125 ++++++++++ .../hyperlighting/HyperLightingForge.java | 24 ++ .../client/ForgeClientEventHandler.java | 22 ++ Forge/src/main/resources/META-INF/mods.toml | 38 +++ .../resources/hyperlighting.forge.mixins.json | 16 ++ LICENSE | 21 ++ README.md | 9 + build.gradle | 66 ++++++ gradle.properties | 31 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 +++++++++++++++ gradlew.bat | 89 +++++++ settings.gradle | 16 ++ .../models/block/torch/black_torch.json | 6 + .../models/block/torch/black_wall_torch.json | 6 + .../models/block/torch/blue_torch.json | 6 + .../models/block/torch/blue_wall_torch.json | 6 + .../models/block/torch/brown_torch.json | 6 + .../models/block/torch/brown_wall_torch.json | 6 + .../models/block/torch/cyan_torch.json | 6 + .../models/block/torch/cyan_wall_torch.json | 6 + .../models/block/torch/gray_torch.json | 6 + .../models/block/torch/gray_wall_torch.json | 6 + .../models/block/torch/green_torch.json | 6 + .../models/block/torch/green_wall_torch.json | 6 + .../models/block/torch/light_blue_torch.json | 6 + .../block/torch/light_blue_wall_torch.json | 6 + .../models/block/torch/light_gray_torch.json | 6 + .../block/torch/light_gray_wall_torch.json | 6 + .../models/block/torch/lime_torch.json | 6 + .../models/block/torch/lime_wall_torch.json | 6 + .../models/block/torch/magenta_torch.json | 6 + .../block/torch/magenta_wall_torch.json | 6 + .../models/block/torch/orange_torch.json | 6 + .../models/block/torch/orange_wall_torch.json | 6 + .../models/block/torch/pink_torch.json | 6 + .../models/block/torch/pink_wall_torch.json | 6 + .../models/block/torch/purple_torch.json | 6 + .../models/block/torch/purple_wall_torch.json | 6 + .../models/block/torch/red_torch.json | 6 + .../models/block/torch/red_wall_torch.json | 6 + .../models/block/torch/white_torch.json | 6 + .../models/block/torch/white_wall_torch.json | 6 + .../models/block/torch/yellow_torch.json | 6 + .../models/block/torch/yellow_wall_torch.json | 6 + .../models/item/torch/black_torch.json | 6 + .../models/item/torch/blue_torch.json | 6 + .../models/item/torch/brown_torch.json | 6 + .../models/item/torch/cyan_torch.json | 6 + .../models/item/torch/gray_torch.json | 6 + .../models/item/torch/green_torch.json | 6 + .../models/item/torch/light_blue_torch.json | 6 + .../models/item/torch/light_gray_torch.json | 6 + .../models/item/torch/lime_torch.json | 6 + .../models/item/torch/magenta_torch.json | 6 + .../models/item/torch/orange_torch.json | 6 + .../models/item/torch/pink_torch.json | 6 + .../models/item/torch/purple_torch.json | 6 + .../models/item/torch/red_torch.json | 6 + .../models/item/torch/white_torch.json | 6 + .../models/item/torch/yellow_torch.json | 6 + 173 files changed, 2353 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 ASSETS_LICENSE.txt create mode 100644 Common/build.gradle create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/Constants.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/api/LightableBlock.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/client/init/ClientRegistration.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/client/particles/ColoredFlameParticle.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/client/particles/ParticleRegistryHandler.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedTorchBlock.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/common/config/HyperLightingConfig.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/common/init/CommonRegistration.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLBlocks.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLItems.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLParticles.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLSounds.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/common/items/LighterTool.java create mode 100644 Common/src/main/java/me/hypherionmc/hyperlighting/util/StackUtil.java create mode 100644 Common/src/main/resources/assets/hyperlighting/blockstates/advanced_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/lang/en_us.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/black_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/black_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/blue_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/blue_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/brown_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/brown_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/cyan_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/cyan_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/gray_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/gray_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/green_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/green_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/lime_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/lime_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/magenta_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/magenta_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/orange_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/orange_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/pink_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/pink_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/purple_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/purple_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/red_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/red_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/white_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/white_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/yellow_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch/yellow_wall_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch_base.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/block/torch_wall_base.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/item/advanced_torch.json create mode 100644 Common/src/main/resources/assets/hyperlighting/models/item/lighter_tool.json create mode 100644 Common/src/main/resources/assets/hyperlighting/particles/colored_flame.json create mode 100644 Common/src/main/resources/assets/hyperlighting/sounds.json create mode 100644 Common/src/main/resources/assets/hyperlighting/sounds/torch_ignite.ogg create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/black.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/blue.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/brown.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/cyan.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/gray.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/green.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/light_blue.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/light_gray.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/lime.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/magenta.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/orange.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/pink.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/purple.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/red.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/white.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/white_base.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/yellow.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/block/torch_base_on.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/item/torch_tool.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/black_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/blue_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/brown_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/cyan_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/gray_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/green_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/light_blue_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/light_gray_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/lime_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/magenta_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/orange_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/pink_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/purple_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/red_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/white_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/overlay/yellow_overlay.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/particle/bubble_particle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/particle/colored_flame.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/particle/flame_base.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/particle/fog_particle.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/particle/fog_particle.png.mcmeta create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/particle/splash_0.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/particle/splash_1.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/particle/splash_2.png create mode 100644 Common/src/main/resources/assets/hyperlighting/textures/particle/splash_3.png create mode 100644 Common/src/main/resources/hyperlighting.aw create mode 100644 Common/src/main/resources/hyperlighting.mixins.json create mode 100644 Common/src/main/resources/pack.mcmeta create mode 100644 Fabric/build.gradle create mode 100644 Fabric/src/main/java/me/hypherionmc/hyperlighting/HyperLightingFabric.java create mode 100644 Fabric/src/main/java/me/hypherionmc/hyperlighting/client/HyperLightingFabricClient.java create mode 100644 Fabric/src/main/resources/fabric.mod.json create mode 100644 Fabric/src/main/resources/hyperlighting.fabric.mixins.json create mode 100644 Forge/build.gradle create mode 100644 Forge/src/main/java/me/hypherionmc/hyperlighting/HyperLightingForge.java create mode 100644 Forge/src/main/java/me/hypherionmc/hyperlighting/client/ForgeClientEventHandler.java create mode 100644 Forge/src/main/resources/META-INF/mods.toml create mode 100644 Forge/src/main/resources/hyperlighting.forge.mixins.json create mode 100644 LICENSE create mode 100644 README.md create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/black_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/black_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/blue_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/blue_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/brown_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/brown_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/cyan_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/cyan_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/gray_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/gray_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/green_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/green_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/light_blue_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/light_blue_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/light_gray_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/light_gray_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/lime_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/lime_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/magenta_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/magenta_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/orange_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/orange_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/pink_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/pink_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/purple_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/purple_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/red_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/red_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/white_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/white_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/yellow_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/block/torch/yellow_wall_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/black_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/blue_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/brown_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/cyan_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/gray_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/green_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/light_blue_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/light_gray_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/lime_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/magenta_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/orange_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/pink_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/purple_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/red_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/white_torch.json create mode 100644 src/main/resources/assets/hyperlighting/models/item/torch/yellow_torch.json diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..20fc528 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,15 @@ +* text eol=lf +*.bat text eol=crlf +*.patch text eol=lf +*.java text eol=lf +*.gradle text eol=crlf +*.png binary +*.gif binary +*.exe binary +*.dll binary +*.jar binary +*.lzma binary +*.zip binary +*.pyd binary +*.cfg text eol=lf +*.jks binary \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..77bb201 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run + +artifacts +ColorGen.java diff --git a/ASSETS_LICENSE.txt b/ASSETS_LICENSE.txt new file mode 100644 index 0000000..6518ee7 --- /dev/null +++ b/ASSETS_LICENSE.txt @@ -0,0 +1,5 @@ +All Rights Reserved + +Copyright (c) [2022] [HypherionMC and Contributors] + +All assets used in this mod that is not from the Default Minecraft assets, may not be used EVER without written permission from HypherionMC diff --git a/Common/build.gradle b/Common/build.gradle new file mode 100644 index 0000000..5746322 --- /dev/null +++ b/Common/build.gradle @@ -0,0 +1,54 @@ +plugins { + id 'java' + id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' + id 'maven-publish' +} + +archivesBaseName = "${mod_name}-common-${minecraft_version}" + +minecraft { + accessWideners(project.file("src/main/resources/hyperlighting.aw")) + version(minecraft_version) + runs { + if (project.hasProperty('common_runs_enabled') ? project.findProperty('common_runs_enabled').toBoolean() : true) { + + server(project.hasProperty('common_server_run_name') ? project.findProperty('common_server_run_name') : 'vanilla_server') { + workingDirectory(this.file("run")) + } + client(project.hasProperty('common_client_run_name') ? project.findProperty('common_client_run_name') : 'vanilla_client') { + workingDirectory(this.file("run")) + } + } + } +} + +dependencies { + compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5' + compileOnly("me.hypherionmc.craterlib:CraterLib-common-1.19.1:${craterlib_version}") +} + +processResources { + + def buildProps = project.properties.clone() + + filesMatching(['pack.mcmeta']) { + + expand buildProps + } +} +publishing { + publications { + mavenJava(MavenPublication) { + groupId project.group + artifactId project.archivesBaseName + version project.version + from components.java + } + } + + repositories { + maven { + url "file://" + System.getenv("local_maven") + } + } +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/Constants.java b/Common/src/main/java/me/hypherionmc/hyperlighting/Constants.java new file mode 100644 index 0000000..8ebc8e3 --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/Constants.java @@ -0,0 +1,20 @@ +package me.hypherionmc.hyperlighting; + +import me.hypherionmc.craterlib.client.gui.tabs.CreativeTabBuilder; +import me.hypherionmc.hyperlighting.common.init.HLBlocks; +import me.hypherionmc.hyperlighting.common.init.HLItems; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class Constants { + + public static final String MOD_ID = "hyperlighting"; + public static final String MOD_NAME = "Hyper Lighting 2"; + public static final Logger LOG = LogManager.getLogger(MOD_NAME); + public static ResourceLocation rl(String name) { + return new ResourceLocation(MOD_ID, name); + } +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/api/LightableBlock.java b/Common/src/main/java/me/hypherionmc/hyperlighting/api/LightableBlock.java new file mode 100644 index 0000000..0c68f4e --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/api/LightableBlock.java @@ -0,0 +1,17 @@ +package me.hypherionmc.hyperlighting.api; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; + +public interface LightableBlock { + + /** + * Allows Torch Lighter tool to cycle the state of a clicked block + * @param worldIn + * @param state + * @param pos + */ + void toggleLight(Level worldIn, BlockState state, BlockPos pos); + +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/client/init/ClientRegistration.java b/Common/src/main/java/me/hypherionmc/hyperlighting/client/init/ClientRegistration.java new file mode 100644 index 0000000..9313cf4 --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/client/init/ClientRegistration.java @@ -0,0 +1,28 @@ +package me.hypherionmc.hyperlighting.client.init; + +import me.hypherionmc.craterlib.client.events.ColorRegistrationEvent; +import me.hypherionmc.craterlib.client.registry.ClientRegistry; +import me.hypherionmc.craterlib.events.CraterEventBus; +import me.hypherionmc.hyperlighting.common.init.HLBlocks; +import me.hypherionmc.hyperlighting.common.init.HLItems; + +/** + * @author HypherionSA + * @date 17/06/2022 + */ +public class ClientRegistration { + + public void registerAll() { + CraterEventBus.register(ColorRegistrationEvent.BLOCKS.class, this::registerBlockColors); + CraterEventBus.register(ColorRegistrationEvent.ITEMS.class, this::registerItemColors); + } + + public void registerBlockColors(ColorRegistrationEvent.BLOCKS event) { + ClientRegistry.registerBlockColors(event.getColors(), HLBlocks.BLOCKS); + } + + public void registerItemColors(ColorRegistrationEvent.ITEMS event) { + ClientRegistry.registerItemColors(event.getColors(), HLItems.ITEMS); + } + +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/client/particles/ColoredFlameParticle.java b/Common/src/main/java/me/hypherionmc/hyperlighting/client/particles/ColoredFlameParticle.java new file mode 100644 index 0000000..504714e --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/client/particles/ColoredFlameParticle.java @@ -0,0 +1,75 @@ +package me.hypherionmc.hyperlighting.client.particles; + +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.particle.*; +import net.minecraft.core.particles.SimpleParticleType; +import net.minecraft.util.Mth; + +public class ColoredFlameParticle extends RisingParticle { + + public ColoredFlameParticle(ClientLevel level, double x, double y, double z, double r, double g, double b) { + super(level, x, y, z, 0, 0, 0); + this.setColor((float) r, (float) g, (float) b); + } + + @Override + public ParticleRenderType getRenderType() { + return ParticleRenderType.PARTICLE_SHEET_LIT; + } + + @Override + public void move(double dx, double dy, double dz) { + this.setBoundingBox(this.getBoundingBox().inflate(dx, dy, dz)); + this.setLocationFromBoundingbox(); + } + + @Override + public float getQuadSize(float tickDelta) { + float f = ((float) this.age + tickDelta) / (float) this.lifetime; + return this.quadSize * (1.0f - f * f * 0.5f); + } + + @Override + protected int getLightColor(float tint) { + float f = ((float) this.age + tint) / (float) this.lifetime; + f = Mth.clamp(f, 0.0f, 1.0f); + int i = super.getLightColor(tint); + int j = i & 0xFF; + int k = i >> 16 & 0xFF; + if ((j += (int) (f * 15.0f * 16.0f)) > 240) { + j = 240; + } + return j | k << 16; + } + + public static class SmallFactory implements ParticleProvider { + private final SpriteSet spriteSet; + + public SmallFactory(SpriteSet spriteSet) { + this.spriteSet = spriteSet; + } + + @Override + public Particle createParticle(SimpleParticleType type, ClientLevel clientLevel, double x, double y, double z, double r, double g, double b) { + ColoredFlameParticle coloredFlameParticle = new ColoredFlameParticle(clientLevel, x, y, z, r, g, b); + coloredFlameParticle.setSpriteFromAge(this.spriteSet); + coloredFlameParticle.scale(0.5f); + return coloredFlameParticle; + } + } + + public static class Factory implements ParticleProvider { + private final SpriteSet spriteSet; + + public Factory(SpriteSet spriteSet) { + this.spriteSet = spriteSet; + } + + @Override + public Particle createParticle(SimpleParticleType type, ClientLevel clientLevel, double x, double y, double z, double r, double g, double b) { + ColoredFlameParticle coloredFlameParticle = new ColoredFlameParticle(clientLevel, x, y, z, r, g, b); + coloredFlameParticle.setSpriteFromAge(this.spriteSet); + return coloredFlameParticle; + } + } +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/client/particles/ParticleRegistryHandler.java b/Common/src/main/java/me/hypherionmc/hyperlighting/client/particles/ParticleRegistryHandler.java new file mode 100644 index 0000000..91680f1 --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/client/particles/ParticleRegistryHandler.java @@ -0,0 +1,18 @@ +package me.hypherionmc.hyperlighting.client.particles; + +import me.hypherionmc.hyperlighting.common.init.HLParticles; +import net.minecraft.client.particle.ParticleEngine; +import net.minecraft.core.particles.ParticleOptions; +import net.minecraft.core.particles.ParticleType; + +public class ParticleRegistryHandler { + + public static void registerParticles(ParticleStrategy strategy) { + strategy.register(HLParticles.COLORED_FLAME.get(), ColoredFlameParticle.Factory::new); + } + + public interface ParticleStrategy { + void register(ParticleType particle, ParticleEngine.SpriteParticleRegistration provider); + } + +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedTorchBlock.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedTorchBlock.java new file mode 100644 index 0000000..0458c9f --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedTorchBlock.java @@ -0,0 +1,217 @@ +package me.hypherionmc.hyperlighting.common.blocks; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import me.hypherionmc.craterlib.api.rendering.DyableBlock; +import me.hypherionmc.craterlib.common.item.BlockItemDyable; +import me.hypherionmc.craterlib.util.BlockStateUtils; +import me.hypherionmc.craterlib.util.RenderUtils; +import me.hypherionmc.hyperlighting.api.LightableBlock; +import me.hypherionmc.hyperlighting.common.init.CommonRegistration; +import me.hypherionmc.hyperlighting.common.init.HLItems; +import me.hypherionmc.hyperlighting.common.init.HLSounds; +import me.hypherionmc.hyperlighting.util.StackUtil; +import net.minecraft.ChatFormatting; +import net.minecraft.client.color.block.BlockColor; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.core.particles.SimpleParticleType; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtUtils; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.util.RandomSource; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.AttachFace; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.block.state.properties.BooleanProperty; +import net.minecraft.world.level.block.state.properties.EnumProperty; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; +import org.jetbrains.annotations.NotNull; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.function.Supplier; + +public class AdvancedTorchBlock extends HorizontalDirectionalBlock implements DyableBlock, LightableBlock { + + public static final BooleanProperty LIT = BlockStateProperties.LIT; + public static final EnumProperty COLOR = EnumProperty.create("color", DyeColor.class); + public static final EnumProperty ATTACH_FACE = EnumProperty.create("face", AttachFace.class, AttachFace.FLOOR, AttachFace.WALL); + private static final Map SHAPES = Maps.newEnumMap(ImmutableMap.of(Direction.NORTH, Block.box(5.5D, 2.0D, 11.0D, 10.5D, 12.0D, 16.0D), Direction.SOUTH, Block.box(5.5D, 2.0D, 0.0D, 10.5D, 12.0D, 5.0D), Direction.WEST, Block.box(11.0D, 2.0D, 5.5D, 16.0D, 12.0D, 10.5D), Direction.EAST, Block.box(0.0D, 2.0D, 5.5D, 5.0D, 12.0D, 10.5D), Direction.UP, Block.box(6.0D, 0.0D, 6.0D, 10.0D, 10.0D, 10.0D))); + private final Supplier particleType; + + private DyeColor color; + + public AdvancedTorchBlock(String name, DyeColor color, CreativeModeTab tab, Supplier type) { + super(Properties.of(Material.WOOD).noCollission().instabreak().lightLevel(BlockStateUtils.createLightLevelFromLitBlockState(15))); + this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(LIT, CommonRegistration.config.torchConfig.litByDefault).setValue(COLOR, color)); + this.particleType = type; + this.color = color; + + HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties().tab(tab))); + } + + @Override + public VoxelShape getShape(BlockState blockState, BlockGetter level, BlockPos pos, CollisionContext context) { + return switch (blockState.getValue(ATTACH_FACE)) { + case FLOOR -> SHAPES.get(Direction.UP); + case WALL -> SHAPES.get(blockState.getValue(FACING)); + case CEILING -> null; + }; + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + builder.add(LIT, ATTACH_FACE, FACING, COLOR); + super.createBlockStateDefinition(builder); + } + + @Override + public BlockState getStateForPlacement(BlockPlaceContext context) { + Direction direction = context.getClickedFace(); + BlockState state = this.defaultBlockState(); + if (direction == Direction.UP) { + state = state.setValue(ATTACH_FACE, AttachFace.FLOOR); + } else { + state = state.setValue(ATTACH_FACE, AttachFace.WALL).setValue(FACING, direction); + } + return state.setValue(LIT, CommonRegistration.config.torchConfig.litByDefault); + } + + @Override + public BlockState updateShape(BlockState stateIn, Direction facing, BlockState neighbourState, LevelAccessor levelIn, BlockPos currentPos, BlockPos newPos) { + if (facing == Direction.DOWN && !this.isValidPosition(stateIn, levelIn, currentPos, facing)) { + return Blocks.AIR.defaultBlockState(); + } + return super.updateShape(stateIn, facing, neighbourState, levelIn, currentPos, newPos); + } + + public boolean isValidPosition(BlockState state, LevelAccessor levelAccessor, BlockPos pos, Direction direction) { + return canSupportCenter(levelAccessor, pos, direction); + } + + @Override + public void toggleLight(Level worldIn, BlockState state, BlockPos pos) { + state = state.setValue(LIT, !state.getValue(LIT)); + worldIn.setBlock(pos, state, 2); + if (!state.getValue(LIT)) { + worldIn.playSound(null, pos, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.3f, 1.0f); + } else { + worldIn.playSound(null, pos, HLSounds.TORCH_IGNITE.get(), SoundSource.BLOCKS, 0.3f, 1.0f); + } + worldIn.blockUpdated(pos, this); + } + + @Override + public BlockColor dyeHandler() { + return ((blockState, blockAndTintGetter, blockPos, i) -> { + if (blockState.getValue(LIT)) { + return RenderUtils.renderColorFromDye(blockState.getValue(COLOR)); + } else { + return RenderUtils.renderColorFromDye(DyeColor.BLACK); + } + }); + } + + @Override + public DyeColor defaultDyeColor() { + return this.defaultBlockState().getValue(COLOR); + } + + /** Check if player clicked the block with DYE and apply Color Tint **/ + @Override + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { + if (!level.isClientSide()) { + if (!player.getItemInHand(handIn).isEmpty() && player.getItemInHand(handIn).getItem() instanceof DyeItem dyeItem) { + state = state.setValue(COLOR, dyeItem.getDyeColor()); + this.color = dyeItem.getDyeColor(); + level.setBlock(pos, state, 3); + level.sendBlockUpdated(pos, state, state, 3); + + if (!player.isCreative()) { + ItemStack stack = player.getItemInHand(handIn); + stack.shrink(1); + player.setItemInHand(handIn, stack); + } + return InteractionResult.CONSUME; + } else if (!CommonRegistration.config.torchConfig.requiresTool) { + state = state.cycle(LIT); + level.setBlock(pos, state, 3); + level.sendBlockUpdated(pos, state, state, 3); + if (!state.getValue(LIT)) { + level.playSound(null, pos, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.3f, 1.0f); + } else { + level.playSound(null, pos, HLSounds.TORCH_IGNITE.get(), SoundSource.BLOCKS, 0.3f, 1.0f); + } + return InteractionResult.CONSUME; + } + } + return InteractionResult.PASS; + } + + @Override + public void appendHoverText(ItemStack stack, BlockGetter level, List tooltip, TooltipFlag options) { + tooltip.add(Component.literal(ChatFormatting.YELLOW + "Dyable")); + tooltip.add(Component.literal(ChatFormatting.GREEN + "Color: " + color.getName())); + super.appendHoverText(stack, level, tooltip, options); + } + + @Override + public void animateTick(BlockState stateIn, Level levelIn, BlockPos pos, RandomSource random) { + if (stateIn.getValue(LIT)) { + DyeColor color = stateIn.getValue(COLOR); + + if (stateIn.getValue(ATTACH_FACE) == AttachFace.FLOOR) { + double d0 = (double) pos.getX() + 0.5D; + double d1 = (double) pos.getY() + 0.7D; + double d2 = (double) pos.getZ() + 0.5D; + levelIn.addParticle(ParticleTypes.SMOKE, d0, d1, d2, 0.0D, 0.0D, 0.0D); + + // xSpeed, ySpeed and zSpeed here is used to pass color data. This isn't the proper way, but I don't wanna add a bunch of extra code for something so simple + levelIn.addParticle(particleType.get(), d0, d1, d2, color.getTextureDiffuseColors()[0], color.getTextureDiffuseColors()[1], color.getTextureDiffuseColors()[2]); + } else { + Direction direction = stateIn.getValue(FACING); + double d0 = (double) pos.getX() + 0.5D; + double d1 = (double) pos.getY() + 0.7D; + double d2 = (double) pos.getZ() + 0.5D; + Direction direction1 = direction.getOpposite(); + levelIn.addParticle(ParticleTypes.SMOKE, d0 + 0.37D * (double) direction1.getStepX(), d1 + 0.15D, d2 + 0.37D * (double) direction1.getStepZ(), 0.0D, 0.0D, 0.0D); + + // xSpeed, ySpeed and zSpeed here is used to pass color data. This isn't the proper way, but I don't wanna add a bunch of extra code for something so simple + levelIn.addParticle(particleType.get(), d0 + 0.37D * (double) direction1.getStepX(), d1 + 0.15D, d2 + 0.37D * (double) direction1.getStepZ(), color.getTextureDiffuseColors()[0], color.getTextureDiffuseColors()[1], color.getTextureDiffuseColors()[2]); + } + } + } + + @Override + public @NotNull ItemStack getCloneItemStack(@NotNull BlockGetter level, @NotNull BlockPos pos, @NotNull BlockState state) { + return StackUtil.getColorStack(this, state.getValue(COLOR)); + } + + @Override + public List getDrops(BlockState blockState, LootContext.Builder lootBuilder) { + return List.of(StackUtil.getColorStack(this, blockState.getValue(COLOR))); + } +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/config/HyperLightingConfig.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/config/HyperLightingConfig.java new file mode 100644 index 0000000..91e8c42 --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/config/HyperLightingConfig.java @@ -0,0 +1,36 @@ +package me.hypherionmc.hyperlighting.common.config; + +import me.hypherionmc.craterlib.common.config.ModuleConfig; +import me.hypherionmc.craterlib.common.config.annotations.SubConfig; +import me.hypherionmc.hyperlighting.Constants; +import me.hypherionmc.hyperlighting.common.init.CommonRegistration; +import me.hypherionmc.nightconfig.core.conversion.Path; +import me.hypherionmc.nightconfig.core.conversion.SpecComment; + +public class HyperLightingConfig extends ModuleConfig { + + @Path("torchConfig") + @SpecComment("Torch Configuration") + @SubConfig + public TorchConfig torchConfig = new TorchConfig(); + + public HyperLightingConfig() { + super(Constants.MOD_ID, "hyperlighting-common"); + registerAndSetup(this); + } + + @Override + public void configReloaded() { + CommonRegistration.config = loadConfig(this); + } + + public static class TorchConfig { + @Path("litByDefault") + @SpecComment("Should torches be lit by default when placed") + public boolean litByDefault = false; + + @Path("requiresTool") + @SpecComment("Is the Torch Lighter tool needed to light torches") + public boolean requiresTool = true; + } +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/CommonRegistration.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/CommonRegistration.java new file mode 100644 index 0000000..e576740 --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/CommonRegistration.java @@ -0,0 +1,22 @@ +package me.hypherionmc.hyperlighting.common.init; + +import me.hypherionmc.craterlib.client.gui.tabs.CreativeTabBuilder; +import me.hypherionmc.hyperlighting.common.config.HyperLightingConfig; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; + +import static me.hypherionmc.hyperlighting.Constants.MOD_ID; + +public class CommonRegistration { + + public static HyperLightingConfig config = new HyperLightingConfig(); + public static final CreativeModeTab LIGHTS_TAB = CreativeTabBuilder.builder(MOD_ID, "lighting").setIcon(() -> new ItemStack(HLBlocks.ADVANCED_TORCH)).build(); + + public static void registerAll() { + HLSounds.loadAll(); + HLParticles.loadAll(); + HLBlocks.loadAll(); + HLItems.loadAll(); + } + +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLBlocks.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLBlocks.java new file mode 100644 index 0000000..ed81494 --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLBlocks.java @@ -0,0 +1,27 @@ +package me.hypherionmc.hyperlighting.common.init; + +import me.hypherionmc.craterlib.systems.reg.BlockRegistryObject; +import me.hypherionmc.craterlib.systems.reg.RegistrationProvider; +import me.hypherionmc.hyperlighting.Constants; +import me.hypherionmc.hyperlighting.common.blocks.AdvancedTorchBlock; +import net.minecraft.core.Registry; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.block.Block; + +import java.util.function.Supplier; + +public class HLBlocks { + + public static RegistrationProvider BLOCKS = RegistrationProvider.get(Registry.BLOCK_REGISTRY, Constants.MOD_ID); + + /* Torches */ + public static BlockRegistryObject ADVANCED_TORCH = register("advanced_torch", () -> new AdvancedTorchBlock("advanced_torch", DyeColor.ORANGE, CommonRegistration.LIGHTS_TAB, HLParticles.COLORED_FLAME)); + + public static void loadAll() {} + + public static BlockRegistryObject register(String name, Supplier block) { + final var ro = BLOCKS.register(name, block); + return BlockRegistryObject.wrap(ro); + } +} 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 new file mode 100644 index 0000000..7fd501c --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLItems.java @@ -0,0 +1,24 @@ +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.LighterTool; +import net.minecraft.core.Registry; +import net.minecraft.world.item.Item; + +import java.util.function.Supplier; + +public class HLItems { + public static final RegistrationProvider ITEMS = RegistrationProvider.get(Registry.ITEM_REGISTRY, Constants.MOD_ID); + + /* Tools */ + public static RegistryObject TORCH_TOOL = register("lighter_tool", LighterTool::new); + + public static void loadAll() {} + + public static RegistryObject register(String name, Supplier item) { + return ITEMS.register(name, item); + } + +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLParticles.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLParticles.java new file mode 100644 index 0000000..a2a7b94 --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLParticles.java @@ -0,0 +1,25 @@ +package me.hypherionmc.hyperlighting.common.init; + +import me.hypherionmc.craterlib.common.particles.WrappedSimpleParticleType; +import me.hypherionmc.craterlib.systems.reg.RegistrationProvider; +import me.hypherionmc.craterlib.systems.reg.RegistryObject; +import me.hypherionmc.hyperlighting.Constants; +import net.minecraft.core.Registry; +import net.minecraft.core.particles.ParticleType; +import net.minecraft.core.particles.SimpleParticleType; + +import java.util.function.Supplier; + +public class HLParticles { + + public static final RegistrationProvider> PARTICLES = RegistrationProvider.get(Registry.PARTICLE_TYPE_REGISTRY, Constants.MOD_ID); + + public static RegistryObject COLORED_FLAME = register("colored_flame", () -> new WrappedSimpleParticleType(false)); + + public static > RegistryObject register(String name, Supplier particle) { + return PARTICLES.register(name, particle); + } + + public static void loadAll() {} + +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLSounds.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLSounds.java new file mode 100644 index 0000000..ec5fc38 --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLSounds.java @@ -0,0 +1,25 @@ +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 net.minecraft.core.Registry; +import net.minecraft.sounds.SoundEvent; + +/** + * @author HypherionSA + * @date 01/07/2022 + */ +public class HLSounds { + + public static final RegistrationProvider SOUNDS = RegistrationProvider.get(Registry.SOUND_EVENT, Constants.MOD_ID); + + public static RegistryObject TORCH_IGNITE = createSound("block.torch_ignite"); + + public static RegistryObject createSound(String location) { + final var soundLocation = Constants.rl(location); + return SOUNDS.register(location, () -> new SoundEvent(soundLocation)); + } + + public static void loadAll() {} +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/LighterTool.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/LighterTool.java new file mode 100644 index 0000000..7f872b7 --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/LighterTool.java @@ -0,0 +1,26 @@ +package me.hypherionmc.hyperlighting.common.items; + +import me.hypherionmc.hyperlighting.api.LightableBlock; +import me.hypherionmc.hyperlighting.common.init.CommonRegistration; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.block.state.BlockState; + +public class LighterTool extends Item { + + public LighterTool() { + super(new Properties().stacksTo(1).tab(CommonRegistration.LIGHTS_TAB).durability(20)); + } + + @Override + public InteractionResult useOn(UseOnContext context) { + if (!context.getLevel().isClientSide()) { + BlockState block = context.getLevel().getBlockState(context.getClickedPos()); + if (block.getBlock() instanceof LightableBlock lightableBlock) { + lightableBlock.toggleLight(context.getLevel(), block, context.getClickedPos()); + } + } + return InteractionResult.CONSUME; + } +} diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/util/StackUtil.java b/Common/src/main/java/me/hypherionmc/hyperlighting/util/StackUtil.java new file mode 100644 index 0000000..dde2fd6 --- /dev/null +++ b/Common/src/main/java/me/hypherionmc/hyperlighting/util/StackUtil.java @@ -0,0 +1,24 @@ +package me.hypherionmc.hyperlighting.util; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.Block; + +/** + * @author HypherionSA + * @date 01/07/2022 + */ + +// TODO: Move this into CraterLib. This should not be here +public class StackUtil { + + public static ItemStack getColorStack(Block block, DyeColor color) { + ItemStack stack = new ItemStack(block); + CompoundTag tag = stack.getOrCreateTag(); + tag.putString("color", color.getName()); + stack.setTag(tag); + return stack; + } + +} diff --git a/Common/src/main/resources/assets/hyperlighting/blockstates/advanced_torch.json b/Common/src/main/resources/assets/hyperlighting/blockstates/advanced_torch.json new file mode 100644 index 0000000..044b748 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/blockstates/advanced_torch.json @@ -0,0 +1,164 @@ +{ + "variants": { + "face=floor,lit=true,color=white": {"model": "hyperlighting:block/torch/white_torch"}, + "face=floor,lit=false,color=white": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=white": {"model": "hyperlighting:block/torch/white_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=white": {"model": "hyperlighting:block/torch/white_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=white": {"model": "hyperlighting:block/torch/white_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=white": {"model": "hyperlighting:block/torch/white_wall_torch"}, + "face=wall,facing=north,lit=false,color=white": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=white": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=white": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=white": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=orange": {"model": "hyperlighting:block/torch/orange_torch"}, + "face=floor,lit=false,color=orange": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=orange": {"model": "hyperlighting:block/torch/orange_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=orange": {"model": "hyperlighting:block/torch/orange_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=orange": {"model": "hyperlighting:block/torch/orange_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=orange": {"model": "hyperlighting:block/torch/orange_wall_torch"}, + "face=wall,facing=north,lit=false,color=orange": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=orange": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=orange": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=orange": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=magenta": {"model": "hyperlighting:block/torch/magenta_torch"}, + "face=floor,lit=false,color=magenta": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=magenta": {"model": "hyperlighting:block/torch/magenta_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=magenta": {"model": "hyperlighting:block/torch/magenta_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=magenta": {"model": "hyperlighting:block/torch/magenta_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=magenta": {"model": "hyperlighting:block/torch/magenta_wall_torch"}, + "face=wall,facing=north,lit=false,color=magenta": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=magenta": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=magenta": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=magenta": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=light_blue": {"model": "hyperlighting:block/torch/light_blue_torch"}, + "face=floor,lit=false,color=light_blue": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=light_blue": {"model": "hyperlighting:block/torch/light_blue_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=light_blue": {"model": "hyperlighting:block/torch/light_blue_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=light_blue": {"model": "hyperlighting:block/torch/light_blue_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=light_blue": {"model": "hyperlighting:block/torch/light_blue_wall_torch"}, + "face=wall,facing=north,lit=false,color=light_blue": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=light_blue": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=light_blue": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=light_blue": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=yellow": {"model": "hyperlighting:block/torch/yellow_torch"}, + "face=floor,lit=false,color=yellow": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=yellow": {"model": "hyperlighting:block/torch/yellow_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=yellow": {"model": "hyperlighting:block/torch/yellow_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=yellow": {"model": "hyperlighting:block/torch/yellow_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=yellow": {"model": "hyperlighting:block/torch/yellow_wall_torch"}, + "face=wall,facing=north,lit=false,color=yellow": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=yellow": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=yellow": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=yellow": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=lime": {"model": "hyperlighting:block/torch/lime_torch"}, + "face=floor,lit=false,color=lime": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=lime": {"model": "hyperlighting:block/torch/lime_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=lime": {"model": "hyperlighting:block/torch/lime_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=lime": {"model": "hyperlighting:block/torch/lime_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=lime": {"model": "hyperlighting:block/torch/lime_wall_torch"}, + "face=wall,facing=north,lit=false,color=lime": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=lime": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=lime": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=lime": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=pink": {"model": "hyperlighting:block/torch/pink_torch"}, + "face=floor,lit=false,color=pink": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=pink": {"model": "hyperlighting:block/torch/pink_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=pink": {"model": "hyperlighting:block/torch/pink_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=pink": {"model": "hyperlighting:block/torch/pink_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=pink": {"model": "hyperlighting:block/torch/pink_wall_torch"}, + "face=wall,facing=north,lit=false,color=pink": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=pink": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=pink": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=pink": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=gray": {"model": "hyperlighting:block/torch/gray_torch"}, + "face=floor,lit=false,color=gray": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=gray": {"model": "hyperlighting:block/torch/gray_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=gray": {"model": "hyperlighting:block/torch/gray_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=gray": {"model": "hyperlighting:block/torch/gray_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=gray": {"model": "hyperlighting:block/torch/gray_wall_torch"}, + "face=wall,facing=north,lit=false,color=gray": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=gray": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=gray": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=gray": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=light_gray": {"model": "hyperlighting:block/torch/light_gray_torch"}, + "face=floor,lit=false,color=light_gray": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=light_gray": {"model": "hyperlighting:block/torch/light_gray_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=light_gray": {"model": "hyperlighting:block/torch/light_gray_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=light_gray": {"model": "hyperlighting:block/torch/light_gray_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=light_gray": {"model": "hyperlighting:block/torch/light_gray_wall_torch"}, + "face=wall,facing=north,lit=false,color=light_gray": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=light_gray": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=light_gray": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=light_gray": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=cyan": {"model": "hyperlighting:block/torch/cyan_torch"}, + "face=floor,lit=false,color=cyan": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=cyan": {"model": "hyperlighting:block/torch/cyan_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=cyan": {"model": "hyperlighting:block/torch/cyan_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=cyan": {"model": "hyperlighting:block/torch/cyan_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=cyan": {"model": "hyperlighting:block/torch/cyan_wall_torch"}, + "face=wall,facing=north,lit=false,color=cyan": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=cyan": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=cyan": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=cyan": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=purple": {"model": "hyperlighting:block/torch/purple_torch"}, + "face=floor,lit=false,color=purple": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=purple": {"model": "hyperlighting:block/torch/purple_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=purple": {"model": "hyperlighting:block/torch/purple_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=purple": {"model": "hyperlighting:block/torch/purple_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=purple": {"model": "hyperlighting:block/torch/purple_wall_torch"}, + "face=wall,facing=north,lit=false,color=purple": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=purple": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=purple": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=purple": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=blue": {"model": "hyperlighting:block/torch/blue_torch"}, + "face=floor,lit=false,color=blue": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=blue": {"model": "hyperlighting:block/torch/blue_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=blue": {"model": "hyperlighting:block/torch/blue_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=blue": {"model": "hyperlighting:block/torch/blue_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=blue": {"model": "hyperlighting:block/torch/blue_wall_torch"}, + "face=wall,facing=north,lit=false,color=blue": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=blue": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=blue": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=blue": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=brown": {"model": "hyperlighting:block/torch/brown_torch"}, + "face=floor,lit=false,color=brown": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=brown": {"model": "hyperlighting:block/torch/brown_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=brown": {"model": "hyperlighting:block/torch/brown_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=brown": {"model": "hyperlighting:block/torch/brown_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=brown": {"model": "hyperlighting:block/torch/brown_wall_torch"}, + "face=wall,facing=north,lit=false,color=brown": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=brown": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=brown": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=brown": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=green": {"model": "hyperlighting:block/torch/green_torch"}, + "face=floor,lit=false,color=green": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=green": {"model": "hyperlighting:block/torch/green_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=green": {"model": "hyperlighting:block/torch/green_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=green": {"model": "hyperlighting:block/torch/green_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=green": {"model": "hyperlighting:block/torch/green_wall_torch"}, + "face=wall,facing=north,lit=false,color=green": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=green": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=green": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=green": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=red": {"model": "hyperlighting:block/torch/red_torch"}, + "face=floor,lit=false,color=red": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=red": {"model": "hyperlighting:block/torch/red_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=red": {"model": "hyperlighting:block/torch/red_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=red": {"model": "hyperlighting:block/torch/red_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=red": {"model": "hyperlighting:block/torch/red_wall_torch"}, + "face=wall,facing=north,lit=false,color=red": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=red": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=red": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=red": {"model": "hyperlighting:block/torch_wall_base"}, + "face=floor,lit=true,color=black": {"model": "hyperlighting:block/torch/black_torch"}, + "face=floor,lit=false,color=black": {"model": "hyperlighting:block/torch_base"}, + "face=wall,facing=north,lit=true,color=black": {"model": "hyperlighting:block/torch/black_wall_torch", "y": 270}, + "face=wall,facing=south,lit=true,color=black": {"model": "hyperlighting:block/torch/black_wall_torch", "y": 90}, + "face=wall,facing=west,lit=true,color=black": {"model": "hyperlighting:block/torch/black_wall_torch", "y": 180}, + "face=wall,facing=east,lit=true,color=black": {"model": "hyperlighting:block/torch/black_wall_torch"}, + "face=wall,facing=north,lit=false,color=black": {"model": "hyperlighting:block/torch_wall_base", "y": 270}, + "face=wall,facing=south,lit=false,color=black": {"model": "hyperlighting:block/torch_wall_base", "y": 90}, + "face=wall,facing=west,lit=false,color=black": {"model": "hyperlighting:block/torch_wall_base", "y": 180}, + "face=wall,facing=east,lit=false,color=black": {"model": "hyperlighting:block/torch_wall_base"} + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/lang/en_us.json b/Common/src/main/resources/assets/hyperlighting/lang/en_us.json new file mode 100644 index 0000000..d39d772 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/lang/en_us.json @@ -0,0 +1,5 @@ +{ + "block.hyperlighting.advanced_torch": "Advanced Torch (%s)", + + "subtitles.torch_ignite": "Torch Ignite Sound" +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/black_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/black_torch.json new file mode 100644 index 0000000..81b04ee --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/black_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/black" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/black_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/black_wall_torch.json new file mode 100644 index 0000000..69ec297 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/black_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/black" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/blue_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/blue_torch.json new file mode 100644 index 0000000..abde180 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/blue_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/blue" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/blue_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/blue_wall_torch.json new file mode 100644 index 0000000..3b4aa14 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/blue_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/blue" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/brown_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/brown_torch.json new file mode 100644 index 0000000..9d3641c --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/brown_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/brown" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/brown_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/brown_wall_torch.json new file mode 100644 index 0000000..1d54b82 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/brown_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/brown" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/cyan_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/cyan_torch.json new file mode 100644 index 0000000..6513927 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/cyan_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/cyan" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/cyan_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/cyan_wall_torch.json new file mode 100644 index 0000000..f830ae8 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/cyan_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/cyan" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/gray_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/gray_torch.json new file mode 100644 index 0000000..063aa69 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/gray_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/gray" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/gray_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/gray_wall_torch.json new file mode 100644 index 0000000..5d608e5 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/gray_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/gray" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/green_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/green_torch.json new file mode 100644 index 0000000..bb136b7 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/green_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/green" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/green_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/green_wall_torch.json new file mode 100644 index 0000000..4246c55 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/green_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/green" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_torch.json new file mode 100644 index 0000000..2f031d6 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/light_blue" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_wall_torch.json new file mode 100644 index 0000000..3dbd9b0 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/light_blue" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_torch.json new file mode 100644 index 0000000..dc61201 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/light_gray" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_wall_torch.json new file mode 100644 index 0000000..d6406b1 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/light_gray" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/lime_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/lime_torch.json new file mode 100644 index 0000000..bf3b3c5 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/lime_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/lime" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/lime_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/lime_wall_torch.json new file mode 100644 index 0000000..51facad --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/lime_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/lime" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/magenta_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/magenta_torch.json new file mode 100644 index 0000000..ae3e0cd --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/magenta_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/magenta" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/magenta_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/magenta_wall_torch.json new file mode 100644 index 0000000..7325ba4 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/magenta_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/magenta" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/orange_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/orange_torch.json new file mode 100644 index 0000000..56ff798 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/orange_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/orange" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/orange_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/orange_wall_torch.json new file mode 100644 index 0000000..7dd8e85 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/orange_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/orange" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/pink_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/pink_torch.json new file mode 100644 index 0000000..636705a --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/pink_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/pink" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/pink_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/pink_wall_torch.json new file mode 100644 index 0000000..14c35f1 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/pink_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/pink" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/purple_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/purple_torch.json new file mode 100644 index 0000000..e33c38e --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/purple_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/purple" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/purple_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/purple_wall_torch.json new file mode 100644 index 0000000..aa925c6 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/purple_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/purple" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/red_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/red_torch.json new file mode 100644 index 0000000..e7e18a5 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/red_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/red" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/red_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/red_wall_torch.json new file mode 100644 index 0000000..91f6d19 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/red_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/red" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/white_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/white_torch.json new file mode 100644 index 0000000..0d40880 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/white_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/white" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/white_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/white_wall_torch.json new file mode 100644 index 0000000..6308cd3 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/white_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/white" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/yellow_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/yellow_torch.json new file mode 100644 index 0000000..64dc39c --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/yellow_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/yellow" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch/yellow_wall_torch.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch/yellow_wall_torch.json new file mode 100644 index 0000000..fffd518 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch/yellow_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/yellow" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch_base.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch_base.json new file mode 100644 index 0000000..d7b915a --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch_base.json @@ -0,0 +1,35 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "hyperlighting:block/torch_base_on", + "1": "hyperlighting:block/torch/color/black", + "particle": "hyperlighting:block/torch_base_on" + }, + "elements": [ + { + "name": "torch", + "from": [7, 0, 7], + "to": [9, 8, 9], + "faces": { + "north": {"uv": [4, 8, 6, 16], "texture": "#0"}, + "east": {"uv": [6, 8, 8, 16], "texture": "#0"}, + "south": {"uv": [8, 8, 10, 16], "texture": "#0"}, + "west": {"uv": [10, 8, 12, 16], "texture": "#0"}, + "up": {"uv": [4, 8, 6, 10], "texture": "#0"}, + "down": {"uv": [4, 14, 6, 16], "texture": "#0"} + } + }, + { + "from": [7, 8, 7], + "to": [9, 10, 9], + "faces": { + "north": {"uv": [7, 14, 9, 16], "texture": "#1"}, + "east": {"uv": [7, 14, 9, 16], "texture": "#1"}, + "south": {"uv": [7, 14, 9, 16], "texture": "#1"}, + "west": {"uv": [7, 14, 9, 16], "texture": "#1"}, + "up": {"uv": [7, 14, 9, 16], "texture": "#1"}, + "down": {"uv": [7, 14, 9, 16], "texture": "#1"} + } + } + ] +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/block/torch_wall_base.json b/Common/src/main/resources/assets/hyperlighting/models/block/torch_wall_base.json new file mode 100644 index 0000000..b4bbcb1 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/block/torch_wall_base.json @@ -0,0 +1,83 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "hyperlighting:block/torch_base_on", + "1": "block/stone", + "2": "hyperlighting:block/torch/color/black", + "particle": "hyperlighting:block/torch_base_on" + }, + "elements": [ + { + "name": "torch", + "from": [1, 2, 7], + "to": [3, 10, 9], + "faces": { + "north": {"uv": [4, 8, 6, 16], "texture": "#0"}, + "east": {"uv": [6, 8, 8, 16], "texture": "#0"}, + "south": {"uv": [8, 8, 10, 16], "texture": "#0"}, + "west": {"uv": [10, 8, 12, 16], "texture": "#0"}, + "up": {"uv": [4, 8, 6, 10], "texture": "#0"}, + "down": {"uv": [4, 14, 6, 16], "texture": "#0"} + } + }, + { + "from": [1, 10, 7], + "to": [3, 12, 9], + "faces": { + "north": {"uv": [7, 14, 9, 16], "texture": "#2"}, + "east": {"uv": [7, 14, 9, 16], "texture": "#2"}, + "south": {"uv": [7, 14, 9, 16], "texture": "#2"}, + "west": {"uv": [7, 14, 9, 16], "texture": "#2"}, + "up": {"uv": [7, 14, 9, 16], "texture": "#2"}, + "down": {"uv": [7, 14, 9, 16], "texture": "#2"} + } + }, + { + "from": [0, 6, 6], + "to": [1, 8, 10], + "faces": { + "north": {"uv": [9, 13, 10, 15], "texture": "#1"}, + "east": {"uv": [5, 13, 9, 15], "texture": "#1"}, + "south": {"uv": [0, 13, 1, 15], "texture": "#1"}, + "west": {"uv": [1, 13, 5, 15], "texture": "#1"}, + "up": {"uv": [11, 11, 12, 15], "texture": "#1"}, + "down": {"uv": [10, 11, 11, 15], "texture": "#1"} + } + }, + { + "from": [1, 6, 9], + "to": [3, 8, 10], + "faces": { + "north": {"uv": [3, 13, 5, 15], "texture": "#1"}, + "east": {"uv": [5, 13, 6, 15], "texture": "#1"}, + "south": {"uv": [1, 13, 3, 15], "texture": "#1"}, + "west": {"uv": [6, 13, 7, 15], "texture": "#1"}, + "up": {"uv": [1, 12, 3, 13], "texture": "#1"}, + "down": {"uv": [1, 15, 3, 16], "texture": "#1"} + } + }, + { + "from": [1, 6, 6], + "to": [3, 8, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 6.5]}, + "faces": { + "north": {"uv": [1, 13, 3, 15], "texture": "#1"}, + "east": {"uv": [6, 13, 7, 15], "texture": "#1"}, + "south": {"uv": [3, 13, 5, 15], "texture": "#1"}, + "west": {"uv": [5, 13, 6, 15], "texture": "#1"}, + "up": {"uv": [1, 12, 3, 13], "rotation": 180, "texture": "#1"}, + "down": {"uv": [1, 15, 3, 16], "rotation": 180, "texture": "#1"} + } + } + ], + "groups": [ + 0, + 1, + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [2, 3, 4] + } + ] +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/item/advanced_torch.json b/Common/src/main/resources/assets/hyperlighting/models/item/advanced_torch.json new file mode 100644 index 0000000..422721a --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/item/advanced_torch.json @@ -0,0 +1,21 @@ +{ + "parent": "hyperlighting:block/torch_base", + "overrides": [ + { "predicate": { "color": 0 }, "model": "hyperlighting:block/torch/white_torch" }, + { "predicate": { "color": 1 }, "model": "hyperlighting:block/torch/orange_torch" }, + { "predicate": { "color": 2 }, "model": "hyperlighting:block/torch/magenta_torch" }, + { "predicate": { "color": 3 }, "model": "hyperlighting:block/torch/light_blue_torch" }, + { "predicate": { "color": 4 }, "model": "hyperlighting:block/torch/yellow_torch" }, + { "predicate": { "color": 5 }, "model": "hyperlighting:block/torch/lime_torch" }, + { "predicate": { "color": 6 }, "model": "hyperlighting:block/torch/pink_torch" }, + { "predicate": { "color": 7 }, "model": "hyperlighting:block/torch/gray_torch" }, + { "predicate": { "color": 8 }, "model": "hyperlighting:block/torch/light_gray_torch" }, + { "predicate": { "color": 9 }, "model": "hyperlighting:block/torch/cyan_torch" }, + { "predicate": { "color": 10 }, "model": "hyperlighting:block/torch/purple_torch" }, + { "predicate": { "color": 11 }, "model": "hyperlighting:block/torch/blue_torch" }, + { "predicate": { "color": 12 }, "model": "hyperlighting:block/torch/brown_torch" }, + { "predicate": { "color": 13 }, "model": "hyperlighting:block/torch/green_torch" }, + { "predicate": { "color": 14 }, "model": "hyperlighting:block/torch/red_torch" }, + { "predicate": { "color": 15 }, "model": "hyperlighting:block/torch/black_torch" } + ] +} diff --git a/Common/src/main/resources/assets/hyperlighting/models/item/lighter_tool.json b/Common/src/main/resources/assets/hyperlighting/models/item/lighter_tool.json new file mode 100644 index 0000000..82d9271 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/models/item/lighter_tool.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "hyperlighting:item/torch_tool" + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/particles/colored_flame.json b/Common/src/main/resources/assets/hyperlighting/particles/colored_flame.json new file mode 100644 index 0000000..4666ce2 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/particles/colored_flame.json @@ -0,0 +1,5 @@ +{ + "textures": [ + "hyperlighting:colored_flame" + ] +} diff --git a/Common/src/main/resources/assets/hyperlighting/sounds.json b/Common/src/main/resources/assets/hyperlighting/sounds.json new file mode 100644 index 0000000..9ba5f70 --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/sounds.json @@ -0,0 +1,9 @@ +{ + "block.torch_ignite": { + "category": "block", + "subtitle": "subtitles.torch_ignite", + "sounds": [ + "hyperlighting:torch_ignite" + ] + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/sounds/torch_ignite.ogg b/Common/src/main/resources/assets/hyperlighting/sounds/torch_ignite.ogg new file mode 100644 index 0000000000000000000000000000000000000000..d0db1f9255f4e84b7b131c68281be9f2e812ae19 GIT binary patch literal 10265 zcmb_?c|4Te-|!`sB_YX{G_sD65wdS(8~czo%Giy4ELkeq_bprYZOB?=5Rn#J_HD?L zTZ(L1$`au{!+rmr`|~{S=Xw8mug~Rt&N<)heAjcXW3+8;^`H~b-;bjBacAJL`T_|X ziI_NMo5oYi2w{EdsjO_ zZFgIkqdnT-NB~R?CM+Z@By>Ya1jdW9w(_*JceaHoIeXc=yEr>pJA1$>0Nn-fcT-za zQ%Or-Pexn_?drr2L!hlKJa_;=Urk>_Nk-qr-O>)mt9_pzcGJ_tgUH3%#n;!-8ZHS_ zcC>J^W(24TD19|OeHm?cYe8!m%G$=>+1lOS8p{AcC?yRg1wEyk+PAgzQN}XL_RfwL z&Q^RxA`QjcnlgGWp3YV<7aN$Ni#tXVrs!y4iNQMAd)UFOt?WJQU7TSE7;%{@N?Ir- zKyK}51#`EybaA%=OJN599Z$5QJ=V_J{eOsu@d^teZoruVlA?|#jF+ew7UpX04s)`1 z_VloZ1C^-(P#>jmQ(fz}rlJx`M)(HFsbjldRlI3H0+9naLIc(s&>w#rf@mS=9w(go ziH#Z@mz2lrla{1P?6nF-q$NePGFe6=+Wu)^B35A8C!qjdir9iVHHTgaTPB`Z_go2k zE%9O)S)}e?5)|(?xhKq_v&N?&5H|9v>>>0hVuKE64`l*P7^`~+dvT^a zCEv5$KuX~bSdfPBLg5oF$%SVHv673tHT{Zb1ZoD68i)}C%gUzHX8zb-iTTXG8;T=6 zU|=nZr}V% zJf3ETUe=>to}*q5jMG9)>mL}`hnS9qm~DqxFopj8?mU>@Cca0i!$_c94vCamc>WcZ z{4Wyuq`{%(Cm<`LNnjL-SKx^SYDG2Ln`#@Y$2ff5*U7d6DnjAAuMfhmX<`QM+%NAUs_Vb8KjaR?y4 z9&d4EmH@z(DUbXn)v+Xi5T5rHmfoNKvqyqD{abDcea6t+2>lG6S0!l~M;>(SWu67T zgnxY6n)|dr9owr$m5w{^`OsyMRg?^ZIp+CH>NaKzfM-9LPFC{C2+$h$r_VimMGtxr zNf|u&SNg~N{tk;0^UU725;K4zVmt%$ioy)^ep_Y!=%FCa{rB*Z2Y#~{V`|F^gguBo zjizTWVt>Ns5l8(b7tsMPWQ&PaMwSHWpqP1Z9)U-i!yqV__9%+~X^ukqIEo7sBl$k^ zzU&t6;wLuc?|UVeUc9HhNreDW%r6R}I0iqLjjfbW#o+J+ldHHS6cUa*&M4qim{q*O zY38FO2~BhV2rmX%@o&eiarT|NH1MytZ=F?_jtjg4!UB5NWp3-=HuQ2bPW7Cq3o#q> zoF08JJsNYDG4#I&)_*bw0!b5ml#@y5XheHvkd`9Fv4j7~95?#*1lG<3PW5U|%|ZU2 z4H501A_M1@bVW4vE|?8m@El^W))O-u615(>Z9U>;{i)X4wC;g%?cWJ=oHo;=p8v`m zVv1amh@DkUJo#Ullgk_XMLd>6Es@hWk=rN5HX^;`Y4$=%KIMPQ9J|Qkw8-M{$ocSC z-iQ?Yi1gA|`Hmkemm2<`?|(8!#hnwpAaj)5IscV8EeO_|Ae*ZBHGdxKC^G;I>Y>E= zZwEk7OFWhOQ614m35=jbM^FN{^=1C|i~-OQ5zQeHVAx~`0!90KE3i6kVnK=tZL{G= z30~1{bA%23htGbvG=*6AwWnyL1TVh07l8{;xMO-X;mQXKYRTJL@MjA11T}I2GEnwT zLb@Q`6vGi8n9$J*9k5%`2y*7&aKvf$pne5%u8<^Qa`xnS)CVRo?1Tj;DXK9i#iLYl z5EKBBfxk0({qYw_h&V?f=!Yl9uv_=V@1*ryD znW&ZEhfOLf@Jv$V@DSpvYEn!h5jX}*Ufhvz91xDLB?_<6N7)l894gv?@DiXP22o3J zh(WZmTJ}ib=q(-KZNnzf0=2A`<)Yq4nlpe^;Q>IP4VdI;RRVxQqoS1sdBh3`Cz!-k z;92yLKtTtM60ntah+?F$E`~yCvpfzz4zcsA!3K)?gGWk`@(-n9mH-K_Zh;8i+aKoI?o;iD)~TE3u9y z&d~zSc(C$tO#sV< z0E6R_^iBA102!Fd;MlGX6%e#`k_^f{anV3U9L{ov|42s?s0HM*!fAF(;>jo&G+>=f z#B~bgQPHzh(?P1>R7M5#Cj;4a6kA9&I58@SkwOeLqVxYAV!&F6Lnf&sCfYd-T1$U7$nFzOoixt5=d==3AXnX1QQX50xpfckbI{$V015!{VGX-Gz6)_ zj}Dd~yNE_7dgGsSCZgy+z5kj!>dpNP=q5TRT4IisNSle(0^$Fd6p{~!xsq`{`s4+o zj^x1A(H2MHACD|ZIx=vw0ShiOh>jT1pg?iqK;#S5c1ytF$v_nWFFG&;L0Vn~Di@{% z&tMsI2~@L4fi@QG3NQ`O2gD~Rf@1)MkbVF)#l{p(6$sO7b{Nj?W~= ztd1fMg`_yfJ36c+(GeGUOaTIrh?jQ^Kp~IfmdJ|84+Jm!KL8-;Nca%|rAW^89{>(8 z0INC%073ush+H73|Hz-`k{Qs&%!X`_IVhRAkMnB=Y=8gYI&l6&&jISp-<A@qr2o>LGzz5h;LYFpa93Gr^GM6@m&%46w?kpm-#v z;v19Y3yJx01ztFQ3>_^xYT`#-QUe&^x9(tiB*H<3M-W)BJ)+x_>VR`Prc#tF2TNOo z8*_*eozL{6mE0LNiFq~0=FzV(&*p)w0J~tX3>mxs+AF*frbl%Ca}bRr`LshB2yD!% z%yxE=GXg|%|63x8LOm0vPhy)jm|Aj&jSA|BafRgX2qnf#cD)!3zo^|p`xw+0N+=v` zXwjem1t0qa9eJGU|4L@?k-!bE0!|vet?V8wjrmffwUJMABB%dcMgn^(3i0H;Lfo)U zRPwzr1J@wNfTIl!eC5!F1B+l|X_E-(l~?*m35TlrB=*3}noRXhDg`YQjDS@KFAt)Y zUO1S(X53@}lyh`hl}9u}t)w*tIS>qC7)&>AjM? zydZl)ORlSiI8T-s_>vFrri}=1g(31-c=?J*16ogo`a>Q4W2%ky0fMA=`diJ&6v-87 z1C3baNhrj{XF_>CuLWPs%+=FhB+4OvSN{d9@Cmw-|McnX_q82};v6$O93i2grVGk3 zcwo>DD1rt7;dVB2;*!#`@`|^VRgoH6Iw<}BT(krP1RUYYgEk=G_$sAE_Gk(sUZoHb z-^4rTGf9Xa!VgKe_6|?&ZT|WGYkm9RknE83@Wjc%B1WBqpX~8g2K>{L8)`GYe(w-> zYxy`oruN~%RYQNCsPPBNM9u{18 zXrCO^(vgdMxf}PW;QrRK>F$2$E4!@es+X84y~DiN-}2YfbEt32_7tMJpc1RAr<11sH|szZgO@INDil@#=$;HSJ7(!me}c%Z9!m*`*%Q`vc;4 zrv)#U>En!w&7Xf*?&@l+pO!Iev-hl@KJB$Obx>auqxAr{&0F16wq}%Gdgpg#!ON|; ziS!zG=HQ9Zlu5#;D(EVF&b=yvIiDx{Ekn|*)|l>ni}W5Qr$8XI54mm0)yBBBm9pkG zMCnrW(1A&mt=BGneSfzZcW+?B#@6vq?QoiNs#{7*35)uI)zWh>7EKF8#=Wm|x~3PG z8qIV5YA)v%I$1U(FjpGlu{Y^(y(}7ubf&qt?pmpNQTm1`47vd}{TAaNQq7MjYJd3q zUb7it&6F)}9A!V;q?=0KUc$can^-~Do|k2N?C|`K`(CC*x$(zw1zcJ2TX}=_Bq=sr zc&+7q{jK=S*YMx_vx|+US%a(-Yom)v`_aqS7*BO%`u8!U$Bfjs{8+rTd@1=$f?$Ic zIytK8(uyFnnvoyP19w3>OTCcu2;Xl_k0K$q(#EHTV}q@8|C?mKH9=TAcmi zO{jQMWz3nqSQtE5u=4WUBY&?)@7@o^+#f`Ht6ZyS<`D9GnUTd|89&K4(dqqjA?=j} zU7O0b3bTKed*+&mcJ|zC?GuIG5|x9m((CT!Q+MTJMU`V-M&uR9KNv5b=De1Fj#S(C zPx}wv07D8$1)Mi?hbhy8c%-DaSAJxYs`q?M^35&yJ$ifE^0BQhc@Et-Bo;#_edA*K zcV3SOfpn*28cZ*{!>P%cB9n}-r1l%w^38{{_{`qXS1Ztp%pdsKug;?mR>|=_bO8#w znxjc$Xq}UgjAAt{no|`rFKx`QMW2vQl{Mmizx1o*ypxu?BBpruhH`6BW!qE7)9O4| zH5Yf;n+_*soYTYS1PKyTj+cw|XbLDSxzgkOHDd7YUgEW(Cc2NXVmBDYOn<*IE31>z zVIG2gMK$x>PM65K$kCMK)aK?s_p@zPcK0qm>4BHr>1eTlLShlQQ<`)8rA=B?$Dgg- zHv{q03*T8x`HK$UZaVv>%C2Mk&L{JEVz?NU9^ig4&T8p>!tZbY9EzbZ+`IjHm*wM% ztS>J8aa<-N%_dL#lDBv0*+V8PcaG)))62I~7n<)ED~a<6R^U^`1j=@2T?w14t^Rvd)t)MxBo@?)d&ZuT>s_8J9Pdibcwt5@scQRVSl5L-jzcS9>udCYR)M#q{&OiWW=(wA17`L$o!S!?_cw31(2vGzs{*^F0b zU&nNQx{)^!fq0>LgKyfT*y8a4lbt$Bjbob_F!L{TvhOa3GI}&HLU25*7>en zncA+nO#P>_YgO|bnad9k9rd_(IiFiTB2o$sQfK$BZ^bfv{i{1i!27G7MfY?3?hfny zYcqVKX{-9Ua}I(l@7VX2KU`)Uz|U#9#0ib@<@#shE!5uD&m`Ct&#L%G(ucp9{Pfw- zeG>thr#F7|wuAa7m6k$g@HB*PomzeAHpTeyC~ga(%Nv(i8u;a|Wqz$KWR<^a^dL87 za>1^jGWD{+?}0KdOQGLR-^*Jai#T*^?}m(38A`vBx|VKm{q{BcSH|tX8tUYVC<+J< zZp?WI8;yAst1uPWT7Ug(;E8#*UqTzLcg(o}QlRzt#--u;f>Y{IZlQUnH(x*UV~uF~ z9P{g0oZ+{-U82oWEq8Y&a%jBVBA2{RQc*802cE7A*ZWY+T5l|3X_|%~`Z0P~wS8mH z3L|s?~!sZAb69BVqB=p_!4Z<0OJY#axiJUhMv#YlZl$to0?cG?{U2xpW zo*xk`>6f*2Z40{WemY#jFlY%pd_GE&tPRc|=c4Lc7l)=+4xb1%Q~Fn7#;KtZC8Wl^ z`S|LsJ0z0ZMMdViae5(I#2iN9(1p|cPvE^$>;6o zvz@+a$$MU14mLfLB9q-4&51?K=c*K7-uPnBr=~I3zrHxDw@|c{YFZ`8F z;;ksnb}mtb-LNjTJ>H0=D=Yd>v(@?4QuR{@#lj>CNj_&7^sKQBmZ>Ge!HhoQL*kDG zsaNbEgRoP)?2oJNKx}9HBUN6L3aMZjRjESzN_xIOjkOZ%%=^66KQ-tvh)&C}xKlgL z5-Pd$bw9*7(u{3f+0+FwRVa4TN9eirSu&Mv&r%LtZjDe;;#*L_MmX^nL-&juu074&Q1HlZ4+~yNKHO zL-U2wB(XBRk)_V$`j?k3`$d~?_|;^F&2~^z49rpJyLQXb_8N)oc$Uc{mO}YSns@!G z{Ys%Umc5p-HOZg#6~!4JeEjaPbs74)DW}k5eQX~l-;)X>m3Wn-vnQpToX?bMlVXvx z>qT9xA~y4DpMc78YZ9e>xmw35xER;`a-W+%=5dZ%W5Y?RK6F3Jm`P}ZZqyBH$q5Nt zmR0k!5ensB-)x21+{&khfejm?eW98B-tfJ04(Vje6f={9_a6<#^7iLN_ALr$H%&d; z7fxKQ%dwA(C^M_eN#w_fICtx9pP4+BB||XAX<|o36{F8NYXC*k?98#dTNb&zW%an6jj%EjQTURqgLPdXyEogaqxe<|Q`A z)=E5IYASXy8}D8i))7&8&H3QgyO(aGugPx=c{I?3wR>cDSFRh2PyUL3!nWL8&0?Z_ ziuBZx(xRHkA*3mPcJtXkPvR=GoJTvT3A9LmG+iT{+5E}0*S~j|8#z<1ueo3M6`W9fn z6Ux0}D?9o2sjF63%U8ln4>=~b*b@aWQ`ssJOi>o|juTBcFMfDX`kd@b^&gSe414*c zqEZSg*T8Tp?l8nyBqM3gX}8Xp;x?Vj63Xe^*8(?3xb-wkk#&#;aCCfrgWk6X1Bg6~sgU~f!KgtB@?dt7~EDL-nEec5v zO$hK+eY|-%_3?vYD%?@?y?e{fe%ze2Kl}Va4Yk$5MXx|wF)r#K?-S7eueoX!EVpYk zOIRfquF=Y9#X92qE>j$+nr=!hL;cPXwH)u~srDwsoPN5;a;R(btdBhh*JV0Orqe9a z5)p6pa-{9Q7bW_RUr{!|n%76`PpC}P6}(N!=U)tSd}QUx*?pcM7U8?O70(?mWf^5K z;_>c&tVz2n1EaS#8a+!LNK(lQ!rDB_sTVJLdb?%{TdernCc+nK@x?i>o@+l> ze}%V+lBWFDNH-pL6G<++FC`WAUGCFmF_GNUIcWV1GP5Tq+fh~Wy;oB^VX`5=8pegp z<#JjLva)W`G2hS`)Xm{4Sa|I)BkjM$o)dgG_;GAbw@Jljrt7!avK%23oke`J%W@dI z_`*5E3xRpLTJuqnu0^gmMMze4X(5F9^HTrrx$<$C`g=@8*4pk}g5IpguF&?9!V4`2 zs`d=+@mm#^lW&aSdD48!)Va*g?0%vd9?7?d5rrIBBKK_28#)jDx6 zvEB*h6Bu0WE3uSYn=Hurt);ih^sU5`>58bu+VvCa+L06CJ_<4Y25%Sl!}4+YWH-7D zY_m$cQ_7++uge1^EIlYjL#Yf3b*R}yhL*-JOjRGg$tqG=d+xh(kF%10A_37xhd23P zZrAzO7`O3>9_6_!j={IoA?QE_v+;P`GbVpscqw7#Y4qj_UYn}+-H=YbRL6SM3EF}v z-L54p6E5AVdI3{*$Bgx+3`&klGwZT$!A11fo4e(|o(->NVGHS#b=?ZN_I2nuO@`iE z7`P>jiCV^HosH5q@Lk`kOb+I?%S~362e)5PVZ+sc&pv}*J9KD`MylU&I$1-;AH zDGWL>m0;M|d$r+h0OifA$3NmY+5PtqIfyq8#Pd{|$n!7cdpn1u2Zxk<*}z8B#&2T# z4>;=Yds*DCXu6}>-wM0SlyL!5@O$UCpxyEh%#Ex@slNOAN=T$HzS!P)ALWIrgWHGD zm$i;hdA-(H>vg@xJUKu0Xs>i$J<#G_A!ctg&wS7KiHb?Sr*{S2dG>|B?y|qb$>&nK zf`11Xoyb-54_ngH^Mo*O8Wz2p`r7&8yDopp z%m31n)STtu<^Py}dyw8mUVw(_I{{kL-CuBiTkNs}l8vWZ@O{ifoXl*5I12 zho1v7k7ERJ)^N3jz9ef~FJB?EtvN_{6bwTzswXH&5G~>^qy!|lO zgx|T=}(XXW1eKcm0jmsHytBI228w&qb zeWD_)Nn3<){ z%;`;&WdSQ1k;4~E=ZU#y*Zz#R6ERWOU6=9xO5PK7q!5;J%-pz~FgRrQ7<00D#4~%a zWAazSRCA~+=lnsz{k>WbR@_??!S&`{*{ItbZIO$xh_kF?ce+n-U|pVc@A%IAaL#T^ zt%Ex*FB-1)WE=E#7i}^x_ch*6wyD9&GDuOXJRJ3D`C`!A+>rEIfjk76*AO98G#n*i zQtKV$p?~+ne8piwp>F0`i&it}KsjTbnKd8}7ga<*vgUI?sXbhB^vAP`Dx-u%ZcTe7 za}4Ett;D4VgvV-~!#gcCcct;2r3)>R{(^-5xKE~|8EuV+=}ZoME2ac9pE1Iv)sBI# z_xUQ=6!9-nnlVmXiyp?6tCvzzJmenMUmURz;1=VdpwYUQc)co+SR+|wN7s~}p9~{; zP$n#TS;99Z(v+7bDiCZvQ48c50MBt9<2;Y6D60&5Wl3Zf|1s;Qh?m^S&Dqh{3|Jo(-XO zyWb5f*eSocZx0>KA5LsJPOI){>=8D&*X`{LuiG!zY>_pl?+3~JJb2h=@g+qsJ;7`To+kv?KWSXY5wW#2#{J;c>sj#5|caN!8D_)AfJ1oB3-k93T`rz~F{OBdG zsc`|~=^>zgvx7Cch%Kw+a?1>F-{-wAlIZTm=9seZAom?!>RGcltj>8&Kf$k`PTD)n zYP5Wn5@Aela!Gnf9j#Y@bFHBh`fam?#d5qfaGAi#(Y9aEpJL9LF~|^8{I1awOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001XRL_t(IPh(&h1*0J_8UjNg1fn97{;R7Q l|0mn2=g(jK4+8iM002)O3jT+Sh!+3=002ovPDHLkV1m$~*Qo#i literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/blue.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/blue.png new file mode 100644 index 0000000000000000000000000000000000000000..40511029b3c14beda561db6949d84f46e7720622 GIT binary patch literal 494 zcmVwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001UQL_t(IPh(&h1*0J_8UjNg1eP86|39|( k|9`Tb`uyF0Fu-R30A`;K9QdcS<^TWy07*qoM6N<$fwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001XRL_t(IPh(&h1*0J_8UjNg1YU3I`oFn0 l>_6E~{r~dTe-OZD001b*4Qby-V!8kT002ovPDHLkV1ftL*}wn* literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/cyan.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/cyan.png new file mode 100644 index 0000000000000000000000000000000000000000..724687c8af4fee2976506da0ac9ab30135a2e0e4 GIT binary patch literal 494 zcmVwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001UQL_t(IPh(&h1*0J_8UjNg1UjyK{_nH! k$bYh(di%?NFu-R307yX%$c12$>i_@%07*qoM6N<$f-0-oO#lD@ literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/gray.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/gray.png new file mode 100644 index 0000000000000000000000000000000000000000..df60dba52a6e3261e088ea332f1cbdc9c6da2909 GIT binary patch literal 495 zcmVwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001XRL_t(IPh(&h1*0J_8UjNg1orIN^MBg3 lY5&P~>cfW*|APQN0{}le4U^@f7^(mO002ovPDHLkV1gSJ*}4D# literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/green.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/green.png new file mode 100644 index 0000000000000000000000000000000000000000..f07abf80d8a4d45763e1d41dd59b02718709bed6 GIT binary patch literal 495 zcmVwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001XRL_t(IPh(&h1*0J_8UjNg1Qs4k|6e`V l<3HI>ee{3Ze-OZD008lc48Ike3|{~M002ovPDHLkV1ltF*9!mu literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/light_blue.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/light_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..b9467ee1858fe9742060e836ed02fed6f8a10075 GIT binary patch literal 494 zcmVwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001UQL_t(IPh(&h1*0J_8UjNg1h!rI|G#3< k-T!1e_34NIV1Um60D3wOPE&Qb#Q*>R07*qoM6N<$fwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001XRL_t(IPh(&h1*0J_8UjNg1kRto_J8f# lwg1U>>f5(p{(}HM0|0mK4nwH@F*E=G002ovPDHLkV1h8U+NS^j literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/lime.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/lime.png new file mode 100644 index 0000000000000000000000000000000000000000..9c0fd49e34f324f470458d25898b3bd5a66a6e5e GIT binary patch literal 495 zcmVwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001XRL_t(IPh(&h1*0J_8UjNg1h)JS{ois$ l_CMK9efWRZe-OZD000o(4H2Fnp4tEa002ovPDHLkV1nf}*kAwv literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/magenta.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/magenta.png new file mode 100644 index 0000000000000000000000000000000000000000..a2a655f6bb401bf21e79f9447966a4f2f50d73d4 GIT binary patch literal 495 zcmVwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001XRL_t(IPh(&h1*0J_8UjNg1paUM_5WJQ lh5uwb_5Y*4|3Lts0RWZ_4x8rX31$EQ002ovPDHLkV1gvB+DZTb literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/orange.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/orange.png new file mode 100644 index 0000000000000000000000000000000000000000..788ce2bddc87ea8b41effa706f8d20a58fcb7372 GIT binary patch literal 495 zcmVwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001XRL_t(IPh(&h1*0J_8UjNg1pXgy{(rw; l??2g2{r~#Xe-OZD002Go4Vw^+aV!7;002ovPDHLkV1oJZ*!%zh literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/pink.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/pink.png new file mode 100644 index 0000000000000000000000000000000000000000..2d025c2ba8c9d9d1b4896913bccf4f07f3a4bf71 GIT binary patch literal 495 zcmVwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001XRL_t(IPh(&h1*0J_8UjNg1paQn{r_b1 l^8aKz_5agP|3Lts0RVh)4pN1`A2a{}002ovPDHLkV1gq8+1CI7 literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/purple.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/purple.png new file mode 100644 index 0000000000000000000000000000000000000000..d1c6daff908eb2eb819ad588e52c6b53036e6c12 GIT binary patch literal 494 zcmVwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001UQL_t(IPh(&h1*0J_8UjNg1YYd^|9^YZ kwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001XRL_t(IPh(&h1*0J_8UjNg1iq|V{{K^A l%zv_-`v3W}{~&wOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001XRL_t(IPh(&h1*0J_8UjNg1fD&6_W$_t lbGy-{(}HM0|2lv4&%cNBW3^q002ovPDHLkV1gur+8zJ^ literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/white_base.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/white_base.png new file mode 100644 index 0000000000000000000000000000000000000000..c623c3f28126eee415fbb9af45eb0270b03f9980 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|)ID7sLo9le z6C_v{Cy4Mc7Cb!E`oH+unVwOE51WVLv&R}IuI_bMT+K}$o>5ViC* z^dHn3v=#(G5kxfg2lTas+}@*s5qd7?zCWIGo|ki;1MX;EFW7A%C=^RpY&POwOfLDo zuXyp`BTQ#Xx6QfuOoEo<>mHY?cR|&w^}eQ~J8jrHxH^Qxx@nb!r-Y;HB~$UXaKD~Q zrG<}#$1FLZ@U_ylI=?8+*7-xRm55D)TlMs3|FHIl^_*1@9u*E0@@4(^JnAMrMsXo7 zbx`IIHZf+2;76m(DtSr-r4}W#=DtwPH_w`QborZ9u*8uiC*Cnp%hJ`5ni1WQFHc3~ z{y$GUGcjK8-V=fLXUBOT2JbFZcO2*Y*m0^S;CX_}V#B{CIZb|wzSGbGhtRhP=T{9) z+k=ZO7OR;ng>WV$mMcsqmMB=~NjYq_4)?>eUskl2tXx`F)z7?J&bD?jjBXagQq z{A2(C010qNS#tmY3labT3lag+-G2N4001XRL_t(IPh(&h1*0J_8UjNg1pfaI{{Q^B l)_<~{`v3pd{~&<4Kmh(B@eo@Yy8}F|zacTT~G%;B7giSL)%k{4}!n9@jmN%vw zvS|c9cxA=l5bXWq!{2Hb1_q6(4*Po62W?PkP<*T1`MT;u#AF7WLn5vX%ci}*#olyg zzV+kcpr)WsM=n*a9}Xw?y3GA{_=Nw7(j9k|4=_J}>|45~wH)MA22WQ%mvv4FO#s{I BXCwds literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/item/torch_tool.png b/Common/src/main/resources/assets/hyperlighting/textures/item/torch_tool.png new file mode 100644 index 0000000000000000000000000000000000000000..67d64eed03439046e46733802b5bbf0105fc4eee GIT binary patch literal 1829 zcmbVNTa46H816>athg%+21P`yT}+l>r#)?Fdf6?wbcWplW_KMXvcv>A)1H}WcBZGa zot@dm2QfTA)C4z%7)9fQpvFt|Nz6uxAtCxA3lfbNOh`l$Vl>1A6JylVxjC2xH#TW| zdd_#g|NAfJ@1gP0;hv?dmr@kflN^bs$-6hayKW`V`+xlllGknS$S$9vZof0UJE#|r zuA->U-|fsqFp=7>nYa{z7S5tbwd4{sMGbDMy3m|N0i8v8+tHa{=1wxSZRyO;Xo^p{ z1}fMiGalM8Gnz4HCQa31Hf^K_s~RCFp#aj=Qql3Xs?OASH8KvTIfkx5f=Qhj3JuZ| zsd3uC9-^a>7;6Gapk*}zV!SFy577b-WR90PAhJBr_?RZDbmL-(HP6av>G+n0E%K!^ zg&=S>j;mBEk%}0>UY-N0s&c%*2?9$HtUv7pu*y1qUy~t@eABbtz{U<8GQun_2RcKP z)?FyMEn3HKgoy-?O3?tuW#Ff;xIruBk%&x@)8Tw3{W&d(15go7c`!)LsQtYbJGh# zMU9VM2PIWw!2tdz*fO;o_DYcWY?ojjajuhR=vE{(0~fJJ3=?%?`+U+c#yy;~i)6u1 z4{xTE2_pv7Sd0}Spe8q!(vprJK*vPMxXzIHL~PsAEGY6ou(B+#STYMNDat~{GFc_6 zAVEQj1y$7CAID}ntb%ZV{XkgQBpm<9lcG6A0zhCv)Qqx{DVZ#kg*&pWXhmbJtV)Q@W@Uwi0uZ2#U=|9ou<~ogq>b16C4*Xl=uW_T`i#taJrSxjTvULYQevfS8TDIh|6lPalO_i-+$Ko1S&N$eI= zh}@0z`*7;!>KB*Ix~v7&w-@gJRNn}WS%6L+kygtwp+8*MlNE($|%nsOTWMT6y5#ArNLXI&$`yHI@pswJGb@B zitZmCI0yF6ja?K!nNY4Kde)pfx%Q(2>;62{LB(HtY|k@a2cN3jE(G%rb5F{zzIXij zt)K53%Y69s7WclpXRqm}PrP+uxw~ZV<0BvMFL(ZS>G0*@+_G*-Bt@1zc~M3?`-dL>7R}oT^--=TRHzt|2p`N{@w9w8?LN9zxyj=V0Kx* zcn~lL+^#Dt-hTPa;bPaL^Y?VVq`$H9kJSVBemj5U&8dq$v!`}nz3arbMEE01CPw4$ IZr=0M-%Z6(Y5)KL literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/black_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/black_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..8714b00024881367f43c9748c54db9eb023f735a GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheDgizruAZKr*4EZ0CMKbwp~1ny5fKsL;ogTe~ HDWM4fm%3Zw literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/blue_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/blue_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..af103eee3c482073bcda061aa3fbb017dabefae2 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheiUB?$u9elxGqd`WlAGH)cDJ*?YcB5_%_ZzFF@0FSe*Vyx`)1^?rkrnT8R1jJO{ z&Ch3TOYj$J>DJivdCh?pZhYJ-lO_c;8z??;n;_tlFzk+`hew~@CcfX7)@F;;f@g8y+%)7oqu0%9uf z=I67vCHM=qbZcz-yyn0PH$HBaNs|Ja4HTcaO%QO_J-=YVMJLax-{kvxw=&nx4J()4 zy!;B6|1s`*-90CTm&ynFeYRttbHCp7Va>mvG3FIo0uL9)d=~{;%;4$j=d#Wzp$Pza CbzTqv literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/cyan_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/cyan_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..f7d430c88f8b95113baec78ed9a06f00ebf2b51a GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheiUB?$uElfaq_(!kRae)qUtha=b>pT@4I4HrIe&is*|RwlCe*B4X*V$| z1E`p@z$3Dlfr0NZ2s0kfUy%Y7%=L6}43W63+qaRoC4k3SRxws~`GWs(P1D+J9Rgx1 z@8;*Twk7xrwRCH2`n=}A3O7D(l}VEVnhg}6xJ?jn);+&q!9^#}so&)Ldbcvy&J8P< z-n{$@m;W*Ddfh!Ig_p_)`hB)zpL4(7^kL1vpE2eYS^^Ij#(WnATFl_->gTe~DWM4f DJ4Rn1 literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/gray_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/gray_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..6ec780eab1c67bfbdcdadbcac66abf1cdfc85fef GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheiUB?$uGO`5**Uq%si~da-EAG6-MxKXJ-wT@ZdwBixPMq5~VNS#DGfTD}n_tnG(><*wcB6+E zP%&qLM`SSr1K(i~W;~w1A_XXz>*?YcB5_%_ZzFF@0FSe*Vyx`)1^?rkrnT8R1jJO{ z&Ch3TOYj$J>DJivdCh?pZhYJ-lO_c;8z??;n;_t~rqdn?9`h_cO-4LQCM`!kF)(K#LhXUHx3vIVCg! E0PPE5umAu6 literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/light_gray_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/light_gray_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..af7b0299d9b6e83ec17a9006ecb2b2e83ae499fd GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheiUB?$uFID%@9*z#Zf@Sad-skVJNE9~yJydy^XJc>J$rWc?AhD5Z&&h| zavrFdv%n*=n1O-sFbFdq&tH)O6wLK>aSV~TtlPJdwZ2G+BzzR1$Zk0)s0-6mJpSVpBaMnG)V8KNv&#B+!`+B!B*Uk+q zm)^Ym3YY&e?t0xlCxw^F2l{=sW1n-s-t=M3zn?MY6FVdQ&MBb@ E0A%Z8O#lD@ literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/lime_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/lime_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..bf903fead41a77d7c5381f461327b16e85305673 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheiUB?$u02~yD%YgtFN&YDyK&~O`UQKN=j~}ae}37CvkRLygTe~DWM4f Dm@HqX literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/magenta_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/magenta_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..ec667808cdd61fa1ceb77f2929475d6c2a81608f GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheiUB?$u3KuitjSrlD0Ry2uHCyjcJ1xmyQgQ*`K{;Au0Ok>WW&z3ok=}P zbwI_O1s;*b3=DjSL74G){)!Z!V6LZ&V~E6M-M)>yEde~vvWl^?%NP8QYns+(>ktrA zc{e|wwJpJ4sHIzD)8{n@R=DwTt4x{{&}^Xi#BG9rv+nr?3obf&PW>j|*SnRuc5Ya? z^ycMPxcrZC*X!;%DZErZ(C@Py`<(mrrVnfW{fsfM&=PpKFy^}`&|(HpS3j3^P6Ni0&yU+Zr(xI3y1fgU_snZLe}3876AL#q=kAz-e*;G&b~)Nk^Ay<3@U=Z2L_ zZ(e?d%l{a6z3!fq!b{}?{XW~V&$(Z3`mpBT&lvLxErEv%W4?<5EoSg^^>bP0l+XkK D7T#Xb literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/pink_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/pink_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..20ac044908edd9da057c72354f73e46e1db6d8da GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheiUB?$u3IK9UsKz^yrg;eqTRdZ@7TL+@17-l&YwSj_UzdW?X!2z+pZ${ z{T5I$XMsm#F#`kNVGw3Kp1&dmD46T%;us=vS+{Q^Z%Y7=v#esQ?D7TwRZc_w{aNuALiJ zF1>mA6)yi{-1WM9P6{uT5A^$N$3EwNz3Ic6e?Mc)E3^b2E{ypu3bdHP)78&qol`;+ E08Q#*FaQ7m literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/purple_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/purple_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..de613b286de8dfa6ff601d46c128747104f854da GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheiUB?$t`p0*)MU&lPV8UUvU^_Rt|e`I7q{*?zxw>yWoO$8R?ThLc{_?< z1E`p@z$3Dlfr0NZ2s0kfUy%Y7%=L6}43W63+qaRoC4k3SRxws~`GWs(P1D+J9Rgx1 z@8;*Twk7xrwRCH2`n=}A3O7D(l}VEVnhg}6xJ?jn);+&q!9^#}so&)Ldbcvy&J8P< z-n{$@m;W*Ddfh!Ig_p_)`hB)zpL4(7^kL1vpE2eYS^^Ij#(WnATFl_->gTe~DWM4f DW)xpl literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/red_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/red_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..3aba9ca04c3def8d08cf2a57df96c2b0cf4053de GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheiUB?$uItLnrevgbB*gD-Zrat@u(!2kPfPRpRV&UeUA!PaZ)Zc@?|TxH zfr>c`JR*x382Ao@Fyrz36)8Z$Tu&Fr5Q)pWeH(dO0(hKd6=P+WFZdtVG_B3nAt0vm zZhk&%TY|q(OSi_R&ub2>aO2}vnKUV&*+B7$+XMk;-SZ0;Ty*lB`c1yCcPn%4+^}-# z&C9QF`5)u1*WGhcc&U7#-)B4aIrr;LAJ+W)8Dn0dCGc=z%y&_s#SEUVelF{r5}E)R ClwSP+ literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/white_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/white_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..dfc6bf43bd0174df73009f8ed2cfc91efbfbfd27 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheDgizru3NTjS+i!%^5x5S@7}#@*RH*L_wL!V=luEeXV0EpvuxRh4I6gu z+}Tr`QXpnn_rF@{;QlPUdbiMsmEq#2(+8Q M)78&qol`;+0HVNbR{#J2 literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/yellow_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/yellow_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..9faa9d78dabdf0fc726977deb4aab3a4e46393c0 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheiUB?$u3NTLu33}0e0kFD-EF&ewd~#7v1d>F`Sa_~o?W?NL*dSy%_m>2 z+6+|8S>O>_%)r2R7=#&*=dVZs3g&vcIEF}E*6rKK+Y-RzEUOqRyL`d_xTa}swhjR? zm3Q;=S=$o)g<85bHho@mV1*kWx5}hR0nG-APuwO5IP0EYu;8MT=hScVeZ5k44ofy`glX(f`Bzw9zhGMIDep^YhsM>p9NnugYG!&WZF?Z`=9ci1cxsD z2U+@m(h~yG5)yWtK5$?|XJg~SKA=j81 literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/particle/fog_particle.png b/Common/src/main/resources/assets/hyperlighting/textures/particle/fog_particle.png new file mode 100644 index 0000000000000000000000000000000000000000..83f469db810aa843d6bad83dc2c0230b9cee7892 GIT binary patch literal 3317 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 literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/particle/fog_particle.png.mcmeta b/Common/src/main/resources/assets/hyperlighting/textures/particle/fog_particle.png.mcmeta new file mode 100644 index 0000000..e38a5ad --- /dev/null +++ b/Common/src/main/resources/assets/hyperlighting/textures/particle/fog_particle.png.mcmeta @@ -0,0 +1,5 @@ +{ + "texture": { + "blur": true + } +} diff --git a/Common/src/main/resources/assets/hyperlighting/textures/particle/splash_0.png b/Common/src/main/resources/assets/hyperlighting/textures/particle/splash_0.png new file mode 100644 index 0000000000000000000000000000000000000000..d8f3fbf18e80b639641de1a78f40a31aed9276c0 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|)ID7sLo9le z6C_v{Cj>N$%isT>o{*4G@#)>!`c1r*Kc1=noaGKQ;+hV(73zopr E0M9KTSO5S3 literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/particle/splash_1.png b/Common/src/main/resources/assets/hyperlighting/textures/particle/splash_1.png new file mode 100644 index 0000000000000000000000000000000000000000..85559a15a87c7c83ae9c9b9d2dbe64597f5e5cc9 GIT binary patch literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D%KdAc};So9_* wNU$zW2xu0UzyE)Em!to^y$kys4@)pG%nxU84Sp&u4phqE>FVdQ&MBb@0HMemqW}N^ literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/particle/splash_2.png b/Common/src/main/resources/assets/hyperlighting/textures/particle/splash_2.png new file mode 100644 index 0000000000000000000000000000000000000000..5e03e7776d22105c35cb360393d7194f336b5b98 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Bt2amLo9le q6C_v{CwMfdzrXiKKEs@+nt{PolX;(3M!X+T5re0zpUXO@geCyYP8WUv literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/assets/hyperlighting/textures/particle/splash_3.png b/Common/src/main/resources/assets/hyperlighting/textures/particle/splash_3.png new file mode 100644 index 0000000000000000000000000000000000000000..600f78f6b605da3bfbbfbd43d524cd014c4ed671 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|lssJ=Lo9le z6C_v{Cj>N$%isU6?j|d&*ExTGec*Z1!!isE=YO&7sOO%j094K3>FVdQ&MBb@0NhU; AIsgCw literal 0 HcmV?d00001 diff --git a/Common/src/main/resources/hyperlighting.aw b/Common/src/main/resources/hyperlighting.aw new file mode 100644 index 0000000..2019771 --- /dev/null +++ b/Common/src/main/resources/hyperlighting.aw @@ -0,0 +1,3 @@ +accessWidener v1 named + +Accessible class net/minecraft/client/particle/ParticleEngine$SpriteParticleRegistration diff --git a/Common/src/main/resources/hyperlighting.mixins.json b/Common/src/main/resources/hyperlighting.mixins.json new file mode 100644 index 0000000..fa0daac --- /dev/null +++ b/Common/src/main/resources/hyperlighting.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "me.hypherionmc.hyperlighting.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + ], + "server": [ + ], + "injectors": { + "defaultRequire": 1 + }, + "refmap": "${refmap_target}refmap.json" +} diff --git a/Common/src/main/resources/pack.mcmeta b/Common/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..7c0ccca --- /dev/null +++ b/Common/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "${mod_name}", + "pack_format": 9 + } +} diff --git a/Fabric/build.gradle b/Fabric/build.gradle new file mode 100644 index 0000000..caa2ee6 --- /dev/null +++ b/Fabric/build.gradle @@ -0,0 +1,95 @@ +plugins { + id 'fabric-loom' version '0.12-SNAPSHOT' + id 'maven-publish' + id 'idea' +} + +archivesBaseName = "${mod_name}-fabric-${minecraft_version}" + +dependencies { + minecraft "com.mojang:minecraft:${minecraft_version}" + mappings loom.officialMojangMappings() + modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" + implementation project(":Common") + + modApi("me.hypherionmc.craterlib:CraterLib-fabric-1.19.1:${craterlib_version}") { + exclude(group: "net.fabricmc.fabric-api") + } +} + +loom { + accessWidenerPath = project(":Common").file("src/main/resources/hyperlighting.aw") + runs { + client { + client() + setConfigName("Fabric Client") + ideConfigGenerated(true) + runDir("run") + } + server { + server() + setConfigName("Fabric Server") + ideConfigGenerated(true) + runDir("run") + } + } +} + + +processResources { + from project(":Common").sourceSets.main.resources + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } + + filesMatching('*.mixins.json') { + expand "refmap_target": "${archivesBaseName}-" + } +} + +tasks.withType(JavaCompile) { + source(project(":Common").sourceSets.main.allSource) +} + +jar { + from("LICENSE") { + rename { "${it}_${mod_name}" } + } +} + +publishing { + publications { + mavenJava(MavenPublication) { + groupId project.group + artifactId project.archivesBaseName + version project.version + from components.java + } + } + + repositories { + maven { + url "file://" + System.getenv("local_maven") + } + } +} + +task delDevJar { + doLast { + def tree = fileTree('build/libs') + tree.include '**/*-dev.jar' + tree.each { it.delete() } + } +} +build.finalizedBy delDevJar + +task copyAllArtifacts(type: Copy) { + from "$buildDir/libs" + into "$rootDir/artifacts" + include("*.jar") +} + +build.finalizedBy(copyAllArtifacts); diff --git a/Fabric/src/main/java/me/hypherionmc/hyperlighting/HyperLightingFabric.java b/Fabric/src/main/java/me/hypherionmc/hyperlighting/HyperLightingFabric.java new file mode 100644 index 0000000..29825b0 --- /dev/null +++ b/Fabric/src/main/java/me/hypherionmc/hyperlighting/HyperLightingFabric.java @@ -0,0 +1,12 @@ +package me.hypherionmc.hyperlighting; + +import me.hypherionmc.hyperlighting.common.init.CommonRegistration; +import net.fabricmc.api.ModInitializer; + +public class HyperLightingFabric implements ModInitializer { + + @Override + public void onInitialize() { + CommonRegistration.registerAll(); + } +} diff --git a/Fabric/src/main/java/me/hypherionmc/hyperlighting/client/HyperLightingFabricClient.java b/Fabric/src/main/java/me/hypherionmc/hyperlighting/client/HyperLightingFabricClient.java new file mode 100644 index 0000000..cf445f9 --- /dev/null +++ b/Fabric/src/main/java/me/hypherionmc/hyperlighting/client/HyperLightingFabricClient.java @@ -0,0 +1,24 @@ +package me.hypherionmc.hyperlighting.client; + +import me.hypherionmc.hyperlighting.client.init.ClientRegistration; +import me.hypherionmc.hyperlighting.client.particles.ParticleRegistryHandler; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; +import net.minecraft.client.particle.ParticleEngine; +import net.minecraft.core.particles.ParticleOptions; +import net.minecraft.core.particles.ParticleType; + +public class HyperLightingFabricClient implements ClientModInitializer { + + @Override + public void onInitializeClient() { + new ClientRegistration().registerAll(); + // TODO: Move to CraterLib as an Event + ParticleRegistryHandler.registerParticles(new ParticleRegistryHandler.ParticleStrategy() { + @Override + public void register(ParticleType particle, ParticleEngine.SpriteParticleRegistration provider) { + ParticleFactoryRegistry.getInstance().register(particle, provider::create); + } + }); + } +} diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..a6089d4 --- /dev/null +++ b/Fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,41 @@ +{ + "schemaVersion": 1, + "id": "hyperlighting", + "version": "${version}", + + "name": "Hyper Lighting 2", + "description": "Not your average Lighting & Decoration Mod", + "authors": [ + "HypherionSA" + ], + "contact": { + "homepage": "", + "sources": "" + }, + + "license": "MIT", + "icon": "assets/hyperlighting/icon.png", + + "environment": "*", + "entrypoints": { + "main": [ + "me.hypherionmc.hyperlighting.HyperLightingFabric" + ], + "client": [ + "me.hypherionmc.hyperlighting.client.HyperLightingFabricClient" + ] + }, + "mixins": [ + "hyperlighting.mixins.json", + "hyperlighting.fabric.mixins.json" + ], + + "depends": { + "fabricloader": ">=0.14", + "fabric": "*", + "minecraft": "1.19.1", + "java": ">=17", + "craterlib": "*" + }, + "accessWidener": "hyperlighting.aw" + } diff --git a/Fabric/src/main/resources/hyperlighting.fabric.mixins.json b/Fabric/src/main/resources/hyperlighting.fabric.mixins.json new file mode 100644 index 0000000..3a6e7a2 --- /dev/null +++ b/Fabric/src/main/resources/hyperlighting.fabric.mixins.json @@ -0,0 +1,15 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "me.hypherionmc.hyperlighting.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + ], + "server": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/Forge/build.gradle b/Forge/build.gradle new file mode 100644 index 0000000..8344afe --- /dev/null +++ b/Forge/build.gradle @@ -0,0 +1,125 @@ +buildscript { + repositories { + maven { url = 'https://maven.minecraftforge.net' } + maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } + mavenCentral() + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true + classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' + } +} +apply plugin: 'java' +apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'eclipse' +apply plugin: 'org.spongepowered.mixin' +apply plugin: 'maven-publish' + +archivesBaseName = "${mod_name}-forge-${minecraft_version}" + +mixin { + add sourceSets.main, "${mod_id}.refmap.json" + + config "${mod_id}.mixins.json" + config "${mod_id}.forge.mixins.json" +} + +minecraft { + mappings channel: 'official', version: minecraft_version + + if (project.hasProperty('forge_ats_enabled') && project.findProperty('forge_ats_enabled').toBoolean()) { + // This location is hardcoded in Forge and can not be changed. + // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123 + accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + project.logger.debug('Forge Access Transformers are enabled for this project.') + } + + runs { + client { + workingDirectory project.file('run') + ideaModule "${rootProject.name}.${project.name}.main" + taskName 'Client' + args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.forge.mixins.json" + mods { + modClientRun { + source sourceSets.main + source project(":Common").sourceSets.main + } + } + } + + server { + workingDirectory project.file('run') + ideaModule "${rootProject.name}.${project.name}.main" + taskName 'Server' + args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.forge.mixins.json" + mods { + modServerRun { + source sourceSets.main + source project(":Common").sourceSets.main + } + } + } + + data { + workingDirectory project.file('run') + ideaModule "${rootProject.name}.${project.name}.main" + args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + taskName 'Data' + args "-mixin.config=${mod_id}.mixins.json", "-mixin.config=${mod_id}.forge.mixins.json" + mods { + modDataRun { + source sourceSets.main + source project(":Common").sourceSets.main + } + } + } + } +} + +sourceSets.main.resources.srcDir 'src/generated/resources' + +dependencies { + minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + compileOnly project(":Common") + annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor' + implementation fg.deobf("me.hypherionmc.craterlib:CraterLib-forge-1.19.1:${craterlib_version}") +} + +tasks.withType(JavaCompile) { + source(project(":Common").sourceSets.main.allSource) +} + +processResources { + from project(":Common").sourceSets.main.resources + + filesMatching('*.mixins.json') { + expand "refmap_target": "${mod_id}." + } +} + +jar.finalizedBy('reobfJar') + +publishing { + publications { + mavenJava(MavenPublication) { + groupId project.group + artifactId project.archivesBaseName + version project.version + artifact jar + } + } + repositories { + maven { + url "file://" + System.getenv("local_maven") + } + } +} + +task copyAllArtifacts(type: Copy) { + from "$buildDir/libs" + into "$rootDir/artifacts" + include("*.jar") +} + +build.finalizedBy(copyAllArtifacts) diff --git a/Forge/src/main/java/me/hypherionmc/hyperlighting/HyperLightingForge.java b/Forge/src/main/java/me/hypherionmc/hyperlighting/HyperLightingForge.java new file mode 100644 index 0000000..264db15 --- /dev/null +++ b/Forge/src/main/java/me/hypherionmc/hyperlighting/HyperLightingForge.java @@ -0,0 +1,24 @@ +package me.hypherionmc.hyperlighting; + +import me.hypherionmc.craterlib.client.gui.config.CraterConfigScreen; +import me.hypherionmc.hyperlighting.client.init.ClientRegistration; +import me.hypherionmc.hyperlighting.common.init.CommonRegistration; +import net.minecraftforge.client.ConfigScreenHandler; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; + +@Mod(Constants.MOD_ID) +public class HyperLightingForge { + + public HyperLightingForge() { + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientInit); + CommonRegistration.registerAll(); + } + + public void clientInit(FMLClientSetupEvent event) { + new ClientRegistration().registerAll(); + ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((mc, screen) -> new CraterConfigScreen(CommonRegistration.config, screen))); + } +} diff --git a/Forge/src/main/java/me/hypherionmc/hyperlighting/client/ForgeClientEventHandler.java b/Forge/src/main/java/me/hypherionmc/hyperlighting/client/ForgeClientEventHandler.java new file mode 100644 index 0000000..0e02839 --- /dev/null +++ b/Forge/src/main/java/me/hypherionmc/hyperlighting/client/ForgeClientEventHandler.java @@ -0,0 +1,22 @@ +package me.hypherionmc.hyperlighting.client; + +import me.hypherionmc.hyperlighting.client.particles.ParticleRegistryHandler; +import net.minecraft.client.Minecraft; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.RegisterParticleProvidersEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +/** + * @author HypherionSA + * @date 03/07/2022 + */ +@Mod.EventBusSubscriber(value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) +public class ForgeClientEventHandler { + + @SubscribeEvent + public static void registerParticles(RegisterParticleProvidersEvent event) { + ParticleRegistryHandler.registerParticles(Minecraft.getInstance().particleEngine::register); + } + +} diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..6082b18 --- /dev/null +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -0,0 +1,38 @@ +modLoader="javafml" +loaderVersion="[42,)" +license="MIT" +#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" + +[[mods]] #mandatory +modId="hyperlighting" +version="${file.jarVersion}" +displayName="Hyper Lighting 2" +#updateJSONURL="https://change.me.example.invalid/updates.json" +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" +logoFile="multiloader.png" +#credits="Thanks for this example mod goes to Java" +authors="HypherionSA" +description=''' +Not your average Lighting & Decoration Mods +''' + +[[dependencies.hyperlighting]] + modId="forge" + mandatory=true + versionRange="[42,)" + ordering="NONE" + side="BOTH" + +[[dependencies.hyperlighting]] + modId="minecraft" + mandatory=true + versionRange="[1.19.1,1.20)" + ordering="NONE" + side="BOTH" + +[[dependencies.hyperlighting]] + modId="craterlib" + mandatory=true + versionRange="1.0.x" + ordering="AFTER" + side="BOTH" diff --git a/Forge/src/main/resources/hyperlighting.forge.mixins.json b/Forge/src/main/resources/hyperlighting.forge.mixins.json new file mode 100644 index 0000000..fa0daac --- /dev/null +++ b/Forge/src/main/resources/hyperlighting.forge.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "me.hypherionmc.hyperlighting.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + ], + "server": [ + ], + "injectors": { + "defaultRequire": 1 + }, + "refmap": "${refmap_target}refmap.json" +} diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..fa16de9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) [2022] [HypherionMC and Contributors] + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..779362c --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# Hyper Lighting 2 + +Not your average Minecraft Lighting mod! + +### This is still a WIP. The code is just here for contributors to, well, contribute! + +*** + +#### Requires [CraterLib](https://github.com/hypherionmc/CraterLib) diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..365fe00 --- /dev/null +++ b/build.gradle @@ -0,0 +1,66 @@ +subprojects { + ext { + release=project.properties['release'] ?: false + } + + def version_base = "${project.version_major}.${project.version_minor}" + version = "${version_base}.${project.version_patch}" + + // Jenkins + if (!release && System.getenv('BUILD_NUMBER') != null) { + version = version_base + "." + System.getenv('BUILD_NUMBER') + "d" + } + + apply plugin: 'java' + + java.toolchain.languageVersion = JavaLanguageVersion.of(17) + //java.withSourcesJar() + //java.withJavadocJar() + + jar { + manifest { + attributes([ + 'Specification-Title' : mod_name, + 'Specification-Vendor' : mod_author, + 'Specification-Version' : project.jar.archiveVersion, + 'Implementation-Title' : project.name, + 'Implementation-Version' : project.jar.archiveVersion, + 'Implementation-Vendor' : mod_author, + 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), + 'Timestampe' : System.currentTimeMillis(), + 'Built-On-Java' : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})", + 'Build-On-Minecraft' : minecraft_version + ]) + } + } + + repositories { + mavenCentral() + mavenLocal() + maven { + name = 'Sponge / Mixin' + url = 'https://repo.spongepowered.org/repository/maven-public/' + } + maven { + name = 'First Dark Dev Maven' + url = 'https://maven.firstdarkdev.xyz/snapshots' + } + } + + + tasks.withType(JavaCompile).configureEach { + it.options.encoding = 'UTF-8' + it.options.release = 17 + } + + // Disables Gradle's custom module metadata from being published to maven. The + // metadata includes mapped dependencies which are not reasonably consumable by + // other mod developers. + tasks.withType(GenerateModuleMetadata) { + enabled = false + } + + clean { + delete "$rootDir/artifacts" + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..2e35a0d --- /dev/null +++ b/gradle.properties @@ -0,0 +1,31 @@ +# Project +version_major=0 +version_minor=0 +version_patch=1 +group=me.hypherionmc.hyperlighting + +# Common +minecraft_version=1.19.1 +common_runs_enabled=false +common_client_run_name=Common Client +common_server_run_name=Common Server + +# Forge +forge_version=42.0.1 +//forge_ats_enabled=true + +# Fabric +fabric_version=0.58.5+1.19.1 +fabric_loader_version=0.14.8 + +# Mod options +mod_name=HyperLighting2 +mod_author=HypherionSA +mod_id=hyperlighting + +# Gradle +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false + +#dependencies +craterlib_version=1.0.3d diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa GIT binary patch literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e750102 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..b4f908a --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env bash + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MSYS* | MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +ARGV=("$@") +eval set -- $DEFAULT_JVM_OPTS + +IFS=$' +' read -rd '' -a JAVA_OPTS_ARR <<< "$(echo $JAVA_OPTS | xargs -n1)" +IFS=$' +' read -rd '' -a GRADLE_OPTS_ARR <<< "$(echo $GRADLE_OPTS | xargs -n1)" + +exec "$JAVACMD" "$@" "${JAVA_OPTS_ARR[@]}" "${GRADLE_OPTS_ARR[@]}" "-Dorg.gradle.appname=$APP_BASE_NAME" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "${ARGV[@]}" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..7cc941e --- /dev/null +++ b/settings.gradle @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + maven { + name = 'Sponge Snapshots' + url = 'https://repo.spongepowered.org/repository/maven-public/' + } + } +} + +rootProject.name = 'HyperLighting2' +include("Common", "Fabric", "Forge") diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/black_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/black_torch.json new file mode 100644 index 0000000..81b04ee --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/black_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/black" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/black_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/black_wall_torch.json new file mode 100644 index 0000000..69ec297 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/black_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/black" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/blue_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/blue_torch.json new file mode 100644 index 0000000..abde180 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/blue_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/blue" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/blue_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/blue_wall_torch.json new file mode 100644 index 0000000..3b4aa14 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/blue_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/blue" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/brown_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/brown_torch.json new file mode 100644 index 0000000..9d3641c --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/brown_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/brown" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/brown_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/brown_wall_torch.json new file mode 100644 index 0000000..1d54b82 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/brown_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/brown" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/cyan_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/cyan_torch.json new file mode 100644 index 0000000..6513927 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/cyan_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/cyan" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/cyan_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/cyan_wall_torch.json new file mode 100644 index 0000000..f830ae8 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/cyan_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/cyan" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/gray_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/gray_torch.json new file mode 100644 index 0000000..063aa69 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/gray_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/gray" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/gray_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/gray_wall_torch.json new file mode 100644 index 0000000..5d608e5 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/gray_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/gray" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/green_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/green_torch.json new file mode 100644 index 0000000..bb136b7 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/green_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/green" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/green_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/green_wall_torch.json new file mode 100644 index 0000000..4246c55 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/green_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/green" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_torch.json new file mode 100644 index 0000000..2f031d6 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/light_blue" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_wall_torch.json new file mode 100644 index 0000000..3dbd9b0 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/light_blue_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/light_blue" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_torch.json new file mode 100644 index 0000000..dc61201 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/light_gray" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_wall_torch.json new file mode 100644 index 0000000..d6406b1 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/light_gray_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/light_gray" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/lime_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/lime_torch.json new file mode 100644 index 0000000..bf3b3c5 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/lime_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/lime" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/lime_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/lime_wall_torch.json new file mode 100644 index 0000000..51facad --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/lime_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/lime" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/magenta_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/magenta_torch.json new file mode 100644 index 0000000..ae3e0cd --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/magenta_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/magenta" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/magenta_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/magenta_wall_torch.json new file mode 100644 index 0000000..7325ba4 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/magenta_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/magenta" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/orange_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/orange_torch.json new file mode 100644 index 0000000..56ff798 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/orange_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/orange" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/orange_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/orange_wall_torch.json new file mode 100644 index 0000000..7dd8e85 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/orange_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/orange" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/pink_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/pink_torch.json new file mode 100644 index 0000000..636705a --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/pink_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/pink" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/pink_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/pink_wall_torch.json new file mode 100644 index 0000000..14c35f1 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/pink_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/pink" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/purple_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/purple_torch.json new file mode 100644 index 0000000..e33c38e --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/purple_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/purple" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/purple_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/purple_wall_torch.json new file mode 100644 index 0000000..aa925c6 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/purple_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/purple" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/red_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/red_torch.json new file mode 100644 index 0000000..e7e18a5 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/red_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/red" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/red_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/red_wall_torch.json new file mode 100644 index 0000000..91f6d19 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/red_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/red" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/white_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/white_torch.json new file mode 100644 index 0000000..0d40880 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/white_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/white" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/white_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/white_wall_torch.json new file mode 100644 index 0000000..6308cd3 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/white_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/white" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/yellow_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/yellow_torch.json new file mode 100644 index 0000000..64dc39c --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/yellow_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/yellow" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/block/torch/yellow_wall_torch.json b/src/main/resources/assets/hyperlighting/models/block/torch/yellow_wall_torch.json new file mode 100644 index 0000000..fffd518 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/block/torch/yellow_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_wall_base", + "textures": { + "2": "hyperlighting:block/torch/color/yellow" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/black_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/black_torch.json new file mode 100644 index 0000000..81b04ee --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/black_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/black" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/blue_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/blue_torch.json new file mode 100644 index 0000000..abde180 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/blue_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/blue" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/brown_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/brown_torch.json new file mode 100644 index 0000000..9d3641c --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/brown_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/brown" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/cyan_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/cyan_torch.json new file mode 100644 index 0000000..6513927 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/cyan_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/cyan" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/gray_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/gray_torch.json new file mode 100644 index 0000000..063aa69 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/gray_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/gray" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/green_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/green_torch.json new file mode 100644 index 0000000..bb136b7 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/green_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/green" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/light_blue_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/light_blue_torch.json new file mode 100644 index 0000000..2f031d6 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/light_blue_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/light_blue" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/light_gray_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/light_gray_torch.json new file mode 100644 index 0000000..dc61201 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/light_gray_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/light_gray" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/lime_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/lime_torch.json new file mode 100644 index 0000000..bf3b3c5 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/lime_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/lime" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/magenta_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/magenta_torch.json new file mode 100644 index 0000000..ae3e0cd --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/magenta_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/magenta" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/orange_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/orange_torch.json new file mode 100644 index 0000000..56ff798 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/orange_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/orange" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/pink_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/pink_torch.json new file mode 100644 index 0000000..636705a --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/pink_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/pink" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/purple_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/purple_torch.json new file mode 100644 index 0000000..e33c38e --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/purple_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/purple" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/red_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/red_torch.json new file mode 100644 index 0000000..e7e18a5 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/red_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/red" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/white_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/white_torch.json new file mode 100644 index 0000000..0d40880 --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/white_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/white" + } +} diff --git a/src/main/resources/assets/hyperlighting/models/item/torch/yellow_torch.json b/src/main/resources/assets/hyperlighting/models/item/torch/yellow_torch.json new file mode 100644 index 0000000..64dc39c --- /dev/null +++ b/src/main/resources/assets/hyperlighting/models/item/torch/yellow_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "hyperlighting:block/torch_base", + "textures": { + "1": "hyperlighting:block/torch/color/yellow" + } +}