[update] Experience Lantern

MarbleGateKeeper · MarbleGateKeeper · commit d8b093e62e02 · 2025-04-30T00:56:23.000+08:00
diff --git a/src/generated/resources/assets/create_enchantment_industry/blockstates/experience_lantern.json b/src/generated/resources/assets/create_enchantment_industry/blockstates/experience_lantern.json
@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "create_enchantment_industry:block/experience_lantern",
+      "x": 180
+    },
+    "facing=east": {
+      "model": "create_enchantment_industry:block/experience_lantern",
+      "x": 90,
+      "y": 90
+    },
+    "facing=north": {
+      "model": "create_enchantment_industry:block/experience_lantern",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "create_enchantment_industry:block/experience_lantern",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up": {
+      "model": "create_enchantment_industry:block/experience_lantern"
+    },
+    "facing=west": {
+      "model": "create_enchantment_industry:block/experience_lantern",
+      "x": 90,
+      "y": 270
+    }
+  }
+}
diff --git a/src/generated/resources/assets/create_enchantment_industry/lang/de_de.json b/src/generated/resources/assets/create_enchantment_industry/lang/de_de.json
@@ -62,6 +62,7 @@
   "block.create_enchantment_industry.blaze_forger": "Lohen-Schmied",
   "block.create_enchantment_industry.experience": "Flüssige Erfahrung",
   "block.create_enchantment_industry.experience_hatch": "Erfahrungsluke",
+  "block.create_enchantment_industry.experience_lantern": "Experience Lantern",
   "block.create_enchantment_industry.grindstone_drain": "Schleifsteinabfluss",
   "block.create_enchantment_industry.mechanical_grindstone": "Mechanischer Schleifstein",
   "block.create_enchantment_industry.printer": "Drucker",
diff --git a/src/generated/resources/assets/create_enchantment_industry/lang/en_ud.json b/src/generated/resources/assets/create_enchantment_industry/lang/en_ud.json
@@ -61,6 +61,7 @@
   "block.create_enchantment_industry.blaze_forger": "ɹǝbɹoℲ ǝzɐןᗺ",
   "block.create_enchantment_industry.experience": "ǝɔuǝıɹǝdxƎ pınbıꞀ",
   "block.create_enchantment_industry.experience_hatch": "ɥɔʇɐH ǝɔuǝıɹǝdxƎ",
+  "block.create_enchantment_industry.experience_lantern": "uɹǝʇuɐꞀ ǝɔuǝıɹǝdxƎ",
   "block.create_enchantment_industry.grindstone_drain": "uıɐɹᗡ ǝuoʇspuıɹ⅁",
   "block.create_enchantment_industry.mechanical_grindstone": "ǝuoʇspuıɹ⅁ ןɐɔıuɐɥɔǝW",
   "block.create_enchantment_industry.printer": "ɹǝʇuıɹԀ",
diff --git a/src/generated/resources/assets/create_enchantment_industry/lang/en_us.json b/src/generated/resources/assets/create_enchantment_industry/lang/en_us.json
@@ -61,6 +61,7 @@
   "block.create_enchantment_industry.blaze_forger": "Blaze Forger",
   "block.create_enchantment_industry.experience": "Liquid Experience",
   "block.create_enchantment_industry.experience_hatch": "Experience Hatch",
+  "block.create_enchantment_industry.experience_lantern": "Experience Lantern",
   "block.create_enchantment_industry.grindstone_drain": "Grindstone Drain",
   "block.create_enchantment_industry.mechanical_grindstone": "Mechanical Grindstone",
   "block.create_enchantment_industry.printer": "Printer",
diff --git a/src/generated/resources/assets/create_enchantment_industry/lang/es_es.json b/src/generated/resources/assets/create_enchantment_industry/lang/es_es.json
@@ -62,6 +62,7 @@
   "block.create_enchantment_industry.blaze_forger": "Forjador de Blaze",
   "block.create_enchantment_industry.experience": "Experiencia Líquida",
   "block.create_enchantment_industry.experience_hatch": "Madriguera de Experiencia",
