From 7f027f0953fc096152b0b84a89ada672f0875386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8C=AF=E7=82=AB=20=E9=82=B1?= <2296282722@qq.com> Date: Fri, 15 Sep 2023 11:24:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=88=86=E5=8C=85=20?= =?UTF-8?q?=E5=B0=86=E6=89=80=E6=9C=89Renderer=E7=B1=BB=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E4=BB=85=E5=AE=A2=E6=88=B7=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/hechu/mindustry/Mindustry.java | 16 ++++++++-------- .../MechanicalDrillBlockEntityRenderer.java | 10 ---------- .../block/PneumaticDrillBlockEntityRenderer.java | 9 --------- .../block/DrillBlockEntityRenderer.java | 9 +++++++-- .../MechanicalDrillBlockEntityRenderer.java | 14 ++++++++++++++ .../block/PneumaticDrillBlockEntityRenderer.java | 13 +++++++++++++ .../renderer}/item/DrillRenderer.java | 5 ++++- .../renderer/item/MechanicalDrillRenderer.java | 13 +++++++++++++ .../renderer/item/PneumaticDrillRenderer.java | 13 +++++++++++++ .../creative/CreativeModeTabRegister.java | 2 +- .../mindustry/item/MechanicalDrillRenderer.java | 9 --------- .../mindustry/item/PneumaticDrillRender.java | 9 --------- .../mindustry/jade/DrillComponentProvider.java | 3 +-- .../jade/HealthBlockComponentProvider.java | 5 +---- .../hechu/mindustry/jade/MindustryPlugin.java | 8 ++++---- .../{ => world}/entity/EntityRegister.java | 4 ++-- .../{ => world}/entity/turrets/Duo.java | 2 +- .../{ => world}/entity/turrets/DuoRenderer.java | 5 ++--- .../entity/turrets/model/DuoModel.java | 4 ++-- .../hechu/mindustry/{ => world}/item/Drill.java | 4 ++-- .../mindustry/{ => world}/item/HealthTest.java | 2 +- .../mindustry/{ => world}/item/ItemRegister.java | 10 +++++----- .../{ => world}/item/MechanicalDrill.java | 3 ++- .../{ => world}/item/PneumaticDrill.java | 7 ++++--- .../{ => world}/item/model/DrillModel.java | 4 ++-- .../item/model/MechanicalDrillModel.java | 4 ++-- .../item/model/PneumaticDrillModel.java | 4 ++-- .../{ => world/level}/block/BlockRegister.java | 2 +- .../{ => world/level}/block/DrillBlock.java | 3 ++- .../{ => world/level}/block/HealthTestBlock.java | 10 +++------- .../level}/block/MechanicalDrillBlock.java | 3 ++- .../level}/block/PneumaticDrillBlock.java | 3 ++- .../level/block/entity}/BlockEntityRegister.java | 3 ++- .../level/block/entity}/DrillBlockEntity.java | 6 +++--- .../block/entity}/HealthTestBlockEntity.java | 2 +- .../entity}/MechanicalDrillBlockEntity.java | 6 ++---- .../block/entity}/PneumaticDrillBlockEntity.java | 4 ++-- .../level}/block/model/DrillModel.java | 4 ++-- .../level}/block/model/MechanicalDrillModel.java | 6 +++--- .../level}/block/model/PneumaticDrillModel.java | 4 ++-- 40 files changed, 133 insertions(+), 114 deletions(-) delete mode 100644 src/main/java/com/hechu/mindustry/block/MechanicalDrillBlockEntityRenderer.java delete mode 100644 src/main/java/com/hechu/mindustry/block/PneumaticDrillBlockEntityRenderer.java rename src/main/java/com/hechu/mindustry/{ => client/renderer}/block/DrillBlockEntityRenderer.java (67%) create mode 100644 src/main/java/com/hechu/mindustry/client/renderer/block/MechanicalDrillBlockEntityRenderer.java create mode 100644 src/main/java/com/hechu/mindustry/client/renderer/block/PneumaticDrillBlockEntityRenderer.java rename src/main/java/com/hechu/mindustry/{ => client/renderer}/item/DrillRenderer.java (69%) create mode 100644 src/main/java/com/hechu/mindustry/client/renderer/item/MechanicalDrillRenderer.java create mode 100644 src/main/java/com/hechu/mindustry/client/renderer/item/PneumaticDrillRenderer.java delete mode 100644 src/main/java/com/hechu/mindustry/item/MechanicalDrillRenderer.java delete mode 100644 src/main/java/com/hechu/mindustry/item/PneumaticDrillRender.java rename src/main/java/com/hechu/mindustry/{ => world}/entity/EntityRegister.java (88%) rename src/main/java/com/hechu/mindustry/{ => world}/entity/turrets/Duo.java (98%) rename src/main/java/com/hechu/mindustry/{ => world}/entity/turrets/DuoRenderer.java (67%) rename src/main/java/com/hechu/mindustry/{ => world}/entity/turrets/model/DuoModel.java (90%) rename src/main/java/com/hechu/mindustry/{ => world}/item/Drill.java (96%) rename src/main/java/com/hechu/mindustry/{ => world}/item/HealthTest.java (88%) rename src/main/java/com/hechu/mindustry/{ => world}/item/ItemRegister.java (78%) rename src/main/java/com/hechu/mindustry/{ => world}/item/MechanicalDrill.java (94%) rename src/main/java/com/hechu/mindustry/{ => world}/item/PneumaticDrill.java (88%) rename src/main/java/com/hechu/mindustry/{ => world}/item/model/DrillModel.java (90%) rename src/main/java/com/hechu/mindustry/{ => world}/item/model/MechanicalDrillModel.java (80%) rename src/main/java/com/hechu/mindustry/{ => world}/item/model/PneumaticDrillModel.java (80%) rename src/main/java/com/hechu/mindustry/{ => world/level}/block/BlockRegister.java (95%) rename src/main/java/com/hechu/mindustry/{ => world/level}/block/DrillBlock.java (98%) rename src/main/java/com/hechu/mindustry/{ => world/level}/block/HealthTestBlock.java (86%) rename src/main/java/com/hechu/mindustry/{ => world/level}/block/MechanicalDrillBlock.java (76%) rename src/main/java/com/hechu/mindustry/{ => world/level}/block/PneumaticDrillBlock.java (76%) rename src/main/java/com/hechu/mindustry/{block => world/level/block/entity}/BlockEntityRegister.java (91%) rename src/main/java/com/hechu/mindustry/{block => world/level/block/entity}/DrillBlockEntity.java (98%) rename src/main/java/com/hechu/mindustry/{block => world/level/block/entity}/HealthTestBlockEntity.java (98%) rename src/main/java/com/hechu/mindustry/{block => world/level/block/entity}/MechanicalDrillBlockEntity.java (86%) rename src/main/java/com/hechu/mindustry/{block => world/level/block/entity}/PneumaticDrillBlockEntity.java (94%) rename src/main/java/com/hechu/mindustry/{ => world/level}/block/model/DrillModel.java (89%) rename src/main/java/com/hechu/mindustry/{ => world/level}/block/model/MechanicalDrillModel.java (71%) rename src/main/java/com/hechu/mindustry/{ => world/level}/block/model/PneumaticDrillModel.java (79%) diff --git a/src/main/java/com/hechu/mindustry/Mindustry.java b/src/main/java/com/hechu/mindustry/Mindustry.java index d46ead7..0ee04a2 100644 --- a/src/main/java/com/hechu/mindustry/Mindustry.java +++ b/src/main/java/com/hechu/mindustry/Mindustry.java @@ -1,14 +1,14 @@ package com.hechu.mindustry; -import com.hechu.mindustry.block.BlockEntityRegister; -import com.hechu.mindustry.block.BlockRegister; -import com.hechu.mindustry.block.MechanicalDrillBlockEntityRenderer; -import com.hechu.mindustry.block.PneumaticDrillBlockEntityRenderer; +import com.hechu.mindustry.world.level.block.entity.BlockEntityRegister; +import com.hechu.mindustry.world.level.block.BlockRegister; +import com.hechu.mindustry.client.renderer.block.MechanicalDrillBlockEntityRenderer; +import com.hechu.mindustry.client.renderer.block.PneumaticDrillBlockEntityRenderer; import com.hechu.mindustry.creative.CreativeModeTabRegister; -import com.hechu.mindustry.entity.EntityRegister; -import com.hechu.mindustry.entity.turrets.Duo; -import com.hechu.mindustry.entity.turrets.DuoRenderer; -import com.hechu.mindustry.item.ItemRegister; +import com.hechu.mindustry.world.entity.EntityRegister; +import com.hechu.mindustry.world.entity.turrets.Duo; +import com.hechu.mindustry.world.entity.turrets.DuoRenderer; +import com.hechu.mindustry.world.item.ItemRegister; import com.mojang.logging.LogUtils; import net.minecraft.client.Minecraft; import net.minecraft.world.item.CreativeModeTabs; diff --git a/src/main/java/com/hechu/mindustry/block/MechanicalDrillBlockEntityRenderer.java b/src/main/java/com/hechu/mindustry/block/MechanicalDrillBlockEntityRenderer.java deleted file mode 100644 index 2f3102e..0000000 --- a/src/main/java/com/hechu/mindustry/block/MechanicalDrillBlockEntityRenderer.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.hechu.mindustry.block; - -import com.hechu.mindustry.block.model.MechanicalDrillModel; - -public class MechanicalDrillBlockEntityRenderer extends DrillBlockEntityRenderer { - - public MechanicalDrillBlockEntityRenderer() { - super(new MechanicalDrillModel()); - } -} diff --git a/src/main/java/com/hechu/mindustry/block/PneumaticDrillBlockEntityRenderer.java b/src/main/java/com/hechu/mindustry/block/PneumaticDrillBlockEntityRenderer.java deleted file mode 100644 index 10bd146..0000000 --- a/src/main/java/com/hechu/mindustry/block/PneumaticDrillBlockEntityRenderer.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.hechu.mindustry.block; - -import com.hechu.mindustry.block.model.PneumaticDrillModel; - -public class PneumaticDrillBlockEntityRenderer extends DrillBlockEntityRenderer{ - public PneumaticDrillBlockEntityRenderer() { - super(new PneumaticDrillModel()); - } -} diff --git a/src/main/java/com/hechu/mindustry/block/DrillBlockEntityRenderer.java b/src/main/java/com/hechu/mindustry/client/renderer/block/DrillBlockEntityRenderer.java similarity index 67% rename from src/main/java/com/hechu/mindustry/block/DrillBlockEntityRenderer.java rename to src/main/java/com/hechu/mindustry/client/renderer/block/DrillBlockEntityRenderer.java index 7a1dd5e..8e2cf68 100644 --- a/src/main/java/com/hechu/mindustry/block/DrillBlockEntityRenderer.java +++ b/src/main/java/com/hechu/mindustry/client/renderer/block/DrillBlockEntityRenderer.java @@ -1,13 +1,18 @@ -package com.hechu.mindustry.block; +package com.hechu.mindustry.client.renderer.block; +import com.hechu.mindustry.world.level.block.DrillBlock; +import com.hechu.mindustry.world.level.block.entity.DrillBlockEntity; import net.minecraft.world.phys.Vec3; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.jetbrains.annotations.NotNull; import software.bernie.geckolib.core.animatable.GeoAnimatable; import software.bernie.geckolib.model.GeoModel; import software.bernie.geckolib.renderer.GeoBlockRenderer; -import static com.hechu.mindustry.block.DrillBlock.PART; +import static com.hechu.mindustry.world.level.block.DrillBlock.PART; +@OnlyIn(Dist.CLIENT) public abstract class DrillBlockEntityRenderer extends GeoBlockRenderer { public DrillBlockEntityRenderer(GeoModel model) { super(model); diff --git a/src/main/java/com/hechu/mindustry/client/renderer/block/MechanicalDrillBlockEntityRenderer.java b/src/main/java/com/hechu/mindustry/client/renderer/block/MechanicalDrillBlockEntityRenderer.java new file mode 100644 index 0000000..90353f0 --- /dev/null +++ b/src/main/java/com/hechu/mindustry/client/renderer/block/MechanicalDrillBlockEntityRenderer.java @@ -0,0 +1,14 @@ +package com.hechu.mindustry.client.renderer.block; + +import com.hechu.mindustry.world.level.block.entity.MechanicalDrillBlockEntity; +import com.hechu.mindustry.world.level.block.model.MechanicalDrillModel; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +@OnlyIn(Dist.CLIENT) +public class MechanicalDrillBlockEntityRenderer extends DrillBlockEntityRenderer { + + public MechanicalDrillBlockEntityRenderer() { + super(new MechanicalDrillModel()); + } +} diff --git a/src/main/java/com/hechu/mindustry/client/renderer/block/PneumaticDrillBlockEntityRenderer.java b/src/main/java/com/hechu/mindustry/client/renderer/block/PneumaticDrillBlockEntityRenderer.java new file mode 100644 index 0000000..01c493a --- /dev/null +++ b/src/main/java/com/hechu/mindustry/client/renderer/block/PneumaticDrillBlockEntityRenderer.java @@ -0,0 +1,13 @@ +package com.hechu.mindustry.client.renderer.block; + +import com.hechu.mindustry.world.level.block.entity.PneumaticDrillBlockEntity; +import com.hechu.mindustry.world.level.block.model.PneumaticDrillModel; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +@OnlyIn(Dist.CLIENT) +public class PneumaticDrillBlockEntityRenderer extends DrillBlockEntityRenderer{ + public PneumaticDrillBlockEntityRenderer() { + super(new PneumaticDrillModel()); + } +} diff --git a/src/main/java/com/hechu/mindustry/item/DrillRenderer.java b/src/main/java/com/hechu/mindustry/client/renderer/item/DrillRenderer.java similarity index 69% rename from src/main/java/com/hechu/mindustry/item/DrillRenderer.java rename to src/main/java/com/hechu/mindustry/client/renderer/item/DrillRenderer.java index 7398788..1957b74 100644 --- a/src/main/java/com/hechu/mindustry/item/DrillRenderer.java +++ b/src/main/java/com/hechu/mindustry/client/renderer/item/DrillRenderer.java @@ -1,10 +1,13 @@ -package com.hechu.mindustry.item; +package com.hechu.mindustry.client.renderer.item; import net.minecraft.world.item.Item; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import software.bernie.geckolib.core.animatable.GeoAnimatable; import software.bernie.geckolib.model.GeoModel; import software.bernie.geckolib.renderer.GeoItemRenderer; +@OnlyIn(Dist.CLIENT) public abstract class DrillRenderer extends GeoItemRenderer { public DrillRenderer(GeoModel model) { super(model); diff --git a/src/main/java/com/hechu/mindustry/client/renderer/item/MechanicalDrillRenderer.java b/src/main/java/com/hechu/mindustry/client/renderer/item/MechanicalDrillRenderer.java new file mode 100644 index 0000000..282c037 --- /dev/null +++ b/src/main/java/com/hechu/mindustry/client/renderer/item/MechanicalDrillRenderer.java @@ -0,0 +1,13 @@ +package com.hechu.mindustry.client.renderer.item; + +import com.hechu.mindustry.world.item.PneumaticDrill; +import com.hechu.mindustry.world.item.model.MechanicalDrillModel; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +@OnlyIn(Dist.CLIENT) +public class MechanicalDrillRenderer extends DrillRenderer { + public MechanicalDrillRenderer() { + super(new MechanicalDrillModel()); + } +} diff --git a/src/main/java/com/hechu/mindustry/client/renderer/item/PneumaticDrillRenderer.java b/src/main/java/com/hechu/mindustry/client/renderer/item/PneumaticDrillRenderer.java new file mode 100644 index 0000000..7fde84f --- /dev/null +++ b/src/main/java/com/hechu/mindustry/client/renderer/item/PneumaticDrillRenderer.java @@ -0,0 +1,13 @@ +package com.hechu.mindustry.client.renderer.item; + +import com.hechu.mindustry.world.item.PneumaticDrill; +import com.hechu.mindustry.world.item.model.PneumaticDrillModel; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +@OnlyIn(Dist.CLIENT) +public class PneumaticDrillRenderer extends DrillRenderer{ + public PneumaticDrillRenderer() { + super(new PneumaticDrillModel()); + } +} diff --git a/src/main/java/com/hechu/mindustry/creative/CreativeModeTabRegister.java b/src/main/java/com/hechu/mindustry/creative/CreativeModeTabRegister.java index 9db342c..58dba0c 100644 --- a/src/main/java/com/hechu/mindustry/creative/CreativeModeTabRegister.java +++ b/src/main/java/com/hechu/mindustry/creative/CreativeModeTabRegister.java @@ -1,7 +1,7 @@ package com.hechu.mindustry.creative; import com.hechu.mindustry.Mindustry; -import com.hechu.mindustry.item.ItemRegister; +import com.hechu.mindustry.world.item.ItemRegister; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.world.item.CreativeModeTab; diff --git a/src/main/java/com/hechu/mindustry/item/MechanicalDrillRenderer.java b/src/main/java/com/hechu/mindustry/item/MechanicalDrillRenderer.java deleted file mode 100644 index 0fa7d9f..0000000 --- a/src/main/java/com/hechu/mindustry/item/MechanicalDrillRenderer.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.hechu.mindustry.item; - -import com.hechu.mindustry.item.model.MechanicalDrillModel; - -public class MechanicalDrillRenderer extends DrillRenderer { - public MechanicalDrillRenderer() { - super(new MechanicalDrillModel()); - } -} diff --git a/src/main/java/com/hechu/mindustry/item/PneumaticDrillRender.java b/src/main/java/com/hechu/mindustry/item/PneumaticDrillRender.java deleted file mode 100644 index f71683f..0000000 --- a/src/main/java/com/hechu/mindustry/item/PneumaticDrillRender.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.hechu.mindustry.item; - -import com.hechu.mindustry.item.model.PneumaticDrillModel; - -public class PneumaticDrillRender extends DrillRenderer{ - public PneumaticDrillRender() { - super(new PneumaticDrillModel()); - } -} diff --git a/src/main/java/com/hechu/mindustry/jade/DrillComponentProvider.java b/src/main/java/com/hechu/mindustry/jade/DrillComponentProvider.java index 2511366..b0deba4 100644 --- a/src/main/java/com/hechu/mindustry/jade/DrillComponentProvider.java +++ b/src/main/java/com/hechu/mindustry/jade/DrillComponentProvider.java @@ -1,7 +1,6 @@ package com.hechu.mindustry.jade; -import com.hechu.mindustry.block.DrillBlockEntity; -import com.hechu.mindustry.block.HealthTestBlockEntity; +import com.hechu.mindustry.world.level.block.entity.DrillBlockEntity; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/hechu/mindustry/jade/HealthBlockComponentProvider.java b/src/main/java/com/hechu/mindustry/jade/HealthBlockComponentProvider.java index 5ea061b..d09699c 100644 --- a/src/main/java/com/hechu/mindustry/jade/HealthBlockComponentProvider.java +++ b/src/main/java/com/hechu/mindustry/jade/HealthBlockComponentProvider.java @@ -1,12 +1,9 @@ package com.hechu.mindustry.jade; -import com.hechu.mindustry.block.DrillBlockEntity; -import com.hechu.mindustry.block.HealthTestBlockEntity; +import com.hechu.mindustry.world.level.block.entity.HealthTestBlockEntity; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; import snownee.jade.api.BlockAccessor; import snownee.jade.api.IBlockComponentProvider; import snownee.jade.api.IServerDataProvider; diff --git a/src/main/java/com/hechu/mindustry/jade/MindustryPlugin.java b/src/main/java/com/hechu/mindustry/jade/MindustryPlugin.java index b5451ae..0513445 100644 --- a/src/main/java/com/hechu/mindustry/jade/MindustryPlugin.java +++ b/src/main/java/com/hechu/mindustry/jade/MindustryPlugin.java @@ -1,10 +1,10 @@ package com.hechu.mindustry.jade; import com.hechu.mindustry.Mindustry; -import com.hechu.mindustry.block.DrillBlock; -import com.hechu.mindustry.block.DrillBlockEntity; -import com.hechu.mindustry.block.HealthTestBlock; -import com.hechu.mindustry.block.HealthTestBlockEntity; +import com.hechu.mindustry.world.level.block.DrillBlock; +import com.hechu.mindustry.world.level.block.entity.DrillBlockEntity; +import com.hechu.mindustry.world.level.block.HealthTestBlock; +import com.hechu.mindustry.world.level.block.entity.HealthTestBlockEntity; import net.minecraft.resources.ResourceLocation; import snownee.jade.api.*; diff --git a/src/main/java/com/hechu/mindustry/entity/EntityRegister.java b/src/main/java/com/hechu/mindustry/world/entity/EntityRegister.java similarity index 88% rename from src/main/java/com/hechu/mindustry/entity/EntityRegister.java rename to src/main/java/com/hechu/mindustry/world/entity/EntityRegister.java index 1a626c5..49efc53 100644 --- a/src/main/java/com/hechu/mindustry/entity/EntityRegister.java +++ b/src/main/java/com/hechu/mindustry/world/entity/EntityRegister.java @@ -1,7 +1,7 @@ -package com.hechu.mindustry.entity; +package com.hechu.mindustry.world.entity; import com.hechu.mindustry.Mindustry; -import com.hechu.mindustry.entity.turrets.Duo; +import com.hechu.mindustry.world.entity.turrets.Duo; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobCategory; import net.minecraftforge.registries.DeferredRegister; diff --git a/src/main/java/com/hechu/mindustry/entity/turrets/Duo.java b/src/main/java/com/hechu/mindustry/world/entity/turrets/Duo.java similarity index 98% rename from src/main/java/com/hechu/mindustry/entity/turrets/Duo.java rename to src/main/java/com/hechu/mindustry/world/entity/turrets/Duo.java index 56c7cfc..fb7efe1 100644 --- a/src/main/java/com/hechu/mindustry/entity/turrets/Duo.java +++ b/src/main/java/com/hechu/mindustry/world/entity/turrets/Duo.java @@ -1,4 +1,4 @@ -package com.hechu.mindustry.entity.turrets; +package com.hechu.mindustry.world.entity.turrets; import com.hechu.mindustry.Mindustry; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/hechu/mindustry/entity/turrets/DuoRenderer.java b/src/main/java/com/hechu/mindustry/world/entity/turrets/DuoRenderer.java similarity index 67% rename from src/main/java/com/hechu/mindustry/entity/turrets/DuoRenderer.java rename to src/main/java/com/hechu/mindustry/world/entity/turrets/DuoRenderer.java index 6c722b8..bbe2ad1 100644 --- a/src/main/java/com/hechu/mindustry/entity/turrets/DuoRenderer.java +++ b/src/main/java/com/hechu/mindustry/world/entity/turrets/DuoRenderer.java @@ -1,8 +1,7 @@ -package com.hechu.mindustry.entity.turrets; +package com.hechu.mindustry.world.entity.turrets; -import com.hechu.mindustry.entity.turrets.model.DuoModel; +import com.hechu.mindustry.world.entity.turrets.model.DuoModel; import net.minecraft.client.renderer.entity.EntityRendererProvider; -import software.bernie.geckolib.model.GeoModel; import software.bernie.geckolib.renderer.GeoEntityRenderer; public class DuoRenderer extends GeoEntityRenderer { diff --git a/src/main/java/com/hechu/mindustry/entity/turrets/model/DuoModel.java b/src/main/java/com/hechu/mindustry/world/entity/turrets/model/DuoModel.java similarity index 90% rename from src/main/java/com/hechu/mindustry/entity/turrets/model/DuoModel.java rename to src/main/java/com/hechu/mindustry/world/entity/turrets/model/DuoModel.java index 4cd2d81..1a14fe6 100644 --- a/src/main/java/com/hechu/mindustry/entity/turrets/model/DuoModel.java +++ b/src/main/java/com/hechu/mindustry/world/entity/turrets/model/DuoModel.java @@ -1,7 +1,7 @@ -package com.hechu.mindustry.entity.turrets.model; +package com.hechu.mindustry.world.entity.turrets.model; import com.hechu.mindustry.Mindustry; -import com.hechu.mindustry.entity.turrets.Duo; +import com.hechu.mindustry.world.entity.turrets.Duo; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.DefaultedEntityGeoModel; diff --git a/src/main/java/com/hechu/mindustry/item/Drill.java b/src/main/java/com/hechu/mindustry/world/item/Drill.java similarity index 96% rename from src/main/java/com/hechu/mindustry/item/Drill.java rename to src/main/java/com/hechu/mindustry/world/item/Drill.java index fd4940a..ac21a06 100644 --- a/src/main/java/com/hechu/mindustry/item/Drill.java +++ b/src/main/java/com/hechu/mindustry/world/item/Drill.java @@ -1,6 +1,6 @@ -package com.hechu.mindustry.item; +package com.hechu.mindustry.world.item; -import com.hechu.mindustry.block.DrillBlock; +import com.hechu.mindustry.world.level.block.DrillBlock; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; diff --git a/src/main/java/com/hechu/mindustry/item/HealthTest.java b/src/main/java/com/hechu/mindustry/world/item/HealthTest.java similarity index 88% rename from src/main/java/com/hechu/mindustry/item/HealthTest.java rename to src/main/java/com/hechu/mindustry/world/item/HealthTest.java index ec6df1a..e20017a 100644 --- a/src/main/java/com/hechu/mindustry/item/HealthTest.java +++ b/src/main/java/com/hechu/mindustry/world/item/HealthTest.java @@ -1,4 +1,4 @@ -package com.hechu.mindustry.item; +package com.hechu.mindustry.world.item; import net.minecraft.world.item.BlockItem; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/com/hechu/mindustry/item/ItemRegister.java b/src/main/java/com/hechu/mindustry/world/item/ItemRegister.java similarity index 78% rename from src/main/java/com/hechu/mindustry/item/ItemRegister.java rename to src/main/java/com/hechu/mindustry/world/item/ItemRegister.java index 706b893..9464144 100644 --- a/src/main/java/com/hechu/mindustry/item/ItemRegister.java +++ b/src/main/java/com/hechu/mindustry/world/item/ItemRegister.java @@ -1,7 +1,7 @@ -package com.hechu.mindustry.item; +package com.hechu.mindustry.world.item; import com.hechu.mindustry.Mindustry; -import com.hechu.mindustry.block.BlockRegister; +import com.hechu.mindustry.world.level.block.BlockRegister; import net.minecraft.world.item.Item; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -10,10 +10,10 @@ public class ItemRegister { // Create a Deferred Register to hold Items which will all be registered under the "mindustry" namespace public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Mindustry.MODID); - public static final RegistryObject MECHANICAL_DRILL_ITEM = ITEMS.register(com.hechu.mindustry.item.MechanicalDrill.NAME, + public static final RegistryObject MECHANICAL_DRILL_ITEM = ITEMS.register(MechanicalDrill.NAME, () -> new MechanicalDrill(BlockRegister.MECHANICAL_DRILL.get(), new Item.Properties())); - public static final RegistryObject PNEUMATIC_DRILL_ITEM = ITEMS.register(com.hechu.mindustry.item.PneumaticDrill.NAME, + public static final RegistryObject PNEUMATIC_DRILL_ITEM = ITEMS.register(PneumaticDrill.NAME, () -> new PneumaticDrill(BlockRegister.PNEUMATIC_DRILL.get(), new Item.Properties())); - public static final RegistryObject HEALTH_TEST_ITEM = ITEMS.register(com.hechu.mindustry.item.HealthTest.NAME, + public static final RegistryObject HEALTH_TEST_ITEM = ITEMS.register(HealthTest.NAME, () -> new HealthTest(BlockRegister.HEALTH_TEST.get(), new Item.Properties())); } diff --git a/src/main/java/com/hechu/mindustry/item/MechanicalDrill.java b/src/main/java/com/hechu/mindustry/world/item/MechanicalDrill.java similarity index 94% rename from src/main/java/com/hechu/mindustry/item/MechanicalDrill.java rename to src/main/java/com/hechu/mindustry/world/item/MechanicalDrill.java index c8c8edf..86848ae 100644 --- a/src/main/java/com/hechu/mindustry/item/MechanicalDrill.java +++ b/src/main/java/com/hechu/mindustry/world/item/MechanicalDrill.java @@ -1,5 +1,6 @@ -package com.hechu.mindustry.item; +package com.hechu.mindustry.world.item; +import com.hechu.mindustry.client.renderer.item.MechanicalDrillRenderer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.world.level.block.Block; import net.minecraftforge.client.extensions.common.IClientItemExtensions; diff --git a/src/main/java/com/hechu/mindustry/item/PneumaticDrill.java b/src/main/java/com/hechu/mindustry/world/item/PneumaticDrill.java similarity index 88% rename from src/main/java/com/hechu/mindustry/item/PneumaticDrill.java rename to src/main/java/com/hechu/mindustry/world/item/PneumaticDrill.java index ee650c6..9397af3 100644 --- a/src/main/java/com/hechu/mindustry/item/PneumaticDrill.java +++ b/src/main/java/com/hechu/mindustry/world/item/PneumaticDrill.java @@ -1,5 +1,6 @@ -package com.hechu.mindustry.item; +package com.hechu.mindustry.world.item; +import com.hechu.mindustry.client.renderer.item.PneumaticDrillRenderer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; @@ -27,12 +28,12 @@ public PneumaticDrill(@NotNull Block block, Item.Properties properties) { @Override public void initializeClient(Consumer consumer) { consumer.accept(new IClientItemExtensions() { - private PneumaticDrillRender renderer; + private PneumaticDrillRenderer renderer; @Override public BlockEntityWithoutLevelRenderer getCustomRenderer() { if (this.renderer == null) - renderer = new PneumaticDrillRender(); + renderer = new PneumaticDrillRenderer(); return this.renderer; } }); diff --git a/src/main/java/com/hechu/mindustry/item/model/DrillModel.java b/src/main/java/com/hechu/mindustry/world/item/model/DrillModel.java similarity index 90% rename from src/main/java/com/hechu/mindustry/item/model/DrillModel.java rename to src/main/java/com/hechu/mindustry/world/item/model/DrillModel.java index 30e0784..0f6913a 100644 --- a/src/main/java/com/hechu/mindustry/item/model/DrillModel.java +++ b/src/main/java/com/hechu/mindustry/world/item/model/DrillModel.java @@ -1,7 +1,7 @@ -package com.hechu.mindustry.item.model; +package com.hechu.mindustry.world.item.model; import com.hechu.mindustry.Mindustry; -import com.hechu.mindustry.item.Drill; +import com.hechu.mindustry.world.item.Drill; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; diff --git a/src/main/java/com/hechu/mindustry/item/model/MechanicalDrillModel.java b/src/main/java/com/hechu/mindustry/world/item/model/MechanicalDrillModel.java similarity index 80% rename from src/main/java/com/hechu/mindustry/item/model/MechanicalDrillModel.java rename to src/main/java/com/hechu/mindustry/world/item/model/MechanicalDrillModel.java index d0079d6..fe7c5ee 100644 --- a/src/main/java/com/hechu/mindustry/item/model/MechanicalDrillModel.java +++ b/src/main/java/com/hechu/mindustry/world/item/model/MechanicalDrillModel.java @@ -1,6 +1,6 @@ -package com.hechu.mindustry.item.model; +package com.hechu.mindustry.world.item.model; -import com.hechu.mindustry.item.MechanicalDrill; +import com.hechu.mindustry.world.item.MechanicalDrill; public class MechanicalDrillModel extends DrillModel { diff --git a/src/main/java/com/hechu/mindustry/item/model/PneumaticDrillModel.java b/src/main/java/com/hechu/mindustry/world/item/model/PneumaticDrillModel.java similarity index 80% rename from src/main/java/com/hechu/mindustry/item/model/PneumaticDrillModel.java rename to src/main/java/com/hechu/mindustry/world/item/model/PneumaticDrillModel.java index 93634c9..a6b5829 100644 --- a/src/main/java/com/hechu/mindustry/item/model/PneumaticDrillModel.java +++ b/src/main/java/com/hechu/mindustry/world/item/model/PneumaticDrillModel.java @@ -1,6 +1,6 @@ -package com.hechu.mindustry.item.model; +package com.hechu.mindustry.world.item.model; -import com.hechu.mindustry.item.PneumaticDrill; +import com.hechu.mindustry.world.item.PneumaticDrill; public class PneumaticDrillModel extends DrillModel { @Override diff --git a/src/main/java/com/hechu/mindustry/block/BlockRegister.java b/src/main/java/com/hechu/mindustry/world/level/block/BlockRegister.java similarity index 95% rename from src/main/java/com/hechu/mindustry/block/BlockRegister.java rename to src/main/java/com/hechu/mindustry/world/level/block/BlockRegister.java index d24d755..179dcb9 100644 --- a/src/main/java/com/hechu/mindustry/block/BlockRegister.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/BlockRegister.java @@ -1,4 +1,4 @@ -package com.hechu.mindustry.block; +package com.hechu.mindustry.world.level.block; import com.hechu.mindustry.Mindustry; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/com/hechu/mindustry/block/DrillBlock.java b/src/main/java/com/hechu/mindustry/world/level/block/DrillBlock.java similarity index 98% rename from src/main/java/com/hechu/mindustry/block/DrillBlock.java rename to src/main/java/com/hechu/mindustry/world/level/block/DrillBlock.java index b3ea9e6..23fe4e8 100644 --- a/src/main/java/com/hechu/mindustry/block/DrillBlock.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/DrillBlock.java @@ -1,5 +1,6 @@ -package com.hechu.mindustry.block; +package com.hechu.mindustry.world.level.block; +import com.hechu.mindustry.world.level.block.entity.DrillBlockEntity; import com.mojang.logging.LogUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/hechu/mindustry/block/HealthTestBlock.java b/src/main/java/com/hechu/mindustry/world/level/block/HealthTestBlock.java similarity index 86% rename from src/main/java/com/hechu/mindustry/block/HealthTestBlock.java rename to src/main/java/com/hechu/mindustry/world/level/block/HealthTestBlock.java index a4a531d..c236cfb 100644 --- a/src/main/java/com/hechu/mindustry/block/HealthTestBlock.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/HealthTestBlock.java @@ -1,15 +1,11 @@ -package com.hechu.mindustry.block; +package com.hechu.mindustry.world.level.block; import com.hechu.mindustry.utils.capabilities.MindustryCapabilities; -import net.minecraft.advancements.CriteriaTriggers; +import com.hechu.mindustry.world.level.block.entity.HealthTestBlockEntity; import net.minecraft.core.BlockPos; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.stats.Stats; -import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.BaseEntityBlock; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.RenderShape; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; @@ -29,7 +25,7 @@ public HealthTestBlock() { public BlockEntity newBlockEntity(@NotNull BlockPos pPos, @NotNull BlockState pState) { HealthTestBlockEntity healthTestBlockEntity = new HealthTestBlockEntity(pPos, pState); healthTestBlockEntity.getCapability(MindustryCapabilities.HEALTH_HANDLER, null).ifPresent(healthHandler -> { - healthHandler.setHealth(500); + healthHandler.setHealth(100); }); return healthTestBlockEntity; } diff --git a/src/main/java/com/hechu/mindustry/block/MechanicalDrillBlock.java b/src/main/java/com/hechu/mindustry/world/level/block/MechanicalDrillBlock.java similarity index 76% rename from src/main/java/com/hechu/mindustry/block/MechanicalDrillBlock.java rename to src/main/java/com/hechu/mindustry/world/level/block/MechanicalDrillBlock.java index fa9bd74..5b4513e 100644 --- a/src/main/java/com/hechu/mindustry/block/MechanicalDrillBlock.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/MechanicalDrillBlock.java @@ -1,5 +1,6 @@ -package com.hechu.mindustry.block; +package com.hechu.mindustry.world.level.block; +import com.hechu.mindustry.world.level.block.entity.MechanicalDrillBlockEntity; import net.minecraft.core.Vec3i; public class MechanicalDrillBlock extends DrillBlock { diff --git a/src/main/java/com/hechu/mindustry/block/PneumaticDrillBlock.java b/src/main/java/com/hechu/mindustry/world/level/block/PneumaticDrillBlock.java similarity index 76% rename from src/main/java/com/hechu/mindustry/block/PneumaticDrillBlock.java rename to src/main/java/com/hechu/mindustry/world/level/block/PneumaticDrillBlock.java index 204f7e8..38b9616 100644 --- a/src/main/java/com/hechu/mindustry/block/PneumaticDrillBlock.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/PneumaticDrillBlock.java @@ -1,5 +1,6 @@ -package com.hechu.mindustry.block; +package com.hechu.mindustry.world.level.block; +import com.hechu.mindustry.world.level.block.entity.PneumaticDrillBlockEntity; import net.minecraft.core.Vec3i; public class PneumaticDrillBlock extends DrillBlock { diff --git a/src/main/java/com/hechu/mindustry/block/BlockEntityRegister.java b/src/main/java/com/hechu/mindustry/world/level/block/entity/BlockEntityRegister.java similarity index 91% rename from src/main/java/com/hechu/mindustry/block/BlockEntityRegister.java rename to src/main/java/com/hechu/mindustry/world/level/block/entity/BlockEntityRegister.java index 9490601..5496bbc 100644 --- a/src/main/java/com/hechu/mindustry/block/BlockEntityRegister.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/entity/BlockEntityRegister.java @@ -1,6 +1,7 @@ -package com.hechu.mindustry.block; +package com.hechu.mindustry.world.level.block.entity; import com.hechu.mindustry.Mindustry; +import com.hechu.mindustry.world.level.block.BlockRegister; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; diff --git a/src/main/java/com/hechu/mindustry/block/DrillBlockEntity.java b/src/main/java/com/hechu/mindustry/world/level/block/entity/DrillBlockEntity.java similarity index 98% rename from src/main/java/com/hechu/mindustry/block/DrillBlockEntity.java rename to src/main/java/com/hechu/mindustry/world/level/block/entity/DrillBlockEntity.java index a7b1f32..17d51d7 100644 --- a/src/main/java/com/hechu/mindustry/block/DrillBlockEntity.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/entity/DrillBlockEntity.java @@ -1,6 +1,7 @@ -package com.hechu.mindustry.block; +package com.hechu.mindustry.world.level.block.entity; import com.hechu.mindustry.utils.AdaptedItemHandler; +import com.hechu.mindustry.world.level.block.DrillBlock; import com.mojang.logging.LogUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -35,8 +36,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import static com.hechu.mindustry.block.DrillBlock.PART; -import static net.minecraft.world.level.material.Fluids.WATER; +import static com.hechu.mindustry.world.level.block.DrillBlock.PART; public abstract class DrillBlockEntity extends BlockEntity implements GeoBlockEntity { public static final Logger LOGGER = LogUtils.getLogger(); diff --git a/src/main/java/com/hechu/mindustry/block/HealthTestBlockEntity.java b/src/main/java/com/hechu/mindustry/world/level/block/entity/HealthTestBlockEntity.java similarity index 98% rename from src/main/java/com/hechu/mindustry/block/HealthTestBlockEntity.java rename to src/main/java/com/hechu/mindustry/world/level/block/entity/HealthTestBlockEntity.java index dbc86d2..cabc9fa 100644 --- a/src/main/java/com/hechu/mindustry/block/HealthTestBlockEntity.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/entity/HealthTestBlockEntity.java @@ -1,4 +1,4 @@ -package com.hechu.mindustry.block; +package com.hechu.mindustry.world.level.block.entity; import com.hechu.mindustry.utils.capabilities.HealthHandler; import com.hechu.mindustry.utils.capabilities.IHealthHandler; diff --git a/src/main/java/com/hechu/mindustry/block/MechanicalDrillBlockEntity.java b/src/main/java/com/hechu/mindustry/world/level/block/entity/MechanicalDrillBlockEntity.java similarity index 86% rename from src/main/java/com/hechu/mindustry/block/MechanicalDrillBlockEntity.java rename to src/main/java/com/hechu/mindustry/world/level/block/entity/MechanicalDrillBlockEntity.java index 95e4db9..3371dc9 100644 --- a/src/main/java/com/hechu/mindustry/block/MechanicalDrillBlockEntity.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/entity/MechanicalDrillBlockEntity.java @@ -1,4 +1,4 @@ -package com.hechu.mindustry.block; +package com.hechu.mindustry.world.level.block.entity; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; @@ -9,14 +9,12 @@ import java.util.Arrays; -import static com.hechu.mindustry.block.BlockEntityRegister.MECHANICAL_DRILL_BLOCK_ENTITY; - public class MechanicalDrillBlockEntity extends DrillBlockEntity { public static final String NAME = "mechanical_drill"; private static final RawAnimation ROTATION_ANIMS = RawAnimation.begin().thenLoop("2x2drill_template.rotate"); public MechanicalDrillBlockEntity(BlockPos pos, BlockState state) { - super(MECHANICAL_DRILL_BLOCK_ENTITY.get(), pos, state, + super(BlockEntityRegister.MECHANICAL_DRILL_BLOCK_ENTITY.get(), pos, state, Arrays.stream(new BlockPos[]{pos.below(),pos.below().east(),pos.below().south(),pos.below().east().south()}).toList(), state1 -> state1.is(BlockTags.SAND) || state1.is(BlockTags.COAL_ORES) || diff --git a/src/main/java/com/hechu/mindustry/block/PneumaticDrillBlockEntity.java b/src/main/java/com/hechu/mindustry/world/level/block/entity/PneumaticDrillBlockEntity.java similarity index 94% rename from src/main/java/com/hechu/mindustry/block/PneumaticDrillBlockEntity.java rename to src/main/java/com/hechu/mindustry/world/level/block/entity/PneumaticDrillBlockEntity.java index b274f87..ca534af 100644 --- a/src/main/java/com/hechu/mindustry/block/PneumaticDrillBlockEntity.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/entity/PneumaticDrillBlockEntity.java @@ -1,4 +1,4 @@ -package com.hechu.mindustry.block; +package com.hechu.mindustry.world.level.block.entity; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; @@ -9,7 +9,7 @@ import java.util.Arrays; -import static com.hechu.mindustry.block.BlockEntityRegister.PNEUMATIC_DRILL_BLOCK_ENTITY; +import static com.hechu.mindustry.world.level.block.entity.BlockEntityRegister.PNEUMATIC_DRILL_BLOCK_ENTITY; public class PneumaticDrillBlockEntity extends DrillBlockEntity { public static final String NAME = "pneumatic_drill"; diff --git a/src/main/java/com/hechu/mindustry/block/model/DrillModel.java b/src/main/java/com/hechu/mindustry/world/level/block/model/DrillModel.java similarity index 89% rename from src/main/java/com/hechu/mindustry/block/model/DrillModel.java rename to src/main/java/com/hechu/mindustry/world/level/block/model/DrillModel.java index 5793ebd..363cb8a 100644 --- a/src/main/java/com/hechu/mindustry/block/model/DrillModel.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/model/DrillModel.java @@ -1,7 +1,7 @@ -package com.hechu.mindustry.block.model; +package com.hechu.mindustry.world.level.block.model; import com.hechu.mindustry.Mindustry; -import com.hechu.mindustry.block.DrillBlockEntity; +import com.hechu.mindustry.world.level.block.entity.DrillBlockEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.DefaultedBlockGeoModel; diff --git a/src/main/java/com/hechu/mindustry/block/model/MechanicalDrillModel.java b/src/main/java/com/hechu/mindustry/world/level/block/model/MechanicalDrillModel.java similarity index 71% rename from src/main/java/com/hechu/mindustry/block/model/MechanicalDrillModel.java rename to src/main/java/com/hechu/mindustry/world/level/block/model/MechanicalDrillModel.java index e9e8984..43b188e 100644 --- a/src/main/java/com/hechu/mindustry/block/model/MechanicalDrillModel.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/model/MechanicalDrillModel.java @@ -1,7 +1,7 @@ -package com.hechu.mindustry.block.model; +package com.hechu.mindustry.world.level.block.model; -import com.hechu.mindustry.block.MechanicalDrillBlock; -import com.hechu.mindustry.block.MechanicalDrillBlockEntity; +import com.hechu.mindustry.world.level.block.MechanicalDrillBlock; +import com.hechu.mindustry.world.level.block.entity.MechanicalDrillBlockEntity; public class MechanicalDrillModel extends DrillModel { diff --git a/src/main/java/com/hechu/mindustry/block/model/PneumaticDrillModel.java b/src/main/java/com/hechu/mindustry/world/level/block/model/PneumaticDrillModel.java similarity index 79% rename from src/main/java/com/hechu/mindustry/block/model/PneumaticDrillModel.java rename to src/main/java/com/hechu/mindustry/world/level/block/model/PneumaticDrillModel.java index dcc6c3a..8a401c8 100644 --- a/src/main/java/com/hechu/mindustry/block/model/PneumaticDrillModel.java +++ b/src/main/java/com/hechu/mindustry/world/level/block/model/PneumaticDrillModel.java @@ -1,6 +1,6 @@ -package com.hechu.mindustry.block.model; +package com.hechu.mindustry.world.level.block.model; -import com.hechu.mindustry.block.PneumaticDrillBlockEntity; +import com.hechu.mindustry.world.level.block.entity.PneumaticDrillBlockEntity; public class PneumaticDrillModel extends DrillModel {