13 Commits

Author SHA1 Message Date
PaulGoersCode
2be2edeed4 Tiki Torch Change
Updated Tiki Torch (tiki_torch) to support multiple heights when placed on Tiki Sticks (tiki_stick)
Added tiki_stick model
2023-04-11 17:10:24 -05:00
PaulGoersCode
a722707ce2 Create tiki_torch.json
Added Tiki Torch Model
2023-04-06 17:11:17 -05:00
PaulGoersCode
e57a95bc9f Solar Panel and Fence
Tweaked solar_top texture and redid solar_bottom.
Added Solar Fence
2023-04-04 17:02:04 -05:00
PaulGoersCode
73c906804b Pumpkin Trio Updates
Updated name of 'jacklantern_trio' to 'carved_pumpkin_trio'. Added 'jack_o_lantern_trio' model and 'small jack_o_lantern' texture.
2023-03-24 01:01:05 -05:00
PaulGoersCode
d120c686fc Most Current New Resources
Updated Advanced Campfire (both states), Advanced Candle (both states), and Solar Panel Textures and Models.
Added Hanging Fire (both states), and Jack O' Lantern Trio.
2023-03-22 15:33:01 -05:00
a2238fa663 Finish recipes for currently implemented blocks and items 2023-03-19 17:24:35 +02:00
932259087c Rework Torch recipe 2023-03-19 16:31:18 +02:00
5b531ffaf3 Cleanup Imports 2023-03-19 15:59:36 +02:00
21161af4aa Fix Block Drops 2023-03-19 15:59:27 +02:00
da2d3da484 Fix CreativeTab assignment (Fabric) 2023-03-19 15:56:12 +02:00
8bb3e0c0a9 Fix CraterLib dependency 2023-03-19 15:55:52 +02:00
d08e7d1fd7 Fix invalid file name 2023-03-19 15:55:23 +02:00
0e633eef04 Port to 1.19.4 2023-03-19 14:35:24 +02:00
164 changed files with 2080 additions and 309 deletions

View File

