↔️ Restructed

ZiYueCommentary · Mar 31, 2024 · 6c507cb · 6c507cb
1 parent 1aac00a
commit 6c507cb
Show file tree

Hide file tree

Showing 81 changed files with 183 additions and 254 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../ziyue/tjmetro/blocks/BlockAPGCorner.java → ...a/ziyue/tjmetro/block/BlockAPGCorner.java b/.../ziyue/tjmetro/blocks/BlockAPGCorner.java → ...a/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/...java/ziyue/tjmetro/blocks/BlockBench.java → .../java/ziyue/tjmetro/block/BlockBench.java b/...java/ziyue/tjmetro/blocks/BlockBench.java → .../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/...ue/tjmetro/blocks/BlockCeilingNotLit.java → ...yue/tjmetro/block/BlockCeilingNotLit.java b/...ue/tjmetro/blocks/BlockCeilingNotLit.java → ...yue/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/...etro/blocks/BlockCustomColorConcrete.java → ...metro/block/BlockCustomColorConcrete.java b/...etro/blocks/BlockCustomColorConcrete.java → ...metro/block/BlockCustomColorConcrete.java
@@ -1,12 +1,12 @@
-package ziyue.tjmetro.blocks;
+package ziyue.tjmetro.block;
 
 import mtr.Blocks;
 import mtr.mappings.BlockEntityMapper;
 import net.minecraft.core.BlockPos;
 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/.../blocks/BlockCustomColorConcreteSlab.java → ...o/block/BlockCustomColorConcreteSlab.java b/.../blocks/BlockCustomColorConcreteSlab.java → ...o/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/...locks/BlockCustomColorConcreteStairs.java → ...block/BlockCustomColorConcreteStairs.java b/...locks/BlockCustomColorConcreteStairs.java → ...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/.../tjmetro/blocks/BlockDecorationLight.java → ...e/tjmetro/block/BlockDecorationLight.java b/.../tjmetro/blocks/BlockDecorationLight.java → ...e/tjmetro/block/BlockDecorationLight.java
@@ -1,12 +1,11 @@
-package ziyue.tjmetro.blocks;
+package ziyue.tjmetro.block;
 
 import mtr.Blocks;
 import mtr.mappings.BlockEntityMapper;
 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.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/...jmetro/blocks/BlockEmergencyExitSign.java → ...tjmetro/block/BlockEmergencyExitSign.java b/...jmetro/blocks/BlockEmergencyExitSign.java → ...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/...jmetro/blocks/BlockHighSpeedRepeater.java → ...tjmetro/block/BlockHighSpeedRepeater.java b/...jmetro/blocks/BlockHighSpeedRepeater.java → ...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/.../java/ziyue/tjmetro/blocks/BlockLogo.java → ...n/java/ziyue/tjmetro/block/BlockLogo.java b/.../java/ziyue/tjmetro/blocks/BlockLogo.java → ...n/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/...metro/blocks/BlockMetalDetectionDoor.java → ...jmetro/block/BlockMetalDetectionDoor.java b/...metro/blocks/BlockMetalDetectionDoor.java → ...jmetro/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/...e/tjmetro/blocks/BlockPSDDoorTianjin.java → ...ue/tjmetro/block/BlockPSDDoorTianjin.java b/...e/tjmetro/blocks/BlockPSDDoorTianjin.java → ...ue/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/...metro/blocks/BlockPSDGlassEndTianjin.java → ...jmetro/block/BlockPSDGlassEndTianjin.java b/...metro/blocks/BlockPSDGlassEndTianjin.java → ...jmetro/block/BlockPSDGlassEndTianjin.java
@@ -1,12 +1,12 @@
-package ziyue.tjmetro.blocks;
+package ziyue.tjmetro.block;
 
 import mtr.block.BlockPSDAPGGlassEndBase;
 import net.minecraft.world.item.Item;
 import ziyue.tjmetro.ItemList;
 
 /**
  * @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
@@ -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/...ue/tjmetro/blocks/BlockPSDTopTianjin.java → ...yue/tjmetro/block/BlockPSDTopTianjin.java b/...ue/tjmetro/blocks/BlockPSDTopTianjin.java → ...yue/tjmetro/block/BlockPSDTopTianjin.java
@@ -1,4 +1,4 @@
-package ziyue.tjmetro.blocks;
+package ziyue.tjmetro.block;
 
 import mtr.Items;
 import mtr.block.BlockPSDAPGBase;
@@ -20,21 +20,18 @@
 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;
 import ziyue.tjmetro.IBlockExtends;
 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/...e/tjmetro/blocks/BlockPlayerDetector.java → ...ue/tjmetro/block/BlockPlayerDetector.java b/...e/tjmetro/blocks/BlockPlayerDetector.java → ...ue/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/...metro/blocks/BlockRailwaySignTianjin.java → ...jmetro/block/BlockRailwaySignTianjin.java b/...metro/blocks/BlockRailwaySignTianjin.java → ...jmetro/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/...o/blocks/BlockRailwaySignTianjinPole.java → ...ro/block/BlockRailwaySignTianjinPole.java b/...o/blocks/BlockRailwaySignTianjinPole.java → ...ro/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/.../tjmetro/blocks/BlockRailwaySignWall.java → ...e/tjmetro/block/BlockRailwaySignWall.java b/.../tjmetro/blocks/BlockRailwaySignWall.java → ...e/tjmetro/block/BlockRailwaySignWall.java
@@ -1,12 +1,11 @@
-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.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/...metro/blocks/BlockRailwaySignWallBig.java → ...jmetro/block/BlockRailwaySignWallBig.java b/...metro/blocks/BlockRailwaySignWallBig.java → ...jmetro/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.