firstdarkdev/Hyper-Lighting2
1
0
Fork 0
Code Issues 1 Pull Requests Activity

Port to 1.19.4

Browse Source
This commit is contained in:
HypherionSA
2023-03-19 14:35:24 +02:00
parent c0dbe967f3
commit 0e633eef04
37 changed files with 120 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/build.gradle
View File

@@ -25,7 +25,7 @@ minecraft {
dependencies {
compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5'
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 {

4
Common/src/main/java/me/hypherionmc/hyperlighting/client/config/HyperLightingClientConfig.java
View File

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

14
Common/src/main/java/me/hypherionmc/hyperlighting/client/renderer/blockentity/AdvancedCampfireRenderer.java
View File

@@ -1,16 +1,16 @@
package me.hypherionmc.hyperlighting.client.renderer.blockentity;
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.blocks.AdvancedCampfire;
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.BlockEntityRendererProvider;
import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.core.Direction;
import net.minecraft.core.NonNullList;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
/**
@@ -33,17 +33,17 @@ public class AdvancedCampfireRenderer implements BlockEntityRenderer<AdvancedCam
int blockPos = (int)campfire.getBlockPos().asLong();
for(int i = 0; i < items.size(); ++i) {
ItemStack $$10 = items.get(i);
if ($$10 != ItemStack.EMPTY) {
ItemStack stack = items.get(i);
if (stack != ItemStack.EMPTY) {
poseStack.pushPose();
poseStack.translate(0.5, 0.44921875, 0.5);
Direction direction1 = Direction.from2DDataValue((i + direction.get2DDataValue()) % 4);
float rot = -direction1.toYRot();
poseStack.mulPose(Vector3f.YP.rotationDegrees(rot));
poseStack.mulPose(Vector3f.XP.rotationDegrees(90.0F));
poseStack.mulPose(Axis.YP.rotationDegrees(rot));
poseStack.mulPose(Axis.XP.rotationDegrees(90.0F));
poseStack.translate(-0.3125, -0.3125, 0.0);
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();
}
}

14
Common/src/main/java/me/hypherionmc/hyperlighting/common/blockentities/AdvancedCampfireBlockEntity.java
View File

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

8
Common/src/main/java/me/hypherionmc/hyperlighting/common/blockentities/BatteryNeonBlockEntity.java
View File

@@ -1,10 +1,10 @@
package me.hypherionmc.hyperlighting.common.blockentities;
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.systems.SimpleInventory;
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.init.HLBlockEntities;
import me.hypherionmc.hyperlighting.common.items.WirelessBattery;
@@ -131,8 +131,8 @@ public class BatteryNeonBlockEntity extends CraterBlockEntity implements ITickab
}
@Override
public <T> Optional<T> getForgeCapability(ForgeCapability capability, Direction side) {
if (capability == ForgeCapability.ENERGY && side == null) {
public <T> Optional<T> getCapability(CapabilityHandler capability, Direction side) {
if (capability == CapabilityHandler.ENERGY && side == null) {
return (Optional<T>) Optional.of(energyStorage);
}
return Optional.empty();

6
Common/src/main/java/me/hypherionmc/hyperlighting/common/blockentities/SolarPanelBlockEntity.java
View File

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

9
Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedCampfire.java
View File

@@ -1,8 +1,10 @@
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.DyableBlock;
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.RenderUtils;
import me.hypherionmc.hyperlighting.api.LightableBlock;
@@ -27,7 +29,6 @@ import net.minecraft.util.RandomSource;
import net.minecraft.world.Containers;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
@@ -80,7 +81,7 @@ public class AdvancedCampfire extends BaseEntityBlock implements DyableBlock, Li
private DyeColor color;
public AdvancedCampfire(String name, DyeColor color, CreativeModeTab tab) {
public AdvancedCampfire(String name, DyeColor color, CraterCreativeModeTab tab) {
super(Properties.of(
Material.WOOD,
MaterialColor.COLOR_BROWN)
@@ -94,7 +95,7 @@ public class AdvancedCampfire extends BaseEntityBlock implements DyableBlock, Li
this.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
@@ -145,7 +146,7 @@ public class AdvancedCampfire extends BaseEntityBlock implements DyableBlock, Li
@Override
public void entityInside(BlockState blockState, Level level, BlockPos blockPos, Entity 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);
}

7
Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedCandleBlock.java
View File

@@ -2,8 +2,10 @@ package me.hypherionmc.hyperlighting.common.blocks;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import me.hypherionmc.craterlib.api.inventory.CraterCreativeModeTab;
import me.hypherionmc.craterlib.api.rendering.DyableBlock;
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.RenderUtils;
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.VoxelShape;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Map;
@@ -69,12 +72,12 @@ public class AdvancedCandleBlock extends HorizontalDirectionalBlock implements D
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)));
this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(LIT, CommonRegistration.config.candleConfig.litByDefault).setValue(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

7
Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedLanternBlock.java
View File

@@ -1,8 +1,10 @@
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.DyableBlock;
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.MathUtils;
import me.hypherionmc.craterlib.util.RenderUtils;
@@ -68,7 +70,7 @@ public class AdvancedLanternBlock extends FaceAttachedHorizontalDirectionalBlock
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)
.instabreak()
.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.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

6
Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedTorchBlock.java
View File

@@ -2,8 +2,10 @@ package me.hypherionmc.hyperlighting.common.blocks;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import me.hypherionmc.craterlib.api.inventory.CraterCreativeModeTab;
import me.hypherionmc.craterlib.api.rendering.DyableBlock;
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.RenderUtils;
import me.hypherionmc.hyperlighting.api.LightableBlock;
@@ -70,12 +72,12 @@ public class AdvancedTorchBlock extends HorizontalDirectionalBlock implements Dy
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)));
this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(LIT, CommonRegistration.config.torchConfig.litByDefault).setValue(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

9
Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/BatteryNeon.java
View File

@@ -2,8 +2,8 @@ package me.hypherionmc.hyperlighting.common.blocks;
import me.hypherionmc.craterlib.api.rendering.DyableBlock;
import me.hypherionmc.craterlib.common.item.BlockItemDyable;
import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry;
import me.hypherionmc.craterlib.util.BlockStateUtils;
import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.blockentities.BatteryNeonBlockEntity;
import me.hypherionmc.hyperlighting.common.init.CommonRegistration;
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.InteractionResult;
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.level.BlockGetter;
import net.minecraft.world.level.Level;
@@ -64,7 +67,7 @@ public class BatteryNeon extends BaseEntityBlock implements DyableBlock {
super(Properties.of(Material.GLASS).sound(SoundType.GLASS).lightLevel(BlockStateUtils.createLightLevelFromLitBlockState(14)));
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

5
Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/SolarPanel.java
View File

@@ -1,10 +1,11 @@
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.init.CommonRegistration;
import me.hypherionmc.hyperlighting.common.init.HLItems;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
@@ -32,7 +33,7 @@ public class SolarPanel extends BaseEntityBlock {
public SolarPanel(String name) {
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

2
Common/src/main/java/me/hypherionmc/hyperlighting/common/containers/BatteryNeonContainer.java
View File

@@ -1,6 +1,5 @@
package me.hypherionmc.hyperlighting.common.containers;
import me.hypherionmc.craterlib.systems.SimpleInventory;
import me.hypherionmc.hyperlighting.common.blockentities.BatteryNeonBlockEntity;
import me.hypherionmc.hyperlighting.common.init.HLContainers;
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.Player;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.SimpleContainerData;
import net.minecraft.world.inventory.Slot;
import net.minecraft.world.item.DyeItem;
import net.minecraft.world.item.ItemStack;

8
Common/src/main/java/me/hypherionmc/hyperlighting/common/init/CommonRegistration.java
View File

@@ -1,11 +1,11 @@
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.platform.Platform;
import me.hypherionmc.hyperlighting.client.config.HyperLightingClientConfig;
import me.hypherionmc.hyperlighting.integration.HyperLightingIntegrations;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;
import static me.hypherionmc.hyperlighting.Constants.MOD_ID;
@@ -13,8 +13,8 @@ import static me.hypherionmc.hyperlighting.Constants.MOD_ID;
public class CommonRegistration {
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 CreativeModeTab MACHINES_TAB = CreativeTabBuilder.builder(MOD_ID, "machines").setIcon(() -> new ItemStack(HLBlocks.ADVANCED_TORCH)).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 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);

4
Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLBlockEntities.java
View File

@@ -6,7 +6,7 @@ import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.blockentities.AdvancedCampfireBlockEntity;
import me.hypherionmc.hyperlighting.common.blockentities.BatteryNeonBlockEntity;
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;
/**
@@ -15,7 +15,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
*/
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));

4
Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLBlocks.java
View File

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

4
Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLContainers.java
View File

@@ -5,7 +5,7 @@ import me.hypherionmc.craterlib.systems.reg.RegistrationProvider;
import me.hypherionmc.craterlib.systems.reg.RegistryObject;
import me.hypherionmc.hyperlighting.Constants;
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.MenuType;
@@ -15,7 +15,7 @@ import net.minecraft.world.inventory.MenuType;
*/
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));