@@ -25,7 +25,7 @@ minecraft {
dependencies { dependencies {
compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5' compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5'
compileOnly("me.hypherionmc.craterlib:CraterLib-common-${minecraft_version}:${craterlib_version}") compileOnly("me.hypherionmc.craterlib:CraterLib-common-${minecraft_version}:${craterlib_version}")
compileOnly("com.lowdragmc.shimmer:Shimmer-common-1.19.1:${shimmer_version}") //compileOnly("com.lowdragmc.shimmer:Shimmer-common-1.19.1:${shimmer_version}")
} }
processResources { processResources {

View File

@@ -4,8 +4,8 @@ import me.hypherionmc.craterlib.common.config.ModuleConfig;
import me.hypherionmc.craterlib.common.config.annotations.SubConfig; import me.hypherionmc.craterlib.common.config.annotations.SubConfig;
import me.hypherionmc.hyperlighting.Constants; import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.init.CommonRegistration; import me.hypherionmc.hyperlighting.common.init.CommonRegistration;
import me.hypherionmc.nightconfig.core.conversion.Path; import me.hypherionmc.moonconfig.core.conversion.Path;
import me.hypherionmc.nightconfig.core.conversion.SpecComment; import me.hypherionmc.moonconfig.core.conversion.SpecComment;
public class HyperLightingClientConfig extends ModuleConfig { public class HyperLightingClientConfig extends ModuleConfig {

View File

@@ -1,16 +1,16 @@
package me.hypherionmc.hyperlighting.client.renderer.blockentity; package me.hypherionmc.hyperlighting.client.renderer.blockentity;
import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Vector3f; import com.mojang.math.Axis;
import me.hypherionmc.hyperlighting.common.blockentities.AdvancedCampfireBlockEntity; import me.hypherionmc.hyperlighting.common.blockentities.AdvancedCampfireBlockEntity;
import me.hypherionmc.hyperlighting.common.blocks.AdvancedCampfire; import me.hypherionmc.hyperlighting.common.blocks.AdvancedCampfire;
import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.NonNullList; import net.minecraft.core.NonNullList;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
/** /**
@@ -33,17 +33,17 @@ public class AdvancedCampfireRenderer implements BlockEntityRenderer<AdvancedCam
int blockPos = (int)campfire.getBlockPos().asLong(); int blockPos = (int)campfire.getBlockPos().asLong();
for(int i = 0; i < items.size(); ++i) { for(int i = 0; i < items.size(); ++i) {
ItemStack $$10 = items.get(i); ItemStack stack = items.get(i);
if ($$10 != ItemStack.EMPTY) { if (stack != ItemStack.EMPTY) {
poseStack.pushPose(); poseStack.pushPose();
poseStack.translate(0.5, 0.44921875, 0.5); poseStack.translate(0.5, 0.44921875, 0.5);
Direction direction1 = Direction.from2DDataValue((i + direction.get2DDataValue()) % 4); Direction direction1 = Direction.from2DDataValue((i + direction.get2DDataValue()) % 4);
float rot = -direction1.toYRot(); float rot = -direction1.toYRot();
poseStack.mulPose(Vector3f.YP.rotationDegrees(rot)); poseStack.mulPose(Axis.YP.rotationDegrees(rot));
poseStack.mulPose(Vector3f.XP.rotationDegrees(90.0F)); poseStack.mulPose(Axis.XP.rotationDegrees(90.0F));
poseStack.translate(-0.3125, -0.3125, 0.0); poseStack.translate(-0.3125, -0.3125, 0.0);
poseStack.scale(0.375F, 0.375F, 0.375F); poseStack.scale(0.375F, 0.375F, 0.375F);
this.itemRenderer.renderStatic($$10, ItemTransforms.TransformType.FIXED, combinedLight, overlay, poseStack, bufferSource, blockPos + i); this.itemRenderer.renderStatic(stack, ItemDisplayContext.FIXED, combinedLight, overlay, poseStack, bufferSource, campfire.getLevel(), blockPos + i);
poseStack.popPose(); poseStack.popPose();
} }
} }

View File

@@ -53,12 +53,14 @@ public class AdvancedCampfireBlockEntity extends BlockEntity implements Clearabl
isDirty = true; isDirty = true;
int time = be.cookingProgress[i]++; int time = be.cookingProgress[i]++;
if (be.cookingProgress[i] >= be.cookingTime[i]) { if (be.cookingProgress[i] >= be.cookingTime[i]) {
Container container = new SimpleContainer(inStack); Container $$7 = new SimpleContainer(inStack);
ItemStack outStack = be.quickCheck.getRecipeFor(container, level).map(r -> r.assemble(container)).orElse(inStack); ItemStack $$8 = ((AdvancedCampfireBlockEntity) blockEntity).quickCheck.getRecipeFor($$7, level).map(($$2x) -> $$2x.assemble($$7, level.registryAccess())).orElse(inStack);
Containers.dropItemStack(level, blockPos.getX(), blockPos.getY(), blockPos.getZ(), outStack); if ($$8.isItemEnabled(level.enabledFeatures())) {
be.items.set(i, ItemStack.EMPTY); Containers.dropItemStack(level, blockPos.getX(), blockPos.getY(), blockPos.getZ(), $$8);
level.sendBlockUpdated(blockPos, blockState, blockState, 3); ((AdvancedCampfireBlockEntity) blockEntity).items.set(i, ItemStack.EMPTY);
level.gameEvent(GameEvent.BLOCK_CHANGE, blockPos, GameEvent.Context.of(blockState)); level.sendBlockUpdated(blockPos, blockState, blockState, 3);
level.gameEvent(GameEvent.BLOCK_CHANGE, blockPos, GameEvent.Context.of(blockState));
}
} }
} }
} }

View File

@@ -1,10 +1,10 @@
package me.hypherionmc.hyperlighting.common.blockentities; package me.hypherionmc.hyperlighting.common.blockentities;
import me.hypherionmc.craterlib.api.blockentities.ITickable; import me.hypherionmc.craterlib.api.blockentities.ITickable;
import me.hypherionmc.craterlib.api.blockentities.caps.ForgeCapability; import me.hypherionmc.craterlib.api.blockentities.caps.CapabilityHandler;
import me.hypherionmc.craterlib.common.blockentity.CraterBlockEntity; import me.hypherionmc.craterlib.common.blockentity.CraterBlockEntity;
import me.hypherionmc.craterlib.systems.SimpleInventory;
import me.hypherionmc.craterlib.systems.energy.CustomEnergyStorage; import me.hypherionmc.craterlib.systems.energy.CustomEnergyStorage;
import me.hypherionmc.craterlib.systems.inventory.SimpleInventory;
import me.hypherionmc.hyperlighting.common.blocks.BatteryNeon; import me.hypherionmc.hyperlighting.common.blocks.BatteryNeon;
import me.hypherionmc.hyperlighting.common.init.HLBlockEntities; import me.hypherionmc.hyperlighting.common.init.HLBlockEntities;
import me.hypherionmc.hyperlighting.common.items.WirelessBattery; import me.hypherionmc.hyperlighting.common.items.WirelessBattery;
@@ -131,8 +131,8 @@ public class BatteryNeonBlockEntity extends CraterBlockEntity implements ITickab
} }
@Override @Override
public <T> Optional<T> getForgeCapability(ForgeCapability capability, Direction side) { public <T> Optional<T> getCapability(CapabilityHandler capability, Direction side) {
if (capability == ForgeCapability.ENERGY && side == null) { if (capability == CapabilityHandler.ENERGY && side == null) {
return (Optional<T>) Optional.of(energyStorage); return (Optional<T>) Optional.of(energyStorage);
} }
return Optional.empty(); return Optional.empty();

View File

@@ -1,7 +1,7 @@
package me.hypherionmc.hyperlighting.common.blockentities; package me.hypherionmc.hyperlighting.common.blockentities;
import me.hypherionmc.craterlib.api.blockentities.ITickable; import me.hypherionmc.craterlib.api.blockentities.ITickable;
import me.hypherionmc.craterlib.api.blockentities.caps.ForgeCapability; import me.hypherionmc.craterlib.api.blockentities.caps.CapabilityHandler;
import me.hypherionmc.craterlib.common.blockentity.CraterBlockEntity; import me.hypherionmc.craterlib.common.blockentity.CraterBlockEntity;
import me.hypherionmc.craterlib.systems.energy.CustomEnergyStorage; import me.hypherionmc.craterlib.systems.energy.CustomEnergyStorage;
import me.hypherionmc.hyperlighting.common.blocks.SolarPanel; import me.hypherionmc.hyperlighting.common.blocks.SolarPanel;
@@ -59,8 +59,8 @@ public class SolarPanelBlockEntity extends CraterBlockEntity implements ITickabl
} }
@Override @Override
public <T> Optional<T> getForgeCapability(ForgeCapability forgeCapability, Direction direction) { public <T> Optional<T> getCapability(CapabilityHandler forgeCapability, Direction direction) {
if (forgeCapability == ForgeCapability.ENERGY && (direction == Direction.DOWN || direction == null)) { if (forgeCapability == CapabilityHandler.ENERGY && (direction == Direction.DOWN || direction == null)) {
return (Optional<T>) Optional.of(energyStorage); return (Optional<T>) Optional.of(energyStorage);
} }

View File

@@ -1,8 +1,10 @@
package me.hypherionmc.hyperlighting.common.blocks; package me.hypherionmc.hyperlighting.common.blocks;
import me.hypherionmc.craterlib.api.inventory.CraterCreativeModeTab;
import me.hypherionmc.craterlib.api.rendering.CustomRenderType; import me.hypherionmc.craterlib.api.rendering.CustomRenderType;
import me.hypherionmc.craterlib.api.rendering.DyableBlock; import me.hypherionmc.craterlib.api.rendering.DyableBlock;
import me.hypherionmc.craterlib.common.item.BlockItemDyable; import me.hypherionmc.craterlib.common.item.BlockItemDyable;
import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry;
import me.hypherionmc.craterlib.util.BlockStateUtils; import me.hypherionmc.craterlib.util.BlockStateUtils;
import me.hypherionmc.craterlib.util.RenderUtils; import me.hypherionmc.craterlib.util.RenderUtils;
import me.hypherionmc.hyperlighting.api.LightableBlock; import me.hypherionmc.hyperlighting.api.LightableBlock;
@@ -27,7 +29,6 @@ import net.minecraft.util.RandomSource;
import net.minecraft.world.Containers; import net.minecraft.world.Containers;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResult;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
@@ -80,7 +81,7 @@ public class AdvancedCampfire extends BaseEntityBlock implements DyableBlock, Li
private DyeColor color; private DyeColor color;
public AdvancedCampfire(String name, DyeColor color, CreativeModeTab tab) { public AdvancedCampfire(String name, DyeColor color, CraterCreativeModeTab tab) {
super(Properties.of( super(Properties.of(
Material.WOOD, Material.WOOD,
MaterialColor.COLOR_BROWN) MaterialColor.COLOR_BROWN)
@@ -94,7 +95,7 @@ public class AdvancedCampfire extends BaseEntityBlock implements DyableBlock, Li
this.color = color; this.color = color;
this.registerDefaultState(this.defaultBlockState().setValue(LIT, CommonRegistration.config.campfireConfig.litByDefault).setValue(SIGNAL_FIRE, false).setValue(FACING, Direction.NORTH).setValue(COLOR, color)); this.registerDefaultState(this.defaultBlockState().setValue(LIT, CommonRegistration.config.campfireConfig.litByDefault).setValue(SIGNAL_FIRE, false).setValue(FACING, Direction.NORTH).setValue(COLOR, color));
HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties().tab(tab))); CreativeTabRegistry.setCreativeTab(tab, HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties())));
} }
@Override @Override
@@ -145,7 +146,7 @@ public class AdvancedCampfire extends BaseEntityBlock implements DyableBlock, Li
@Override @Override
public void entityInside(BlockState blockState, Level level, BlockPos blockPos, Entity entity) { public void entityInside(BlockState blockState, Level level, BlockPos blockPos, Entity entity) {
if (blockState.getValue(LIT) && entity instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity)entity)) { if (blockState.getValue(LIT) && entity instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity)entity)) {
entity.hurt(DamageSource.IN_FIRE, (float)this.fireDamage); entity.hurt(level.damageSources().inFire(), (float)this.fireDamage);
} }
super.entityInside(blockState, level, blockPos, entity); super.entityInside(blockState, level, blockPos, entity);
} }

View File

@@ -2,8 +2,10 @@ package me.hypherionmc.hyperlighting.common.blocks;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import me.hypherionmc.craterlib.api.inventory.CraterCreativeModeTab;
import me.hypherionmc.craterlib.api.rendering.DyableBlock; import me.hypherionmc.craterlib.api.rendering.DyableBlock;
import me.hypherionmc.craterlib.common.item.BlockItemDyable; import me.hypherionmc.craterlib.common.item.BlockItemDyable;
import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry;
import me.hypherionmc.craterlib.util.BlockStateUtils; import me.hypherionmc.craterlib.util.BlockStateUtils;
import me.hypherionmc.craterlib.util.RenderUtils; import me.hypherionmc.craterlib.util.RenderUtils;
import me.hypherionmc.hyperlighting.api.LightableBlock; import me.hypherionmc.hyperlighting.api.LightableBlock;
@@ -44,6 +46,7 @@ import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.VoxelShape;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -69,12 +72,12 @@ public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements D
private DyeColor color; private DyeColor color;
public AdvancedCandleBlock(String name, DyeColor color, CreativeModeTab tab) { public AdvancedCandleBlock(String name, DyeColor color, CraterCreativeModeTab tab) {
super(Properties.of(Material.WOOD).noCollission().instabreak().lightLevel(BlockStateUtils.createLightLevelFromLitBlockState(15))); super(Properties.of(Material.WOOD).noCollission().instabreak().lightLevel(BlockStateUtils.createLightLevelFromLitBlockState(15)));
this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(LIT, CommonRegistration.config.candleConfig.litByDefault).setValue(COLOR, color)); this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(LIT, CommonRegistration.config.candleConfig.litByDefault).setValue(COLOR, color));
this.color = color; this.color = color;
HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties().tab(tab))); CreativeTabRegistry.setCreativeTab(tab, HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties())));
} }
@Override @Override

View File

@@ -1,8 +1,10 @@
package me.hypherionmc.hyperlighting.common.blocks; package me.hypherionmc.hyperlighting.common.blocks;
import me.hypherionmc.craterlib.api.inventory.CraterCreativeModeTab;
import me.hypherionmc.craterlib.api.rendering.CustomRenderType; import me.hypherionmc.craterlib.api.rendering.CustomRenderType;
import me.hypherionmc.craterlib.api.rendering.DyableBlock; import me.hypherionmc.craterlib.api.rendering.DyableBlock;
import me.hypherionmc.craterlib.common.item.BlockItemDyable; import me.hypherionmc.craterlib.common.item.BlockItemDyable;
import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry;
import me.hypherionmc.craterlib.util.BlockStateUtils; import me.hypherionmc.craterlib.util.BlockStateUtils;
import me.hypherionmc.craterlib.util.MathUtils; import me.hypherionmc.craterlib.util.MathUtils;
import me.hypherionmc.craterlib.util.RenderUtils; import me.hypherionmc.craterlib.util.RenderUtils;
@@ -68,7 +70,7 @@ public class AdvancedLanternBlock extends FaceAttachedHorizontalDirectionalBlock
private DyeColor color; private DyeColor color;
public AdvancedLanternBlock(String name, DyeColor color, CreativeModeTab tab) { public AdvancedLanternBlock(String name, DyeColor color, CraterCreativeModeTab tab) {
super(Properties.of(Material.HEAVY_METAL) super(Properties.of(Material.HEAVY_METAL)
.instabreak() .instabreak()
.sound(SoundType.LANTERN) .sound(SoundType.LANTERN)
@@ -76,7 +78,8 @@ public class AdvancedLanternBlock extends FaceAttachedHorizontalDirectionalBlock
); );
this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(LIT, CommonRegistration.config.lanternConfig.litByDefault).setValue(COLOR, color)); this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(LIT, CommonRegistration.config.lanternConfig.litByDefault).setValue(COLOR, color));
this.color = color; this.color = color;
HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties().tab(tab)));
CreativeTabRegistry.setCreativeTab(tab, HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties())));
} }
@Override @Override

View File

@@ -2,8 +2,10 @@ package me.hypherionmc.hyperlighting.common.blocks;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import me.hypherionmc.craterlib.api.inventory.CraterCreativeModeTab;
import me.hypherionmc.craterlib.api.rendering.DyableBlock; import me.hypherionmc.craterlib.api.rendering.DyableBlock;
import me.hypherionmc.craterlib.common.item.BlockItemDyable; import me.hypherionmc.craterlib.common.item.BlockItemDyable;
import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry;
import me.hypherionmc.craterlib.util.BlockStateUtils; import me.hypherionmc.craterlib.util.BlockStateUtils;
import me.hypherionmc.craterlib.util.RenderUtils; import me.hypherionmc.craterlib.util.RenderUtils;
import me.hypherionmc.hyperlighting.api.LightableBlock; import me.hypherionmc.hyperlighting.api.LightableBlock;
@@ -70,12 +72,12 @@ public class AdvancedTorchBlock extends HorizontalDirectionalBlock implements Dy
private DyeColor color; private DyeColor color;
public AdvancedTorchBlock(String name, DyeColor color, CreativeModeTab tab) { public AdvancedTorchBlock(String name, DyeColor color, CraterCreativeModeTab tab) {
super(Properties.of(Material.WOOD).noCollission().instabreak().lightLevel(BlockStateUtils.createLightLevelFromLitBlockState(15))); 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.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(LIT, CommonRegistration.config.torchConfig.litByDefault).setValue(COLOR, color));
this.color = color; this.color = color;
HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties().tab(tab))); CreativeTabRegistry.setCreativeTab(tab, HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties())));
} }
@Override @Override

View File

@@ -2,8 +2,8 @@ package me.hypherionmc.hyperlighting.common.blocks;
import me.hypherionmc.craterlib.api.rendering.DyableBlock; import me.hypherionmc.craterlib.api.rendering.DyableBlock;
import me.hypherionmc.craterlib.common.item.BlockItemDyable; import me.hypherionmc.craterlib.common.item.BlockItemDyable;
import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry;
import me.hypherionmc.craterlib.util.BlockStateUtils; import me.hypherionmc.craterlib.util.BlockStateUtils;
import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.blockentities.BatteryNeonBlockEntity; import me.hypherionmc.hyperlighting.common.blockentities.BatteryNeonBlockEntity;
import me.hypherionmc.hyperlighting.common.init.CommonRegistration; import me.hypherionmc.hyperlighting.common.init.CommonRegistration;
import me.hypherionmc.hyperlighting.common.init.HLItems; import me.hypherionmc.hyperlighting.common.init.HLItems;
@@ -17,7 +17,10 @@ import net.minecraft.network.chat.Component;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.*; import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
@@ -35,6 +38,7 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.block.state.properties.DirectionProperty; import net.minecraft.world.level.block.state.properties.DirectionProperty;
import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.block.state.properties.EnumProperty;
import net.minecraft.world.level.material.Material; 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.BlockHitResult;
import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.VoxelShape;
@@ -64,7 +68,7 @@ public class BatteryNeon extends BaseEntityBlock implements DyableBlock {
super(Properties.of(Material.GLASS).sound(SoundType.GLASS).lightLevel(BlockStateUtils.createLightLevelFromLitBlockState(14))); super(Properties.of(Material.GLASS).sound(SoundType.GLASS).lightLevel(BlockStateUtils.createLightLevelFromLitBlockState(14)));
this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(COLOR, DyeColor.WHITE)); this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(COLOR, DyeColor.WHITE));
HLItems.ITEMS.register(name, () -> new BlockItemDyable(this, new Item.Properties().tab(CommonRegistration.LIGHTS_TAB))); CreativeTabRegistry.setCreativeTab(CommonRegistration.LIGHTS_TAB, HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties())));
} }
@Override @Override
@@ -171,4 +175,9 @@ public class BatteryNeon extends BaseEntityBlock implements DyableBlock {
worldIn.setBlock(pos, state, 2); worldIn.setBlock(pos, state, 2);
worldIn.sendBlockUpdated(pos, oldState, state, 4); worldIn.sendBlockUpdated(pos, oldState, state, 4);
} }
@Override
public List<ItemStack> getDrops(BlockState blockState, LootContext.Builder lootBuilder) {
return List.of(new ItemStack(this));
}
} }

View File

@@ -1,11 +1,13 @@
package me.hypherionmc.hyperlighting.common.blocks; package me.hypherionmc.hyperlighting.common.blocks;
import me.hypherionmc.craterlib.common.item.BlockItemDyable;
import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry;
import me.hypherionmc.hyperlighting.common.blockentities.SolarPanelBlockEntity; import me.hypherionmc.hyperlighting.common.blockentities.SolarPanelBlockEntity;
import me.hypherionmc.hyperlighting.common.init.CommonRegistration; import me.hypherionmc.hyperlighting.common.init.CommonRegistration;
import me.hypherionmc.hyperlighting.common.init.HLItems; import me.hypherionmc.hyperlighting.common.init.HLItems;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.BaseEntityBlock; import net.minecraft.world.level.block.BaseEntityBlock;
@@ -17,10 +19,13 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker;
import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.storage.loot.LootContext;
import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.VoxelShape;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.List;
/** /**
* @author HypherionSA * @author HypherionSA
* @date 18/09/2022 * @date 18/09/2022
@@ -32,7 +37,7 @@ public class SolarPanel extends BaseEntityBlock {
public SolarPanel(String name) { public SolarPanel(String name) {
super(Properties.of(Material.GLASS).sound(SoundType.GLASS).noCollission().noOcclusion()); super(Properties.of(Material.GLASS).sound(SoundType.GLASS).noCollission().noOcclusion());
HLItems.register(name, () -> new BlockItem(this, new Item.Properties().tab(CommonRegistration.MACHINES_TAB))); CreativeTabRegistry.setCreativeTab(CommonRegistration.MACHINES_TAB, HLItems.register(name, () -> new BlockItemDyable(this, new Item.Properties())));
} }
@Override @Override
@@ -60,4 +65,9 @@ public class SolarPanel extends BaseEntityBlock {
public RenderShape getRenderShape(BlockState state) { public RenderShape getRenderShape(BlockState state) {
return RenderShape.MODEL; return RenderShape.MODEL;
} }
@Override
public List<ItemStack> getDrops(BlockState blockState, LootContext.Builder lootBuilder) {
return List.of(new ItemStack(this));
}
} }

View File

@@ -1,6 +1,5 @@
package me.hypherionmc.hyperlighting.common.containers; package me.hypherionmc.hyperlighting.common.containers;
import me.hypherionmc.craterlib.systems.SimpleInventory;
import me.hypherionmc.hyperlighting.common.blockentities.BatteryNeonBlockEntity; import me.hypherionmc.hyperlighting.common.blockentities.BatteryNeonBlockEntity;
import me.hypherionmc.hyperlighting.common.init.HLContainers; import me.hypherionmc.hyperlighting.common.init.HLContainers;
import me.hypherionmc.hyperlighting.common.items.WirelessBattery; import me.hypherionmc.hyperlighting.common.items.WirelessBattery;
@@ -10,7 +9,6 @@ import net.minecraft.world.Container;
import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.SimpleContainerData;
import net.minecraft.world.inventory.Slot; import net.minecraft.world.inventory.Slot;
import net.minecraft.world.item.DyeItem; import net.minecraft.world.item.DyeItem;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;

View File

@@ -1,11 +1,11 @@
package me.hypherionmc.hyperlighting.common.init; package me.hypherionmc.hyperlighting.common.init;
import me.hypherionmc.craterlib.client.gui.tabs.CreativeTabBuilder; import me.hypherionmc.craterlib.api.inventory.CraterCreativeModeTab;
import me.hypherionmc.craterlib.network.CraterNetworkHandler; import me.hypherionmc.craterlib.network.CraterNetworkHandler;
import me.hypherionmc.craterlib.platform.Platform; import me.hypherionmc.craterlib.platform.Platform;
import me.hypherionmc.hyperlighting.client.config.HyperLightingClientConfig; import me.hypherionmc.hyperlighting.client.config.HyperLightingClientConfig;
import me.hypherionmc.hyperlighting.integration.HyperLightingIntegrations; import me.hypherionmc.hyperlighting.integration.HyperLightingIntegrations;
import net.minecraft.world.item.CreativeModeTab; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import static me.hypherionmc.hyperlighting.Constants.MOD_ID; import static me.hypherionmc.hyperlighting.Constants.MOD_ID;
@@ -13,8 +13,8 @@ import static me.hypherionmc.hyperlighting.Constants.MOD_ID;
public class CommonRegistration { public class CommonRegistration {
public static HyperLightingClientConfig config = new HyperLightingClientConfig(); public static HyperLightingClientConfig config = new HyperLightingClientConfig();
public static final CreativeModeTab LIGHTS_TAB = CreativeTabBuilder.builder(MOD_ID, "lighting").setIcon(() -> new ItemStack(HLBlocks.ADVANCED_LANTERN)).build(); public static final CraterCreativeModeTab LIGHTS_TAB = new CraterCreativeModeTab.Builder(new ResourceLocation(MOD_ID, "lighting")).setIcon(() -> new ItemStack(HLBlocks.ADVANCED_LANTERN)).build();
public static final CreativeModeTab MACHINES_TAB = CreativeTabBuilder.builder(MOD_ID, "machines").setIcon(() -> new ItemStack(HLBlocks.ADVANCED_TORCH)).build(); public static final CraterCreativeModeTab MACHINES_TAB = new CraterCreativeModeTab.Builder(new ResourceLocation(MOD_ID, "machines")).setIcon(() -> new ItemStack(HLBlocks.ADVANCED_TORCH)).build();
public static CraterNetworkHandler networkHandler = Platform.COMMON_HELPER.createPacketHandler(MOD_ID); public static CraterNetworkHandler networkHandler = Platform.COMMON_HELPER.createPacketHandler(MOD_ID);

View File

@@ -6,7 +6,7 @@ import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.blockentities.AdvancedCampfireBlockEntity; import me.hypherionmc.hyperlighting.common.blockentities.AdvancedCampfireBlockEntity;
import me.hypherionmc.hyperlighting.common.blockentities.BatteryNeonBlockEntity; import me.hypherionmc.hyperlighting.common.blockentities.BatteryNeonBlockEntity;
import me.hypherionmc.hyperlighting.common.blockentities.SolarPanelBlockEntity; import me.hypherionmc.hyperlighting.common.blockentities.SolarPanelBlockEntity;
import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.entity.BlockEntityType;
/** /**
@@ -15,7 +15,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
*/ */
public class HLBlockEntities { public class HLBlockEntities {
public static final RegistrationProvider<BlockEntityType<?>> BE = RegistrationProvider.get(Registry.BLOCK_ENTITY_TYPE, Constants.MOD_ID); public static final RegistrationProvider<BlockEntityType<?>> BE = RegistrationProvider.get(BuiltInRegistries.BLOCK_ENTITY_TYPE, Constants.MOD_ID);
public static RegistryObject<BlockEntityType<AdvancedCampfireBlockEntity>> CAMPFIRE = BE.register("campfire", () -> BlockEntityType.Builder.of(AdvancedCampfireBlockEntity::new, HLBlocks.ADVANCED_CAMPFIRE.get()).build(null)); public static RegistryObject<BlockEntityType<AdvancedCampfireBlockEntity>> CAMPFIRE = BE.register("campfire", () -> BlockEntityType.Builder.of(AdvancedCampfireBlockEntity::new, HLBlocks.ADVANCED_CAMPFIRE.get()).build(null));

View File

@@ -4,7 +4,7 @@ import me.hypherionmc.craterlib.systems.reg.BlockRegistryObject;
import me.hypherionmc.craterlib.systems.reg.RegistrationProvider; import me.hypherionmc.craterlib.systems.reg.RegistrationProvider;
import me.hypherionmc.hyperlighting.Constants; import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.blocks.*; import me.hypherionmc.hyperlighting.common.blocks.*;
import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
@@ -12,7 +12,7 @@ import java.util.function.Supplier;
public class HLBlocks { public class HLBlocks {
public static RegistrationProvider<Block> BLOCKS = RegistrationProvider.get(Registry.BLOCK_REGISTRY, Constants.MOD_ID); public static RegistrationProvider<Block> BLOCKS = RegistrationProvider.get(BuiltInRegistries.BLOCK, Constants.MOD_ID);
/* Torches */ /* Torches */
public static BlockRegistryObject<Block> ADVANCED_TORCH = register("advanced_torch", () -> new AdvancedTorchBlock("advanced_torch", DyeColor.ORANGE, CommonRegistration.LIGHTS_TAB)); public static BlockRegistryObject<Block> ADVANCED_TORCH = register("advanced_torch", () -> new AdvancedTorchBlock("advanced_torch", DyeColor.ORANGE, CommonRegistration.LIGHTS_TAB));

View File

@@ -5,7 +5,7 @@ import me.hypherionmc.craterlib.systems.reg.RegistrationProvider;
import me.hypherionmc.craterlib.systems.reg.RegistryObject; import me.hypherionmc.craterlib.systems.reg.RegistryObject;
import me.hypherionmc.hyperlighting.Constants; import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.containers.BatteryNeonContainer; import me.hypherionmc.hyperlighting.common.containers.BatteryNeonContainer;
import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.MenuType;
@@ -15,7 +15,7 @@ import net.minecraft.world.inventory.MenuType;
*/ */
public class HLContainers { public class HLContainers {
public static RegistrationProvider<MenuType<?>> CONTAINERS = RegistrationProvider.get(Registry.MENU, Constants.MOD_ID); public static RegistrationProvider<MenuType<?>> CONTAINERS = RegistrationProvider.get(BuiltInRegistries.MENU, Constants.MOD_ID);
public static final RegistryObject<MenuType<BatteryNeonContainer>> BATTERY_NEON = register("battery_neon", Platform.COMMON_HELPER.createMenuType(BatteryNeonContainer::new)); public static final RegistryObject<MenuType<BatteryNeonContainer>> BATTERY_NEON = register("battery_neon", Platform.COMMON_HELPER.createMenuType(BatteryNeonContainer::new));

View File

@@ -4,7 +4,7 @@ import me.hypherionmc.craterlib.systems.reg.RegistrationProvider;
import me.hypherionmc.craterlib.systems.reg.RegistryObject; import me.hypherionmc.craterlib.systems.reg.RegistryObject;
import me.hypherionmc.hyperlighting.Constants; import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.entities.NeonFlyEntity; import me.hypherionmc.hyperlighting.common.entities.NeonFlyEntity;
import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.MobCategory; import net.minecraft.world.entity.MobCategory;
@@ -14,7 +14,7 @@ import net.minecraft.world.entity.MobCategory;
*/ */
public class HLEntities { public class HLEntities {
public static final RegistrationProvider<EntityType<?>> ENTITIES = RegistrationProvider.get(Registry.ENTITY_TYPE, Constants.MOD_ID); public static final RegistrationProvider<EntityType<?>> ENTITIES = RegistrationProvider.get(BuiltInRegistries.ENTITY_TYPE, Constants.MOD_ID);
public static final RegistryObject<EntityType<NeonFlyEntity>> NEONFLY = ENTITIES.register("neonfly", () -> EntityType.Builder.of(NeonFlyEntity::new, MobCategory.AMBIENT) public static final RegistryObject<EntityType<NeonFlyEntity>> NEONFLY = ENTITIES.register("neonfly", () -> EntityType.Builder.of(NeonFlyEntity::new, MobCategory.AMBIENT)
.sized(1f, 1f) .sized(1f, 1f)

View File

@@ -6,13 +6,13 @@ import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.items.CandleInAJar; import me.hypherionmc.hyperlighting.common.items.CandleInAJar;
import me.hypherionmc.hyperlighting.common.items.LighterTool; import me.hypherionmc.hyperlighting.common.items.LighterTool;
import me.hypherionmc.hyperlighting.common.items.WirelessBattery; import me.hypherionmc.hyperlighting.common.items.WirelessBattery;
import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import java.util.function.Supplier; import java.util.function.Supplier;
public class HLItems { public class HLItems {
public static final RegistrationProvider<Item> ITEMS = RegistrationProvider.get(Registry.ITEM_REGISTRY, Constants.MOD_ID); public static final RegistrationProvider<Item> ITEMS = RegistrationProvider.get(BuiltInRegistries.ITEM, Constants.MOD_ID);
/* Tools */ /* Tools */
public static RegistryObject<Item> TORCH_TOOL = register("lighter_tool", LighterTool::new); public static RegistryObject<Item> TORCH_TOOL = register("lighter_tool", LighterTool::new);

View File

@@ -3,14 +3,14 @@ package me.hypherionmc.hyperlighting.common.init;
import me.hypherionmc.craterlib.systems.reg.RegistrationProvider; import me.hypherionmc.craterlib.systems.reg.RegistrationProvider;
import me.hypherionmc.craterlib.systems.reg.RegistryObject; import me.hypherionmc.craterlib.systems.reg.RegistryObject;
import me.hypherionmc.hyperlighting.Constants; import me.hypherionmc.hyperlighting.Constants;
import net.minecraft.core.Registry;
import net.minecraft.core.particles.ParticleType; import net.minecraft.core.particles.ParticleType;
import net.minecraft.core.registries.BuiltInRegistries;
import java.util.function.Supplier; import java.util.function.Supplier;
public class HLParticles { public class HLParticles {
public static final RegistrationProvider<ParticleType<?>> PARTICLES = RegistrationProvider.get(Registry.PARTICLE_TYPE_REGISTRY, Constants.MOD_ID); public static final RegistrationProvider<ParticleType<?>> PARTICLES = RegistrationProvider.get(BuiltInRegistries.PARTICLE_TYPE, Constants.MOD_ID);
public static <T extends ParticleType<?>> RegistryObject<T> register(String name, Supplier<T> particle) { public static <T extends ParticleType<?>> RegistryObject<T> register(String name, Supplier<T> particle) {
return PARTICLES.register(name, particle); return PARTICLES.register(name, particle);

View File

@@ -3,7 +3,7 @@ package me.hypherionmc.hyperlighting.common.init;
import me.hypherionmc.craterlib.systems.reg.RegistrationProvider; import me.hypherionmc.craterlib.systems.reg.RegistrationProvider;
import me.hypherionmc.craterlib.systems.reg.RegistryObject; import me.hypherionmc.craterlib.systems.reg.RegistryObject;
import me.hypherionmc.hyperlighting.Constants; import me.hypherionmc.hyperlighting.Constants;
import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvent;
/** /**
@@ -12,13 +12,13 @@ import net.minecraft.sounds.SoundEvent;
*/ */
public class HLSounds { public class HLSounds {
public static final RegistrationProvider<SoundEvent> SOUNDS = RegistrationProvider.get(Registry.SOUND_EVENT, Constants.MOD_ID); public static final RegistrationProvider<SoundEvent> SOUNDS = RegistrationProvider.get(BuiltInRegistries.SOUND_EVENT, Constants.MOD_ID);
public static RegistryObject<SoundEvent> TORCH_IGNITE = createSound("block.torch_ignite"); public static RegistryObject<SoundEvent> TORCH_IGNITE = createSound("block.torch_ignite");
public static RegistryObject<SoundEvent> createSound(String location) { public static RegistryObject<SoundEvent> createSound(String location) {
final var soundLocation = Constants.rl(location); final var soundLocation = Constants.rl(location);
return SOUNDS.register(location, () -> new SoundEvent(soundLocation)); return SOUNDS.register(location, () -> SoundEvent.createVariableRangeEvent(soundLocation));
} }
public static void loadAll() {} public static void loadAll() {}

View File

@@ -1,6 +1,7 @@
package me.hypherionmc.hyperlighting.common.items; package me.hypherionmc.hyperlighting.common.items;
import me.hypherionmc.craterlib.platform.Platform; import me.hypherionmc.craterlib.platform.Platform;
import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry;
import me.hypherionmc.hyperlighting.common.init.CommonRegistration; import me.hypherionmc.hyperlighting.common.init.CommonRegistration;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
@@ -10,10 +11,13 @@ import net.minecraft.world.item.Item;
*/ */
public class CandleInAJar extends Item { public class CandleInAJar extends Item {
private static final Properties shimmerLoaded = new Properties().tab(CommonRegistration.LIGHTS_TAB); private static final Properties shimmerLoaded = new Properties(); //.tab(CommonRegistration.LIGHTS_TAB);
public CandleInAJar() { public CandleInAJar() {
super(Platform.LOADER.isModLoaded("shimmer") ? shimmerLoaded : new Properties()); super(new Properties().stacksTo(1));
if (Platform.LOADER.isModLoaded("shimmer")) {
CreativeTabRegistry.setCreativeTab(CommonRegistration.LIGHTS_TAB, () -> this);
}
} }
} }

View File

@@ -1,5 +1,6 @@
package me.hypherionmc.hyperlighting.common.items; package me.hypherionmc.hyperlighting.common.items;
import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry;
import me.hypherionmc.hyperlighting.api.LightableBlock; import me.hypherionmc.hyperlighting.api.LightableBlock;
import me.hypherionmc.hyperlighting.common.init.CommonRegistration; import me.hypherionmc.hyperlighting.common.init.CommonRegistration;
import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResult;
@@ -10,7 +11,8 @@ import net.minecraft.world.level.block.state.BlockState;
public class LighterTool extends Item { public class LighterTool extends Item {
public LighterTool() { public LighterTool() {
super(new Properties().stacksTo(1).tab(CommonRegistration.LIGHTS_TAB).durability(20)); super(new Properties().stacksTo(1)/*.tab(CommonRegistration.LIGHTS_TAB)*/.durability(20));
CreativeTabRegistry.setCreativeTab(CommonRegistration.LIGHTS_TAB, () -> this);
} }
@Override @Override

View File

@@ -1,5 +1,6 @@
package me.hypherionmc.hyperlighting.common.items; package me.hypherionmc.hyperlighting.common.items;
import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry;
import me.hypherionmc.hyperlighting.api.SwitchModule; import me.hypherionmc.hyperlighting.api.SwitchModule;
import me.hypherionmc.hyperlighting.common.blocks.SolarPanel; import me.hypherionmc.hyperlighting.common.blocks.SolarPanel;
import me.hypherionmc.hyperlighting.common.init.CommonRegistration; import me.hypherionmc.hyperlighting.common.init.CommonRegistration;
@@ -22,7 +23,8 @@ import net.minecraft.world.level.Level;
public class WirelessBattery extends Item implements SwitchModule { public class WirelessBattery extends Item implements SwitchModule {
public WirelessBattery() { public WirelessBattery() {
super(new Properties().tab(CommonRegistration.MACHINES_TAB).stacksTo(1)); super(new Properties().stacksTo(1));
CreativeTabRegistry.setCreativeTab(CommonRegistration.MACHINES_TAB, () -> this);
} }
@Override @Override

View File

@@ -1,18 +1,5 @@
package me.hypherionmc.hyperlighting.integration.shimmer; package me.hypherionmc.hyperlighting.integration.shimmer;
import com.lowdragmc.shimmer.client.light.ColorPointLight;
import com.lowdragmc.shimmer.client.light.LightManager;
import me.hypherionmc.craterlib.common.item.BlockItemDyable;
import me.hypherionmc.craterlib.util.RenderUtils;
import me.hypherionmc.hyperlighting.common.blocks.AdvancedCampfire;
import me.hypherionmc.hyperlighting.common.blocks.AdvancedCandleBlock;
import me.hypherionmc.hyperlighting.common.blocks.AdvancedLanternBlock;
import me.hypherionmc.hyperlighting.common.blocks.AdvancedTorchBlock;
import me.hypherionmc.hyperlighting.common.init.CommonRegistration;
import me.hypherionmc.hyperlighting.common.init.HLBlocks;
import me.hypherionmc.hyperlighting.common.init.HLItems;
import net.minecraft.world.item.DyeColor;
/** /**
* @author HypherionSA * @author HypherionSA
* @date 07/08/2022 * @date 07/08/2022
@@ -25,14 +12,14 @@ public class HyperLightingShimmer {
} }
private static void registerItems() { private static void registerItems() {
LightManager.INSTANCE.registerItemLight(HLBlocks.ADVANCED_TORCH.asItem(), stack -> new ColorPointLight.Template(stack.getCount() / 10 + 6, RenderUtils.alphaColorFromDye(((BlockItemDyable)stack.getItem()).getColor(stack), 1f))); //LightManager.INSTANCE.registerItemLight(HLBlocks.ADVANCED_TORCH.asItem(), stack -> new ColorPointLight.Template(stack.getCount() / 10 + 6, RenderUtils.alphaColorFromDye(((BlockItemDyable)stack.getItem()).getColor(stack), 1f)));
LightManager.INSTANCE.registerItemLight(HLBlocks.ADVANCED_LANTERN.asItem(), stack -> new ColorPointLight.Template(stack.getCount() / 10 + 6, RenderUtils.alphaColorFromDye(((BlockItemDyable)stack.getItem()).getColor(stack), 1f))); //LightManager.INSTANCE.registerItemLight(HLBlocks.ADVANCED_LANTERN.asItem(), stack -> new ColorPointLight.Template(stack.getCount() / 10 + 6, RenderUtils.alphaColorFromDye(((BlockItemDyable)stack.getItem()).getColor(stack), 1f)));
LightManager.INSTANCE.registerItemLight(HLItems.CANDLE_IN_A_JAR.get(), stack -> new ColorPointLight.Template(10, RenderUtils.alphaColorFromDye(DyeColor.WHITE, 1f))); //LightManager.INSTANCE.registerItemLight(HLItems.CANDLE_IN_A_JAR.get(), stack -> new ColorPointLight.Template(10, RenderUtils.alphaColorFromDye(DyeColor.WHITE, 1f)));
} }
private static void registerBlocks() { private static void registerBlocks() {
LightManager.INSTANCE.registerBlockLight(HLBlocks.ADVANCED_TORCH.get(), (state, blockPos) -> { /*LightManager.INSTANCE.registerBlockLight(HLBlocks.ADVANCED_TORCH.get(), (state, blockPos) -> {
if (state.getValue(AdvancedTorchBlock.LIT) && CommonRegistration.config.torchConfig.coloredLighting) { if (state.getValue(AdvancedTorchBlock.LIT) && CommonRegistration.config.torchConfig.coloredLighting) {
DyeColor color = state.getValue(AdvancedTorchBlock.COLOR); DyeColor color = state.getValue(AdvancedTorchBlock.COLOR);
return new ColorPointLight.Template(10, RenderUtils.alphaColorFromDye(color, 1f)); return new ColorPointLight.Template(10, RenderUtils.alphaColorFromDye(color, 1f));
@@ -62,7 +49,7 @@ public class HyperLightingShimmer {
return new ColorPointLight.Template(10, RenderUtils.alphaColorFromDye(color, 1f)); return new ColorPointLight.Template(10, RenderUtils.alphaColorFromDye(color, 1f));
} }
return null; return null;
}); });*/
} }
} }

View File

@@ -1,20 +0,0 @@
package me.hypherionmc.hyperlighting.mixin.access;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.MenuType;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
/**
* @author HypherionSA
* @date 24/09/2022
*/
@Mixin(MenuType.class)
public interface MenuTypeAccess {
@Invoker("<init>")
static <T extends AbstractContainerMenu> MenuType<T> crater_create(MenuType.MenuSupplier<T> menuSupplier) {
throw new Error("Mixin did not apply!");
}
}

View File

@@ -0,0 +1,203 @@
{
"credit": "Made with Blockbench",
"textures": {
"0": "hyperlighting:block/candle/base/advanced_candle",
"particle": "hyperlighting:block/candle/base/advanced_candle"
},
"elements": [
{
"from": [6, 0, 5],
"to": [9, 10, 6],
"faces": {
"north": {"uv": [7, 0, 10, 10], "texture": "#0"},
"east": {"uv": [6, 0, 7, 10], "texture": "#0"},
"south": {"uv": [7, 0, 10, 10], "texture": "#0"},
"west": {"uv": [5, 0, 6, 10], "texture": "#0"},
"up": {"uv": [11, 0, 14, 1], "texture": "#0"},
"down": {"uv": [0, 11, 3, 12], "texture": "#0"}
}
},
{
"from": [6, 0, 9],
"to": [9, 10, 10],
"faces": {
"north": {"uv": [7, 0, 10, 10], "texture": "#0"},
"east": {"uv": [5, 0, 6, 10], "texture": "#0"},
"south": {"uv": [7, 0, 10, 10], "texture": "#0"},
"west": {"uv": [6, 0, 7, 10], "texture": "#0"},
"up": {"uv": [11, 4, 14, 5], "texture": "#0"},
"down": {"uv": [0, 11, 3, 12], "texture": "#0"}
}
},
{
"from": [6, 0, 6],
"to": [9, 10, 9],
"faces": {
"north": {"uv": [7, 0, 10, 10], "texture": "#0"},
"east": {"uv": [2, 0, 5, 10], "texture": "#0"},
"south": {"uv": [7, 0, 10, 10], "texture": "#0"},
"west": {"uv": [2, 0, 5, 10], "texture": "#0"},
"up": {"uv": [11, 1, 14, 4], "texture": "#0"},
"down": {"uv": [0, 11, 3, 14], "texture": "#0"}
}
},
{
"from": [5, 0, 6],
"to": [6, 10, 9],
"faces": {
"north": {"uv": [1, 0, 2, 10], "texture": "#0"},
"east": {"uv": [2, 0, 5, 10], "texture": "#0"},
"south": {"uv": [0, 0, 1, 10], "texture": "#0"},
"west": {"uv": [2, 0, 5, 10], "texture": "#0"},
"up": {"uv": [10, 4, 11, 1], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 11, 1, 14], "texture": "#0"}
}
},
{
"from": [9, 0, 6],
"to": [10, 10, 9],
"faces": {
"north": {"uv": [0, 0, 1, 10], "texture": "#0"},
"east": {"uv": [2, 0, 5, 10], "texture": "#0"},
"south": {"uv": [1, 0, 2, 10], "texture": "#0"},
"west": {"uv": [2, 0, 5, 10], "texture": "#0"},
"up": {"uv": [14, 1, 15, 4], "texture": "#0"},
"down": {"uv": [0, 11, 1, 14], "texture": "#0"}
}
},
{
"from": [10, 0, 6],
"to": [11, 1, 10],
"faces": {
"north": {"uv": [0, 10, 1, 11], "texture": "#0"},
"east": {"uv": [0, 10, 4, 11], "texture": "#0"},
"south": {"uv": [0, 10, 1, 11], "texture": "#0"},
"west": {"uv": [0, 10, 4, 11], "texture": "#0"},
"up": {"uv": [0, 10, 1, 14], "texture": "#0"},
"down": {"uv": [0, 10, 1, 14], "texture": "#0"}
}
},
{
"from": [4, 0, 5],
"to": [5, 1, 7],
"faces": {
"north": {"uv": [1, 11, 2, 12], "texture": "#0"},
"east": {"uv": [1, 11, 3, 12], "texture": "#0"},
"south": {"uv": [1, 11, 2, 12], "texture": "#0"},
"west": {"uv": [1, 11, 3, 12], "texture": "#0"},
"up": {"uv": [1, 11, 2, 13], "texture": "#0"},
"down": {"uv": [1, 11, 2, 13], "texture": "#0"}
}
},
{
"from": [7, 0, 10],
"to": [10, 1, 11],
"faces": {
"north": {"uv": [4, 10, 7, 11], "texture": "#0"},
"east": {"uv": [4, 10, 5, 11], "texture": "#0"},
"south": {"uv": [4, 10, 7, 11], "texture": "#0"},
"west": {"uv": [4, 10, 5, 11], "texture": "#0"},
"up": {"uv": [4, 10, 7, 11], "texture": "#0"},
"down": {"uv": [4, 10, 7, 11], "texture": "#0"}
}
},
{
"from": [5, 0, 4],
"to": [7, 1, 5],
"faces": {
"north": {"uv": [7, 10, 9, 11], "texture": "#0"},
"east": {"uv": [7, 10, 8, 11], "texture": "#0"},
"south": {"uv": [7, 10, 9, 11], "texture": "#0"},
"west": {"uv": [7, 10, 8, 11], "texture": "#0"},
"up": {"uv": [7, 10, 9, 11], "texture": "#0"},
"down": {"uv": [7, 10, 9, 11], "texture": "#0"}
}
},
{
"from": [9, 0, 5],
"to": [10, 1, 6],
"faces": {
"north": {"uv": [9, 10, 10, 11], "texture": "#0"},
"east": {"uv": [9, 10, 10, 11], "texture": "#0"},
"south": {"uv": [9, 10, 10, 11], "texture": "#0"},
"west": {"uv": [9, 10, 10, 11], "texture": "#0"},
"up": {"uv": [9, 10, 10, 11], "texture": "#0"},
"down": {"uv": [9, 10, 10, 11], "texture": "#0"}
}
},
{
"from": [5, 0, 5],
"to": [6, 1, 6],
"faces": {
"north": {"uv": [0, 11, 1, 12], "texture": "#0"},
"east": {"uv": [0, 11, 1, 12], "texture": "#0"},
"south": {"uv": [0, 11, 1, 12], "texture": "#0"},
"west": {"uv": [0, 11, 1, 12], "texture": "#0"},
"up": {"uv": [0, 11, 1, 12], "texture": "#0"},
"down": {"uv": [0, 11, 1, 12], "texture": "#0"}
}
},
{
"from": [9, 0, 9],
"to": [10, 1, 10],
"faces": {
"north": {"uv": [0, 13, 1, 14], "texture": "#0"},
"east": {"uv": [0, 13, 1, 14], "texture": "#0"},
"south": {"uv": [0, 13, 1, 14], "texture": "#0"},
"west": {"uv": [0, 13, 1, 14], "texture": "#0"},
"up": {"uv": [0, 13, 1, 14], "texture": "#0"},
"down": {"uv": [0, 13, 1, 14], "texture": "#0"}
}
},
{
"name": "wick",
"from": [7.5, 10, 7],
"to": [7.5, 12, 8],
"rotation": {"angle": 45, "axis": "y", "origin": [7.5, 0, 7.5]},
"faces": {
"north": {"uv": [4, 11, 4, 13], "texture": "#0"},
"east": {"uv": [3, 11, 4, 13], "texture": "#0"},
"south": {"uv": [4, 11, 4, 13], "texture": "#0"},
"west": {"uv": [3, 11, 4, 13], "texture": "#0"},
"up": {"uv": [3, 13, 4, 13], "texture": "#0"},
"down": {"uv": [3, 13, 4, 13], "texture": "#0"}
}
},
{
"name": "wick",
"from": [7.5, 10, 7],
"to": [7.5, 12, 8],
"rotation": {"angle": -45, "axis": "y", "origin": [7.5, 0, 7.5]},
"faces": {
"north": {"uv": [4, 11, 4, 13], "texture": "#0"},
"east": {"uv": [3, 11, 4, 13], "texture": "#0"},
"south": {"uv": [4, 11, 4, 13], "texture": "#0"},
"west": {"uv": [3, 11, 4, 13], "texture": "#0"},
"up": {"uv": [3, 13, 4, 13], "texture": "#0"},
"down": {"uv": [3, 13, 4, 13], "texture": "#0"}
}
}
],
"groups": [
{
"name": "candle_body",
"origin": [0, 0, 0],
"color": 0,
"children": [
0,
1,
2,
3,
4,
{
"name": "dripped_wax",
"origin": [0, 0, 0],
"color": 0,
"children": [5, 6, 7, 8, 9, 10, 11]
}
]
},
12,
13
]
}

View File

@@ -0,0 +1,203 @@
{
"credit": "Made with Blockbench",
"textures": {
"0": "advanced_candle_lit",
"particle": "advanced_candle_lit"
},
"elements": [
{
"from": [6, 0, 5],
"to": [9, 10, 6],
"faces": {
"north": {"uv": [7, 0, 10, 10], "texture": "#0"},
"east": {"uv": [6, 0, 7, 10], "texture": "#0"},
"south": {"uv": [7, 0, 10, 10], "texture": "#0"},
"west": {"uv": [5, 0, 6, 10], "texture": "#0"},
"up": {"uv": [11, 0, 14, 1], "texture": "#0"},
"down": {"uv": [0, 11, 3, 12], "texture": "#0"}
}
},
{
"from": [6, 0, 9],
"to": [9, 10, 10],
"faces": {
"north": {"uv": [7, 0, 10, 10], "texture": "#0"},
"east": {"uv": [5, 0, 6, 10], "texture": "#0"},
"south": {"uv": [7, 0, 10, 10], "texture": "#0"},
"west": {"uv": [6, 0, 7, 10], "texture": "#0"},
"up": {"uv": [11, 4, 14, 5], "texture": "#0"},
"down": {"uv": [0, 11, 3, 12], "texture": "#0"}
}
},
{
"from": [6, 0, 6],
"to": [9, 10, 9],
"faces": {
"north": {"uv": [7, 0, 10, 10], "texture": "#0"},
"east": {"uv": [2, 0, 5, 10], "texture": "#0"},
"south": {"uv": [7, 0, 10, 10], "texture": "#0"},
"west": {"uv": [2, 0, 5, 10], "texture": "#0"},
"up": {"uv": [11, 1, 14, 4], "texture": "#0"},
"down": {"uv": [0, 11, 3, 14], "texture": "#0"}
}
},
{
"from": [5, 0, 6],
"to": [6, 10, 9],
"faces": {
"north": {"uv": [1, 0, 2, 10], "texture": "#0"},
"east": {"uv": [2, 0, 5, 10], "texture": "#0"},
"south": {"uv": [0, 0, 1, 10], "texture": "#0"},
"west": {"uv": [2, 0, 5, 10], "texture": "#0"},
"up": {"uv": [10, 4, 11, 1], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 11, 1, 14], "texture": "#0"}
}
},
{
"from": [9, 0, 6],
"to": [10, 10, 9],
"faces": {
"north": {"uv": [0, 0, 1, 10], "texture": "#0"},
"east": {"uv": [2, 0, 5, 10], "texture": "#0"},
"south": {"uv": [1, 0, 2, 10], "texture": "#0"},
"west": {"uv": [2, 0, 5, 10], "texture": "#0"},
"up": {"uv": [14, 1, 15, 4], "texture": "#0"},
"down": {"uv": [0, 11, 1, 14], "texture": "#0"}
}
},
{
"from": [10, 0, 6],
"to": [11, 1, 10],
"faces": {
"north": {"uv": [0, 10, 1, 11], "texture": "#0"},
"east": {"uv": [0, 10, 4, 11], "texture": "#0"},
"south": {"uv": [0, 10, 1, 11], "texture": "#0"},
"west": {"uv": [0, 10, 4, 11], "texture": "#0"},
"up": {"uv": [0, 10, 1, 14], "texture": "#0"},
"down": {"uv": [0, 10, 1, 14], "texture": "#0"}
}
},
{
"from": [4, 0, 5],
"to": [5, 1, 7],
"faces": {
"north": {"uv": [1, 11, 2, 12], "texture": "#0"},
"east": {"uv": [1, 11, 3, 12], "texture": "#0"},
"south": {"uv": [1, 11, 2, 12], "texture": "#0"},
"west": {"uv": [1, 11, 3, 12], "texture": "#0"},
"up": {"uv": [1, 11, 2, 13], "texture": "#0"},
"down": {"uv": [1, 11, 2, 13], "texture": "#0"}
}
},
{
"from": [7, 0, 10],
"to": [10, 1, 11],
"faces": {
"north": {"uv": [4, 10, 7, 11], "texture": "#0"},
"east": {"uv": [4, 10, 5, 11], "texture": "#0"},
"south": {"uv": [4, 10, 7, 11], "texture": "#0"},
"west": {"uv": [4, 10, 5, 11], "texture": "#0"},
"up": {"uv": [4, 10, 7, 11], "texture": "#0"},
"down": {"uv": [4, 10, 7, 11], "texture": "#0"}
}
},
{
"from": [5, 0, 4],
"to": [7, 1, 5],
"faces": {
"north": {"uv": [7, 10, 9, 11], "texture": "#0"},
"east": {"uv": [7, 10, 8, 11], "texture": "#0"},
"south": {"uv": [7, 10, 9, 11], "texture": "#0"},
"west": {"uv": [7, 10, 8, 11], "texture": "#0"},
"up": {"uv": [7, 10, 9, 11], "texture": "#0"},
"down": {"uv": [7, 10, 9, 11], "texture": "#0"}
}
},
{
"from": [9, 0, 5],
"to": [10, 1, 6],
"faces": {
"north": {"uv": [9, 10, 10, 11], "texture": "#0"},
"east": {"uv": [9, 10, 10, 11], "texture": "#0"},
"south": {"uv": [9, 10, 10, 11], "texture": "#0"},
"west": {"uv": [9, 10, 10, 11], "texture": "#0"},
"up": {"uv": [9, 10, 10, 11], "texture": "#0"},
"down": {"uv": [9, 10, 10, 11], "texture": "#0"}
}
},
{
"from": [5, 0, 5],
"to": [6, 1, 6],
"faces": {
"north": {"uv": [0, 11, 1, 12], "texture": "#0"},
"east": {"uv": [0, 11, 1, 12], "texture": "#0"},
"south": {"uv": [0, 11, 1, 12], "texture": "#0"},
"west": {"uv": [0, 11, 1, 12], "texture": "#0"},
"up": {"uv": [0, 11, 1, 12], "texture": "#0"},
"down": {"uv": [0, 11, 1, 12], "texture": "#0"}
}
},
{
"from": [9, 0, 9],
"to": [10, 1, 10],
"faces": {
"north": {"uv": [0, 13, 1, 14], "texture": "#0"},
"east": {"uv": [0, 13, 1, 14], "texture": "#0"},
"south": {"uv": [0, 13, 1, 14], "texture": "#0"},
"west": {"uv": [0, 13, 1, 14], "texture": "#0"},
"up": {"uv": [0, 13, 1, 14], "texture": "#0"},
"down": {"uv": [0, 13, 1, 14], "texture": "#0"}
}
},
{
"name": "wick",
"from": [7.5, 10, 7],
"to": [7.5, 12, 8],
"rotation": {"angle": 45, "axis": "y", "origin": [7.5, 0, 7.5]},
"faces": {
"north": {"uv": [4, 11, 4, 13], "texture": "#0"},
"east": {"uv": [3, 11, 4, 13], "texture": "#0"},
"south": {"uv": [4, 11, 4, 13], "texture": "#0"},
"west": {"uv": [3, 11, 4, 13], "texture": "#0"},
"up": {"uv": [3, 13, 4, 13], "texture": "#0"},
"down": {"uv": [3, 13, 4, 13], "texture": "#0"}
}
},
{
"name": "wick",
"from": [7.5, 10, 7],
"to": [7.5, 12, 8],
"rotation": {"angle": -45, "axis": "y", "origin": [7.5, 0, 7.5]},
"faces": {
"north": {"uv": [4, 11, 4, 13], "texture": "#0"},
"east": {"uv": [3, 11, 4, 13], "texture": "#0"},
"south": {"uv": [4, 11, 4, 13], "texture": "#0"},
"west": {"uv": [3, 11, 4, 13], "texture": "#0"},
"up": {"uv": [3, 13, 4, 13], "texture": "#0"},
"down": {"uv": [3, 13, 4, 13], "texture": "#0"}
}
}
],
"groups": [
{
"name": "candle_body",
"origin": [0, 0, 0],
"color": 0,
"children": [
0,
1,
2,
3,
4,
{
"name": "dripped_wax",
"origin": [0, 0, 0],
"color": 0,
"children": [5, 6, 7, 8, 9, 10, 11]
}
]
},
12,
13
]
}

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/black_campfire_log_lit", "0": "hyperlighting:block/campfire/black_campfire_log_lit",
"1": "hyperlighting:block/campfire/black_campfire_log", "1": "hyperlighting:block/campfire/black_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/black_campfire_log", "0": "hyperlighting:block/campfire/black_campfire_log",
"particle": "hyperlighting:block/campfire/black_campfire_log" "particle": "hyperlighting:block/campfire/black_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/blue_campfire_log_lit", "0": "hyperlighting:block/campfire/blue_campfire_log_lit",
"1": "hyperlighting:block/campfire/blue_campfire_log", "1": "hyperlighting:block/campfire/blue_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/blue_campfire_log", "0": "hyperlighting:block/campfire/blue_campfire_log",
"particle": "hyperlighting:block/campfire/blue_campfire_log" "particle": "hyperlighting:block/campfire/blue_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/brown_campfire_log_lit", "0": "hyperlighting:block/campfire/brown_campfire_log_lit",
"1": "hyperlighting:block/campfire/brown_campfire_log", "1": "hyperlighting:block/campfire/brown_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/brown_campfire_log", "0": "hyperlighting:block/campfire/brown_campfire_log",
"particle": "hyperlighting:block/campfire/brown_campfire_log" "particle": "hyperlighting:block/campfire/brown_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/cyan_campfire_log_lit", "0": "hyperlighting:block/campfire/cyan_campfire_log_lit",
"1": "hyperlighting:block/campfire/cyan_campfire_log", "1": "hyperlighting:block/campfire/cyan_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/cyan_campfire_log", "0": "hyperlighting:block/campfire/cyan_campfire_log",
"particle": "hyperlighting:block/campfire/cyan_campfire_log" "particle": "hyperlighting:block/campfire/cyan_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/gray_campfire_log_lit", "0": "hyperlighting:block/campfire/gray_campfire_log_lit",
"1": "hyperlighting:block/campfire/gray_campfire_log", "1": "hyperlighting:block/campfire/gray_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/gray_campfire_log", "0": "hyperlighting:block/campfire/gray_campfire_log",
"particle": "hyperlighting:block/campfire/gray_campfire_log" "particle": "hyperlighting:block/campfire/gray_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/green_campfire_log_lit", "0": "hyperlighting:block/campfire/green_campfire_log_lit",
"1": "hyperlighting:block/campfire/green_campfire_log", "1": "hyperlighting:block/campfire/green_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/green_campfire_log", "0": "hyperlighting:block/campfire/green_campfire_log",
"particle": "hyperlighting:block/campfire/green_campfire_log" "particle": "hyperlighting:block/campfire/green_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/light_blue_campfire_log_lit", "0": "hyperlighting:block/campfire/light_blue_campfire_log_lit",
"1": "hyperlighting:block/campfire/light_blue_campfire_log", "1": "hyperlighting:block/campfire/light_blue_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/light_blue_campfire_log", "0": "hyperlighting:block/campfire/light_blue_campfire_log",
"particle": "hyperlighting:block/campfire/light_blue_campfire_log" "particle": "hyperlighting:block/campfire/light_blue_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/light_gray_campfire_log_lit", "0": "hyperlighting:block/campfire/light_gray_campfire_log_lit",
"1": "hyperlighting:block/campfire/light_gray_campfire_log", "1": "hyperlighting:block/campfire/light_gray_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/light_gray_campfire_log", "0": "hyperlighting:block/campfire/light_gray_campfire_log",
"particle": "hyperlighting:block/campfire/light_gray_campfire_log" "particle": "hyperlighting:block/campfire/light_gray_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/lime_campfire_log_lit", "0": "hyperlighting:block/campfire/lime_campfire_log_lit",
"1": "hyperlighting:block/campfire/lime_campfire_log", "1": "hyperlighting:block/campfire/lime_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/lime_campfire_log", "0": "hyperlighting:block/campfire/lime_campfire_log",
"particle": "hyperlighting:block/campfire/lime_campfire_log" "particle": "hyperlighting:block/campfire/lime_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/magenta_campfire_log_lit", "0": "hyperlighting:block/campfire/magenta_campfire_log_lit",
"1": "hyperlighting:block/campfire/magenta_campfire_log", "1": "hyperlighting:block/campfire/magenta_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/magenta_campfire_log", "0": "hyperlighting:block/campfire/magenta_campfire_log",
"particle": "hyperlighting:block/campfire/magenta_campfire_log" "particle": "hyperlighting:block/campfire/magenta_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/orange_campfire_log_lit", "0": "hyperlighting:block/campfire/orange_campfire_log_lit",
"1": "hyperlighting:block/campfire/orange_campfire_log", "1": "hyperlighting:block/campfire/orange_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/orange_campfire_log", "0": "hyperlighting:block/campfire/orange_campfire_log",
"particle": "hyperlighting:block/campfire/orange_campfire_log" "particle": "hyperlighting:block/campfire/orange_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/pink_campfire_log_lit", "0": "hyperlighting:block/campfire/pink_campfire_log_lit",
"1": "hyperlighting:block/campfire/pink_campfire_log", "1": "hyperlighting:block/campfire/pink_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/pink_campfire_log", "0": "hyperlighting:block/campfire/pink_campfire_log",
"particle": "hyperlighting:block/campfire/pink_campfire_log" "particle": "hyperlighting:block/campfire/pink_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/purple_campfire_log_lit", "0": "hyperlighting:block/campfire/purple_campfire_log_lit",
"1": "hyperlighting:block/campfire/purple_campfire_log", "1": "hyperlighting:block/campfire/purple_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/purple_campfire_log", "0": "hyperlighting:block/campfire/purple_campfire_log",
"particle": "hyperlighting:block/campfire/purple_campfire_log" "particle": "hyperlighting:block/campfire/purple_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/red_campfire_log_lit", "0": "hyperlighting:block/campfire/red_campfire_log_lit",
"1": "hyperlighting:block/campfire/red_campfire_log", "1": "hyperlighting:block/campfire/red_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/red_campfire_log", "0": "hyperlighting:block/campfire/red_campfire_log",
"particle": "hyperlighting:block/campfire/red_campfire_log" "particle": "hyperlighting:block/campfire/red_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/white_campfire_log_lit", "0": "hyperlighting:block/campfire/white_campfire_log_lit",
"1": "hyperlighting:block/campfire/white_campfire_log", "1": "hyperlighting:block/campfire/white_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/white_campfire_log", "0": "hyperlighting:block/campfire/white_campfire_log",
"particle": "hyperlighting:block/campfire/white_campfire_log" "particle": "hyperlighting:block/campfire/white_campfire_log"

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base", "parent": "hyperlighting:block/advanced_campfire_base",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/yellow_campfire_log_lit", "0": "hyperlighting:block/campfire/yellow_campfire_log_lit",
"1": "hyperlighting:block/campfire/yellow_campfire_log", "1": "hyperlighting:block/campfire/yellow_campfire_log",

View File

@@ -1,5 +1,5 @@
{ {
"parent": "hyperlighting:block/campfire_base_unlit", "parent": "hyperlighting:block/advanced_campfire_base_off",
"textures": { "textures": {
"0": "hyperlighting:block/campfire/yellow_campfire_log", "0": "hyperlighting:block/campfire/yellow_campfire_log",
"particle": "hyperlighting:block/campfire/yellow_campfire_log" "particle": "hyperlighting:block/campfire/yellow_campfire_log"

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/black" "0": "hyperlighting:block/candle/base/black_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/black_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/blue" "0": "hyperlighting:block/candle/base/blue_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/blue_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/brown" "0": "hyperlighting:block/candle/base/brown_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/brown_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/cyan" "0": "hyperlighting:block/candle/base/cyan_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/cyan_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,5 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/gray" "0": "hyperlighting:block/candle/base/gray_advanced_candle"
}
} }

View File

@@ -0,0 +1,5 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/gray_advanced_candle_lit"
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/green" "0": "hyperlighting:block/candle/base/green_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/green_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/light_blue" "0": "hyperlighting:block/candle/base/light_blue_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/light_blue_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/light_gray" "0": "hyperlighting:block/candle/base/light_gray_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/light_gray_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/lime" "0": "hyperlighting:block/candle/base/lime_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/lime_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/magenta" "0": "hyperlighting:block/candle/base/magenta_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/magenta_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/orange" "0": "hyperlighting:block/candle/base/orange_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/orange_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/pink" "0": "hyperlighting:block/candle/base/pink_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/pink_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/purple" "0": "hyperlighting:block/candle/base/purple_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/purple_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/red" "0": "hyperlighting:block/candle/base/red_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/red_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/white" "0": "hyperlighting:block/candle/base/white_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/white_advanced_candle_lit"
}
}

View File

@@ -1,6 +1,6 @@
{ {
"parent": "hyperlighting:block/candle_base", "parent": "hyperlighting:block/advanced_candle_base",
"textures": { "textures": {
"0": "hyperlighting:block/candle/color/yellow" "0": "hyperlighting:block/candle/base/yellow_advanced_candle"
} }
} }

View File

@@ -0,0 +1,6 @@
{
"parent": "hyperlighting:block/advanced_candle_base",
"textures": {
"0": "hyperlighting:block/candle/lit/yellow_advanced_candle_lit"
}
}

View File

@@ -1,50 +0,0 @@
{
"credit": "Made with Blockbench",
"textures": {
"0": "hyperlighting:block/candle_wax",
"1": "minecraft:block/coal_block",
"particle": "hyperlighting:block/candle_wax"
},
"elements": [
{
"name": "candle_body",
"from": [7, 0, 7],
"to": [9, 10, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -1, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#0"},
"east": {"uv": [0, 0, 2, 10], "texture": "#0"},
"south": {"uv": [0, 0, 2, 10], "texture": "#0"},
"west": {"uv": [0, 0, 2, 10], "texture": "#0"},
"up": {"uv": [0, 0, 2, 2], "texture": "#0"},
"down": {"uv": [0, 0, 2, 2], "texture": "#0"}
}
},
{
"from": [7.71194, 9.94134, 7.75],
"to": [8.21194, 10.69134, 8.25],
"rotation": {"angle": 0, "axis": "y", "origin": [7.96194, 7.19134, 8]},
"faces": {
"north": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"},
"east": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"},
"south": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"},
"west": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"},
"up": {"uv": [0, 0, 15.5, 15.5], "texture": "#1"},
"down": {"uv": [0, 0, 15.5, 15.5], "texture": "#1"}
}
},
{
"from": [7.53963, 10.59567, 7.75],
"to": [8.03963, 11.34567, 8.25],
"rotation": {"angle": 22.5, "axis": "z", "origin": [7.8853, 11.07664, 8]},
"faces": {
"north": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"},
"east": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"},
"south": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"},
"west": {"uv": [0, 0, 15.5, 15.75], "texture": "#1"},
"up": {"uv": [0, 0, 15.5, 15.5], "texture": "#1"},
"down": {"uv": [0, 0, 15.5, 15.5], "texture": "#1"}
}
}
]
}

View File

@@ -0,0 +1,80 @@
{
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"1": "block/oak_planks",
"2": "hyperlighting:block/small_carved_pumpkin",
"3": "block/hay_block_top",
"particle": "block/hay_block_top"
},
"elements": [
{
"name": "Left Pumpkin",
"from": [8, 1, 2],
"to": [14, 7, 8],
"faces": {
"north": {"uv": [0, 0, 6, 6], "texture": "#2"},
"east": {"uv": [6, 0, 12, 6], "texture": "#2"},
"south": {"uv": [6, 0, 12, 6], "texture": "#2"},
"west": {"uv": [6, 0, 12, 6], "texture": "#2"},
"up": {"uv": [0, 6, 6, 12], "texture": "#2"},
"down": {"uv": [6, 6, 12, 12], "texture": "#2"}
}
},
{
"name": "Right Pumpkin",
"from": [2, 1, 6],
"to": [8, 7, 12],
"rotation": {"angle": 45, "axis": "y", "origin": [5, 0, 9]},
"faces": {
"north": {"uv": [0, 0, 6, 6], "texture": "#2"},
"east": {"uv": [6, 0, 12, 6], "texture": "#2"},
"south": {"uv": [6, 0, 12, 6], "texture": "#2"},
"west": {"uv": [6, 0, 12, 6], "texture": "#2"},
"up": {"uv": [0, 6, 6, 12], "texture": "#2"},
"down": {"uv": [6, 6, 12, 12], "texture": "#2"}
}
},
{
"name": "Top Pumpkin",
"from": [7, 7, 7],
"to": [13, 13, 13],
"rotation": {"angle": 22.5, "axis": "y", "origin": [10, 6, 10]},
"faces": {
"north": {"uv": [0, 0, 6, 6], "texture": "#2"},
"east": {"uv": [6, 0, 12, 6], "texture": "#2"},
"south": {"uv": [6, 0, 12, 6], "texture": "#2"},
"west": {"uv": [6, 0, 12, 6], "texture": "#2"},
"up": {"uv": [0, 6, 6, 12], "texture": "#2"},
"down": {"uv": [0, 6, 6, 12], "texture": "#2"}
}
},
{
"name": "Stand",
"from": [9, 1, 10],
"to": [12, 7, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 0, 10]},
"faces": {
"north": {"uv": [13, 3, 16, 9], "texture": "#1"},
"east": {"uv": [4, 3, 7, 9], "texture": "#1"},
"south": {"uv": [10, 3, 13, 9], "texture": "#1"},
"west": {"uv": [0, 3, 3, 9], "texture": "#1"},
"up": {"uv": [0, 0, 3, 3], "texture": "#1"},
"down": {"uv": [0, 0, 3, 3], "texture": "#1"}
}
},
{
"name": "Straw",
"from": [0, 0, 0],
"to": [16, 1, 16],
"faces": {
"north": {"uv": [0, 15, 16, 16], "texture": "#3"},
"east": {"uv": [0, 15, 16, 16], "texture": "#3"},
"south": {"uv": [0, 15, 16, 16], "texture": "#3"},
"west": {"uv": [0, 15, 16, 16], "texture": "#3"},
"up": {"uv": [0, 0, 16, 16], "texture": "#3"},
"down": {"uv": [0, 0, 16, 16], "texture": "#3"}
}
}
]
}

View File

@@ -0,0 +1,427 @@
{
"credit": "Made with Blockbench",
"textures": {
"2": "block/cauldron_top",
"3": "block/cauldron_side",
"4": "block/cauldron_inner",
"5": "block/campfire_log",
"6": "hyperlighting:block/campfire/ashes",
"7": "block/chain",
"8": "hyperlighting:block/campfire/black_campfire_fire",
"particle": "block/cauldron_side"
},
"elements": [
{
"from": [2, -5, 2],
"to": [14, -4, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 1], "texture": "#missing"},
"east": {"uv": [0, 0, 16, 1], "texture": "#missing"},
"south": {"uv": [0, 0, 16, 1], "texture": "#missing"},
"west": {"uv": [0, 0, 16, 1], "texture": "#missing"},
"up": {"uv": [0, 0, 16, 16], "texture": "#6"},
"down": {"uv": [2, 2, 14, 14], "texture": "#4"}
}
},
{
"from": [0, -5, 0],
"to": [16, 2, 2],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 7], "texture": "#3"},
"east": {"uv": [14, 0, 16, 7], "texture": "#3"},
"south": {"uv": [0, 0, 16, 7], "texture": "#3"},
"west": {"uv": [0, 0, 2, 7], "texture": "#3"},
"up": {"uv": [0, 0, 16, 2], "texture": "#2"},
"down": {"uv": [0, 14, 16, 16], "texture": "#4"}
}
},
{
"from": [0, -5, 14],
"to": [16, 2, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 7], "texture": "#3"},
"east": {"uv": [0, 0, 2, 7], "texture": "#3"},
"south": {"uv": [0, 0, 16, 7], "texture": "#3"},
"west": {"uv": [14, 0, 16, 7], "texture": "#3"},
"up": {"uv": [0, 14, 16, 16], "texture": "#2"},
"down": {"uv": [0, 0, 16, 2], "texture": "#4"}
}
},
{
"from": [0, -5, 2],
"to": [2, 2, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 1, 6], "texture": "#missing"},
"east": {"uv": [2, 0, 14, 7], "texture": "#3"},
"south": {"uv": [0, 0, 1, 6], "texture": "#missing"},
"west": {"uv": [2, 0, 14, 7], "texture": "#3"},
"up": {"uv": [0, 2, 2, 14], "texture": "#2"},
"down": {"uv": [0, 2, 2, 16], "texture": "#4"}
}
},
{
"from": [14, -5, 2],
"to": [16, 2, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 1, 5], "texture": "#missing"},
"east": {"uv": [2, 0, 14, 7], "texture": "#3"},
"south": {"uv": [0, 0, 1, 5], "texture": "#missing"},
"west": {"uv": [2, 0, 14, 7], "texture": "#3"},
"up": {"uv": [14, 2, 16, 14], "texture": "#2"},
"down": {"uv": [14, 2, 16, 14], "texture": "#4"}
}
},
{
"from": [3, -4, 2],
"to": [6, -1, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"east": {"uv": [0, 0, 12, 3], "texture": "#5"},
"south": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"west": {"uv": [0, 0, 12, 3], "texture": "#5"},
"up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#5"},
"down": {"uv": [0, 0, 3, 12], "texture": "#missing"}
}
},
{
"from": [10, -4, 2],
"to": [13, -1, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"east": {"uv": [0, 0, 12, 3], "texture": "#5"},
"south": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"west": {"uv": [0, 0, 12, 3], "texture": "#5"},
"up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#5"},
"down": {"uv": [0, 0, 3, 12], "texture": "#missing"}
}
},
{
"from": [2, -2, 3],
"to": [14, 1, 6],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [4, 1, 16, 4], "texture": "#5"},
"east": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"south": {"uv": [0, 0, 12, 3], "texture": "#5"},
"west": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"up": {"uv": [0, 1, 11, 4], "texture": "#5"},
"down": {"uv": [0, 0, 12, 3], "texture": "#missing"}
}
},
{
"from": [2, -2, 10],
"to": [14, 1, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [1, 0, 13, 3], "texture": "#5"},
"east": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"south": {"uv": [4, 1, 16, 4], "texture": "#5"},
"west": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"up": {"uv": [0, 1, 11, 4], "texture": "#5"},
"down": {"uv": [0, 0, 12, 3], "texture": "#missing"}
}
},
{
"from": [1, 2, -0.41421],
"to": [1, 14, 2.58579],
"rotation": {"angle": -45, "axis": "y", "origin": [1, -5, 1]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [1, 2, -0.41421],
"to": [1, 14, 2.58579],
"rotation": {"angle": 45, "axis": "y", "origin": [1, -5, 1]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [15, 2, -0.41421],
"to": [15, 14, 2.58579],
"rotation": {"angle": 45, "axis": "y", "origin": [15, -6, 1]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [15, 2, -0.41421],
"to": [15, 14, 2.58579],
"rotation": {"angle": -45, "axis": "y", "origin": [15, -6, 1]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [15, 2, 13.58579],
"to": [15, 14, 16.58579],
"rotation": {"angle": -45, "axis": "y", "origin": [15, -5, 15]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [15, 2, 13.58579],
"to": [15, 14, 16.58579],
"rotation": {"angle": 45, "axis": "y", "origin": [15, -5, 15]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [1, 2, 13.58579],
"to": [1, 14, 16.58579],
"rotation": {"angle": 45, "axis": "y", "origin": [1, -6, 15]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [1, 2, 13.58579],
"to": [1, 14, 16.58579],
"rotation": {"angle": -45, "axis": "y", "origin": [1, -6, 15]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"name": "fire",
"from": [0, -4, 8],
"to": [16, 12, 8],
"rotation": {"angle": -45, "axis": "y", "origin": [8, -5, 8]},
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#8"},
"east": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"south": {"uv": [16, 0, 0, 16], "texture": "#8"},
"west": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"up": {"uv": [0, 0, 16, 0], "texture": "#missing"},
"down": {"uv": [0, 0, 16, 0], "texture": "#missing"}
}
},
{
"name": "fire",
"from": [8, -4, 0],
"to": [8, 12, 16],
"rotation": {"angle": -45, "axis": "y", "origin": [8, -5, 8]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [16, 0, 0, 16], "texture": "#8"},
"south": {"uv": [0, 0, 0, 16], "texture": "#8"},
"west": {"uv": [0, 0, 16, 16], "texture": "#8"},
"up": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#missing"},
"down": {"uv": [0, 0, 16, 0], "rotation": 270, "texture": "#missing"}
}
},
{
"from": [0, 14, 0],
"to": [16, 16, 2],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 2], "texture": "#3"},
"east": {"uv": [0, 0, 2, 2], "texture": "#3"},
"south": {"uv": [0, 0, 16, 2], "texture": "#3"},
"west": {"uv": [14, 0, 16, 2], "texture": "#3"},
"up": {"uv": [0, 0, 16, 2], "texture": "#2"},
"down": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"}
}
},
{
"from": [0, 14, 14],
"to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 2], "texture": "#3"},
"east": {"uv": [14, 0, 16, 2], "texture": "#3"},
"south": {"uv": [0, 0, 16, 2], "texture": "#3"},
"west": {"uv": [0, 0, 2, 2], "texture": "#3"},
"up": {"uv": [0, 14, 16, 16], "texture": "#2"},
"down": {"uv": [0, 0, 16, 2], "texture": "#4"}
}
},
{
"from": [0, 14, 2],
"to": [2, 16, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 2, 2], "texture": "#missing"},
"east": {"uv": [2, 0, 14, 2], "texture": "#3"},
"south": {"uv": [0, 0, 2, 2], "texture": "#missing"},
"west": {"uv": [2, 0, 14, 2], "texture": "#3"},
"up": {"uv": [0, 2, 2, 14], "texture": "#2"},
"down": {"uv": [0, 2, 2, 14], "texture": "#4"}
}
},
{
"from": [14, 14, 2],
"to": [16, 16, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 2, 2], "texture": "#missing"},
"east": {"uv": [2, 0, 14, 2], "texture": "#3"},
"south": {"uv": [0, 0, 2, 2], "texture": "#missing"},
"west": {"uv": [2, 0, 14, 2], "texture": "#3"},
"up": {"uv": [14, 2, 16, 14], "texture": "#2"},
"down": {"uv": [14, 2, 16, 14], "texture": "#4"}
}
},
{
"from": [-1, 14.001, 7],
"to": [17, 15.999, 9],
"rotation": {"angle": -45, "axis": "y", "origin": [8, -5, 8]},
"faces": {
"north": {"uv": [0, 4, 16, 6], "texture": "#3"},
"east": {"uv": [14, 4, 16, 6], "texture": "#3"},
"south": {"uv": [0, 4, 16, 6], "texture": "#3"},
"west": {"uv": [0, 4, 2, 6], "texture": "#3"},
"up": {"uv": [0, 4, 16, 6], "texture": "#3"},
"down": {"uv": [0, 4, 16, 6], "texture": "#3"}
}
},
{
"from": [-1, 14.002, 7],
"to": [17, 15.998, 9],
"rotation": {"angle": 45, "axis": "y", "origin": [8, -5, 8]},
"faces": {
"north": {"uv": [0, 4, 16, 6], "texture": "#3"},
"east": {"uv": [14, 4, 16, 6], "texture": "#3"},
"south": {"uv": [0, 4, 16, 6], "texture": "#3"},
"west": {"uv": [0, 4, 2, 6], "texture": "#3"},
"up": {"uv": [0, 4, 16, 6], "texture": "#3"},
"down": {"uv": [0, 4, 16, 6], "texture": "#3"}
}
}
],
"display": {
"thirdperson_righthand": {
"translation": [0, 1.5, -1],
"scale": [0.3, 0.3, 0.3]
},
"thirdperson_lefthand": {
"translation": [0, 1.5, -1],
"scale": [0.3, 0.3, 0.3]
},
"firstperson_righthand": {
"scale": [0.6, 0.6, 0.6]
},
"firstperson_lefthand": {
"scale": [0.6, 0.6, 0.6]
},
"ground": {
"scale": [0.3, 0.3, 0.3]
},
"gui": {
"rotation": [30, 45, 0],
"translation": [0, 1, 0],
"scale": [0.5, 0.5, 0.5]
},
"fixed": {
"translation": [0, 1.75, 0],
"scale": [0.6, 0.6, 0.6]
}
},
"groups": [
{
"name": "cup",
"origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2, 3, 4]
},
{
"name": "wood",
"origin": [0, 0, 0],
"color": 0,
"children": [5, 6, 7, 8]
},
{
"name": "chains",
"origin": [8, 8, 8],
"color": 0,
"children": [
{
"name": "NW",
"origin": [1, 0, 1],
"color": 0,
"children": [9, 10]
},
{
"name": "NE",
"origin": [15, -1, 1],
"color": 0,
"children": [11, 12]
},
{
"name": "SE",
"origin": [1, 0, 1],
"color": 0,
"children": [13, 14]
},
{
"name": "SW",
"origin": [15, -1, 1],
"color": 0,
"children": [15, 16]
}
]
},
{
"name": "fire",
"origin": [0, 0, 0],
"color": 0,
"children": [17, 18]
},
{
"name": "frame",
"origin": [8, 8, 8],
"color": 0,
"children": [19, 20, 21, 22, 23, 24]
}
]
}

