diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_closed.json b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_closed.json index e9ed518..5897e27 100644 --- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_closed.json +++ b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_closed.json @@ -85,8 +85,8 @@ } }, { - "from": [15, 17, -13], - "to": [15, 30, -3], + "from": [16, 17, -13], + "to": [16, 30, -3], "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, "faces": { "north": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_open.json b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_open.json index 72ab1d2..cbe3454 100644 --- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_open.json +++ b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_open.json @@ -228,8 +228,8 @@ } }, { - "from": [15, 17, -13], - "to": [15, 30, -3], + "from": [16, 17, -13], + "to": [16, 30, -3], "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, "faces": { "north": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, diff --git a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java index 6568dca..6a4d7ee 100644 --- a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java +++ b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java @@ -33,6 +33,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import su.a71.tardim_ic.tardim_ic.digital_interface.DigitalInterfaceBlock; import su.a71.tardim_ic.tardim_ic.digital_interface.DigitalInterfacePeripheralProvider; +import su.a71.tardim_ic.tardim_ic.digital_interface.DigitalInterfaceTileEntity; import su.a71.tardim_ic.tardim_ic.redstone_input.RedstoneInputBlock; import su.a71.tardim_ic.tardim_ic.redstone_input.RedstoneInputTileEntity; import su.a71.tardim_ic.tardim_ic.Constants; @@ -57,10 +58,10 @@ public class Registration { FabricBlockEntityTypeBuilder.create(RedstoneInputTileEntity::new, REDSTONE_TARDIM_INPUT).build() ); - public static final BlockEntityType DIGITAL_TARDIM_INTERFACE_TILEENTITY = Registry.register( + public static final BlockEntityType DIGITAL_TARDIM_INTERFACE_TILEENTITY = Registry.register( Registry.BLOCK_ENTITY_TYPE, new ResourceLocation("tardim_ic", "digital_tardim_interface"), - FabricBlockEntityTypeBuilder.create(RedstoneInputTileEntity::new, DIGITAL_TARDIM_INTERFACE).build() + FabricBlockEntityTypeBuilder.create(DigitalInterfaceTileEntity::new, DIGITAL_TARDIM_INTERFACE).build() ); private static final CreativeModeTab TARDIM_IC_TAB = FabricItemGroupBuilder diff --git a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheral.java b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheral.java index 8fd1287..a093d97 100644 --- a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheral.java +++ b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheral.java @@ -107,7 +107,6 @@ public class DigitalInterfacePeripheral implements IPeripheral { * This is mostly a copy of getIDForXZ function with some added checks * * @return TardimData of the TARDIM that the peripheral is in - * @throws LuaException if the peripheral is not in a TARDIM * @hidden */ public TardimData getTardimDataInitial() { diff --git a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheralProvider.java b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheralProvider.java index c6fea50..4b88e07 100644 --- a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheralProvider.java +++ b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheralProvider.java @@ -12,6 +12,7 @@ public class DigitalInterfacePeripheralProvider implements IPeripheralProvider { @NotNull @Override public IPeripheral getPeripheral(@NotNull Level level, @NotNull BlockPos blockPos, @NotNull Direction direction) { + if (level.isClientSide()) return null; // Please...? if (level.getBlockState(blockPos).getBlock() instanceof DigitalInterfaceBlock) { return new DigitalInterfacePeripheral(new FakeDigitalInterfaceTileEntity(blockPos, level)); } diff --git a/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheral.java b/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheral.java index 76cccef..9c51db9 100644 --- a/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheral.java +++ b/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheral.java @@ -107,7 +107,6 @@ public class DigitalInterfacePeripheral implements IPeripheral { * This is mostly a copy of getIDForXZ function with some added checks * * @return TardimData of the TARDIM that the peripheral is in - * @throws LuaException if the peripheral is not in a TARDIM * @hidden */ public TardimData getTardimDataInitial() { diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index ddaa3b9..e94d668 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -5,7 +5,7 @@ license = "MIT" [[mods]] #mandatory # The modid of the mod modId = "tardim_ic" #mandatory -version = "1.0" #mandatory +version = "1.1" #mandatory # A display name for the mod displayName = "TARDIM: In Control" #mandatory # The description text for the mod (multi line!) (#mandatory) diff --git a/gradle.properties b/gradle.properties index fc9bf37..debfa5c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -version=1.0 +version=1.1 group=su.a71.tardim_ic # Common