commit ff4df5d59ff566f94bc605d36c6ba8020d0ecddd Author: HypherionMC Date: Sun Jul 31 21:54:28 2022 +0200 Initial Commit with Torches. Missing LangKeys and Recipes 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 0000000..d0db1f9 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/sounds/torch_ignite.ogg differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/black.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/black.png new file mode 100644 index 0000000..679a2fa Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/black.png differ 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 0000000..4051102 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/blue.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/brown.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/brown.png new file mode 100644 index 0000000..ae4a9a5 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/brown.png differ 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 0000000..724687c Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/cyan.png differ 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 0000000..df60dba Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/gray.png differ 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 0000000..f07abf8 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/green.png differ 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 0000000..b9467ee Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/light_blue.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/light_gray.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/light_gray.png new file mode 100644 index 0000000..abee352 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/light_gray.png differ 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 0000000..9c0fd49 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/lime.png differ 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 0000000..a2a655f Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/magenta.png differ 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 0000000..788ce2b Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/orange.png differ 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 0000000..2d025c2 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/pink.png differ 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 0000000..d1c6daf Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/purple.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/red.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/red.png new file mode 100644 index 0000000..a2404c5 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/red.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/white.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/white.png new file mode 100644 index 0000000..ca6c8b6 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/white.png differ 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 0000000..c623c3f Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/white_base.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/yellow.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/yellow.png new file mode 100644 index 0000000..7a3e79b Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch/color/yellow.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/block/torch_base_on.png b/Common/src/main/resources/assets/hyperlighting/textures/block/torch_base_on.png new file mode 100644 index 0000000..1cf51cb Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/block/torch_base_on.png differ 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 0000000..67d64ee Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/item/torch_tool.png differ 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 0000000..8714b00 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/black_overlay.png differ 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 0000000..af103ee Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/blue_overlay.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/brown_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/brown_overlay.png new file mode 100644 index 0000000..b502b90 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/brown_overlay.png differ 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 0000000..f7d430c Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/cyan_overlay.png differ 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 0000000..6ec780e Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/gray_overlay.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/green_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/green_overlay.png new file mode 100644 index 0000000..14f5185 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/green_overlay.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/light_blue_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/light_blue_overlay.png new file mode 100644 index 0000000..261e1ea Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/light_blue_overlay.png differ 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 0000000..af7b029 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/light_gray_overlay.png differ 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 0000000..bf903fe Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/lime_overlay.png differ 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 0000000..ec66780 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/magenta_overlay.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/overlay/orange_overlay.png b/Common/src/main/resources/assets/hyperlighting/textures/overlay/orange_overlay.png new file mode 100644 index 0000000..f8d4c77 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/orange_overlay.png differ 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 0000000..20ac044 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/pink_overlay.png differ 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 0000000..de613b2 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/purple_overlay.png differ 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 0000000..3aba9ca Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/red_overlay.png differ 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 0000000..dfc6bf4 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/white_overlay.png differ 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 0000000..9faa9d7 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/overlay/yellow_overlay.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/particle/bubble_particle.png b/Common/src/main/resources/assets/hyperlighting/textures/particle/bubble_particle.png new file mode 100644 index 0000000..9b1d5d1 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/particle/bubble_particle.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/particle/colored_flame.png b/Common/src/main/resources/assets/hyperlighting/textures/particle/colored_flame.png new file mode 100644 index 0000000..25d51d1 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/particle/colored_flame.png differ diff --git a/Common/src/main/resources/assets/hyperlighting/textures/particle/flame_base.png b/Common/src/main/resources/assets/hyperlighting/textures/particle/flame_base.png new file mode 100644 index 0000000..df82de6 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/particle/flame_base.png differ 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 0000000..83f469d Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/particle/fog_particle.png differ 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 0000000..d8f3fbf Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/particle/splash_0.png differ 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 0000000..85559a1 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/particle/splash_1.png differ 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 0000000..5e03e77 Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/particle/splash_2.png differ 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 0000000..600f78f Binary files /dev/null and b/Common/src/main/resources/assets/hyperlighting/textures/particle/splash_3.png differ 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 0000000..7454180 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ 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" + } +}