View File

@@ -0,0 +1,392 @@
{
"credit": "Made with Blockbench",
"textures": {
"2": "block/cauldron_top",
"3": "block/cauldron_side",
"4": "block/cauldron_inner",
"5": "block/campfire_log",
"6": "hyperlighting:block/campfire_ashes",
"7": "block/chain",
"particle": "block/cauldron_side"
},
"elements": [
{
"from": [2, -5, 2],
"to": [14, -4, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 1], "texture": "#missing"},
"east": {"uv": [0, 0, 16, 1], "texture": "#missing"},
"south": {"uv": [0, 0, 16, 1], "texture": "#missing"},
"west": {"uv": [0, 0, 16, 1], "texture": "#missing"},
"up": {"uv": [0, 0, 16, 16], "texture": "#6"},
"down": {"uv": [2, 2, 14, 14], "texture": "#4"}
}
},
{
"from": [0, -5, 0],
"to": [16, 2, 2],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 7], "texture": "#3"},
"east": {"uv": [14, 0, 16, 7], "texture": "#3"},
"south": {"uv": [0, 0, 16, 7], "texture": "#3"},
"west": {"uv": [0, 0, 2, 7], "texture": "#3"},
"up": {"uv": [0, 0, 16, 2], "texture": "#2"},
"down": {"uv": [0, 14, 16, 16], "texture": "#4"}
}
},
{
"from": [0, -5, 14],
"to": [16, 2, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 7], "texture": "#3"},
"east": {"uv": [0, 0, 2, 7], "texture": "#3"},
"south": {"uv": [0, 0, 16, 7], "texture": "#3"},
"west": {"uv": [14, 0, 16, 7], "texture": "#3"},
"up": {"uv": [0, 14, 16, 16], "texture": "#2"},
"down": {"uv": [0, 0, 16, 2], "texture": "#4"}
}
},
{
"from": [0, -5, 2],
"to": [2, 2, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 1, 6], "texture": "#missing"},
"east": {"uv": [2, 0, 14, 7], "texture": "#3"},
"south": {"uv": [0, 0, 1, 6], "texture": "#missing"},
"west": {"uv": [2, 0, 14, 7], "texture": "#3"},
"up": {"uv": [0, 2, 2, 14], "texture": "#2"},
"down": {"uv": [0, 2, 2, 16], "texture": "#4"}
}
},
{
"from": [14, -5, 2],
"to": [16, 2, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 1, 5], "texture": "#missing"},
"east": {"uv": [2, 0, 14, 7], "texture": "#3"},
"south": {"uv": [0, 0, 1, 5], "texture": "#missing"},
"west": {"uv": [2, 0, 14, 7], "texture": "#3"},
"up": {"uv": [14, 2, 16, 14], "texture": "#2"},
"down": {"uv": [14, 2, 16, 14], "texture": "#4"}
}
},
{
"from": [3, -4, 2],
"to": [6, -1, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"east": {"uv": [0, 0, 12, 3], "texture": "#5"},
"south": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"west": {"uv": [0, 0, 12, 3], "texture": "#5"},
"up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#5"},
"down": {"uv": [0, 0, 3, 12], "texture": "#missing"}
}
},
{
"from": [10, -4, 2],
"to": [13, -1, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"east": {"uv": [0, 0, 12, 3], "texture": "#5"},
"south": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"west": {"uv": [0, 0, 12, 3], "texture": "#5"},
"up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#5"},
"down": {"uv": [0, 0, 3, 12], "texture": "#missing"}
}
},
{
"from": [2, -2, 3],
"to": [14, 1, 6],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [4, 1, 16, 4], "texture": "#5"},
"east": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"south": {"uv": [0, 0, 12, 3], "texture": "#5"},
"west": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"up": {"uv": [0, 1, 11, 4], "texture": "#5"},
"down": {"uv": [0, 0, 12, 3], "texture": "#missing"}
}
},
{
"from": [2, -2, 10],
"to": [14, 1, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [1, 0, 13, 3], "texture": "#5"},
"east": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"south": {"uv": [4, 1, 16, 4], "texture": "#5"},
"west": {"uv": [0, 0, 3, 3], "texture": "#missing"},
"up": {"uv": [0, 1, 11, 4], "texture": "#5"},
"down": {"uv": [0, 0, 12, 3], "texture": "#missing"}
}
},
{
"from": [1, 2, -0.41421],
"to": [1, 14, 2.58579],
"rotation": {"angle": -45, "axis": "y", "origin": [1, -5, 1]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [1, 2, -0.41421],
"to": [1, 14, 2.58579],
"rotation": {"angle": 45, "axis": "y", "origin": [1, -5, 1]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [15, 2, -0.41421],
"to": [15, 14, 2.58579],
"rotation": {"angle": 45, "axis": "y", "origin": [15, -6, 1]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [15, 2, -0.41421],
"to": [15, 14, 2.58579],
"rotation": {"angle": -45, "axis": "y", "origin": [15, -6, 1]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [15, 2, 13.58579],
"to": [15, 14, 16.58579],
"rotation": {"angle": -45, "axis": "y", "origin": [15, -5, 15]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [15, 2, 13.58579],
"to": [15, 14, 16.58579],
"rotation": {"angle": 45, "axis": "y", "origin": [15, -5, 15]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [1, 2, 13.58579],
"to": [1, 14, 16.58579],
"rotation": {"angle": 45, "axis": "y", "origin": [1, -6, 15]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [0, 4, 3, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [0, 4, 3, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [1, 2, 13.58579],
"to": [1, 14, 16.58579],
"rotation": {"angle": -45, "axis": "y", "origin": [1, -6, 15]},
"faces": {
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [3, 4, 6, 16], "texture": "#7"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [3, 4, 6, 16], "texture": "#7"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"from": [0, 14, 0],
"to": [16, 16, 2],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 2], "texture": "#3"},
"east": {"uv": [0, 0, 2, 2], "texture": "#3"},
"south": {"uv": [0, 0, 16, 2], "texture": "#3"},
"west": {"uv": [14, 0, 16, 2], "texture": "#3"},
"up": {"uv": [0, 0, 16, 2], "texture": "#2"},
"down": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"}
}
},
{
"from": [0, 14, 14],
"to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 2], "texture": "#3"},
"east": {"uv": [14, 0, 16, 2], "texture": "#3"},
"south": {"uv": [0, 0, 16, 2], "texture": "#3"},
"west": {"uv": [0, 0, 2, 2], "texture": "#3"},
"up": {"uv": [0, 14, 16, 16], "texture": "#2"},
"down": {"uv": [0, 0, 16, 2], "texture": "#4"}
}
},
{
"from": [0, 14, 2],
"to": [2, 16, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 2, 2], "texture": "#missing"},
"east": {"uv": [2, 0, 14, 2], "texture": "#3"},
"south": {"uv": [0, 0, 2, 2], "texture": "#missing"},
"west": {"uv": [2, 0, 14, 2], "texture": "#3"},
"up": {"uv": [0, 2, 2, 14], "texture": "#2"},
"down": {"uv": [0, 2, 2, 14], "texture": "#4"}
}
},
{
"from": [14, 14, 2],
"to": [16, 16, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -5, 0]},
"faces": {
"north": {"uv": [0, 0, 2, 2], "texture": "#missing"},
"east": {"uv": [2, 0, 14, 2], "texture": "#3"},
"south": {"uv": [0, 0, 2, 2], "texture": "#missing"},
"west": {"uv": [2, 0, 14, 2], "texture": "#3"},
"up": {"uv": [14, 2, 16, 14], "texture": "#2"},
"down": {"uv": [14, 2, 16, 14], "texture": "#4"}
}
},
{
"from": [-1, 14.001, 7],
"to": [17, 15.999, 9],
"rotation": {"angle": -45, "axis": "y", "origin": [8, -5, 8]},
"faces": {
"north": {"uv": [0, 4, 16, 6], "texture": "#3"},
"east": {"uv": [14, 4, 16, 6], "texture": "#3"},
"south": {"uv": [0, 4, 16, 6], "texture": "#3"},
"west": {"uv": [0, 4, 2, 6], "texture": "#3"},
"up": {"uv": [0, 4, 16, 6], "texture": "#3"},
"down": {"uv": [0, 4, 16, 6], "texture": "#3"}
}
},
{
"from": [-1, 14.002, 7],
"to": [17, 15.998, 9],
"rotation": {"angle": 45, "axis": "y", "origin": [8, -5, 8]},
"faces": {
"north": {"uv": [0, 4, 16, 6], "texture": "#3"},
"east": {"uv": [14, 4, 16, 6], "texture": "#3"},
"south": {"uv": [0, 4, 16, 6], "texture": "#3"},
"west": {"uv": [0, 4, 2, 6], "texture": "#3"},
"up": {"uv": [0, 4, 16, 6], "texture": "#3"},
"down": {"uv": [0, 4, 16, 6], "texture": "#3"}
}
}
],
"display": {
"thirdperson_righthand": {
"translation": [0, 1.5, -1],
"scale": [0.3, 0.3, 0.3]
},
"thirdperson_lefthand": {
"translation": [0, 1.5, -1],
"scale": [0.3, 0.3, 0.3]
},
"firstperson_righthand": {
"scale": [0.6, 0.6, 0.6]
},
"firstperson_lefthand": {
"scale": [0.6, 0.6, 0.6]
},
"ground": {
"scale": [0.3, 0.3, 0.3]
},
"gui": {
"rotation": [30, 45, 0],
"translation": [0, 1, 0],
"scale": [0.5, 0.5, 0.5]
},
"fixed": {
"translation": [0, 1.75, 0],
"scale": [0.6, 0.6, 0.6]
}
},
"groups": [
{
"name": "cup",
"origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2, 3, 4]
},
{
"name": "wood",
"origin": [0, 0, 0],
"color": 0,
"children": [5, 6, 7, 8]
},
{
"name": "chains",
"origin": [8, 8, 8],
"color": 0,
"children": [
{
"name": "NW",
"origin": [1, 0, 1],
"color": 0,
"children": [9, 10]
},
{
"name": "NE",
"origin": [15, -1, 1],
"color": 0,
"children": [11, 12]
},
{
"name": "SE",
"origin": [1, 0, 1],
"color": 0,
"children": [13, 14]
},
{
"name": "SW",
"origin": [15, -1, 1],
"color": 0,
"children": [15, 16]
}
]
},
{
"name": "frame",
"origin": [8, 8, 8],
"color": 0,
"children": [17, 18, 19, 20, 21, 22]
}
]
}

View File

@@ -0,0 +1,80 @@
{
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"1": "block/oak_planks",
"2": "hyperlighting:block/small_jack_o_lantern",
"3": "block/hay_block_top",
"particle": "block/hay_block_top"
},
"elements": [
{
"name": "Left Pumpkin",
"from": [8, 1, 2],
"to": [14, 7, 8],
"faces": {
"north": {"uv": [0, 0, 6, 6], "texture": "#2"},
"east": {"uv": [6, 0, 12, 6], "texture": "#2"},
"south": {"uv": [6, 0, 12, 6], "texture": "#2"},
"west": {"uv": [6, 0, 12, 6], "texture": "#2"},
"up": {"uv": [0, 6, 6, 12], "texture": "#2"},
"down": {"uv": [6, 6, 12, 12], "texture": "#2"}
}
},
{
"name": "Right Pumpkin",
"from": [2, 1, 6],
"to": [8, 7, 12],
"rotation": {"angle": 45, "axis": "y", "origin": [5, 0, 9]},
"faces": {
"north": {"uv": [0, 0, 6, 6], "texture": "#2"},
"east": {"uv": [6, 0, 12, 6], "texture": "#2"},
"south": {"uv": [6, 0, 12, 6], "texture": "#2"},
"west": {"uv": [6, 0, 12, 6], "texture": "#2"},
"up": {"uv": [0, 6, 6, 12], "texture": "#2"},
"down": {"uv": [6, 6, 12, 12], "texture": "#2"}
}
},
{
"name": "Top Pumpkin",
"from": [7, 7, 7],
"to": [13, 13, 13],
"rotation": {"angle": 22.5, "axis": "y", "origin": [10, 6, 10]},
"faces": {
"north": {"uv": [0, 0, 6, 6], "texture": "#2"},
"east": {"uv": [6, 0, 12, 6], "texture": "#2"},
"south": {"uv": [6, 0, 12, 6], "texture": "#2"},
"west": {"uv": [6, 0, 12, 6], "texture": "#2"},
"up": {"uv": [0, 6, 6, 12], "texture": "#2"},
"down": {"uv": [0, 6, 6, 12], "texture": "#2"}
}
},
{
"name": "Stand",
"from": [9, 1, 10],
"to": [12, 7, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 0, 10]},
"faces": {
"north": {"uv": [13, 3, 16, 9], "texture": "#1"},
"east": {"uv": [4, 3, 7, 9], "texture": "#1"},
"south": {"uv": [10, 3, 13, 9], "texture": "#1"},
"west": {"uv": [0, 3, 3, 9], "texture": "#1"},
"up": {"uv": [0, 0, 3, 3], "texture": "#1"},
"down": {"uv": [0, 0, 3, 3], "texture": "#1"}
}
},
{
"name": "Straw",
"from": [0, 0, 0],
"to": [16, 1, 16],
"faces": {
"north": {"uv": [0, 15, 16, 16], "texture": "#3"},
"east": {"uv": [0, 15, 16, 16], "texture": "#3"},
"south": {"uv": [0, 15, 16, 16], "texture": "#3"},
"west": {"uv": [0, 15, 16, 16], "texture": "#3"},
"up": {"uv": [0, 0, 16, 16], "texture": "#3"},
"down": {"uv": [0, 0, 16, 16], "texture": "#3"}
}
}
]
}