4
Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLEntities.java
View File

@@ -4,7 +4,7 @@ import me.hypherionmc.craterlib.systems.reg.RegistrationProvider;
import me.hypherionmc.craterlib.systems.reg.RegistryObject;
import me.hypherionmc.hyperlighting.Constants;
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.MobCategory;
@@ -14,7 +14,7 @@ import net.minecraft.world.entity.MobCategory;
*/
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)
.sized(1f, 1f)

4
Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLItems.java
View File

@@ -6,13 +6,13 @@ import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.items.CandleInAJar;
import me.hypherionmc.hyperlighting.common.items.LighterTool;
import me.hypherionmc.hyperlighting.common.items.WirelessBattery;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.item.Item;
import java.util.function.Supplier;
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 */
public static RegistryObject<Item> TORCH_TOOL = register("lighter_tool", LighterTool::new);

4
Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLParticles.java
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.RegistryObject;
import me.hypherionmc.hyperlighting.Constants;
import net.minecraft.core.Registry;
import net.minecraft.core.particles.ParticleType;
import net.minecraft.core.registries.BuiltInRegistries;
import java.util.function.Supplier;
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) {
return PARTICLES.register(name, particle);

6
Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLSounds.java
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.RegistryObject;
import me.hypherionmc.hyperlighting.Constants;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.sounds.SoundEvent;
/**
@@ -12,13 +12,13 @@ import net.minecraft.sounds.SoundEvent;
*/
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> createSound(String 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() {}

9
Common/src/main/java/me/hypherionmc/hyperlighting/common/items/CandleInAJar.java
View File

@@ -1,7 +1,9 @@
package me.hypherionmc.hyperlighting.common.items;
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.HLItems;
import net.minecraft.world.item.Item;
/**
@@ -10,10 +12,13 @@ import net.minecraft.world.item.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() {
super(Platform.LOADER.isModLoaded("shimmer") ? shimmerLoaded : new Properties());
super(new Properties().stacksTo(1));
if (Platform.LOADER.isModLoaded("shimmer")) {
CreativeTabRegistry.setCreativeTab(CommonRegistration.LIGHTS_TAB, HLItems.CANDLE_IN_A_JAR);
}
}
}

5
Common/src/main/java/me/hypherionmc/hyperlighting/common/items/LighterTool.java
View File

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

5
Common/src/main/java/me/hypherionmc/hyperlighting/common/items/WirelessBattery.java
View File

@@ -1,8 +1,10 @@
package me.hypherionmc.hyperlighting.common.items;
import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry;
import me.hypherionmc.hyperlighting.api.SwitchModule;
import me.hypherionmc.hyperlighting.common.blocks.SolarPanel;
import me.hypherionmc.hyperlighting.common.init.CommonRegistration;
import me.hypherionmc.hyperlighting.common.init.HLItems;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtUtils;
@@ -22,7 +24,8 @@ import net.minecraft.world.level.Level;
public class WirelessBattery extends Item implements SwitchModule {
public WirelessBattery() {
super(new Properties().tab(CommonRegistration.MACHINES_TAB).stacksTo(1));
super(new Properties().stacksTo(1));
CreativeTabRegistry.setCreativeTab(CommonRegistration.MACHINES_TAB, HLItems.WIRELESS_BATTERY);
}
@Override

23
Common/src/main/java/me/hypherionmc/hyperlighting/integration/shimmer/HyperLightingShimmer.java
View File

@@ -1,18 +1,5 @@
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
* @date 07/08/2022
@@ -25,14 +12,14 @@ public class HyperLightingShimmer {
}
private static void registerItems() {
LightManager.INSTANCE.registerItemLight(HLBlocks.ADVANCED_TORCH.asItem(), stack -> new ColorPointLight.Template(stack.getCount() / 10 + 6, RenderUtils.alphaColorFromDye(((BlockItemDyable)stack.getItem()).getColor(stack), 1f)));
LightManager.INSTANCE.registerItemLight(HLBlocks.ADVANCED_LANTERN.asItem(), stack -> new ColorPointLight.Template(stack.getCount() / 10 + 6, RenderUtils.alphaColorFromDye(((BlockItemDyable)stack.getItem()).getColor(stack), 1f)));
//LightManager.INSTANCE.registerItemLight(HLBlocks.ADVANCED_TORCH.asItem(), stack -> new ColorPointLight.Template(stack.getCount() / 10 + 6, RenderUtils.alphaColorFromDye(((BlockItemDyable)stack.getItem()).getColor(stack), 1f)));
//LightManager.INSTANCE.registerItemLight(HLBlocks.ADVANCED_LANTERN.asItem(), stack -> new ColorPointLight.Template(stack.getCount() / 10 + 6, RenderUtils.alphaColorFromDye(((BlockItemDyable)stack.getItem()).getColor(stack), 1f)));
LightManager.INSTANCE.registerItemLight(HLItems.CANDLE_IN_A_JAR.get(), stack -> new ColorPointLight.Template(10, RenderUtils.alphaColorFromDye(DyeColor.WHITE, 1f)));
//LightManager.INSTANCE.registerItemLight(HLItems.CANDLE_IN_A_JAR.get(), stack -> new ColorPointLight.Template(10, RenderUtils.alphaColorFromDye(DyeColor.WHITE, 1f)));
}
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) {
DyeColor color = state.getValue(AdvancedTorchBlock.COLOR);
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 null;
});
});*/
}
}