+  "block.create_enchantment_industry.experience_lantern": "Experience Lantern",
   "block.create_enchantment_industry.grindstone_drain": "Drenaje de Amoladora",
   "block.create_enchantment_industry.mechanical_grindstone": "Amoladora Mecánica",
   "block.create_enchantment_industry.printer": "Impresora",
diff --git a/src/generated/resources/assets/create_enchantment_industry/lang/es_mx.json b/src/generated/resources/assets/create_enchantment_industry/lang/es_mx.json
@@ -62,6 +62,7 @@
   "block.create_enchantment_industry.blaze_forger": "Forjador de Blaze",
   "block.create_enchantment_industry.experience": "Experiencia líquida",
   "block.create_enchantment_industry.experience_hatch": "Compuerta de experiencia",
+  "block.create_enchantment_industry.experience_lantern": "Experience Lantern",
   "block.create_enchantment_industry.grindstone_drain": "Drenador de muela",
   "block.create_enchantment_industry.mechanical_grindstone": "Muela mecánica",
   "block.create_enchantment_industry.printer": "Impresora",
diff --git a/src/generated/resources/assets/create_enchantment_industry/lang/ja_jp.json b/src/generated/resources/assets/create_enchantment_industry/lang/ja_jp.json
@@ -62,6 +62,7 @@
   "block.create_enchantment_industry.blaze_forger": "ブレイズフォージャー",
   "block.create_enchantment_industry.experience": "液体経験値",
   "block.create_enchantment_industry.experience_hatch": "経験値ハッチ",
+  "block.create_enchantment_industry.experience_lantern": "Experience Lantern",
   "block.create_enchantment_industry.grindstone_drain": "砥石排水口",
   "block.create_enchantment_industry.mechanical_grindstone": "メカニカル砥石",
   "block.create_enchantment_industry.printer": "印刷機",
diff --git a/src/generated/resources/assets/create_enchantment_industry/lang/ru_ru.json b/src/generated/resources/assets/create_enchantment_industry/lang/ru_ru.json
@@ -62,6 +62,7 @@
   "block.create_enchantment_industry.blaze_forger": "Всполох-кузнец",
   "block.create_enchantment_industry.experience": "Жидкий опыт",
   "block.create_enchantment_industry.experience_hatch": "Люк опыта",
+  "block.create_enchantment_industry.experience_lantern": "Experience Lantern",
   "block.create_enchantment_industry.grindstone_drain": "Осушитель точила",
   "block.create_enchantment_industry.mechanical_grindstone": "Механическое точило",
   "block.create_enchantment_industry.printer": "Принтер",
diff --git a/src/generated/resources/assets/create_enchantment_industry/lang/zh_cn.json b/src/generated/resources/assets/create_enchantment_industry/lang/zh_cn.json
@@ -1,4 +1,5 @@
 {
+  "_comment.unlocalized": "Remove this line after finishing localization.",
   "advancement.create_enchantment_industry.a_shower_experience": "沐浴“经验”",
   "advancement.create_enchantment_industry.a_shower_experience.desc": "打破管道，沐浴在经验之中\n§7（隐藏进度）",
   "advancement.create_enchantment_industry.assembly_aesthetics": "视觉产线",
@@ -61,6 +62,7 @@
   "block.create_enchantment_industry.blaze_forger": "烈焰人锻造室",
   "block.create_enchantment_industry.experience": "液态经验",
   "block.create_enchantment_industry.experience_hatch": "经验舱口",
+  "block.create_enchantment_industry.experience_lantern": "Experience Lantern",
   "block.create_enchantment_industry.grindstone_drain": "砂轮分液池",
   "block.create_enchantment_industry.mechanical_grindstone": "动力砂轮",
   "block.create_enchantment_industry.printer": "打印机",
diff --git a/src/generated/resources/assets/create_enchantment_industry/models/item/experience_lantern.json b/src/generated/resources/assets/create_enchantment_industry/models/item/experience_lantern.json
@@ -0,0 +1,3 @@
+{
+  "parent": "create_enchantment_industry:block/experience_lantern"
+}
diff --git a/src/generated/resources/data/create_enchantment_industry/loot_table/blocks/experience_lantern.json b/src/generated/resources/data/create_enchantment_industry/loot_table/blocks/experience_lantern.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "create_enchantment_industry:experience_lantern"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "create_enchantment_industry:blocks/experience_lantern"
+}
diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json
@@ -6,6 +6,7 @@
     "create_enchantment_industry:printer",
     "create_enchantment_industry:blaze_enchanter",
     "create_enchantment_industry:blaze_forger",
