From 6c507cba923ed9d1d132e34c2f860d7b8595ce75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=90=E6=82=A6=E8=A7=A3=E8=AF=B4?= Date: Sun, 31 Mar 2024 11:50:09 +0800 Subject: [PATCH] =?UTF-8?q?=E2=86=94=EF=B8=8F=20Restructed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ziyue/tjmetro/BlockEntityTypes.java | 2 +- .../main/java/ziyue/tjmetro/BlockList.java | 4 +-- .../src/main/java/ziyue/tjmetro/Config.java | 2 +- .../src/main/java/ziyue/tjmetro/Filters.java | 2 +- .../src/main/java/ziyue/tjmetro/ItemList.java | 2 +- .../main/java/ziyue/tjmetro/TianjinMetro.java | 2 +- .../{blocks => block}/BlockAPGCorner.java | 2 +- .../tjmetro/{blocks => block}/BlockBench.java | 11 ++++--- .../{blocks => block}/BlockCeilingNotLit.java | 2 +- .../BlockCustomColorConcrete.java | 4 +-- .../BlockCustomColorConcreteSlab.java | 4 +-- .../BlockCustomColorConcreteStairs.java | 6 ++-- .../BlockDecorationLight.java | 6 ++-- .../BlockEmergencyExitSign.java | 2 +- .../BlockHighSpeedRepeater.java | 2 +- .../tjmetro/{blocks => block}/BlockLogo.java | 2 +- .../BlockMetalDetectionDoor.java | 2 +- .../BlockPSDDoorTianjin.java | 15 ++-------- .../BlockPSDGlassEndTianjin.java | 4 +-- .../tjmetro/block/BlockPSDGlassTianjin.java | 20 +++++++++++++ .../{blocks => block}/BlockPSDTopTianjin.java | 7 ++--- .../BlockPlayerDetector.java | 2 +- .../BlockRailwaySignTianjin.java | 6 ++-- .../BlockRailwaySignTianjinPole.java | 2 +- .../BlockRailwaySignWall.java | 8 ++--- .../BlockRailwaySignWallBig.java | 27 ++--------------- .../BlockRailwaySignWallDouble.java | 15 ++-------- .../{blocks => block}/BlockRoadblock.java | 2 +- .../{blocks => block}/BlockRoadblockSign.java | 5 ++-- .../{blocks => block}/BlockRolling.java | 4 +-- .../BlockServiceCorridorSign.java | 2 +- .../BlockStationColorCeiling.java | 10 +------ .../BlockStationColorCeilingAuto.java | 2 +- .../BlockStationColorCeilingNotLit.java | 2 +- .../BlockStationNameSign1.java | 4 +-- .../BlockStationNameSign2.java | 4 +-- .../BlockStationNameWallLegacy.java | 2 +- .../{blocks => block}/BlockTimeDisplay.java | 2 +- .../base/BlockCustomColorBase.java | 2 +- .../base/BlockCustomContentBlockBase.java | 3 +- .../base/BlockRailwaySignBase.java | 2 +- .../base/BlockStationNameSignBase.java | 3 +- .../{blocks => block}/base/IRailwaySign.java | 2 +- .../base/RenderAttachmentBlockEntity.java | 2 +- .../{blocks => block}/base/StairBlock.java | 2 +- .../tjmetro/blocks/BlockPSDGlassTianjin.java | 29 ------------------- .../tjmetro/{filters => filter}/Filter.java | 10 ++++--- .../{filters => filter}/IconButton.java | 2 +- .../{items => item}/ItemPSDTianjinBase.java | 16 +++++----- .../mixin/{mixins => }/ClientDataMixin.java | 2 +- .../mixin/{mixins => }/ConfigScreenMixin.java | 2 +- .../CreativeModeInventoryScreenMixin.java | 12 ++++---- .../{mixins => }/CustomResourcesMixin.java | 2 +- .../EffectRenderingInventoryScreenMixin.java | 10 +++---- .../EntityRenderDispatcherMixin.java | 8 ++--- .../mixin/{mixins => }/FallingBlockMixin.java | 2 +- .../FinishInitializationMixin.java | 4 +-- .../{mixins => }/MinecartRendererMixin.java | 8 ++--- .../{mixins => }/MinecraftServerMixin.java | 8 ++--- .../PacketTrainDataGuiClientMixin.java | 2 +- ...CreativeModeInventoryScreenProperties.java | 16 ---------- .../ziyue/tjmetro/packet/PacketGuiClient.java | 4 +-- .../ziyue/tjmetro/packet/PacketGuiServer.java | 8 ++--- .../CreativeModeInventoryScreenProperty.java | 19 ++++++++++++ .../tjmetro/render/RenderPSDTopTianjin.java | 7 +---- .../render/RenderRailwaySignTianjin.java | 4 +-- .../tjmetro/render/RenderRailwaySignWall.java | 6 ++-- .../render/RenderRailwaySignWallDouble.java | 5 ++-- .../tjmetro/render/RenderRoadblockSign.java | 4 +-- .../render/RenderServiceCorridorSign.java | 4 +-- .../tjmetro/render/RenderStationNameSign.java | 2 +- .../render/RenderStationNameWallLegacy.java | 2 +- .../tjmetro/render/RenderTimeDisplay.java | 2 +- .../tjmetro/screen/CustomContentScreen.java | 3 +- .../tjmetro/screen/RailwaySignScreen.java | 2 +- .../screen/RailwaySignWallDoubleScreen.java | 4 +-- common/src/main/resources/tjmetro.mixins.json | 2 +- .../main/java/ziyue/tjmetro/MainFabric.java | 2 +- .../ziyue/tjmetro/fabric/RegistryImpl.java | 2 +- .../main/java/ziyue/tjmetro/MainForge.java | 2 +- .../ziyue/tjmetro/forge/RegistryImpl.java | 2 +- 81 files changed, 183 insertions(+), 254 deletions(-) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockAPGCorner.java (99%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockBench.java (95%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockCeilingNotLit.java (98%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockCustomColorConcrete.java (92%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockCustomColorConcreteSlab.java (96%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockCustomColorConcreteStairs.java (95%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockDecorationLight.java (92%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockEmergencyExitSign.java (99%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockHighSpeedRepeater.java (99%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockLogo.java (98%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockMetalDetectionDoor.java (99%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockPSDDoorTianjin.java (60%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockPSDGlassEndTianjin.java (82%) create mode 100644 common/src/main/java/ziyue/tjmetro/block/BlockPSDGlassTianjin.java rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockPSDTopTianjin.java (97%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockPlayerDetector.java (99%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockRailwaySignTianjin.java (96%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockRailwaySignTianjinPole.java (97%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockRailwaySignWall.java (97%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockRailwaySignWallBig.java (82%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockRailwaySignWallDouble.java (92%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockRoadblock.java (99%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockRoadblockSign.java (96%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockRolling.java (97%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockServiceCorridorSign.java (99%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockStationColorCeiling.java (86%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockStationColorCeilingAuto.java (98%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockStationColorCeilingNotLit.java (98%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockStationNameSign1.java (95%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockStationNameSign2.java (96%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockStationNameWallLegacy.java (99%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/BlockTimeDisplay.java (99%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/base/BlockCustomColorBase.java (98%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/base/BlockCustomContentBlockBase.java (98%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/base/BlockRailwaySignBase.java (99%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/base/BlockStationNameSignBase.java (98%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/base/IRailwaySign.java (99%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/base/RenderAttachmentBlockEntity.java (90%) rename common/src/main/java/ziyue/tjmetro/{blocks => block}/base/StairBlock.java (94%) delete mode 100644 common/src/main/java/ziyue/tjmetro/blocks/BlockPSDGlassTianjin.java rename common/src/main/java/ziyue/tjmetro/{filters => filter}/Filter.java (96%) rename common/src/main/java/ziyue/tjmetro/{filters => filter}/IconButton.java (98%) rename common/src/main/java/ziyue/tjmetro/{items => item}/ItemPSDTianjinBase.java (89%) rename common/src/main/java/ziyue/tjmetro/mixin/{mixins => }/ClientDataMixin.java (95%) rename common/src/main/java/ziyue/tjmetro/mixin/{mixins => }/ConfigScreenMixin.java (95%) rename common/src/main/java/ziyue/tjmetro/mixin/{mixins => }/CreativeModeInventoryScreenMixin.java (95%) rename common/src/main/java/ziyue/tjmetro/mixin/{mixins => }/CustomResourcesMixin.java (95%) rename common/src/main/java/ziyue/tjmetro/mixin/{mixins => }/EffectRenderingInventoryScreenMixin.java (89%) rename common/src/main/java/ziyue/tjmetro/mixin/{mixins => }/EntityRenderDispatcherMixin.java (86%) rename common/src/main/java/ziyue/tjmetro/mixin/{mixins => }/FallingBlockMixin.java (97%) rename common/src/main/java/ziyue/tjmetro/mixin/{mixins => }/FinishInitializationMixin.java (99%) rename common/src/main/java/ziyue/tjmetro/mixin/{mixins => }/MinecartRendererMixin.java (89%) rename common/src/main/java/ziyue/tjmetro/mixin/{mixins => }/MinecraftServerMixin.java (87%) rename common/src/main/java/ziyue/tjmetro/mixin/{mixins => }/PacketTrainDataGuiClientMixin.java (97%) delete mode 100644 common/src/main/java/ziyue/tjmetro/mixin/properties/CreativeModeInventoryScreenProperties.java create mode 100644 common/src/main/java/ziyue/tjmetro/property/CreativeModeInventoryScreenProperty.java diff --git a/common/src/main/java/ziyue/tjmetro/BlockEntityTypes.java b/common/src/main/java/ziyue/tjmetro/BlockEntityTypes.java index fa1cf54..c5dbe80 100644 --- a/common/src/main/java/ziyue/tjmetro/BlockEntityTypes.java +++ b/common/src/main/java/ziyue/tjmetro/BlockEntityTypes.java @@ -3,7 +3,7 @@ import mtr.RegistryObject; import mtr.mappings.RegistryUtilities; import net.minecraft.world.level.block.entity.BlockEntityType; -import ziyue.tjmetro.blocks.*; +import ziyue.tjmetro.block.*; /** * @since beta-1 diff --git a/common/src/main/java/ziyue/tjmetro/BlockList.java b/common/src/main/java/ziyue/tjmetro/BlockList.java index 8c290a9..3169f08 100644 --- a/common/src/main/java/ziyue/tjmetro/BlockList.java +++ b/common/src/main/java/ziyue/tjmetro/BlockList.java @@ -8,8 +8,8 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; -import ziyue.tjmetro.blocks.*; -import ziyue.tjmetro.blocks.base.StairBlock; +import ziyue.tjmetro.block.*; +import ziyue.tjmetro.block.base.StairBlock; /** * @since beta-1 diff --git a/common/src/main/java/ziyue/tjmetro/Config.java b/common/src/main/java/ziyue/tjmetro/Config.java index 5d8e4c2..ac8edc2 100644 --- a/common/src/main/java/ziyue/tjmetro/Config.java +++ b/common/src/main/java/ziyue/tjmetro/Config.java @@ -16,7 +16,7 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TextColor; import ziyue.tjmetro.client.ClientCache; -import ziyue.tjmetro.filters.Filter; +import ziyue.tjmetro.filter.Filter; import java.nio.file.Files; import java.nio.file.Path; diff --git a/common/src/main/java/ziyue/tjmetro/Filters.java b/common/src/main/java/ziyue/tjmetro/Filters.java index df764e0..dd91df4 100644 --- a/common/src/main/java/ziyue/tjmetro/Filters.java +++ b/common/src/main/java/ziyue/tjmetro/Filters.java @@ -5,7 +5,7 @@ import mtr.mappings.Text; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Blocks; -import ziyue.tjmetro.filters.Filter; +import ziyue.tjmetro.filter.Filter; /** * @see Filter diff --git a/common/src/main/java/ziyue/tjmetro/ItemList.java b/common/src/main/java/ziyue/tjmetro/ItemList.java index 79fc842..5629447 100644 --- a/common/src/main/java/ziyue/tjmetro/ItemList.java +++ b/common/src/main/java/ziyue/tjmetro/ItemList.java @@ -3,7 +3,7 @@ import mtr.RegistryObject; import mtr.item.ItemWithCreativeTabBase; import net.minecraft.world.item.Item; -import ziyue.tjmetro.items.ItemPSDTianjinBase; +import ziyue.tjmetro.item.ItemPSDTianjinBase; /** * @since beta-1 diff --git a/common/src/main/java/ziyue/tjmetro/TianjinMetro.java b/common/src/main/java/ziyue/tjmetro/TianjinMetro.java index c3bc23d..3e35405 100644 --- a/common/src/main/java/ziyue/tjmetro/TianjinMetro.java +++ b/common/src/main/java/ziyue/tjmetro/TianjinMetro.java @@ -11,7 +11,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import ziyue.tjmetro.filters.Filter; +import ziyue.tjmetro.filter.Filter; import ziyue.tjmetro.packet.PacketGuiServer; import java.util.function.BiConsumer; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockAPGCorner.java b/common/src/main/java/ziyue/tjmetro/block/BlockAPGCorner.java similarity index 99% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockAPGCorner.java rename to common/src/main/java/ziyue/tjmetro/block/BlockAPGCorner.java index 434d4af..1778d2f 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockAPGCorner.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockAPGCorner.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.block.IBlock; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockBench.java b/common/src/main/java/ziyue/tjmetro/block/BlockBench.java similarity index 95% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockBench.java rename to common/src/main/java/ziyue/tjmetro/block/BlockBench.java index e38b403..c5f6087 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockBench.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockBench.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.block.IBlock; import mtr.mappings.BlockEntityMapper; @@ -29,6 +29,9 @@ import org.jetbrains.annotations.Nullable; import ziyue.tjmetro.BlockEntityTypes; import ziyue.tjmetro.BlockList; +import ziyue.tjmetro.mixin.EntityRenderDispatcherMixin; +import ziyue.tjmetro.mixin.MinecartRendererMixin; +import ziyue.tjmetro.mixin.MinecraftServerMixin; import java.util.HashSet; import java.util.Set; @@ -142,9 +145,9 @@ public void tick() { * For some unknown reason, Fabric 1.16.5 was unable to register entities properly. * The minecart will be the seat of the bench so that players can sit down. * - * @see ziyue.tjmetro.mixin.mixins.EntityRenderDispatcherMixin - * @see ziyue.tjmetro.mixin.mixins.MinecartRendererMixin - * @see ziyue.tjmetro.mixin.mixins.MinecraftServerMixin + * @see EntityRenderDispatcherMixin + * @see MinecartRendererMixin + * @see MinecraftServerMixin */ public void ride(Level world, BlockPos pos, Player player) { seat = new Minecart(world, pos.getX() + 0.5, pos.getY() + 0.35, pos.getZ() + 0.5) diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockCeilingNotLit.java b/common/src/main/java/ziyue/tjmetro/block/BlockCeilingNotLit.java similarity index 98% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockCeilingNotLit.java rename to common/src/main/java/ziyue/tjmetro/block/BlockCeilingNotLit.java index 6874da0..9d51da1 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockCeilingNotLit.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockCeilingNotLit.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.block.BlockCeiling; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockCustomColorConcrete.java b/common/src/main/java/ziyue/tjmetro/block/BlockCustomColorConcrete.java similarity index 92% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockCustomColorConcrete.java rename to common/src/main/java/ziyue/tjmetro/block/BlockCustomColorConcrete.java index 5ba1c08..ce3c6d3 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockCustomColorConcrete.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockCustomColorConcrete.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.mappings.BlockEntityMapper; @@ -6,7 +6,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; import ziyue.tjmetro.BlockEntityTypes; -import ziyue.tjmetro.blocks.base.BlockCustomColorBase; +import ziyue.tjmetro.block.base.BlockCustomColorBase; /** * @author ZiYueCommentary diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockCustomColorConcreteSlab.java b/common/src/main/java/ziyue/tjmetro/block/BlockCustomColorConcreteSlab.java similarity index 96% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockCustomColorConcreteSlab.java rename to common/src/main/java/ziyue/tjmetro/block/BlockCustomColorConcreteSlab.java index 2cac80a..b3fc68f 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockCustomColorConcreteSlab.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockCustomColorConcreteSlab.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.block.IBlock; @@ -23,7 +23,7 @@ import net.minecraft.world.phys.BlockHitResult; import org.jetbrains.annotations.Nullable; import ziyue.tjmetro.BlockEntityTypes; -import ziyue.tjmetro.blocks.base.BlockCustomColorBase; +import ziyue.tjmetro.block.base.BlockCustomColorBase; import ziyue.tjmetro.packet.PacketGuiServer; import java.util.List; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockCustomColorConcreteStairs.java b/common/src/main/java/ziyue/tjmetro/block/BlockCustomColorConcreteStairs.java similarity index 95% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockCustomColorConcreteStairs.java rename to common/src/main/java/ziyue/tjmetro/block/BlockCustomColorConcreteStairs.java index 4accc4c..89a6638 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockCustomColorConcreteStairs.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockCustomColorConcreteStairs.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.block.IBlock; @@ -22,8 +22,8 @@ import net.minecraft.world.phys.BlockHitResult; import org.jetbrains.annotations.Nullable; import ziyue.tjmetro.BlockEntityTypes; -import ziyue.tjmetro.blocks.base.BlockCustomColorBase; -import ziyue.tjmetro.blocks.base.StairBlock; +import ziyue.tjmetro.block.base.BlockCustomColorBase; +import ziyue.tjmetro.block.base.StairBlock; import ziyue.tjmetro.packet.PacketGuiServer; import java.util.List; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockDecorationLight.java b/common/src/main/java/ziyue/tjmetro/block/BlockDecorationLight.java similarity index 92% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockDecorationLight.java rename to common/src/main/java/ziyue/tjmetro/block/BlockDecorationLight.java index e08854f..a833cbc 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockDecorationLight.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockDecorationLight.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.mappings.BlockEntityMapper; @@ -6,7 +6,6 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -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; @@ -15,9 +14,8 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.phys.BlockHitResult; -import org.jetbrains.annotations.Nullable; import ziyue.tjmetro.BlockEntityTypes; -import ziyue.tjmetro.blocks.base.BlockCustomColorBase; +import ziyue.tjmetro.block.base.BlockCustomColorBase; /** * @author ZiYueCommentary diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockEmergencyExitSign.java b/common/src/main/java/ziyue/tjmetro/block/BlockEmergencyExitSign.java similarity index 99% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockEmergencyExitSign.java rename to common/src/main/java/ziyue/tjmetro/block/BlockEmergencyExitSign.java index 79563eb..85cf6a0 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockEmergencyExitSign.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockEmergencyExitSign.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.block.IBlock; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockHighSpeedRepeater.java b/common/src/main/java/ziyue/tjmetro/block/BlockHighSpeedRepeater.java similarity index 99% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockHighSpeedRepeater.java rename to common/src/main/java/ziyue/tjmetro/block/BlockHighSpeedRepeater.java index 2b1dda6..c544080 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockHighSpeedRepeater.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockHighSpeedRepeater.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockLogo.java b/common/src/main/java/ziyue/tjmetro/block/BlockLogo.java similarity index 98% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockLogo.java rename to common/src/main/java/ziyue/tjmetro/block/BlockLogo.java index d7aa7dd..4576d4a 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockLogo.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockLogo.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.block.IBlock; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockMetalDetectionDoor.java b/common/src/main/java/ziyue/tjmetro/block/BlockMetalDetectionDoor.java similarity index 99% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockMetalDetectionDoor.java rename to common/src/main/java/ziyue/tjmetro/block/BlockMetalDetectionDoor.java index e3019b3..d1f8278 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockMetalDetectionDoor.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockMetalDetectionDoor.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import me.shedaniel.architectury.extensions.BlockEntityExtension; import mtr.Blocks; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockPSDDoorTianjin.java b/common/src/main/java/ziyue/tjmetro/block/BlockPSDDoorTianjin.java similarity index 60% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockPSDDoorTianjin.java rename to common/src/main/java/ziyue/tjmetro/block/BlockPSDDoorTianjin.java index 359fc25..bae3b7a 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockPSDDoorTianjin.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockPSDDoorTianjin.java @@ -1,27 +1,16 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.block.BlockPSDAPGDoorBase; import mtr.mappings.BlockEntityMapper; import net.minecraft.core.BlockPos; -import net.minecraft.util.StringRepresentable; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.EnumProperty; -import net.minecraft.world.level.block.state.properties.IntegerProperty; -import net.minecraft.world.phys.BlockHitResult; import ziyue.tjmetro.BlockEntityTypes; import ziyue.tjmetro.ItemList; /** * @author ZiYueCommentary - * @see ziyue.tjmetro.items.ItemPSDTianjinBase + * @see ziyue.tjmetro.item.ItemPSDTianjinBase * @see BlockPSDAPGDoorBase * @since beta-1 */ diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockPSDGlassEndTianjin.java b/common/src/main/java/ziyue/tjmetro/block/BlockPSDGlassEndTianjin.java similarity index 82% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockPSDGlassEndTianjin.java rename to common/src/main/java/ziyue/tjmetro/block/BlockPSDGlassEndTianjin.java index ac082db..eda213a 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockPSDGlassEndTianjin.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockPSDGlassEndTianjin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.block.BlockPSDAPGGlassEndBase; import net.minecraft.world.item.Item; @@ -6,7 +6,7 @@ /** * @author ZiYueCommentary - * @see ziyue.tjmetro.items.ItemPSDTianjinBase + * @see ziyue.tjmetro.item.ItemPSDTianjinBase * @see mtr.block.BlockPSDGlassEnd * @since beta-1 */ diff --git a/common/src/main/java/ziyue/tjmetro/block/BlockPSDGlassTianjin.java b/common/src/main/java/ziyue/tjmetro/block/BlockPSDGlassTianjin.java new file mode 100644 index 0000000..d5b2256 --- /dev/null +++ b/common/src/main/java/ziyue/tjmetro/block/BlockPSDGlassTianjin.java @@ -0,0 +1,20 @@ +package ziyue.tjmetro.block; + +import mtr.block.BlockPSDAPGGlassBase; +import net.minecraft.world.item.Item; +import ziyue.tjmetro.ItemList; + +/** + * @author ZiYueCommentary + * @see ziyue.tjmetro.item.ItemPSDTianjinBase + * @see BlockPSDAPGGlassBase + * @since beta-1 + */ + +public class BlockPSDGlassTianjin extends BlockPSDAPGGlassBase +{ + @Override + public Item asItem() { + return ItemList.PSD_GLASS_TIANJIN.get(); + } +} diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockPSDTopTianjin.java b/common/src/main/java/ziyue/tjmetro/block/BlockPSDTopTianjin.java similarity index 97% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockPSDTopTianjin.java rename to common/src/main/java/ziyue/tjmetro/block/BlockPSDTopTianjin.java index 75bc9f0..fba5dec 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockPSDTopTianjin.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockPSDTopTianjin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Items; import mtr.block.BlockPSDAPGBase; @@ -20,7 +20,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.EnumProperty; -import net.minecraft.world.level.block.state.properties.Property; import net.minecraft.world.phys.BlockHitResult; import ziyue.tjmetro.BlockEntityTypes; import ziyue.tjmetro.BlockList; @@ -28,13 +27,11 @@ import ziyue.tjmetro.ItemList; import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Predicate; /** * @author ZiYueCommentary * @see BlockPSDTop - * @see ziyue.tjmetro.items.ItemPSDTianjinBase + * @see ziyue.tjmetro.item.ItemPSDTianjinBase * @since beta-1 */ diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockPlayerDetector.java b/common/src/main/java/ziyue/tjmetro/block/BlockPlayerDetector.java similarity index 99% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockPlayerDetector.java rename to common/src/main/java/ziyue/tjmetro/block/BlockPlayerDetector.java index 4979843..a1487b2 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockPlayerDetector.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockPlayerDetector.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.block.IBlock; import mtr.mappings.BlockEntityMapper; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignTianjin.java b/common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignTianjin.java similarity index 96% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignTianjin.java rename to common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignTianjin.java index 90d626c..155679f 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignTianjin.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignTianjin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.mappings.BlockEntityMapper; import net.minecraft.core.BlockPos; @@ -16,8 +16,8 @@ import net.minecraft.world.phys.shapes.VoxelShape; import ziyue.tjmetro.BlockEntityTypes; import ziyue.tjmetro.BlockList; -import ziyue.tjmetro.blocks.base.BlockRailwaySignBase; -import ziyue.tjmetro.blocks.base.IRailwaySign; +import ziyue.tjmetro.block.base.BlockRailwaySignBase; +import ziyue.tjmetro.block.base.IRailwaySign; public class BlockRailwaySignTianjin extends BlockRailwaySignBase { diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignTianjinPole.java b/common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignTianjinPole.java similarity index 97% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignTianjinPole.java rename to common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignTianjinPole.java index f78afdd..8f276ab 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignTianjinPole.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignTianjinPole.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.block.BlockRailwaySignPole; import mtr.block.IBlock; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignWall.java b/common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignWall.java similarity index 97% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignWall.java rename to common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignWall.java index 091ae4e..0cccb13 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignWall.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignWall.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.block.IBlock; import mtr.mappings.BlockEntityMapper; @@ -6,7 +6,6 @@ import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; import net.minecraft.server.level.ServerPlayer; @@ -15,7 +14,6 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; @@ -35,8 +33,8 @@ import ziyue.tjmetro.BlockEntityTypes; import ziyue.tjmetro.BlockList; import ziyue.tjmetro.IBlockExtends; -import ziyue.tjmetro.blocks.base.BlockRailwaySignBase; -import ziyue.tjmetro.blocks.base.IRailwaySign; +import ziyue.tjmetro.block.base.BlockRailwaySignBase; +import ziyue.tjmetro.block.base.IRailwaySign; import ziyue.tjmetro.packet.PacketGuiServer; import java.util.List; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignWallBig.java b/common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignWallBig.java similarity index 82% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignWallBig.java rename to common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignWallBig.java index bd2aa0d..8e321dd 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignWallBig.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignWallBig.java @@ -1,44 +1,23 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.block.IBlock; import mtr.mappings.BlockEntityMapper; -import mtr.mappings.Text; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.Style; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; 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; import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.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.BooleanProperty; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.VoxelShape; import ziyue.tjmetro.BlockEntityTypes; import ziyue.tjmetro.BlockList; -import ziyue.tjmetro.blocks.base.BlockRailwaySignBase; -import ziyue.tjmetro.blocks.base.IRailwaySign; -import ziyue.tjmetro.packet.PacketGuiServer; - -import java.util.List; - -import static net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED; +import ziyue.tjmetro.block.base.BlockRailwaySignBase; +import ziyue.tjmetro.block.base.IRailwaySign; /** * Big Railway Sign Wall. diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignWallDouble.java b/common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignWallDouble.java similarity index 92% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignWallDouble.java rename to common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignWallDouble.java index 20f0a13..8e26ff9 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockRailwaySignWallDouble.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockRailwaySignWallDouble.java @@ -1,37 +1,28 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.block.IBlock; import mtr.mappings.BlockEntityClientSerializableMapper; import mtr.mappings.BlockEntityMapper; -import mtr.mappings.Text; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.Style; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; 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; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.VoxelShape; import ziyue.tjmetro.BlockEntityTypes; import ziyue.tjmetro.BlockList; import ziyue.tjmetro.IBlockExtends; -import ziyue.tjmetro.blocks.base.BlockRailwaySignBase; -import ziyue.tjmetro.blocks.base.IRailwaySign; +import ziyue.tjmetro.block.base.BlockRailwaySignBase; +import ziyue.tjmetro.block.base.IRailwaySign; import ziyue.tjmetro.packet.PacketGuiServer; import java.util.*; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockRoadblock.java b/common/src/main/java/ziyue/tjmetro/block/BlockRoadblock.java similarity index 99% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockRoadblock.java rename to common/src/main/java/ziyue/tjmetro/block/BlockRoadblock.java index 6f1594d..d0f46b0 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockRoadblock.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockRoadblock.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.block.IBlock; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockRoadblockSign.java b/common/src/main/java/ziyue/tjmetro/block/BlockRoadblockSign.java similarity index 96% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockRoadblockSign.java rename to common/src/main/java/ziyue/tjmetro/block/BlockRoadblockSign.java index af8ecdc..dac2ad3 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockRoadblockSign.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockRoadblockSign.java @@ -1,7 +1,6 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; -import mtr.block.IBlock; import mtr.mappings.BlockEntityMapper; import mtr.mappings.EntityBlockMapper; import mtr.mappings.Text; @@ -24,7 +23,7 @@ import ziyue.tjmetro.BlockEntityTypes; import ziyue.tjmetro.IBlockExtends; import ziyue.tjmetro.TianjinMetro; -import ziyue.tjmetro.blocks.base.BlockCustomContentBlockBase; +import ziyue.tjmetro.block.base.BlockCustomContentBlockBase; import ziyue.tjmetro.packet.PacketGuiServer; import java.util.List; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockRolling.java b/common/src/main/java/ziyue/tjmetro/block/BlockRolling.java similarity index 97% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockRolling.java rename to common/src/main/java/ziyue/tjmetro/block/BlockRolling.java index a246bcc..0081f5e 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockRolling.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockRolling.java @@ -1,6 +1,5 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; -import mtr.block.IBlock; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -10,7 +9,6 @@ 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.Blocks; import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockServiceCorridorSign.java b/common/src/main/java/ziyue/tjmetro/block/BlockServiceCorridorSign.java similarity index 99% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockServiceCorridorSign.java rename to common/src/main/java/ziyue/tjmetro/block/BlockServiceCorridorSign.java index 17e646f..446bd86 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockServiceCorridorSign.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockServiceCorridorSign.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.block.IBlock; import mtr.mappings.BlockEntityClientSerializableMapper; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockStationColorCeiling.java b/common/src/main/java/ziyue/tjmetro/block/BlockStationColorCeiling.java similarity index 86% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockStationColorCeiling.java rename to common/src/main/java/ziyue/tjmetro/block/BlockStationColorCeiling.java index def61ca..6fd6b45 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockStationColorCeiling.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockStationColorCeiling.java @@ -1,29 +1,21 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.block.BlockCeiling; -import mtr.block.IBlock; import mtr.mappings.Text; import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; 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.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; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; -import net.minecraft.world.phys.BlockHitResult; import org.jetbrains.annotations.Nullable; -import ziyue.tjmetro.BlockList; import java.util.List; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockStationColorCeilingAuto.java b/common/src/main/java/ziyue/tjmetro/block/BlockStationColorCeilingAuto.java similarity index 98% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockStationColorCeilingAuto.java rename to common/src/main/java/ziyue/tjmetro/block/BlockStationColorCeilingAuto.java index 6140bdb..a4e2644 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockStationColorCeilingAuto.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockStationColorCeilingAuto.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.block.BlockCeilingAuto; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockStationColorCeilingNotLit.java b/common/src/main/java/ziyue/tjmetro/block/BlockStationColorCeilingNotLit.java similarity index 98% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockStationColorCeilingNotLit.java rename to common/src/main/java/ziyue/tjmetro/block/BlockStationColorCeilingNotLit.java index c33ae16..0ee3038 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockStationColorCeilingNotLit.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockStationColorCeilingNotLit.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.mappings.Text; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockStationNameSign1.java b/common/src/main/java/ziyue/tjmetro/block/BlockStationNameSign1.java similarity index 95% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockStationNameSign1.java rename to common/src/main/java/ziyue/tjmetro/block/BlockStationNameSign1.java index 3bdcb28..ead5fc9 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockStationNameSign1.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockStationNameSign1.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.block.IBlock; @@ -13,7 +13,7 @@ import net.minecraft.world.phys.BlockHitResult; import ziyue.tjmetro.BlockEntityTypes; import ziyue.tjmetro.ItemList; -import ziyue.tjmetro.blocks.base.BlockStationNameSignBase; +import ziyue.tjmetro.block.base.BlockStationNameSignBase; /** * First variant for Station Name Sign. diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockStationNameSign2.java b/common/src/main/java/ziyue/tjmetro/block/BlockStationNameSign2.java similarity index 96% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockStationNameSign2.java rename to common/src/main/java/ziyue/tjmetro/block/BlockStationNameSign2.java index 7a19f47..31413b3 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockStationNameSign2.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockStationNameSign2.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.mappings.BlockEntityMapper; @@ -15,7 +15,7 @@ import net.minecraft.world.phys.BlockHitResult; import ziyue.tjmetro.BlockEntityTypes; import ziyue.tjmetro.TianjinMetro; -import ziyue.tjmetro.blocks.base.BlockStationNameSignBase; +import ziyue.tjmetro.block.base.BlockStationNameSignBase; /** * Second variant for Station Name Sign. diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockStationNameWallLegacy.java b/common/src/main/java/ziyue/tjmetro/block/BlockStationNameWallLegacy.java similarity index 99% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockStationNameWallLegacy.java rename to common/src/main/java/ziyue/tjmetro/block/BlockStationNameWallLegacy.java index 8b5779e..d8fde12 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockStationNameWallLegacy.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockStationNameWallLegacy.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.block.BlockStationNameBase; import mtr.block.IBlock; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockTimeDisplay.java b/common/src/main/java/ziyue/tjmetro/block/BlockTimeDisplay.java similarity index 99% rename from common/src/main/java/ziyue/tjmetro/blocks/BlockTimeDisplay.java rename to common/src/main/java/ziyue/tjmetro/block/BlockTimeDisplay.java index e793062..6766d09 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockTimeDisplay.java +++ b/common/src/main/java/ziyue/tjmetro/block/BlockTimeDisplay.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks; +package ziyue.tjmetro.block; import mtr.Blocks; import mtr.block.IBlock; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/base/BlockCustomColorBase.java b/common/src/main/java/ziyue/tjmetro/block/base/BlockCustomColorBase.java similarity index 98% rename from common/src/main/java/ziyue/tjmetro/blocks/base/BlockCustomColorBase.java rename to common/src/main/java/ziyue/tjmetro/block/base/BlockCustomColorBase.java index 1c344fe..656a275 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/base/BlockCustomColorBase.java +++ b/common/src/main/java/ziyue/tjmetro/block/base/BlockCustomColorBase.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks.base; +package ziyue.tjmetro.block.base; import mtr.mappings.BlockEntityClientSerializableMapper; import mtr.mappings.EntityBlockMapper; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/base/BlockCustomContentBlockBase.java b/common/src/main/java/ziyue/tjmetro/block/base/BlockCustomContentBlockBase.java similarity index 98% rename from common/src/main/java/ziyue/tjmetro/blocks/base/BlockCustomContentBlockBase.java rename to common/src/main/java/ziyue/tjmetro/block/base/BlockCustomContentBlockBase.java index a67c9b8..d0625d6 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/base/BlockCustomContentBlockBase.java +++ b/common/src/main/java/ziyue/tjmetro/block/base/BlockCustomContentBlockBase.java @@ -1,6 +1,5 @@ -package ziyue.tjmetro.blocks.base; +package ziyue.tjmetro.block.base; -import mtr.block.IBlock; import mtr.mappings.BlockEntityClientSerializableMapper; import mtr.mappings.EntityBlockMapper; import mtr.mappings.Text; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/base/BlockRailwaySignBase.java b/common/src/main/java/ziyue/tjmetro/block/base/BlockRailwaySignBase.java similarity index 99% rename from common/src/main/java/ziyue/tjmetro/blocks/base/BlockRailwaySignBase.java rename to common/src/main/java/ziyue/tjmetro/block/base/BlockRailwaySignBase.java index fcdd147..dcc017a 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/base/BlockRailwaySignBase.java +++ b/common/src/main/java/ziyue/tjmetro/block/base/BlockRailwaySignBase.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks.base; +package ziyue.tjmetro.block.base; import mtr.block.IBlock; import mtr.mappings.*; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/base/BlockStationNameSignBase.java b/common/src/main/java/ziyue/tjmetro/block/base/BlockStationNameSignBase.java similarity index 98% rename from common/src/main/java/ziyue/tjmetro/blocks/base/BlockStationNameSignBase.java rename to common/src/main/java/ziyue/tjmetro/block/base/BlockStationNameSignBase.java index 4f4edc4..826fdb5 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/base/BlockStationNameSignBase.java +++ b/common/src/main/java/ziyue/tjmetro/block/base/BlockStationNameSignBase.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks.base; +package ziyue.tjmetro.block.base; import mtr.block.BlockStationNameBase; import mtr.block.IBlock; @@ -12,7 +12,6 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/base/IRailwaySign.java b/common/src/main/java/ziyue/tjmetro/block/base/IRailwaySign.java similarity index 99% rename from common/src/main/java/ziyue/tjmetro/blocks/base/IRailwaySign.java rename to common/src/main/java/ziyue/tjmetro/block/base/IRailwaySign.java index 2665f35..31f2f69 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/base/IRailwaySign.java +++ b/common/src/main/java/ziyue/tjmetro/block/base/IRailwaySign.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks.base; +package ziyue.tjmetro.block.base; import mtr.block.IBlock; import net.minecraft.core.BlockPos; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/base/RenderAttachmentBlockEntity.java b/common/src/main/java/ziyue/tjmetro/block/base/RenderAttachmentBlockEntity.java similarity index 90% rename from common/src/main/java/ziyue/tjmetro/blocks/base/RenderAttachmentBlockEntity.java rename to common/src/main/java/ziyue/tjmetro/block/base/RenderAttachmentBlockEntity.java index 7768567..d9bf43b 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/base/RenderAttachmentBlockEntity.java +++ b/common/src/main/java/ziyue/tjmetro/block/base/RenderAttachmentBlockEntity.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks.base; +package ziyue.tjmetro.block.base; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/base/StairBlock.java b/common/src/main/java/ziyue/tjmetro/block/base/StairBlock.java similarity index 94% rename from common/src/main/java/ziyue/tjmetro/blocks/base/StairBlock.java rename to common/src/main/java/ziyue/tjmetro/block/base/StairBlock.java index 30ea6bc..6a8c8f8 100644 --- a/common/src/main/java/ziyue/tjmetro/blocks/base/StairBlock.java +++ b/common/src/main/java/ziyue/tjmetro/block/base/StairBlock.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.blocks.base; +package ziyue.tjmetro.block.base; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockBehaviour; diff --git a/common/src/main/java/ziyue/tjmetro/blocks/BlockPSDGlassTianjin.java b/common/src/main/java/ziyue/tjmetro/blocks/BlockPSDGlassTianjin.java deleted file mode 100644 index 918666c..0000000 --- a/common/src/main/java/ziyue/tjmetro/blocks/BlockPSDGlassTianjin.java +++ /dev/null @@ -1,29 +0,0 @@ -package ziyue.tjmetro.blocks; - -import mtr.block.BlockPSDAPGGlassBase; -import net.minecraft.core.BlockPos; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.pathfinder.PathComputationType; -import net.minecraft.world.phys.BlockHitResult; -import ziyue.tjmetro.ItemList; - -/** - * @author ZiYueCommentary - * @see ziyue.tjmetro.items.ItemPSDTianjinBase - * @see BlockPSDAPGGlassBase - * @since beta-1 - */ - -public class BlockPSDGlassTianjin extends BlockPSDAPGGlassBase -{ - @Override - public Item asItem() { - return ItemList.PSD_GLASS_TIANJIN.get(); - } -} diff --git a/common/src/main/java/ziyue/tjmetro/filters/Filter.java b/common/src/main/java/ziyue/tjmetro/filter/Filter.java similarity index 96% rename from common/src/main/java/ziyue/tjmetro/filters/Filter.java rename to common/src/main/java/ziyue/tjmetro/filter/Filter.java index 852419f..291dbea 100644 --- a/common/src/main/java/ziyue/tjmetro/filters/Filter.java +++ b/common/src/main/java/ziyue/tjmetro/filter/Filter.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.filters; +package ziyue.tjmetro.filter; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; @@ -15,7 +15,9 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import ziyue.tjmetro.mixin.mixins.CreativeModeInventoryScreenMixin; +import ziyue.tjmetro.mixin.CreativeModeInventoryScreenMixin; +import ziyue.tjmetro.mixin.EffectRenderingInventoryScreenMixin; +import ziyue.tjmetro.property.CreativeModeInventoryScreenProperty; import java.util.ArrayList; import java.util.Arrays; @@ -31,8 +33,8 @@ * * @author ZiYueCommentary * @see CreativeModeInventoryScreenMixin - * @see ziyue.tjmetro.mixin.mixins.EffectRenderingInventoryScreenMixin - * @see ziyue.tjmetro.mixin.properties.CreativeModeInventoryScreenProperties + * @see EffectRenderingInventoryScreenMixin + * @see CreativeModeInventoryScreenProperty * @see Filters Mod * @see MrCrayfish's Furniture Mod * @since beta-1 diff --git a/common/src/main/java/ziyue/tjmetro/filters/IconButton.java b/common/src/main/java/ziyue/tjmetro/filter/IconButton.java similarity index 98% rename from common/src/main/java/ziyue/tjmetro/filters/IconButton.java rename to common/src/main/java/ziyue/tjmetro/filter/IconButton.java index 5698492..5607062 100644 --- a/common/src/main/java/ziyue/tjmetro/filters/IconButton.java +++ b/common/src/main/java/ziyue/tjmetro/filter/IconButton.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.filters; +package ziyue.tjmetro.filter; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/common/src/main/java/ziyue/tjmetro/items/ItemPSDTianjinBase.java b/common/src/main/java/ziyue/tjmetro/item/ItemPSDTianjinBase.java similarity index 89% rename from common/src/main/java/ziyue/tjmetro/items/ItemPSDTianjinBase.java rename to common/src/main/java/ziyue/tjmetro/item/ItemPSDTianjinBase.java index 0d2e864..e124244 100644 --- a/common/src/main/java/ziyue/tjmetro/items/ItemPSDTianjinBase.java +++ b/common/src/main/java/ziyue/tjmetro/item/ItemPSDTianjinBase.java @@ -1,8 +1,7 @@ -package ziyue.tjmetro.items; +package ziyue.tjmetro.item; import mtr.RegistryObject; import mtr.block.BlockPSDAPGBase; -import mtr.block.BlockPSDAPGDoorBase; import mtr.block.IBlock; import mtr.item.ItemWithCreativeTabBase; import mtr.mappings.Text; @@ -20,17 +19,16 @@ import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; import org.jetbrains.annotations.Nullable; import ziyue.tjmetro.TianjinMetro; -import ziyue.tjmetro.blocks.BlockPSDDoorTianjin; -import ziyue.tjmetro.blocks.BlockPSDGlassEndTianjin; -import ziyue.tjmetro.blocks.BlockPSDGlassTianjin; -import ziyue.tjmetro.blocks.BlockPSDTopTianjin; -import ziyue.tjmetro.client.ClientCache; +import ziyue.tjmetro.block.BlockPSDDoorTianjin; +import ziyue.tjmetro.block.BlockPSDGlassEndTianjin; +import ziyue.tjmetro.block.BlockPSDGlassTianjin; +import ziyue.tjmetro.block.BlockPSDTopTianjin; import java.util.List; import static mtr.item.ItemPSDAPGBase.blocksNotReplaceable; -import static ziyue.tjmetro.blocks.BlockPSDTopTianjin.STYLE; -import static ziyue.tjmetro.blocks.BlockPSDTopTianjin.getActualState; +import static ziyue.tjmetro.block.BlockPSDTopTianjin.STYLE; +import static ziyue.tjmetro.block.BlockPSDTopTianjin.getActualState; /** * @author ZiYueCommentary diff --git a/common/src/main/java/ziyue/tjmetro/mixin/mixins/ClientDataMixin.java b/common/src/main/java/ziyue/tjmetro/mixin/ClientDataMixin.java similarity index 95% rename from common/src/main/java/ziyue/tjmetro/mixin/mixins/ClientDataMixin.java rename to common/src/main/java/ziyue/tjmetro/mixin/ClientDataMixin.java index ea70b30..a76f17f 100644 --- a/common/src/main/java/ziyue/tjmetro/mixin/mixins/ClientDataMixin.java +++ b/common/src/main/java/ziyue/tjmetro/mixin/ClientDataMixin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.mixin.mixins; +package ziyue.tjmetro.mixin; import mtr.client.ClientData; import net.minecraft.network.FriendlyByteBuf; diff --git a/common/src/main/java/ziyue/tjmetro/mixin/mixins/ConfigScreenMixin.java b/common/src/main/java/ziyue/tjmetro/mixin/ConfigScreenMixin.java similarity index 95% rename from common/src/main/java/ziyue/tjmetro/mixin/mixins/ConfigScreenMixin.java rename to common/src/main/java/ziyue/tjmetro/mixin/ConfigScreenMixin.java index 9a8129d..305884e 100644 --- a/common/src/main/java/ziyue/tjmetro/mixin/mixins/ConfigScreenMixin.java +++ b/common/src/main/java/ziyue/tjmetro/mixin/ConfigScreenMixin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.mixin.mixins; +package ziyue.tjmetro.mixin; import mtr.data.IGui; import mtr.mappings.ScreenMapper; diff --git a/common/src/main/java/ziyue/tjmetro/mixin/mixins/CreativeModeInventoryScreenMixin.java b/common/src/main/java/ziyue/tjmetro/mixin/CreativeModeInventoryScreenMixin.java similarity index 95% rename from common/src/main/java/ziyue/tjmetro/mixin/mixins/CreativeModeInventoryScreenMixin.java rename to common/src/main/java/ziyue/tjmetro/mixin/CreativeModeInventoryScreenMixin.java index c97c3e0..c59a605 100644 --- a/common/src/main/java/ziyue/tjmetro/mixin/mixins/CreativeModeInventoryScreenMixin.java +++ b/common/src/main/java/ziyue/tjmetro/mixin/CreativeModeInventoryScreenMixin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.mixin.mixins; +package ziyue.tjmetro.mixin; import com.mojang.blaze3d.vertex.PoseStack; import mtr.mappings.Text; @@ -20,9 +20,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import ziyue.tjmetro.Config; import ziyue.tjmetro.Reference; -import ziyue.tjmetro.filters.Filter; -import ziyue.tjmetro.filters.IconButton; -import ziyue.tjmetro.mixin.properties.CreativeModeInventoryScreenProperties; +import ziyue.tjmetro.filter.Filter; +import ziyue.tjmetro.filter.IconButton; +import ziyue.tjmetro.property.CreativeModeInventoryScreenProperty; import java.util.Comparator; import java.util.Map; @@ -33,12 +33,12 @@ * @author ZiYueCommentary * @see Filter * @see EffectRenderingInventoryScreenMixin - * @see CreativeModeInventoryScreenProperties + * @see CreativeModeInventoryScreenProperty * @since beta-1 */ @Mixin(CreativeModeInventoryScreen.class) -public abstract class CreativeModeInventoryScreenMixin extends EffectRenderingInventoryScreen implements CreativeModeInventoryScreenProperties +public abstract class CreativeModeInventoryScreenMixin extends EffectRenderingInventoryScreen implements CreativeModeInventoryScreenProperty { @Unique private static final ResourceLocation tianjin_Metro$ICONS = new ResourceLocation(Reference.MOD_ID, "textures/gui/filters.png"); diff --git a/common/src/main/java/ziyue/tjmetro/mixin/mixins/CustomResourcesMixin.java b/common/src/main/java/ziyue/tjmetro/mixin/CustomResourcesMixin.java similarity index 95% rename from common/src/main/java/ziyue/tjmetro/mixin/mixins/CustomResourcesMixin.java rename to common/src/main/java/ziyue/tjmetro/mixin/CustomResourcesMixin.java index e8bf5ef..5c037af 100644 --- a/common/src/main/java/ziyue/tjmetro/mixin/mixins/CustomResourcesMixin.java +++ b/common/src/main/java/ziyue/tjmetro/mixin/CustomResourcesMixin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.mixin.mixins; +package ziyue.tjmetro.mixin; import mtr.client.CustomResources; import mtr.client.ICustomResources; diff --git a/common/src/main/java/ziyue/tjmetro/mixin/mixins/EffectRenderingInventoryScreenMixin.java b/common/src/main/java/ziyue/tjmetro/mixin/EffectRenderingInventoryScreenMixin.java similarity index 89% rename from common/src/main/java/ziyue/tjmetro/mixin/mixins/EffectRenderingInventoryScreenMixin.java rename to common/src/main/java/ziyue/tjmetro/mixin/EffectRenderingInventoryScreenMixin.java index 36d1fcc..02a1dfa 100644 --- a/common/src/main/java/ziyue/tjmetro/mixin/mixins/EffectRenderingInventoryScreenMixin.java +++ b/common/src/main/java/ziyue/tjmetro/mixin/EffectRenderingInventoryScreenMixin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.mixin.mixins; +package ziyue.tjmetro.mixin; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; @@ -11,16 +11,16 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import ziyue.tjmetro.filters.Filter; -import ziyue.tjmetro.mixin.properties.CreativeModeInventoryScreenProperties; +import ziyue.tjmetro.filter.Filter; +import ziyue.tjmetro.property.CreativeModeInventoryScreenProperty; /** * Change effect labels' position in "creative mode tab with filters". * * @author ZiYueCommentary - * @see ziyue.tjmetro.filters.Filter + * @see ziyue.tjmetro.filter.Filter * @see CreativeModeInventoryScreenMixin - * @see CreativeModeInventoryScreenProperties + * @see CreativeModeInventoryScreenProperty * @since beta-1 */ diff --git a/common/src/main/java/ziyue/tjmetro/mixin/mixins/EntityRenderDispatcherMixin.java b/common/src/main/java/ziyue/tjmetro/mixin/EntityRenderDispatcherMixin.java similarity index 86% rename from common/src/main/java/ziyue/tjmetro/mixin/mixins/EntityRenderDispatcherMixin.java rename to common/src/main/java/ziyue/tjmetro/mixin/EntityRenderDispatcherMixin.java index db0a184..9d541b3 100644 --- a/common/src/main/java/ziyue/tjmetro/mixin/mixins/EntityRenderDispatcherMixin.java +++ b/common/src/main/java/ziyue/tjmetro/mixin/EntityRenderDispatcherMixin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.mixin.mixins; +package ziyue.tjmetro.mixin; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.MultiBufferSource; @@ -9,14 +9,14 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import ziyue.tjmetro.blocks.BlockBench; +import ziyue.tjmetro.block.BlockBench; /** * Prevent render shadows for Bench Seats. * * @author ZiYueCommentary - * @see ziyue.tjmetro.blocks.BlockBench.TileEntityBench - * @see ziyue.tjmetro.blocks.BlockBench + * @see ziyue.tjmetro.block.BlockBench.TileEntityBench + * @see ziyue.tjmetro.block.BlockBench * @since beta-1 */ diff --git a/common/src/main/java/ziyue/tjmetro/mixin/mixins/FallingBlockMixin.java b/common/src/main/java/ziyue/tjmetro/mixin/FallingBlockMixin.java similarity index 97% rename from common/src/main/java/ziyue/tjmetro/mixin/mixins/FallingBlockMixin.java rename to common/src/main/java/ziyue/tjmetro/mixin/FallingBlockMixin.java index 7549356..4e7c112 100644 --- a/common/src/main/java/ziyue/tjmetro/mixin/mixins/FallingBlockMixin.java +++ b/common/src/main/java/ziyue/tjmetro/mixin/FallingBlockMixin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.mixin.mixins; +package ziyue.tjmetro.mixin; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/common/src/main/java/ziyue/tjmetro/mixin/mixins/FinishInitializationMixin.java b/common/src/main/java/ziyue/tjmetro/mixin/FinishInitializationMixin.java similarity index 99% rename from common/src/main/java/ziyue/tjmetro/mixin/mixins/FinishInitializationMixin.java rename to common/src/main/java/ziyue/tjmetro/mixin/FinishInitializationMixin.java index cc063db..71ae825 100644 --- a/common/src/main/java/ziyue/tjmetro/mixin/mixins/FinishInitializationMixin.java +++ b/common/src/main/java/ziyue/tjmetro/mixin/FinishInitializationMixin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.mixin.mixins; +package ziyue.tjmetro.mixin; import com.mojang.blaze3d.systems.RenderSystem; import mtr.Blocks; @@ -14,7 +14,7 @@ import ziyue.tjmetro.Config; import ziyue.tjmetro.Reference; import ziyue.tjmetro.client.RouteMapGenerator; -import ziyue.tjmetro.filters.Filter; +import ziyue.tjmetro.filter.Filter; import java.util.concurrent.atomic.AtomicInteger; diff --git a/common/src/main/java/ziyue/tjmetro/mixin/mixins/MinecartRendererMixin.java b/common/src/main/java/ziyue/tjmetro/mixin/MinecartRendererMixin.java similarity index 89% rename from common/src/main/java/ziyue/tjmetro/mixin/mixins/MinecartRendererMixin.java rename to common/src/main/java/ziyue/tjmetro/mixin/MinecartRendererMixin.java index 9ca1aac..b616776 100644 --- a/common/src/main/java/ziyue/tjmetro/mixin/mixins/MinecartRendererMixin.java +++ b/common/src/main/java/ziyue/tjmetro/mixin/MinecartRendererMixin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.mixin.mixins; +package ziyue.tjmetro.mixin; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.MultiBufferSource; @@ -10,14 +10,14 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import ziyue.tjmetro.blocks.BlockBench; +import ziyue.tjmetro.block.BlockBench; /** * Prevent render bench-seat-minecart. * * @author ZiYueCommentary - * @see ziyue.tjmetro.blocks.BlockBench - * @see ziyue.tjmetro.blocks.BlockBench.TileEntityBench + * @see ziyue.tjmetro.block.BlockBench + * @see ziyue.tjmetro.block.BlockBench.TileEntityBench * @since beta-1 */ diff --git a/common/src/main/java/ziyue/tjmetro/mixin/mixins/MinecraftServerMixin.java b/common/src/main/java/ziyue/tjmetro/mixin/MinecraftServerMixin.java similarity index 87% rename from common/src/main/java/ziyue/tjmetro/mixin/mixins/MinecraftServerMixin.java rename to common/src/main/java/ziyue/tjmetro/mixin/MinecraftServerMixin.java index c2b19ee..852fd9b 100644 --- a/common/src/main/java/ziyue/tjmetro/mixin/mixins/MinecraftServerMixin.java +++ b/common/src/main/java/ziyue/tjmetro/mixin/MinecraftServerMixin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.mixin.mixins; +package ziyue.tjmetro.mixin; import net.minecraft.commands.CommandSource; import net.minecraft.server.MinecraftServer; @@ -11,15 +11,15 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import ziyue.tjmetro.TianjinMetro; -import ziyue.tjmetro.blocks.BlockBench; +import ziyue.tjmetro.block.BlockBench; /** * Killing all bench seats before stopping the server. * Stopping server without kill seats will make seats unable to be killed. * * @author ZiYueCommentary - * @see ziyue.tjmetro.blocks.BlockBench - * @see ziyue.tjmetro.blocks.BlockBench.TileEntityBench + * @see ziyue.tjmetro.block.BlockBench + * @see ziyue.tjmetro.block.BlockBench.TileEntityBench * @since beta-1 */ diff --git a/common/src/main/java/ziyue/tjmetro/mixin/mixins/PacketTrainDataGuiClientMixin.java b/common/src/main/java/ziyue/tjmetro/mixin/PacketTrainDataGuiClientMixin.java similarity index 97% rename from common/src/main/java/ziyue/tjmetro/mixin/mixins/PacketTrainDataGuiClientMixin.java rename to common/src/main/java/ziyue/tjmetro/mixin/PacketTrainDataGuiClientMixin.java index 6c258a6..ecca3d9 100644 --- a/common/src/main/java/ziyue/tjmetro/mixin/mixins/PacketTrainDataGuiClientMixin.java +++ b/common/src/main/java/ziyue/tjmetro/mixin/PacketTrainDataGuiClientMixin.java @@ -1,4 +1,4 @@ -package ziyue.tjmetro.mixin.mixins; +package ziyue.tjmetro.mixin; import mtr.data.NameColorDataBase; import mtr.data.TransportMode; diff --git a/common/src/main/java/ziyue/tjmetro/mixin/properties/CreativeModeInventoryScreenProperties.java b/common/src/main/java/ziyue/tjmetro/mixin/properties/CreativeModeInventoryScreenProperties.java deleted file mode 100644 index 09a3a62..0000000 --- a/common/src/main/java/ziyue/tjmetro/mixin/properties/CreativeModeInventoryScreenProperties.java +++ /dev/null @@ -1,16 +0,0 @@ -package ziyue.tjmetro.mixin.properties; - -/** - * Methods for filters rendering. - * - * @author ZiYueCommentary - * @see ziyue.tjmetro.mixin.mixins.CreativeModeInventoryScreenMixin - * @see ziyue.tjmetro.mixin.mixins.EffectRenderingInventoryScreenMixin - * @see ziyue.tjmetro.filters.Filter - * @since beta-1 - */ - -public interface CreativeModeInventoryScreenProperties -{ - int tianjin_Metro$getSelectedTab(); -} diff --git a/common/src/main/java/ziyue/tjmetro/packet/PacketGuiClient.java b/common/src/main/java/ziyue/tjmetro/packet/PacketGuiClient.java index 35fd7e6..e12a69d 100644 --- a/common/src/main/java/ziyue/tjmetro/packet/PacketGuiClient.java +++ b/common/src/main/java/ziyue/tjmetro/packet/PacketGuiClient.java @@ -7,8 +7,8 @@ import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.level.block.entity.BlockEntity; -import ziyue.tjmetro.blocks.base.BlockCustomColorBase; -import ziyue.tjmetro.blocks.base.BlockCustomContentBlockBase; +import ziyue.tjmetro.block.base.BlockCustomColorBase; +import ziyue.tjmetro.block.base.BlockCustomContentBlockBase; import ziyue.tjmetro.screen.ColorPickerScreen; import ziyue.tjmetro.screen.CustomContentScreen; import ziyue.tjmetro.screen.RailwaySignScreen; diff --git a/common/src/main/java/ziyue/tjmetro/packet/PacketGuiServer.java b/common/src/main/java/ziyue/tjmetro/packet/PacketGuiServer.java index b685171..0eddfd1 100644 --- a/common/src/main/java/ziyue/tjmetro/packet/PacketGuiServer.java +++ b/common/src/main/java/ziyue/tjmetro/packet/PacketGuiServer.java @@ -14,10 +14,10 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.block.entity.BlockEntity; -import ziyue.tjmetro.blocks.BlockRailwaySignWallDouble; -import ziyue.tjmetro.blocks.base.BlockCustomColorBase; -import ziyue.tjmetro.blocks.base.BlockCustomContentBlockBase; -import ziyue.tjmetro.blocks.base.BlockRailwaySignBase; +import ziyue.tjmetro.block.BlockRailwaySignWallDouble; +import ziyue.tjmetro.block.base.BlockCustomColorBase; +import ziyue.tjmetro.block.base.BlockCustomContentBlockBase; +import ziyue.tjmetro.block.base.BlockRailwaySignBase; import java.util.ArrayList; import java.util.HashSet; diff --git a/common/src/main/java/ziyue/tjmetro/property/CreativeModeInventoryScreenProperty.java b/common/src/main/java/ziyue/tjmetro/property/CreativeModeInventoryScreenProperty.java new file mode 100644 index 0000000..f9da13d --- /dev/null +++ b/common/src/main/java/ziyue/tjmetro/property/CreativeModeInventoryScreenProperty.java @@ -0,0 +1,19 @@ +package ziyue.tjmetro.property; + +import ziyue.tjmetro.mixin.CreativeModeInventoryScreenMixin; +import ziyue.tjmetro.mixin.EffectRenderingInventoryScreenMixin; + +/** + * Methods for filters rendering. + * + * @author ZiYueCommentary + * @see CreativeModeInventoryScreenMixin + * @see EffectRenderingInventoryScreenMixin + * @see ziyue.tjmetro.filter.Filter + * @since beta-1 + */ + +public interface CreativeModeInventoryScreenProperty +{ + int tianjin_Metro$getSelectedTab(); +} diff --git a/common/src/main/java/ziyue/tjmetro/render/RenderPSDTopTianjin.java b/common/src/main/java/ziyue/tjmetro/render/RenderPSDTopTianjin.java index 6acd6b2..e646e30 100644 --- a/common/src/main/java/ziyue/tjmetro/render/RenderPSDTopTianjin.java +++ b/common/src/main/java/ziyue/tjmetro/render/RenderPSDTopTianjin.java @@ -1,7 +1,6 @@ package ziyue.tjmetro.render; import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.math.Vector3f; import mtr.block.BlockPSDAPGDoorBase; import mtr.block.BlockPSDAPGGlassEndBase; import mtr.block.BlockPSDTop; @@ -17,17 +16,13 @@ import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; -import net.minecraft.util.Tuple; 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.HorizontalDirectionalBlock; import net.minecraft.world.level.block.state.BlockState; -import ziyue.tjmetro.blocks.BlockPSDTopTianjin; +import ziyue.tjmetro.block.BlockPSDTopTianjin; import ziyue.tjmetro.client.ClientCache; -import ziyue.tjmetro.client.RouteMapGenerator; - -import java.util.Objects; import static mtr.render.RenderRouteBase.getShadingColor; diff --git a/common/src/main/java/ziyue/tjmetro/render/RenderRailwaySignTianjin.java b/common/src/main/java/ziyue/tjmetro/render/RenderRailwaySignTianjin.java index d02ac83..f414788 100644 --- a/common/src/main/java/ziyue/tjmetro/render/RenderRailwaySignTianjin.java +++ b/common/src/main/java/ziyue/tjmetro/render/RenderRailwaySignTianjin.java @@ -28,8 +28,8 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; -import ziyue.tjmetro.blocks.BlockRailwaySignTianjin; -import ziyue.tjmetro.blocks.base.BlockRailwaySignBase; +import ziyue.tjmetro.block.BlockRailwaySignTianjin; +import ziyue.tjmetro.block.base.BlockRailwaySignBase; import java.util.*; import java.util.stream.Collectors; diff --git a/common/src/main/java/ziyue/tjmetro/render/RenderRailwaySignWall.java b/common/src/main/java/ziyue/tjmetro/render/RenderRailwaySignWall.java index d2e3a30..3f910c2 100644 --- a/common/src/main/java/ziyue/tjmetro/render/RenderRailwaySignWall.java +++ b/common/src/main/java/ziyue/tjmetro/render/RenderRailwaySignWall.java @@ -28,9 +28,9 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; -import ziyue.tjmetro.blocks.BlockRailwaySignWall; -import ziyue.tjmetro.blocks.BlockRailwaySignWallBig; -import ziyue.tjmetro.blocks.base.BlockRailwaySignBase; +import ziyue.tjmetro.block.BlockRailwaySignWall; +import ziyue.tjmetro.block.BlockRailwaySignWallBig; +import ziyue.tjmetro.block.base.BlockRailwaySignBase; import java.util.*; import java.util.stream.Collectors; diff --git a/common/src/main/java/ziyue/tjmetro/render/RenderRailwaySignWallDouble.java b/common/src/main/java/ziyue/tjmetro/render/RenderRailwaySignWallDouble.java index 593111e..28abc42 100644 --- a/common/src/main/java/ziyue/tjmetro/render/RenderRailwaySignWallDouble.java +++ b/common/src/main/java/ziyue/tjmetro/render/RenderRailwaySignWallDouble.java @@ -28,9 +28,8 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; -import ziyue.tjmetro.blocks.BlockRailwaySignWall; -import ziyue.tjmetro.blocks.BlockRailwaySignWallDouble; -import ziyue.tjmetro.blocks.base.BlockRailwaySignBase; +import ziyue.tjmetro.block.BlockRailwaySignWallDouble; +import ziyue.tjmetro.block.base.BlockRailwaySignBase; import java.util.*; import java.util.stream.Collectors; diff --git a/common/src/main/java/ziyue/tjmetro/render/RenderRoadblockSign.java b/common/src/main/java/ziyue/tjmetro/render/RenderRoadblockSign.java index c429acc..dcdcc9f 100644 --- a/common/src/main/java/ziyue/tjmetro/render/RenderRoadblockSign.java +++ b/common/src/main/java/ziyue/tjmetro/render/RenderRoadblockSign.java @@ -17,7 +17,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; import ziyue.tjmetro.IDrawingExtends; -import ziyue.tjmetro.blocks.BlockRoadblockSign; +import ziyue.tjmetro.block.BlockRoadblockSign; /** * Render content for Roadblock with Sign. @@ -25,7 +25,7 @@ * * @author ZiYueCommentary * @see ziyue.tjmetro.screen.CustomContentScreen - * @see ziyue.tjmetro.blocks.BlockRoadblockSign + * @see ziyue.tjmetro.block.BlockRoadblockSign * @since beta-1 */ diff --git a/common/src/main/java/ziyue/tjmetro/render/RenderServiceCorridorSign.java b/common/src/main/java/ziyue/tjmetro/render/RenderServiceCorridorSign.java index 95e8fc4..4d9e8db 100644 --- a/common/src/main/java/ziyue/tjmetro/render/RenderServiceCorridorSign.java +++ b/common/src/main/java/ziyue/tjmetro/render/RenderServiceCorridorSign.java @@ -18,13 +18,13 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; import ziyue.tjmetro.IDrawingExtends; -import ziyue.tjmetro.blocks.BlockServiceCorridorSign; +import ziyue.tjmetro.block.BlockServiceCorridorSign; /** * Render contents for Service Corridor Sign. * * @author ZiYueCommentary - * @see ziyue.tjmetro.blocks.BlockServiceCorridorSign + * @see ziyue.tjmetro.block.BlockServiceCorridorSign * @since beta-1 */ diff --git a/common/src/main/java/ziyue/tjmetro/render/RenderStationNameSign.java b/common/src/main/java/ziyue/tjmetro/render/RenderStationNameSign.java index c451e22..b0f26d9 100644 --- a/common/src/main/java/ziyue/tjmetro/render/RenderStationNameSign.java +++ b/common/src/main/java/ziyue/tjmetro/render/RenderStationNameSign.java @@ -21,7 +21,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; import ziyue.tjmetro.IDrawingExtends; -import ziyue.tjmetro.blocks.base.BlockStationNameSignBase; +import ziyue.tjmetro.block.base.BlockStationNameSignBase; /** * Render content for Station Name Sign Block. diff --git a/common/src/main/java/ziyue/tjmetro/render/RenderStationNameWallLegacy.java b/common/src/main/java/ziyue/tjmetro/render/RenderStationNameWallLegacy.java index d914c87..5bb0d7f 100644 --- a/common/src/main/java/ziyue/tjmetro/render/RenderStationNameWallLegacy.java +++ b/common/src/main/java/ziyue/tjmetro/render/RenderStationNameWallLegacy.java @@ -22,7 +22,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; import ziyue.tjmetro.IDrawingExtends; -import ziyue.tjmetro.blocks.BlockStationNameWallLegacy; +import ziyue.tjmetro.block.BlockStationNameWallLegacy; /** * @author ZiYueCommentary diff --git a/common/src/main/java/ziyue/tjmetro/render/RenderTimeDisplay.java b/common/src/main/java/ziyue/tjmetro/render/RenderTimeDisplay.java index bab2330..d85fbd8 100644 --- a/common/src/main/java/ziyue/tjmetro/render/RenderTimeDisplay.java +++ b/common/src/main/java/ziyue/tjmetro/render/RenderTimeDisplay.java @@ -16,7 +16,7 @@ import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; import ziyue.tjmetro.IDrawingExtends; -import ziyue.tjmetro.blocks.BlockTimeDisplay; +import ziyue.tjmetro.block.BlockTimeDisplay; /** * @author ZiYueCommentary diff --git a/common/src/main/java/ziyue/tjmetro/screen/CustomContentScreen.java b/common/src/main/java/ziyue/tjmetro/screen/CustomContentScreen.java index 7bf28ad..a1e0917 100644 --- a/common/src/main/java/ziyue/tjmetro/screen/CustomContentScreen.java +++ b/common/src/main/java/ziyue/tjmetro/screen/CustomContentScreen.java @@ -11,8 +11,7 @@ import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; -import ziyue.tjmetro.TianjinMetro; -import ziyue.tjmetro.blocks.base.BlockCustomContentBlockBase; +import ziyue.tjmetro.block.base.BlockCustomContentBlockBase; import ziyue.tjmetro.packet.PacketGuiClient; /** diff --git a/common/src/main/java/ziyue/tjmetro/screen/RailwaySignScreen.java b/common/src/main/java/ziyue/tjmetro/screen/RailwaySignScreen.java index ff0b2a6..5ee836f 100644 --- a/common/src/main/java/ziyue/tjmetro/screen/RailwaySignScreen.java +++ b/common/src/main/java/ziyue/tjmetro/screen/RailwaySignScreen.java @@ -23,7 +23,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.level.block.entity.BlockEntity; import ziyue.tjmetro.TianjinMetro; -import ziyue.tjmetro.blocks.base.BlockRailwaySignBase; +import ziyue.tjmetro.block.base.BlockRailwaySignBase; import ziyue.tjmetro.packet.PacketGuiServer; import java.util.*; diff --git a/common/src/main/java/ziyue/tjmetro/screen/RailwaySignWallDoubleScreen.java b/common/src/main/java/ziyue/tjmetro/screen/RailwaySignWallDoubleScreen.java index d41e302..6080c40 100644 --- a/common/src/main/java/ziyue/tjmetro/screen/RailwaySignWallDoubleScreen.java +++ b/common/src/main/java/ziyue/tjmetro/screen/RailwaySignWallDoubleScreen.java @@ -23,8 +23,8 @@ import net.minecraft.util.Mth; import net.minecraft.world.level.block.entity.BlockEntity; import ziyue.tjmetro.TianjinMetro; -import ziyue.tjmetro.blocks.BlockRailwaySignWallDouble; -import ziyue.tjmetro.blocks.base.BlockRailwaySignBase; +import ziyue.tjmetro.block.BlockRailwaySignWallDouble; +import ziyue.tjmetro.block.base.BlockRailwaySignBase; import ziyue.tjmetro.packet.PacketGuiServer; import java.util.*; diff --git a/common/src/main/resources/tjmetro.mixins.json b/common/src/main/resources/tjmetro.mixins.json index a8fbf66..ca913af 100644 --- a/common/src/main/resources/tjmetro.mixins.json +++ b/common/src/main/resources/tjmetro.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "ziyue.tjmetro.mixin.mixins", + "package": "ziyue.tjmetro.mixin", "compatibilityLevel": "JAVA_16", "mixins": [ "ClientDataMixin", diff --git a/fabric/src/main/java/ziyue/tjmetro/MainFabric.java b/fabric/src/main/java/ziyue/tjmetro/MainFabric.java index eba2369..b57a5a9 100644 --- a/fabric/src/main/java/ziyue/tjmetro/MainFabric.java +++ b/fabric/src/main/java/ziyue/tjmetro/MainFabric.java @@ -11,7 +11,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; -import ziyue.tjmetro.filters.Filter; +import ziyue.tjmetro.filter.Filter; /** * Entry of fabric mod. diff --git a/fabric/src/main/java/ziyue/tjmetro/fabric/RegistryImpl.java b/fabric/src/main/java/ziyue/tjmetro/fabric/RegistryImpl.java index 941316d..d5bf263 100644 --- a/fabric/src/main/java/ziyue/tjmetro/fabric/RegistryImpl.java +++ b/fabric/src/main/java/ziyue/tjmetro/fabric/RegistryImpl.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.GameRules; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; -import ziyue.tjmetro.blocks.base.BlockCustomColorBase; +import ziyue.tjmetro.block.base.BlockCustomColorBase; /** * Methods implements of fabric mod. diff --git a/forge/src/main/java/ziyue/tjmetro/MainForge.java b/forge/src/main/java/ziyue/tjmetro/MainForge.java index 13bfabd..3103935 100644 --- a/forge/src/main/java/ziyue/tjmetro/MainForge.java +++ b/forge/src/main/java/ziyue/tjmetro/MainForge.java @@ -18,7 +18,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import ziyue.tjmetro.filters.Filter; +import ziyue.tjmetro.filter.Filter; import java.util.ArrayList; diff --git a/forge/src/main/java/ziyue/tjmetro/forge/RegistryImpl.java b/forge/src/main/java/ziyue/tjmetro/forge/RegistryImpl.java index 61fc56b..4869dde 100644 --- a/forge/src/main/java/ziyue/tjmetro/forge/RegistryImpl.java +++ b/forge/src/main/java/ziyue/tjmetro/forge/RegistryImpl.java @@ -10,7 +10,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import ziyue.tjmetro.blocks.base.BlockCustomColorBase; +import ziyue.tjmetro.block.base.BlockCustomColorBase; /** * Methods implements of forge mod.