View File

@@ -0,0 +1,80 @@
{
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"1": "block/oak_planks",
"2": "hyperlighting:block/small_carved_pumpkin",
"3": "block/hay_block_top",
"particle": "block/hay_block_top"
},
"elements": [
{
"name": "Left Pumpkin",
"from": [8, 1, 2],
"to": [14, 7, 8],
"faces": {
"north": {"uv": [0, 0, 6, 6], "texture": "#2"},
"east": {"uv": [6, 0, 12, 6], "texture": "#2"},
"south": {"uv": [6, 0, 12, 6], "texture": "#2"},
"west": {"uv": [6, 0, 12, 6], "texture": "#2"},
"up": {"uv": [0, 6, 6, 12], "texture": "#2"},
"down": {"uv": [6, 6, 12, 12], "texture": "#2"}
}
},
{
"name": "Right Pumpkin",
"from": [2, 1, 6],
"to": [8, 7, 12],
"rotation": {"angle": 45, "axis": "y", "origin": [5, 0, 9]},
"faces": {
"north": {"uv": [0, 0, 6, 6], "texture": "#2"},
"east": {"uv": [6, 0, 12, 6], "texture": "#2"},
"south": {"uv": [6, 0, 12, 6], "texture": "#2"},
"west": {"uv": [6, 0, 12, 6], "texture": "#2"},
"up": {"uv": [0, 6, 6, 12], "texture": "#2"},
"down": {"uv": [6, 6, 12, 12], "texture": "#2"}
}
},
{
"name": "Top Pumpkin",
"from": [7, 7, 7],
"to": [13, 13, 13],
"rotation": {"angle": 22.5, "axis": "y", "origin": [10, 6, 10]},
"faces": {
"north": {"uv": [0, 0, 6, 6], "texture": "#2"},
"east": {"uv": [6, 0, 12, 6], "texture": "#2"},
"south": {"uv": [6, 0, 12, 6], "texture": "#2"},
"west": {"uv": [6, 0, 12, 6], "texture": "#2"},
"up": {"uv": [0, 6, 6, 12], "texture": "#2"},
"down": {"uv": [0, 6, 6, 12], "texture": "#2"}
}
},
{
"name": "Stand",
"from": [9, 1, 10],
"to": [12, 7, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 0, 10]},
"faces": {
"north": {"uv": [13, 3, 16, 9], "texture": "#1"},
"east": {"uv": [4, 3, 7, 9], "texture": "#1"},
"south": {"uv": [10, 3, 13, 9], "texture": "#1"},
"west": {"uv": [0, 3, 3, 9], "texture": "#1"},
"up": {"uv": [0, 0, 3, 3], "texture": "#1"},
"down": {"uv": [0, 0, 3, 3], "texture": "#1"}
}
},
{
"name": "Straw",
"from": [0, 0, 0],
"to": [16, 1, 16],
"faces": {
"north": {"uv": [0, 15, 16, 16], "texture": "#3"},
"east": {"uv": [0, 15, 16, 16], "texture": "#3"},
"south": {"uv": [0, 15, 16, 16], "texture": "#3"},
"west": {"uv": [0, 15, 16, 16], "texture": "#3"},
"up": {"uv": [0, 0, 16, 16], "texture": "#3"},
"down": {"uv": [0, 0, 16, 16], "texture": "#3"}
}
}
]
}

Some files were not shown because too many files have changed in this diff Show More