-    "create_enchantment_industry:super_experience_block"
+    "create_enchantment_industry:super_experience_block",
+    "create_enchantment_industry:experience_lantern"
   ]
 }
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/common/fluids/lantern/ExperienceLanternBlock.java b/src/main/java/plus/dragons/createenchantmentindustry/common/fluids/lantern/ExperienceLanternBlock.java
@@ -0,0 +1,72 @@
+package plus.dragons.createenchantmentindustry.common.fluids.lantern;
+
+import com.simibubi.create.foundation.block.IBE;
+import com.simibubi.create.foundation.block.WrenchableDirectionalBlock;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.block.state.properties.IntegerProperty;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import plus.dragons.createenchantmentindustry.common.registry.CEIBlockEntities;
+import plus.dragons.createenchantmentindustry.common.registry.CEIShapes;
+
+public class ExperienceLanternBlock extends WrenchableDirectionalBlock implements IBE<ExperienceLanternBlockEntity> {
+    public static final IntegerProperty LIGHT = IntegerProperty.create("light", 0, 15);
+
+    public ExperienceLanternBlock(Properties properties) {
+        super(properties);
+        this.registerDefaultState(this.stateDefinition.any().setValue(LIGHT, 0));
+    }
+
+    @Override
+    protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
+        super.createBlockStateDefinition(builder);
+        builder.add(LIGHT);
+    }
+
+    @Override
+    public void onRemove(BlockState pState, Level pLevel, BlockPos pPos, BlockState pNewState, boolean pMovedByPiston) {
+        IBE.onRemove(pState, pLevel, pPos, pNewState);
+    }
+
+    @Override
+    protected int getLightBlock(BlockState state, BlockGetter level, BlockPos pos) {
+        return super.getLightBlock(state, level, pos);
+    }
+
+    @Override
+    public Class<ExperienceLanternBlockEntity> getBlockEntityClass() {
+        return ExperienceLanternBlockEntity.class;
+    }
+
+    @Override
+    public BlockEntityType<? extends ExperienceLanternBlockEntity> getBlockEntityType() {
+        return CEIBlockEntities.EXPERIENCE_LANTERN.get();
+    }
+
+    @Override
+    public BlockState getStateForPlacement(BlockPlaceContext context) {
+        return defaultBlockState().setValue(FACING, context.getClickedFace());
+    }
+
+    @Override
+    public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext) {
+        return CEIShapes.LANTERN_SHAPE.get(pState.getValue(FACING));
+    }
+
+    @Override
+    public boolean hasDynamicLightEmission(BlockState state) {
+        return true;
+    }
+
+    @Override
+    public int getLightEmission(BlockState state, BlockGetter level, BlockPos pos) {
+        return state.getValue(LIGHT);
+    }
+}
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/common/fluids/lantern/ExperienceLanternBlockEntity.java b/src/main/java/plus/dragons/createenchantmentindustry/common/fluids/lantern/ExperienceLanternBlockEntity.java
@@ -0,0 +1,135 @@
+package plus.dragons.createenchantmentindustry.common.fluids.lantern;
+
+import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation;
+import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
+import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.ExperienceOrb;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.AABB;
+import net.neoforged.neoforge.capabilities.Capabilities;
+import net.neoforged.neoforge.fluids.FluidStack;
+import net.neoforged.neoforge.fluids.capability.IFluidHandler;
+import org.jetbrains.annotations.Nullable;
+import plus.dragons.createdragonsplus.common.fluids.tank.ConfigurableFluidTank;
+import plus.dragons.createdragonsplus.common.fluids.tank.FluidTankBehaviour;
+import plus.dragons.createenchantmentindustry.common.fluids.experience.ExperienceHelper;
+import plus.dragons.createenchantmentindustry.common.registry.CEIFluids;
+import plus.dragons.createenchantmentindustry.config.CEIConfig;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+
+import static net.minecraft.world.level.block.DirectionalBlock.FACING;
+
+public class ExperienceLanternBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation {
+    protected FluidTankBehaviour tanks;
+    protected AABB effectiveAABB;
+    protected int rate;
+
+    public ExperienceLanternBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
+        super(type, pos, state);
+        effectiveAABB = new AABB(getBlockPos()).inflate(0.5);
+        rate = CEIConfig.fluids().experienceLanternDrainRate.get();
+    }
+
+
+    protected ConfigurableFluidTank createTank(Consumer<FluidStack> fluidUpdateCallback) {
+        return new ConfigurableFluidTank(CEIConfig.fluids().experienceLanternFluidCapacity.get(), fluidUpdateCallback.andThen(this::onFluidStackChanged))
+                .allowInsertion(fluidStack -> fluidStack.is(CEIFluids.EXPERIENCE));
+    }
+
+
+    @Override
+    public void tick() {
+        super.tick();
+        if (!level.isClientSide && level.getGameTime() % 10 == 0) {
+            drainExp();
+        }
+    }
+
+    protected void drainExp() {
+        List<Player> players = level.getEntitiesOfClass(Player.class, effectiveAABB, player -> player.isAlive() && !player.isSpectator());
+        if (!players.isEmpty()) {
+            AtomicInteger sum = new AtomicInteger();
+            players.forEach(player -> {
+                var playerExp = ExperienceHelper.getExperienceForPlayer(player);
+                if (playerExp >= rate) sum.addAndGet(rate);
+                else if (playerExp != 0) sum.addAndGet(playerExp);
+            });
+            if (sum.get() != 0) {
+                var inserted = tanks.getPrimaryHandler().fill(new FluidStack(CEIFluids.EXPERIENCE, sum.get()), IFluidHandler.FluidAction.EXECUTE);
+                if (inserted != 0) {
+                    for (var player : players) {
+                        var total = ExperienceHelper.getExperienceForPlayer(player);
+                        if (inserted >= rate) {
+                            if (total >= rate) {
+                                player.giveExperiencePoints(-rate);
+                                inserted -= rate;
+                            } else if (total != 0) {
+                                inserted -= total;
+                                player.giveExperiencePoints(-total);
+                            }
+                        } else if (inserted > 0) {
+                            if (total >= inserted) {
+                                player.giveExperiencePoints(-inserted);
+                                inserted = 0;
+                            } else {
+                                inserted -= total;
+                                player.giveExperiencePoints(-total);
+                            }
+                        } else {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        List<ExperienceOrb> experienceOrbs = level.getEntitiesOfClass(ExperienceOrb.class, effectiveAABB);
+        if (!experienceOrbs.isEmpty()) {
+            for (var orb : experienceOrbs) {
+                var amount = orb.value;
+                var fluidStack = new FluidStack(CEIFluids.EXPERIENCE.get(), amount);
+                var inserted = tanks.getPrimaryHandler().fill(fluidStack, IFluidHandler.FluidAction.EXECUTE);
+                if (inserted == amount) {
+                    orb.remove(Entity.RemovalReason.DISCARDED);
+                } else {
+                    if (inserted != 0) {
+                        orb.value -= inserted;
+                    }
+                    break;
+                }
+            }
+        }
+    }
+
+
+    @Override
+    public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
+        tanks = new FluidTankBehaviour(this, this::createTank);
+        behaviours.add(tanks);
+    }
+
+    protected void onFluidStackChanged(FluidStack newFluidStack) {
+        int light = ((int) (((float) tanks.getPrimaryTank().tank.getFluid().getAmount() / tanks.getPrimaryTank().tank.getCapacity()) * 15f));
+        light = Math.min(Math.max(0, light),15);
+        level.setBlockAndUpdate(getBlockPos(),getBlockState().setValue(ExperienceLanternBlock.LIGHT, light));
+    }
+
+    public @Nullable IFluidHandler getFluidHandler(@Nullable Direction side) {
+        if (side == null || side.getOpposite() == getBlockState().getValue(FACING))
+            return tanks.getCapability();
+        return null;
+    }
+
+    @Override
+    public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
+        return containedFluidTooltip(tooltip, isPlayerSneaking, level.getCapability(Capabilities.FluidHandler.BLOCK, worldPosition, null));
+    }
+}
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/common/fluids/lantern/package-info.java b/src/main/java/plus/dragons/createenchantmentindustry/common/fluids/lantern/package-info.java
@@ -0,0 +1,9 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+@FieldsAreNonnullByDefault
+package plus.dragons.createenchantmentindustry.common.fluids.lantern;
+
+import net.minecraft.FieldsAreNonnullByDefault;
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/common/registry/CEIBlockEntities.java b/src/main/java/plus/dragons/createenchantmentindustry/common/registry/CEIBlockEntities.java
@@ -32,6 +32,7 @@
 import plus.dragons.createdragonsplus.common.processing.blaze.BlazeBlockVisual;
 import plus.dragons.createenchantmentindustry.client.model.CEIPartialModels;
 import plus.dragons.createenchantmentindustry.common.fluids.experience.ExperienceHatchBlockEntity;
+import plus.dragons.createenchantmentindustry.common.fluids.lantern.ExperienceLanternBlockEntity;
 import plus.dragons.createenchantmentindustry.common.fluids.printer.PrinterBlockEntity;
 import plus.dragons.createenchantmentindustry.common.fluids.printer.PrinterRenderer;
 import plus.dragons.createenchantmentindustry.common.kinetics.grindstone.GrindstoneDrainBlockEntity;
@@ -76,6 +77,10 @@ public class CEIBlockEntities {
             .renderer(() -> BlazeForgerRenderer::new)
             .validBlock(CEIBlocks.BLAZE_FORGER)
             .register();
+    public static final BlockEntityEntry<ExperienceLanternBlockEntity> EXPERIENCE_LANTERN = REGISTRATE
+            .blockEntity("experience_lantern", ExperienceLanternBlockEntity::new)
+            .validBlock(CEIBlocks.EXPERIENCE_LANTERN)
+            .register();
 
     public static void register(IEventBus modBus) {
         modBus.register(CEIBlockEntities.class);
@@ -93,5 +98,7 @@ public static void registerCapabilities(final RegisterCapabilitiesEvent event) {
                 BLAZE_ENCHANTER.get(), BlazeEnchanterBlockEntity::getFluidHandler);
         event.registerBlockEntity(Capabilities.FluidHandler.BLOCK,
                 BLAZE_FORGER.get(), BlazeForgerBlockEntity::getFluidHandler);
+        event.registerBlockEntity(Capabilities.FluidHandler.BLOCK,
+                EXPERIENCE_LANTERN.get(), ExperienceLanternBlockEntity::getFluidHandler);
     }
 }
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/common/registry/CEIBlocks.java b/src/main/java/plus/dragons/createenchantmentindustry/common/registry/CEIBlocks.java
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/common/registry/CEICreativeModeTabs.java b/src/main/java/plus/dragons/createenchantmentindustry/common/registry/CEICreativeModeTabs.java
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/common/registry/CEIShapes.java b/src/main/java/plus/dragons/createenchantmentindustry/common/registry/CEIShapes.java
diff --git a/src/main/java/plus/dragons/createenchantmentindustry/config/CEIFluidsConfig.java b/src/main/java/plus/dragons/createenchantmentindustry/config/CEIFluidsConfig.java
diff --git a/src/main/resources/assets/create_enchantment_industry/models/block/experience_lantern.json b/src/main/resources/assets/create_enchantment_industry/models/block/experience_lantern.json
diff --git a/src/main/resources/assets/create_enchantment_industry/textures/block/experience_lantern_bottom.png b/src/main/resources/assets/create_enchantment_industry/textures/block/experience_lantern_bottom.png
diff --git a/src/main/resources/assets/create_enchantment_industry/textures/block/experience_lantern_bulb.png b/src/main/resources/assets/create_enchantment_industry/textures/block/experience_lantern_bulb.png
diff --git a/src/main/resources/assets/create_enchantment_industry/textures/block/experience_lantern_side.png b/src/main/resources/assets/create_enchantment_industry/textures/block/experience_lantern_side.png

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "parent": "create_enchantment_industry:block/experience_lantern"`
	`3`	`+}`