Andrew71/Tardim-In-Control
1
0
Fork 0
Code Issues 5 Pull requests Projects 1 Releases Packages Wiki Activity

Implement improvements from 1.1 into main branch #6

Merged
Andrew71 merged 3 commits from urgent-bugfix-1.1 into multiloader-1.19 2023-05-12 10:13:49 +03:00
Conversation 0 Commits 3 Files changed 36 +10 -10
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7fe9425c7b - Show all commits

4
Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_closed.json
View file

@ -85,8 +85,8 @@
} }
}, },
{ {
"from": [15, 17, -13], "from": [16, 17, -13],
"to": [15, 30, -3], "to": [16, 30, -3],
"rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]},
"faces": { "faces": {
"north": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, "north": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"},

4
Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_open.json
View file

@ -228,8 +228,8 @@
} }
}, },
{ {
"from": [15, 17, -13], "from": [16, 17, -13],
"to": [15, 30, -3], "to": [16, 30, -3],
"rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]},
"faces": { "faces": {
"north": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, "north": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"},

5
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java
View file

@ -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.DigitalInterfaceBlock;
import su.a71.tardim_ic.tardim_ic.digital_interface.DigitalInterfacePeripheralProvider; 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.RedstoneInputBlock;
import su.a71.tardim_ic.tardim_ic.redstone_input.RedstoneInputTileEntity; import su.a71.tardim_ic.tardim_ic.redstone_input.RedstoneInputTileEntity;
import su.a71.tardim_ic.tardim_ic.Constants; import su.a71.tardim_ic.tardim_ic.Constants;
@ -57,10 +58,10 @@ public class Registration {
FabricBlockEntityTypeBuilder.create(RedstoneInputTileEntity::new, REDSTONE_TARDIM_INPUT).build() FabricBlockEntityTypeBuilder.create(RedstoneInputTileEntity::new, REDSTONE_TARDIM_INPUT).build()
); );
public static final BlockEntityType<RedstoneInputTileEntity> DIGITAL_TARDIM_INTERFACE_TILEENTITY = Registry.register( public static final BlockEntityType<DigitalInterfaceTileEntity> DIGITAL_TARDIM_INTERFACE_TILEENTITY = Registry.register(
Registry.BLOCK_ENTITY_TYPE, Registry.BLOCK_ENTITY_TYPE,
new ResourceLocation("tardim_ic", "digital_tardim_interface"), 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 private static final CreativeModeTab TARDIM_IC_TAB = FabricItemGroupBuilder

1
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheral.java
View file

@ -107,7 +107,6 @@ public class DigitalInterfacePeripheral implements IPeripheral {
* This is mostly a copy of getIDForXZ function with some added checks * This is mostly a copy of getIDForXZ function with some added checks
* *
* @return TardimData of the TARDIM that the peripheral is in * @return TardimData of the TARDIM that the peripheral is in
* @throws LuaException if the peripheral is not in a TARDIM
* @hidden * @hidden
*/ */
public TardimData getTardimDataInitial() { public TardimData getTardimDataInitial() {

1
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheralProvider.java
View file

@ -12,6 +12,7 @@ public class DigitalInterfacePeripheralProvider implements IPeripheralProvider {
@NotNull @NotNull
@Override @Override
public IPeripheral getPeripheral(@NotNull Level level, @NotNull BlockPos blockPos, @NotNull Direction direction) { 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) { if (level.getBlockState(blockPos).getBlock() instanceof DigitalInterfaceBlock) {
return new DigitalInterfacePeripheral(new FakeDigitalInterfaceTileEntity(blockPos, level)); return new DigitalInterfacePeripheral(new FakeDigitalInterfaceTileEntity(blockPos, level));
} }

1
Forge/src/main/java/su/a71/tardim_ic/tardim_ic/digital_interface/DigitalInterfacePeripheral.java
View file

@ -107,7 +107,6 @@ public class DigitalInterfacePeripheral implements IPeripheral {
* This is mostly a copy of getIDForXZ function with some added checks * This is mostly a copy of getIDForXZ function with some added checks
* *
* @return TardimData of the TARDIM that the peripheral is in * @return TardimData of the TARDIM that the peripheral is in
* @throws LuaException if the peripheral is not in a TARDIM
* @hidden * @hidden
*/ */
public TardimData getTardimDataInitial() { public TardimData getTardimDataInitial() {

2
Forge/src/main/resources/META-INF/mods.toml
View file

@ -5,7 +5,7 @@ license = "MIT"
[[mods]] #mandatory [[mods]] #mandatory
# The modid of the mod # The modid of the mod
modId = "tardim_ic" #mandatory modId = "tardim_ic" #mandatory
version = "1.0" #mandatory version = "1.1" #mandatory
# A display name for the mod # A display name for the mod
displayName = "TARDIM: In Control" #mandatory displayName = "TARDIM: In Control" #mandatory
# The description text for the mod (multi line!) (#mandatory) # The description text for the mod (multi line!) (#mandatory)

2
gradle.properties
View file

@ -1,5 +1,5 @@
# Project # Project
version=1.0 version=1.1
group=su.a71.tardim_ic group=su.a71.tardim_ic
# Common # Common