20
Common/src/main/java/me/hypherionmc/hyperlighting/mixin/access/MenuTypeAccess.java
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!");
}
}

1
Common/src/main/resources/hyperlighting.mixins.json
View File

@@ -4,7 +4,6 @@
"package": "me.hypherionmc.hyperlighting.mixin",
"compatibilityLevel": "JAVA_17",
"mixins": [
"access.MenuTypeAccess"
],
"client": [
"access.MenuScreensAccess"

8
Fabric/build.gradle
View File

@@ -33,12 +33,12 @@ dependencies {
implementation 'org.joml:joml:1.10.4'*/
// Shimmer
modImplementation ("com.lowdragmc.shimmer:Shimmer-fabric-1.19.1:${shimmer_version}") {
/*modImplementation ("com.lowdragmc.shimmer:Shimmer-fabric-1.19.1:${shimmer_version}") {
exclude(group: "net.fabricmc.fabric-api")
}
}*/
// The One Probe Fabric
modCompileOnly("mcjty.theoneprobe:theoneprobe-fabric:${top_fabric}")
//modCompileOnly("mcjty.theoneprobe:theoneprobe-fabric:${top_fabric}")
// WTHIT
// compile against the API
@@ -46,7 +46,7 @@ dependencies {
// run against the full jar
modRuntimeOnly "mcp.mobius.waila:wthit:fabric-${wthitVersion}"
modRuntimeOnly "lol.bai:badpackets:fabric-0.2.0"
modRuntimeOnly "lol.bai:badpackets:fabric-0.4.1"
}
loom {

9
Fabric/src/main/java/me/hypherionmc/hyperlighting/common/integration/top/TOPIntegration.java
View File

@@ -1,15 +1,10 @@
package me.hypherionmc.hyperlighting.common.integration.top;
import mcjty.theoneprobe.api.IProbeConfig;
import mcjty.theoneprobe.api.ITheOneProbe;
import mcjty.theoneprobe.api.ITheOneProbePlugin;
import me.hypherionmc.hyperlighting.common.integration.top.overrides.TOPCampfireInfoProvider;
/**
* @author HypherionSA
* @date 27/08/2022
*/
public class TOPIntegration implements ITheOneProbePlugin {
/*public class TOPIntegration implements ITheOneProbePlugin {
private static ITheOneProbe theOneProbe;
@@ -23,4 +18,4 @@ public class TOPIntegration implements ITheOneProbePlugin {
public static IProbeConfig getProbeConfig() {
return theOneProbe.createProbeConfig();
}
}
}*/

18
Fabric/src/main/java/me/hypherionmc/hyperlighting/common/integration/top/overrides/TOPCampfireInfoProvider.java
View File

@@ -1,24 +1,10 @@
package me.hypherionmc.hyperlighting.common.integration.top.overrides;
import mcjty.theoneprobe.api.*;
import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.blockentities.AdvancedCampfireBlockEntity;
import me.hypherionmc.hyperlighting.common.integration.top.TOPIntegration;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
import static mcjty.theoneprobe.api.IProbeConfig.ConfigMode.EXTENDED;
import static mcjty.theoneprobe.api.IProbeConfig.ConfigMode.NORMAL;
import static mcjty.theoneprobe.api.TextStyleClass.MODNAME;
/**
* @author HypherionSA
* @date 27/08/2022
*/
public class TOPCampfireInfoProvider implements IBlockDisplayOverride {
/*public class TOPCampfireInfoProvider implements IBlockDisplayOverride {
@Override
public boolean overrideStandardInfo(ProbeMode probeMode, IProbeInfo iProbeInfo, Player playerEntity, Level world, BlockState blockState, IProbeHitData iProbeHitData) {
@@ -57,4 +43,4 @@ public class TOPCampfireInfoProvider implements IBlockDisplayOverride {
private boolean show(ProbeMode mode, IProbeConfig.ConfigMode cfg) {
return cfg == NORMAL || (cfg == EXTENDED && mode == ProbeMode.EXTENDED);
}
}
}*/

4
Fabric/src/main/resources/fabric.mod.json
View File

@@ -36,9 +36,9 @@
"depends": {
"fabricloader": ">=0.14",
"fabric": "*",
"minecraft": "1.19.2",
"minecraft": ">=1.19.4",
"java": ">=17",
"craterlib": "*"
"craterlib": "0.0.x"
},
"custom": {
"waila:plugins": {

2
Forge/build.gradle
View File

@@ -89,7 +89,7 @@ dependencies {
//implementation fg.deobf("curse.maven:rubidium-574856:${ribidium_version}")
// Shimmer
implementation fg.deobf("com.lowdragmc.shimmer:Shimmer-forge-1.19.1:${shimmer_version}")
//implementation fg.deobf("com.lowdragmc.shimmer:Shimmer-forge-1.19.1:${shimmer_version}")
// The One Probe
//implementation "mcjty.theoneprobe:theoneprobe:${top_version}:api"

2
Forge/src/main/java/me/hypherionmc/hyperlighting/datagen/DataGenerators.java
View File

@@ -16,7 +16,7 @@ public class DataGenerators {
public static void gatherData(GatherDataEvent event) {
System.out.println("Running Datagen");
DataGenerator generator = event.getGenerator();
generator.addProvider(event.includeServer(), new RecipeGenerator(generator));
//generator.addProvider(event.includeServer(), new RecipeGenerator(generator));
}
}

14
Forge/src/main/java/me/hypherionmc/hyperlighting/datagen/RecipeGenerator.java
View File

@@ -1,20 +1,10 @@
package me.hypherionmc.hyperlighting.datagen;
import me.hypherionmc.hyperlighting.common.init.HLBlocks;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.recipes.FinishedRecipe;
import net.minecraft.data.recipes.RecipeProvider;
import net.minecraft.data.recipes.ShapedRecipeBuilder;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.Items;
import java.util.function.Consumer;
/**
* @author HypherionSA
* @date 04/08/2022
*/
public class RecipeGenerator extends RecipeProvider {
/*public class RecipeGenerator extends RecipeProvider {
public RecipeGenerator(DataGenerator generator) {
super(generator);
@@ -34,4 +24,4 @@ public class RecipeGenerator extends RecipeProvider {
.save(consumer);
}
}
}*/

6
Forge/src/main/resources/META-INF/mods.toml
View File

@@ -1,5 +1,5 @@
modLoader="javafml"
loaderVersion="[43,)"
loaderVersion="[45,)"
license="MIT"
#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/"
@@ -19,14 +19,14 @@ Not your average Lighting & Decoration Mods
[[dependencies.hyperlighting]]
modId="forge"
mandatory=true
versionRange="[43,)"
versionRange="[45,)"
ordering="NONE"
side="BOTH"
[[dependencies.hyperlighting]]
modId="minecraft"
mandatory=true
versionRange="[1.19.2,1.20)"
versionRange="[1.19.4,1.20)"
ordering="NONE"
side="BOTH"

2
README.md
View File

@@ -6,4 +6,4 @@ Not your average Minecraft Lighting mod!
***
#### Requires [CraterLib](https://github.com/hypherionmc/CraterLib)
#### Requires [CraterLib](https://github.com/firstdarkdev/CraterLib)

20
gradle.properties
View File

@@ -5,17 +5,17 @@ version_patch=1
group=me.hypherionmc.hyperlighting
# Common
minecraft_version=1.19.2
minecraft_version=1.19.4
common_runs_enabled=false
common_client_run_name=Common Client
common_server_run_name=Common Server
# Forge
forge_version=43.1.25
forge_version=45.0.9
forge_ats_enabled=true
# Fabric
fabric_version=0.61.0+1.19.2
fabric_version=0.76.0+1.19.4
fabric_loader_version=0.14.9
# Mod options
@@ -28,11 +28,11 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
#dependencies
craterlib_version=0.0.5d
mod_menu_version=4.0.6
shimmer_version=0.1.12
sodium_version=3957319
ribidium_version=3973894
top_version=1.19-6.2.0-6
craterlib_version=0.0.3d
mod_menu_version=6.1.0-rc.4
//shimmer_version=0.1.12
//sodium_version=3957319
//ribidium_version=3973894
top_version=1.19.4-8.0.0
top_fabric=1.19-6.0.0
wthitVersion=5.12.0
wthitVersion=7.1.1