diff --git a/Common/build.gradle b/Common/build.gradle deleted file mode 100644 index d4eaea3..0000000 --- a/Common/build.gradle +++ /dev/null @@ -1,39 +0,0 @@ -plugins { - id 'idea' - id 'java' - id 'maven-publish' - id 'org.spongepowered.gradle.vanilla' -} -base { - archivesName = "${mod_name}-common-${minecraft_version}" -} -minecraft { - version(minecraft_version) - if(file("src/main/resources/${mod_id}.accesswidener").exists()){ - accessWideners(file("src/main/resources/${mod_id}.accesswidener")) - } -} - -dependencies { - compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5' - implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' - - // ComputerCraft - compileOnly("cc.tweaked:cc-tweaked-$minecraft_version-common-api:$cc_version") - - compileOnly(files("./tardim-1.2.2-dev.jar")) -} - -publishing { - publications { - mavenJava(MavenPublication) { - artifactId base.archivesName.get() - from components.java - } - } - repositories { - maven { - url "file://" + System.getenv("local_maven") - } - } -} \ No newline at end of file diff --git a/Common/src/main/java/su/a71/tardim_ic/Constants.java b/Common/src/main/java/su/a71/tardim_ic/Constants.java deleted file mode 100644 index 2866edb..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/Constants.java +++ /dev/null @@ -1,11 +0,0 @@ -package su.a71.tardim_ic; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class Constants { - - public static final String MOD_ID = "tardim_ic"; - public static final String MOD_NAME = "TARDIM: In Control"; - public static final Logger LOG = LoggerFactory.getLogger(MOD_NAME); -} \ No newline at end of file diff --git a/Common/src/main/java/su/a71/tardim_ic/command/CommandListBiomes.java b/Common/src/main/java/su/a71/tardim_ic/command/CommandListBiomes.java deleted file mode 100644 index 555b1fd..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/command/CommandListBiomes.java +++ /dev/null @@ -1,62 +0,0 @@ -package su.a71.tardim_ic.command; - -import com.swdteam.tardim.common.command.tardim.CommandTardimBase; -import com.swdteam.tardim.common.command.tardim.ICommand; -import com.swdteam.tardim.tardim.TardimData; -import com.swdteam.tardim.tardim.TardimManager; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Registry; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.FurnaceFuelSlot; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity; -import net.minecraft.world.level.block.entity.FurnaceBlockEntity; - - -/* -This command prints list of all biomes into the console to find technical names -You can also pass an argument to search for entries with this string (e.g. amethyst for terralith:amethyst_rainforest - */ -public class CommandListBiomes implements ICommand{ - @Override - public void execute(String[] args, Player player, BlockPos pos, CommandTardimBase.CommandSource source) { - ; - if (args.length == 1 || args.length == 0) { - TardimData data = TardimManager.getFromPos(pos); - if (data != null) { - if (data.hasPermission(player)) { - Registry biomeRegistry = player.level().registryAccess().registryOrThrow(Registries.BIOME); - biomeRegistry.keySet().forEach( - (ResourceLocation res) -> { - String out = res.toString(); - if (args.length == 0 || out.toLowerCase().contains(args[0].toLowerCase())) { - CommandTardimBase.sendResponse(player, out, CommandTardimBase.ResponseType.INFO, source); - } - } - ); - } else { - CommandTardimBase.sendResponse(player, "You do not have permission", CommandTardimBase.ResponseType.FAIL, source); - } - } - } else { - CommandTardimBase.sendResponse(player, this.getUsage(), CommandTardimBase.ResponseType.FAIL, source); - } - } - - @Override - public String getCommandName() { - return "list-biomes"; - } - - @Override - public String getUsage() { - return "/list-biomes <..search_query>"; // TODO: how to communicate this better - } - - @Override - public CommandTardimBase.CommandSource allowedSource() { - return CommandTardimBase.CommandSource.BOTH; - } -} \ No newline at end of file diff --git a/Common/src/main/java/su/a71/tardim_ic/command/CommandListDimensions.java b/Common/src/main/java/su/a71/tardim_ic/command/CommandListDimensions.java deleted file mode 100644 index 3658b5a..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/command/CommandListDimensions.java +++ /dev/null @@ -1,47 +0,0 @@ -package su.a71.tardim_ic.command; - -import com.swdteam.tardim.common.command.tardim.CommandTardimBase; -import com.swdteam.tardim.common.command.tardim.ICommand; -import com.swdteam.tardim.tardim.TardimData; -import com.swdteam.tardim.tardim.TardimManager; -import net.minecraft.core.BlockPos; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.player.Player; - -/* -This command prints list of all dimensions into the console to find technical names - */ -public class CommandListDimensions implements ICommand{ - @Override - public void execute(String[] args, Player player, BlockPos pos, CommandTardimBase.CommandSource source) { - if (args.length == 0) { - TardimData data = TardimManager.getFromPos(pos); - if (data != null) { - if (data.hasPermission(player)) { - for (ServerLevel serverLevel : player.level().getServer().getAllLevels()) { - CommandTardimBase.sendResponse(player, serverLevel.dimension().location().toString(), CommandTardimBase.ResponseType.INFO, source); - } - } else { - CommandTardimBase.sendResponse(player, "You do not have permission", CommandTardimBase.ResponseType.FAIL, source); - } - } - } else { - CommandTardimBase.sendResponse(player, this.getUsage(), CommandTardimBase.ResponseType.FAIL, source); - } - } - - @Override - public String getCommandName() { - return "list-dimensions"; - } - - @Override - public String getUsage() { - return "/list-dimensions"; - } - - @Override - public CommandTardimBase.CommandSource allowedSource() { - return CommandTardimBase.CommandSource.BOTH; - } -} \ No newline at end of file diff --git a/Common/src/main/java/su/a71/tardim_ic/command/CommandModemTransmit.java b/Common/src/main/java/su/a71/tardim_ic/command/CommandModemTransmit.java deleted file mode 100644 index eaf208b..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/command/CommandModemTransmit.java +++ /dev/null @@ -1,74 +0,0 @@ -package su.a71.tardim_ic.command; - -// This will be added whenever I manage to convince TARDIM devs to make CommandManager.register public -// 13.04.23 ITS ALIVE - -import com.swdteam.tardim.common.command.tardim.CommandTardimBase; -import com.swdteam.tardim.common.command.tardim.ICommand; -import com.swdteam.tardim.tardim.TardimData; -import com.swdteam.tardim.tardim.TardimManager; - -import dan200.computercraft.api.ComputerCraftAPI; -import dan200.computercraft.api.network.Packet; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Player; - -/* -This command sends out a ComputerCraft modem signal -This could be useful for connecting advanced navigation systems into "vanilla" controls -You can specify both channels, message and even make the message go across dimensions - */ -public class CommandModemTransmit implements ICommand { - @Override - public void execute(String[] args, Player player, BlockPos pos, CommandTardimBase.CommandSource source) { - if (args.length == 3) { // TODO: 3 or 4??? - TardimData data = TardimManager.getFromPos(pos); - if (data != null) { - if (data.hasPermission(player)) { - try { - int sendChannel = Integer.parseInt(args[0]); - int replyChannel = Integer.parseInt(args[1]); - String message = args[2]; - boolean allDimensions = Boolean.parseBoolean(args[3]) || args[3].equals("true"); - - if (data.getTravelLocation() == null) { - data.setTravelLocation(new TardimData.Location(data.getCurrentLocation())); - } - - if (allDimensions) - { - ComputerCraftAPI.getWirelessNetwork(player.getServer()).transmitInterdimensional(new Packet(sendChannel, replyChannel, message, new CommandSender(player, data.getTravelLocation().getPos()))); - } - else { - ComputerCraftAPI.getWirelessNetwork(player.getServer()).transmitSameDimension(new Packet(sendChannel, replyChannel, message, - new CommandSender(player, data.getTravelLocation().getPos())), 300); - } - CommandTardimBase.sendResponse(player, "Sent modem message", CommandTardimBase.ResponseType.COMPLETE, source); - } catch (Exception var9) { - CommandTardimBase.sendResponse(player, "Invalid coordinates", CommandTardimBase.ResponseType.FAIL, source); - } - } else { - CommandTardimBase.sendResponse(player, "You do not have permission", CommandTardimBase.ResponseType.FAIL, source); - } - } - } else { - CommandTardimBase.sendResponse(player, this.getUsage(), CommandTardimBase.ResponseType.FAIL, source); - } - } - - @Override - public String getCommandName() { - return "cc-modem-transmit"; - } - - @Override - public String getUsage() { - return "/cc-modem-transmit "; - } - - @Override - public CommandTardimBase.CommandSource allowedSource() { - return CommandTardimBase.CommandSource.BOTH; - } -} \ No newline at end of file diff --git a/Common/src/main/java/su/a71/tardim_ic/command/CommandSender.java b/Common/src/main/java/su/a71/tardim_ic/command/CommandSender.java deleted file mode 100644 index 4515986..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/command/CommandSender.java +++ /dev/null @@ -1,39 +0,0 @@ -package su.a71.tardim_ic.command; - -import dan200.computercraft.api.network.PacketSender; -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.phys.Vec3; -import org.jetbrains.annotations.NotNull; - -public class CommandSender implements PacketSender { - - private final Player player; - private final Level level; - private final BlockPos pos; - - CommandSender(Player player, BlockPos pos) { - this.player = player; - this.level = player.level(); - this.pos = pos; - } - - @NotNull - @Override - public Level getLevel() { - return this.level; - } - - @NotNull - @Override - public Vec3 getPosition() { - return new Vec3(this.pos.getX(), this.pos.getY(), this.pos.getZ()); - } - - @NotNull - @Override - public String getSenderID() { - return this.player.getName().getString(); - } -} diff --git a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/FakeTardimPeripheralTileEntity.java b/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/FakeTardimPeripheralTileEntity.java deleted file mode 100644 index ffe4d4d..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/FakeTardimPeripheralTileEntity.java +++ /dev/null @@ -1,94 +0,0 @@ -package su.a71.tardim_ic.computercraft_compat.entity; - -import com.swdteam.tardim.tardim.TardimData; -import com.swdteam.tardim.tardim.TardimManager; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; - -public class FakeTardimPeripheralTileEntity implements ITardimPeripheralTileEntity { - public BlockPos blockPos; - public Level level; - public TardimData data; // Our TARDIM - - public FakeTardimPeripheralTileEntity(BlockPos in_block, Level in_level) { - this.blockPos = in_block; - this.level = in_level; - this.data = getTardimDataInitial(); - } - - @Override - public BlockPos getPos() { - return this.blockPos; - } - - @Override - public Level getLevel() { - return this.level; - } - - @Override - public TardimData getTardim() { - return this.data; - } - - @Override - public Block getBlock() { - return this.level.getBlockState(this.blockPos).getBlock(); - } - - public TardimData getTardimDataInitial() { - int X = this.getPos().getX(), Z = this.getPos().getZ(); - - int index = 0; - int x = 0; - int y = 0; - int dx = 0; - int dy = 1; - int segment_length = 1; - int segment_passed = 0; - boolean found = false; - long timecheck = System.currentTimeMillis(); - - while(true) { - if (System.currentTimeMillis() - timecheck > 10000L) { - System.out.println("Finding ID from XZ Coordinates is taking too long!"); - break; - } - - if (X >= x * TardimManager.INTERIOR_BOUNDS - && X <= TardimManager.INTERIOR_BOUNDS + x * TardimManager.INTERIOR_BOUNDS - && Z >= y * TardimManager.INTERIOR_BOUNDS - && Z <= TardimManager.INTERIOR_BOUNDS + y * TardimManager.INTERIOR_BOUNDS) { - found = true; - break; - } - - x += dx; - y += dy; - if (++segment_passed == segment_length) { - segment_passed = 0; - int buffer = dy; - dy = -dx; - dx = buffer; - if (buffer == 0) { - ++segment_length; - } - } - - ++index; - } - - // We really don't want to access a ghost TARDIM, do we? - // If we fail checks here are not inside a TARDIM - if (!found) { - return null; - } - TardimData T = TardimManager.getTardim(index); - if (T.getCurrentLocation() == null || T.getOwnerName() == null) { - return null; - } - - return T; - } -} diff --git a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/ITardimPeripheralTileEntity.java b/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/ITardimPeripheralTileEntity.java deleted file mode 100644 index 7e9b82e..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/ITardimPeripheralTileEntity.java +++ /dev/null @@ -1,18 +0,0 @@ -package su.a71.tardim_ic.computercraft_compat.entity; - -import com.swdteam.tardim.tardim.TardimData; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntity; - -// This is used to getPost(), getLevel() and getTardim() nicely without refactoring code to account for PeripheralProvider -// At least I believe so. Otherwise, don't really remember why I don't just pass these methods to the peripherals. -public interface ITardimPeripheralTileEntity { - public BlockPos getPos(); - public Level getLevel(); - - public TardimData getTardim(); - - public Block getBlock(); -} diff --git a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/FuelStoragePeripheral.java b/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/FuelStoragePeripheral.java deleted file mode 100644 index 05ff46d..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/FuelStoragePeripheral.java +++ /dev/null @@ -1,65 +0,0 @@ -package su.a71.tardim_ic.computercraft_compat.peripherals; - -import com.swdteam.tardim.common.block.BlockFuelStorage; -import com.swdteam.tardim.tardim.TardimData; -import dan200.computercraft.api.lua.LuaException; -import dan200.computercraft.api.lua.LuaFunction; -import dan200.computercraft.api.peripheral.IPeripheral; -import net.minecraft.world.phys.Vec3; -import su.a71.tardim_ic.computercraft_compat.entity.FakeTardimPeripheralTileEntity; - - -/* -* CC Peripheral for TARDIM's fuel storage block. -* Only provides getters for the fuel parts for people who cannot afford or don't need the digital interface. - */ -public class FuelStoragePeripheral extends TardimPeripheral implements IPeripheral { - /** - * @param tileEntity the tile entity of this peripheral - * @hidden - */ - public FuelStoragePeripheral(FakeTardimPeripheralTileEntity tileEntity) { - super(tileEntity, "tardim_fuel_storage", (BlockFuelStorage) tileEntity.getBlock()); - } - - - // Peripheral methods =============================================================== - - /** - * Return how much fuel is left in the TARDIM - * - * @return Fuel left (Out of 100) - */ - @LuaFunction(mainThread = true) - public final double getFuel() throws LuaException { - return getTardimData().getFuel(); - } - - /** - * Get how much fuel it would take to travel to the destination - * @return Amount of fuel needed (Out of 100) - */ - @LuaFunction(mainThread = true) - public final double calculateFuelForJourney() throws LuaException { - TardimData data = getTardimData(); - - if (data.getTravelLocation() == null) return 0; - - TardimData.Location curr = data.getCurrentLocation(); - TardimData.Location dest = data.getTravelLocation(); - - double fuel = 0.0; - - if (curr.getLevel() != dest.getLevel()) - { - fuel = 10.0; - } - - Vec3 posA = new Vec3(curr.getPos().getX(), curr.getPos().getY(), curr.getPos().getZ()); - Vec3 posB = new Vec3(dest.getPos().getX(), dest.getPos().getY(), dest.getPos().getZ()); - fuel += posA.distanceTo(posB) / 100.0; - if (fuel > 100.0) fuel = 100.0; - - return fuel; - } -} \ No newline at end of file diff --git a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimPeripheral.java b/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimPeripheral.java deleted file mode 100644 index 2228b6e..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimPeripheral.java +++ /dev/null @@ -1,86 +0,0 @@ -package su.a71.tardim_ic.computercraft_compat.peripherals; - -import com.swdteam.tardim.tardim.TardimData; -import dan200.computercraft.api.lua.LuaException; -import dan200.computercraft.api.peripheral.IComputerAccess; -import dan200.computercraft.api.peripheral.IPeripheral; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntity; -import su.a71.tardim_ic.computercraft_compat.entity.ITardimPeripheralTileEntity; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.*; - -// Base CC peripheral for whn you need something with access to a TARDIM -public abstract class TardimPeripheral implements IPeripheral { - - private final List connectedComputers = new ArrayList<>(); // List of computers connected to the peripheral - public final ITardimPeripheralTileEntity tileEntity; // Peripheral's BlockEntity, used for accessing coordinates - public final String name; - private final BL block; - - /** - * @param tileEntity the tile entity of this peripheral - * @hidden - */ - public TardimPeripheral(ITardimPeripheralTileEntity tileEntity, String name, BL block) { - this.tileEntity = tileEntity; - this.name = name; - this.block = block; - } - - @Override - public BL getTarget() { - return this.block; - } - - /** Setting name for the peripheral. A computer will see it as "digital_tardim_interface_n" - * @hidden - */ - @Nonnull - @Override - public String getType() { return this.name; } - - /** Apparently CC uses this to check if the peripheral in front of a modem is this one - * @hidden - * @param iPeripheral The peripheral to compare against. This may be {@code null}. - * @return {@code true} if the peripheral is the same as this one. - */ - @Override - public boolean equals(@Nullable IPeripheral iPeripheral) { return this == iPeripheral; } - - /** Called when a computer disconnects from the peripheral - * @hidden - * @param computer The interface to the computer that is being detached. Remember that multiple computers can be - * attached to a peripheral at once. - */ - @Override - public void detach(@Nonnull IComputerAccess computer) { connectedComputers.remove(computer); } - - /** Called when a computer connects to the peripheral - * @hidden - * @param computer The interface to the computer that is being attached. Remember that multiple computers can be - * attached to a peripheral at once. - */ - @Override - public void attach(@Nonnull IComputerAccess computer) { connectedComputers.add(computer); } - - /** - * I *think* I use this to get peripheral's world position - * @hidden - * @return - */ - public ITardimPeripheralTileEntity getTileEntity() { - return tileEntity; - } - - - public TardimData getTardimData() throws LuaException { - TardimData data = this.getTileEntity().getTardim(); - if (data == null || data.getCurrentLocation() == null || data.getOwnerName() == null) { - throw new LuaException("Peripheral is not inside a TARDIM"); - } - return data; - } -} diff --git a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimScannerPeripheral.java b/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimScannerPeripheral.java deleted file mode 100644 index a562735..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimScannerPeripheral.java +++ /dev/null @@ -1,144 +0,0 @@ -package su.a71.tardim_ic.computercraft_compat.peripherals; - -import com.swdteam.tardim.common.block.BlockTardimScanner; -import com.swdteam.tardim.common.init.TardimRegistry; -import com.swdteam.tardim.tardim.TardimData; -import dan200.computercraft.api.lua.LuaException; -import dan200.computercraft.api.lua.LuaFunction; -import dan200.computercraft.api.lua.ObjectLuaTable; -import dan200.computercraft.api.peripheral.IPeripheral; -import net.minecraft.core.Registry; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.players.PlayerList; -import net.minecraft.world.level.biome.Biome; -import su.a71.tardim_ic.computercraft_compat.entity.FakeTardimPeripheralTileEntity; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - - -/* - * CC Peripheral for TARDIM's scanner block. - * Only provides getters for data-related (mostly table output) methods e.g. biome or companion list - * for people who cannot afford or don't need the digital interface. - */ -public class TardimScannerPeripheral extends TardimPeripheral implements IPeripheral { - /** - * @param tileEntity the tile entity of this peripheral - * @hidden - */ - public TardimScannerPeripheral(FakeTardimPeripheralTileEntity tileEntity) { - super(tileEntity, "tardim_scanner", (BlockTardimScanner) tileEntity.getBlock()); - } - - - // Peripheral methods =============================================================== - - /** - * Get username of the TARDIM's owner - * @return String of the owner's username - */ - @LuaFunction(mainThread = true) - public final String getOwnerName() throws LuaException { - TardimData data = getTardimData(); - return data.getOwnerName(); - } - - /** - * Get list of the TARDIM owner's companions - * @return ObjectLuaTable containing the usernames of the companions - */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getCompanions() throws LuaException { - TardimData data = getTardimData(); - Map companions = new HashMap<>(); - for (int i = 0; i < data.getCompanions().size(); i++) { - companions.put(i + 1, data.getCompanions().get(i).getUsername()); - } - return new ObjectLuaTable(companions); - } - - /** - * Get online players. Useful for making a GUI for the locate function or just a nice dashboard. - * - * @return ObjectLuaTable of the online players - */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getOnlinePlayers() throws LuaException { - if (this.tileEntity.getLevel().isClientSide()) { - return null; - } - - PlayerList playerList = this.tileEntity.getLevel().getServer().getPlayerList(); - Map players = new HashMap<>(); - for (int i = 0; i < playerList.getPlayers().size(); i++) { - players.put(i + 1, playerList.getPlayers().get(i).getGameProfile().getName()); - } - - return new ObjectLuaTable(players); - } - - /** - * Get all available TARDIM skins. Useful for making a GUI skin selection. - * - * @return ObjectLuaTable of the available skins - */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getSkins() throws LuaException { - if (this.getTileEntity().getLevel().isClientSide()) { - return null; - } - - Map skins = new HashMap<>(); - - Iterator var5 = TardimRegistry.getRegistry().keySet().iterator(); - int i = 0; - while(var5.hasNext()) { - ResourceLocation builder = (ResourceLocation)var5.next(); - TardimRegistry.TardimBuilder b = TardimRegistry.getTardimBuilder(builder); - skins.put(i + 1, b.getDisplayName()); - i++; - } - - return new ObjectLuaTable(skins); - } - - /** - * Get a table with all registered biomes' names. - * Useful for creating advanced navigation systems. - * @return ObjectLuaTable with all biomes' technical names - */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getBiomes() throws LuaException { - Map biomes = new HashMap<>(); - Registry biomeRegistry = tileEntity.getLevel().registryAccess().registryOrThrow(Registries.BIOME); - Iterator biome_it = biomeRegistry.keySet().iterator(); - int i = 0; - while (biome_it.hasNext()) { - biomes.put(i + 1, biome_it.next().toString()); - i++; - } - - return new ObjectLuaTable(biomes); - } - - /** - * Get a table with all registered dimensions' names. - * Useful for creating advanced navigation systems. - * @return ObjectLuaTable with all dimensions' technical names - */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getDimensions() throws LuaException { - Iterator dim_it = this.getTileEntity().getLevel().getServer().getAllLevels().iterator(); // TODO: Does this really work? - Map dimensions = new HashMap<>(); - int i = 0; - while (dim_it.hasNext()) { - dimensions.put(i + 1, dim_it.next().dimension().location().toString()); - i++; - } - return new ObjectLuaTable(dimensions); - } -} \ No newline at end of file diff --git a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TimeRotorPeripheral.java b/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TimeRotorPeripheral.java deleted file mode 100644 index 9bf959f..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TimeRotorPeripheral.java +++ /dev/null @@ -1,100 +0,0 @@ -package su.a71.tardim_ic.computercraft_compat.peripherals; - -import com.swdteam.tardim.common.block.BlockRotor; -import com.swdteam.tardim.tardim.TardimData; -import dan200.computercraft.api.lua.LuaException; -import dan200.computercraft.api.lua.LuaFunction; -import dan200.computercraft.api.lua.ObjectLuaTable; -import dan200.computercraft.api.peripheral.IPeripheral; -import su.a71.tardim_ic.computercraft_compat.entity.FakeTardimPeripheralTileEntity; - -import java.util.Map; - -/* - * CC Peripheral for TARDIM's time rotor block. - * Only provides getters for the flight status for people who cannot afford or don't need the digital interface. - */ -public class TimeRotorPeripheral extends TardimPeripheral implements IPeripheral { - /** - * @param tileEntity the tile entity of this peripheral - * @hidden - */ - public TimeRotorPeripheral(FakeTardimPeripheralTileEntity tileEntity) { - super(tileEntity, "tardim_rotor", (BlockRotor) tileEntity.getBlock()); - } - - - // Peripheral methods =============================================================== - - /** - * Check whether the TARDIM is in flight - * @return true if in flight, false if not - */ - @LuaFunction(mainThread = true) - public final boolean isInFlight() throws LuaException { return getTardimData().isInFlight(); } - - /** - * Supposedly gets UNIX timestamp of when we entered flight - * @return UNIX timestamp if in flight, -1 if not - */ - @LuaFunction(mainThread = true) - public final long getTimeEnteredFlight() throws LuaException { - TardimData data = getTardimData(); - if (!data.isInFlight()) { - return -1; - } - return data.getTimeEnteredFlight(); - } - - /** - * Get the current location of the TARDIM - * @return ObjectLuaTable of the current location with the following keys: - *
    - *
  • dimension - String of the dimension
    • - *
  • pos - table with the keys x, y, z that hold numbers
    • - *
  • facing - String of the facing
    • - *
- */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getCurrentLocation() throws LuaException { - TardimData.Location loc = getTardimData().getCurrentLocation(); - return new ObjectLuaTable(Map.of( - "dimension", loc.getLevel().location().toString(), - "pos", new ObjectLuaTable(Map.of( - "x", loc.getPos().getX(), - "y", loc.getPos().getY(), - "z", loc.getPos().getZ() - )), - "facing", loc.getFacing().toString() - )); - } - - /** - * Get the current location of the TARDIM - * @return if there is no destination returns null. - *

- * Otherwise, ObjectLuaTable of the current location with the following keys: - *

    - *
  • dimension - String of the dimension
    • - *
  • pos - table with the keys x, y, z that hold numbers
    • - *
  • facing - String of the facing
    • - *
- */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getTravelLocation() throws LuaException { - TardimData data = getTardimData(); - if (data.getTravelLocation() == null) { - data.setTravelLocation(data.getCurrentLocation()); - } - TardimData.Location loc = data.getTravelLocation(); - return new ObjectLuaTable(Map.of( - "dimension", loc.getLevel().location().toString(), - "pos", new ObjectLuaTable(Map.of( - "x", loc.getPos().getX(), - "y", loc.getPos().getY(), - "z", loc.getPos().getZ() - )), - "facing", loc.getFacing().toString() - )); - } -} \ No newline at end of file diff --git a/Common/src/main/java/su/a71/tardim_ic/mixin/JammerMixin.java b/Common/src/main/java/su/a71/tardim_ic/mixin/JammerMixin.java deleted file mode 100644 index de20f26..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/mixin/JammerMixin.java +++ /dev/null @@ -1,58 +0,0 @@ -//package su.a71.tardim_ic.mixin; -// -//import com.swdteam.tardim.common.command.tardim.CommandLocate; -//import com.swdteam.tardim.common.command.tardim.CommandTardimBase; -//import com.swdteam.tardim.tardim.TardimData; -//import com.swdteam.tardim.tardim.TardimManager; -//import net.minecraft.core.BlockPos; -//import net.minecraft.world.entity.player.Player; -//import net.minecraft.world.item.ItemStack; -//import org.spongepowered.asm.mixin.Mixin; -//import org.spongepowered.asm.mixin.Overwrite; -// -//import static com.swdteam.tardim.common.command.tardim.CommandTardimBase.sendResponse; -// -//@Mixin(value = CommandLocate.class, remap = false) -//public class JammerMixin { -//// @Inject(method="execute()V", at=@At(value = "INVOKE", -//// target = "Lcom/swdteam/tardim/tardim/TardimData;setTravelLocation(Lcom/swdteam/tardim/tardim/TardimData$Location;)V")) -//// public void execute(CallbackInfo ci) { -//// LOG.info("test"); -////// for (ItemStack armour : player.getArmorSlots()) { -////// if (armour.is(LOCATION_JAMMER)) { -////// sendResponse(player, "Player's location is jammed", CommandTardimBase.ResponseType.FAIL, source); -////// ci.cancel(); -////// }; -////// } -//// } -// -// @Overwrite -// public void execute(String[] args, Player player, BlockPos pos, CommandTardimBase.CommandSource source) { -// if (args.length == 1) { -// TardimData data = TardimManager.getFromPos(pos); -// if (data != null) { -// if (data.hasPermission(player)) { -// Player otherPlayer = player.getServer().getPlayerList().getPlayerByName(args[0]); -// if (otherPlayer != null) { -// for (ItemStack armour : otherPlayer.getArmorSlots()) { -//// if (armour.is(PERSONAL_JAMMER)) { -//// sendResponse(player, otherPlayer.getGameProfile().getName() + "'s location is jammed", CommandTardimBase.ResponseType.FAIL, source); -//// return; -//// } -// // TODO: Re-add -// } -// data.setTravelLocation(new TardimData.Location(otherPlayer.blockPosition(), otherPlayer.level().dimension())); -// sendResponse(player, "Coords locked on to " + otherPlayer.getGameProfile().getName(), CommandTardimBase.ResponseType.COMPLETE, source); -// } else { -// sendResponse(player, "Player does not exist", CommandTardimBase.ResponseType.FAIL, source); -// } -// } else { -// sendResponse(player, "You do not have permission", CommandTardimBase.ResponseType.FAIL, source); -// } -// } -// } else { -// sendResponse(player, ((CommandLocate)(Object)this).getUsage(), CommandTardimBase.ResponseType.FAIL, source); -// } -// -// } -//} diff --git a/Common/src/main/java/su/a71/tardim_ic/platform/Services.java b/Common/src/main/java/su/a71/tardim_ic/platform/Services.java deleted file mode 100644 index ab300de..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/platform/Services.java +++ /dev/null @@ -1,25 +0,0 @@ -package su.a71.tardim_ic.platform; - -import su.a71.tardim_ic.Constants; -import su.a71.tardim_ic.platform.services.IPlatformHelper; - -import java.util.ServiceLoader; - -public class Services { - - // Platform helper that lets us do stuff for Forge/Fabric while being in Common - public static final IPlatformHelper PLATFORM = load(IPlatformHelper.class); - - // This code is used to load a service for the current environment. Your implementation of the service must be defined - // manually by including a text file in META-INF/services named with the fully qualified class name of the service. - // Inside the file you should write the fully qualified class name of the implementation to load for the platform. For - // example our file on Forge points to ForgePlatformHelper while Fabric points to FabricPlatformHelper. - public static T load(Class clazz) { - - final T loadedService = ServiceLoader.load(clazz) - .findFirst() - .orElseThrow(() -> new NullPointerException("Failed to load service for " + clazz.getName())); -// Constants.LOG.debug("Loaded {} for service {}", loadedService, clazz); - return loadedService; - } -} \ No newline at end of file diff --git a/Common/src/main/java/su/a71/tardim_ic/platform/services/IPlatformHelper.java b/Common/src/main/java/su/a71/tardim_ic/platform/services/IPlatformHelper.java deleted file mode 100644 index c7f9b35..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/platform/services/IPlatformHelper.java +++ /dev/null @@ -1,47 +0,0 @@ -package su.a71.tardim_ic.platform.services; - -import net.minecraft.sounds.SoundEvent; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; - -import java.util.function.Supplier; - -public interface IPlatformHelper { - - /** - * Gets the name of the current platform - * - * @return The name of the current platform. - */ - String getPlatformName(); - - /** - * Checks if a mod with the given id is loaded. - * - * @param modId The mod to check if it is loaded. - * @return True if the mod is loaded, false otherwise. - */ - boolean isModLoaded(String modId); - - /** - * Check if the game is currently in a development environment. - * - * @return True if in a development environment, false otherwise. - */ - boolean isDevelopmentEnvironment(); - - /** - * Gets the name of the environment type as a string. - * - * @return The name of the environment type. - */ - default String getEnvironmentName() { - - return isDevelopmentEnvironment() ? "development" : "production"; - } -} \ No newline at end of file diff --git a/Common/src/main/java/su/a71/tardim_ic/utils/FakePlayer.java b/Common/src/main/java/su/a71/tardim_ic/utils/FakePlayer.java deleted file mode 100644 index c37a7d9..0000000 --- a/Common/src/main/java/su/a71/tardim_ic/utils/FakePlayer.java +++ /dev/null @@ -1,34 +0,0 @@ -package su.a71.tardim_ic.utils; - -import com.mojang.authlib.GameProfile; -import net.minecraft.core.BlockPos; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; - -import java.util.UUID; - -/** - * This class is used whenever we need a player for a function but cannot get one - * (i.g we are on server side and need to execute TARDIM command) - */ -public class FakePlayer extends Player { - - public FakePlayer(Level lvl, BlockPos blockPos) { - super(lvl, blockPos, 0, new GameProfile(UUID.randomUUID(), "FakePlayer_tardimic")); - } - - public FakePlayer(Level lvl, BlockPos blockPos, UUID id) { - super(lvl, blockPos, 0, new GameProfile(id, "FakePlayer_tardimic")); - - } - - @Override - public boolean isSpectator() { - return false; - } - - @Override - public boolean isCreative() { - return false; - } -} diff --git a/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer.png b/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer.png deleted file mode 100644 index c98028b..0000000 Binary files a/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer.png and /dev/null differ diff --git a/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_1.png b/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_1.png deleted file mode 100644 index c98028b..0000000 Binary files a/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_1.png and /dev/null differ diff --git a/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_2.png b/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_2.png deleted file mode 100644 index c98028b..0000000 Binary files a/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_2.png and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json b/Common/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json deleted file mode 100644 index e396b0d..0000000 --- a/Common/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "tardim_ic:block/digital_tardim_interface" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/blockstates/food_machine.json b/Common/src/main/resources/assets/tardim_ic/blockstates/food_machine.json deleted file mode 100644 index 75f685a..0000000 --- a/Common/src/main/resources/assets/tardim_ic/blockstates/food_machine.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "tardim_ic:block/food_machine"}, - "facing=east": { "model": "tardim_ic:block/food_machine", "y": 90}, - "facing=south": { "model": "tardim_ic:block/food_machine", "y": 180}, - "facing=west": { "model": "tardim_ic:block/food_machine", "y": 270} - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json b/Common/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json deleted file mode 100644 index a5718cc..0000000 --- a/Common/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "tardim_ic:block/redstone_tardim_input" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_dock.json b/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_dock.json deleted file mode 100644 index 39f44ce..0000000 --- a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_dock.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "tardim_ic:block/tardim_dock"}, - "facing=east": { "model": "tardim_ic:block/tardim_dock", "y": 90}, - "facing=south": { "model": "tardim_ic:block/tardim_dock", "y": 180}, - "facing=west": { "model": "tardim_ic:block/tardim_dock", "y": 270} - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_door_soviet.json b/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_door_soviet.json deleted file mode 100644 index efab0e8..0000000 --- a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_door_soviet.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=north,half=lower,open=false,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_bottom" - }, - "facing=north,half=lower,open=false,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_bottom_closed" - }, - "facing=north,half=upper,open=false,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_top" - }, - "facing=north,half=upper,open=false,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_top_front_closed" - }, - "facing=west,half=lower,open=false,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_bottom", - "y": 270 - }, - "facing=west,half=lower,open=false,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_bottom_closed", - "y": 270 - }, - "facing=west,half=upper,open=false,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_top", - "y": 270 - }, - "facing=west,half=upper,open=false,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_top_front_closed", - "y": 270 - }, - "facing=east,half=lower,open=false,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_bottom", - "y": 90 - }, - "facing=east,half=lower,open=false,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_bottom_closed", - "y": 90 - }, - "facing=east,half=upper,open=false,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_top", - "y": 90 - }, - "facing=east,half=upper,open=false,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_top_front_closed", - "y": 90 - }, - "facing=south,half=lower,open=false,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_bottom", - "y": 180 - }, - "facing=south,half=lower,open=false,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_bottom_closed", - "y": 180 - }, - "facing=south,half=upper,open=false,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_top", - "y": 180 - }, - "facing=south,half=upper,open=false,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_top_front_closed", - "y": 180 - }, - "facing=north,half=lower,open=true,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_bottom" - }, - "facing=north,half=lower,open=true,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_bottom_open" - }, - "facing=north,half=upper,open=true,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_top" - }, - "facing=north,half=upper,open=true,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_top_front_open" - }, - "facing=west,half=lower,open=true,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_bottom", - "y": 270 - }, - "facing=west,half=lower,open=true,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_bottom_open", - "y": 270 - }, - "facing=west,half=upper,open=true,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_top", - "y": 270 - }, - "facing=west,half=upper,open=true,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_top_front_open", - "y": 270 - }, - "facing=east,half=lower,open=true,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_bottom", - "y": 90 - }, - "facing=east,half=lower,open=true,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_bottom_open", - "y": 90 - }, - "facing=east,half=upper,open=true,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_top", - "y": 90 - }, - "facing=east,half=upper,open=true,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_top_front_open", - "y": 90 - }, - "facing=south,half=lower,open=true,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_bottom", - "y": 180 - }, - "facing=south,half=lower,open=true,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_bottom_open", - "y": 180 - }, - "facing=south,half=upper,open=true,front=false": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_sides_top", - "y": 180 - }, - "facing=south,half=upper,open=true,front=true": { - "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_door_top_front_open", - "y": 180 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_floor_soviet.json b/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_floor_soviet.json deleted file mode 100644 index 2363709..0000000 --- a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_floor_soviet.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_floor" } - } -} diff --git a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_roof_soviet.json b/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_roof_soviet.json deleted file mode 100644 index 9adda15..0000000 --- a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_roof_soviet.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "tardim_ic:block/tardim_soviet_chronobox/tardim_roof" } - } -} diff --git a/Common/src/main/resources/assets/tardim_ic/icon.png b/Common/src/main/resources/assets/tardim_ic/icon.png deleted file mode 100644 index 87a18cf..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/icon.png and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/lang/en_uk.json b/Common/src/main/resources/assets/tardim_ic/lang/en_uk.json deleted file mode 100644 index 252bf62..0000000 --- a/Common/src/main/resources/assets/tardim_ic/lang/en_uk.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "block.tardim_ic.digital_tardim_interface": "Digital TARDIM Interface", - "block.tardim_ic.redstone_tardim_input": "Redstone TARDIM Input", - "block.tardim_ic.tardim_dock": "TARDIM Dock", - "block.tardim_ic.food_machine": "TARDIM food machine", - "itemGroup.tardim_ic": "TARDIM: In Control", - "itemGroup.minecraft.tardim_ic": "TARDIM: In Control", - "subtitles.tardim_ic.cloister": "Cloister bell rings", - "display_source.fuel_level": "TARDIM fuel level" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/lang/en_us.json b/Common/src/main/resources/assets/tardim_ic/lang/en_us.json deleted file mode 100644 index 8ae4985..0000000 --- a/Common/src/main/resources/assets/tardim_ic/lang/en_us.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "block.tardim_ic.digital_tardim_interface": "Digital TARDIM interface", - "block.tardim_ic.redstone_tardim_input": "Redstone TARDIM input", - "block.tardim_ic.tardim_dock": "TARDIM dock", - "block.tardim_ic.food_machine": "TARDIM food machine", - "itemGroup.tardim_ic": "TARDIM: In Control", - "itemGroup.minecraft.tardim_ic": "TARDIM: In Control", - "subtitles.tardim_ic.cloister": "Cloister bell rings", - "display_source.fuel_level": "TARDIM fuel level" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/lang/rpr.json b/Common/src/main/resources/assets/tardim_ic/lang/rpr.json deleted file mode 100644 index 51c5140..0000000 --- a/Common/src/main/resources/assets/tardim_ic/lang/rpr.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "block.tardim_ic.digital_tardim_interface": "Циферный Интерфейсъ Хронобудки", - "block.tardim_ic.redstone_tardim_input": "Краснокаменный Инпутъ Хронобудки", - "block.tardim_ic.tardim_dock": "Конюшня для TARDIM", - "itemGroup.tardim_ic": "ТАРДИМЪ: Подъ Контрольемъ", - "itemGroup.minecraft.tardim_ic": "ТАРДИМЪ: Подъ Контрольемъ", - "subtitles.tardim_ic.cloister": "Звукъ временного колокола" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/lang/ru_ru.json b/Common/src/main/resources/assets/tardim_ic/lang/ru_ru.json deleted file mode 100644 index c819c1d..0000000 --- a/Common/src/main/resources/assets/tardim_ic/lang/ru_ru.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "block.tardim_ic.digital_tardim_interface": "Цифровой интерфейс TARDIM", - "block.tardim_ic.redstone_tardim_input": "Редстоуновый ввод TARDIM", - "block.tardim_ic.tardim_dock": "Стыковочная станция для TARDIM", - "block.tardim_ic.food_machine": "Раздатчик еды", - "itemGroup.tardim_ic": "TARDIM: In Control", - "itemGroup.minecraft.tardim_ic": "TARDIM: In Control", - "subtitles.tardim_ic.cloister": "Звон монастырского колокола", - "display_source.fuel_level": "Уровень топлива в TARDIM" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json b/Common/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json deleted file mode 100644 index 490fd9d..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json +++ /dev/null @@ -1,213 +0,0 @@ -{ - "credit": "Made by karoter2 (Feulim)", - "parent": "digital_tardim_interface", - "texture_size": [64, 64], - "textures": { - "1": "tardim_ic:block/digital_tardim_interface", - "particle": "tardim_ic:block/digital_tardim_interface" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [4, 4, 8, 7.5], "texture": "#1"}, - "east": {"uv": [0, 4, 4, 7.5], "texture": "#1"}, - "south": {"uv": [12, 4, 16, 7.5], "texture": "#1"}, - "west": {"uv": [8, 4, 12, 7.5], "texture": "#1"}, - "up": {"uv": [8, 4, 4, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 8, 4], "texture": "#1"} - } - }, - { - "from": [5, 14, 5], - "to": [11, 16, 11], - "faces": { - "north": {"uv": [1.5, 9, 3, 9.5], "texture": "#1"}, - "east": {"uv": [0, 9, 1.5, 9.5], "texture": "#1"}, - "south": {"uv": [4.5, 9, 6, 9.5], "texture": "#1"}, - "west": {"uv": [3, 9, 4.5, 9.5], "texture": "#1"}, - "up": {"uv": [3, 9, 1.5, 7.5], "texture": "#1"}, - "down": {"uv": [4.5, 7.5, 3, 9], "texture": "#1"} - } - }, - { - "from": [11, 14, 7], - "to": [14, 16, 9], - "faces": { - "north": {"uv": [12.5, 0.5, 13.25, 1], "texture": "#1"}, - "east": {"uv": [12, 0.5, 12.5, 1], "texture": "#1"}, - "south": {"uv": [13.75, 0.5, 14.5, 1], "texture": "#1"}, - "west": {"uv": [13.25, 0.5, 13.75, 1], "texture": "#1"}, - "up": {"uv": [13.25, 0.5, 12.5, 0], "texture": "#1"}, - "down": {"uv": [14, 0, 13.25, 0.5], "texture": "#1"} - } - }, - { - "from": [12.5, 14, 3.5], - "to": [12.5, 15, 12.5], - "faces": { - "north": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "east": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "south": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "west": {"uv": [13, 3.75, 15.25, 4], "texture": "#1"}, - "up": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "down": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"} - } - }, - { - "from": [3.5, 14, 12.5], - "to": [12.5, 15, 12.5], - "faces": { - "north": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "east": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "south": {"uv": [12.5, 3.75, 14.75, 4], "texture": "#1"}, - "west": {"uv": [13.5, 3.75, 15.75, 4], "texture": "#1"}, - "up": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "down": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"} - } - }, - { - "from": [3.5, 14, 3.5], - "to": [12.5, 15, 3.5], - "faces": { - "north": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "east": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "south": {"uv": [12.5, 3.75, 14.75, 4], "texture": "#1"}, - "west": {"uv": [13.5, 3.75, 15.75, 4], "texture": "#1"}, - "up": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "down": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"} - } - }, - { - "from": [3.5, 14, 3.5], - "to": [3.5, 15, 12.5], - "faces": { - "north": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "east": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "south": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "west": {"uv": [13, 3.75, 15.25, 4], "texture": "#1"}, - "up": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "down": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"} - } - }, - { - "from": [2, 14, 7], - "to": [5, 16, 9], - "faces": { - "north": {"uv": [5, 8, 5.75, 8.5], "texture": "#1"}, - "east": {"uv": [4.5, 8, 5, 8.5], "texture": "#1"}, - "south": {"uv": [6.25, 8, 7, 8.5], "texture": "#1"}, - "west": {"uv": [5.75, 8, 6.25, 8.5], "texture": "#1"}, - "up": {"uv": [5.75, 8, 5, 7.5], "texture": "#1"}, - "down": {"uv": [6.5, 7.5, 5.75, 8], "texture": "#1"} - } - }, - { - "from": [7, 14, 2], - "to": [9, 16, 5], - "faces": { - "north": {"uv": [3.25, 12.5, 3.75, 13], "texture": "#1"}, - "east": {"uv": [2.5, 12.5, 3.25, 13], "texture": "#1"}, - "south": {"uv": [4.5, 12.5, 5, 13], "texture": "#1"}, - "west": {"uv": [3.75, 12.5, 4.5, 13], "texture": "#1"}, - "up": {"uv": [3.75, 12.5, 3.25, 11.75], "texture": "#1"}, - "down": {"uv": [4.25, 11.75, 3.75, 12.5], "texture": "#1"} - } - }, - { - "from": [7, 14, 11], - "to": [9, 16, 14], - "faces": { - "north": {"uv": [0.75, 12.5, 1.25, 13], "texture": "#1"}, - "east": {"uv": [0, 12.5, 0.75, 13], "texture": "#1"}, - "south": {"uv": [2, 12.5, 2.5, 13], "texture": "#1"}, - "west": {"uv": [1.25, 12.5, 2, 13], "texture": "#1"}, - "up": {"uv": [1.25, 12.5, 0.75, 11.75], "texture": "#1"}, - "down": {"uv": [1.75, 11.75, 1.25, 12.5], "texture": "#1"} - } - }, - { - "from": [6, 13, -2], - "to": [10, 17, 2], - "faces": { - "north": {"uv": [10, 9.5, 11, 10.5], "texture": "#1"}, - "east": {"uv": [9, 9.5, 10, 10.5], "texture": "#1"}, - "south": {"uv": [12, 9.5, 13, 10.5], "texture": "#1"}, - "west": {"uv": [11, 9.5, 12, 10.5], "texture": "#1"}, - "up": {"uv": [11, 9.5, 10, 8.5], "texture": "#1"}, - "down": {"uv": [12, 8.5, 11, 9.5], "texture": "#1"} - } - }, - { - "from": [6, 13, 14], - "to": [10, 17, 18], - "faces": { - "north": {"uv": [7, 8.5, 8, 9.5], "texture": "#1"}, - "east": {"uv": [6, 8.5, 7, 9.5], "texture": "#1"}, - "south": {"uv": [9, 8.5, 10, 9.5], "texture": "#1"}, - "west": {"uv": [8, 8.5, 9, 9.5], "texture": "#1"}, - "up": {"uv": [8, 8.5, 7, 7.5], "texture": "#1"}, - "down": {"uv": [9, 7.5, 8, 8.5], "texture": "#1"} - } - }, - { - "from": [-2, 13, 6], - "to": [2, 17, 10], - "faces": { - "north": {"uv": [1, 3, 2, 4], "texture": "#1"}, - "east": {"uv": [0, 3, 1, 4], "texture": "#1"}, - "south": {"uv": [3, 3, 4, 4], "texture": "#1"}, - "west": {"uv": [2, 3, 3, 4], "texture": "#1"}, - "up": {"uv": [2, 3, 1, 2], "texture": "#1"}, - "down": {"uv": [3, 2, 2, 3], "texture": "#1"} - } - }, - { - "from": [14, 13, 6], - "to": [18, 17, 10], - "faces": { - "north": {"uv": [1, 1, 2, 2], "texture": "#1"}, - "east": {"uv": [0, 1, 1, 2], "texture": "#1"}, - "south": {"uv": [3, 1, 4, 2], "texture": "#1"}, - "west": {"uv": [2, 1, 3, 2], "texture": "#1"}, - "up": {"uv": [2, 1, 1, 0], "texture": "#1"}, - "down": {"uv": [3, 0, 2, 1], "texture": "#1"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, -1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, -1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [-1.25, 0, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [3.75, -1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, -0.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "gui": { - "rotation": [33, 45, 0], - "scale": [0.6, 0.6, 0.6] - }, - "head": { - "translation": [0, 0.75, 0], - "scale": [1.1, 1.1, 1.1] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, 4.25] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/food_machine.json b/Common/src/main/resources/assets/tardim_ic/models/block/food_machine.json deleted file mode 100644 index 7cbaf76..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/food_machine.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made by karoter2 (Feulim)", - "texture_size": [128, 128], - "textures": { - "0": "tardim_ic:block/food_machine", - "particle": "tardim_ic:block/food_machine" - }, - "elements": [ - { - "from": [0, 0, 1], - "to": [16, 10, 16], - "faces": { - "north": {"uv": [1.875, 1.875, 3.875, 3.125], "texture": "#0"}, - "east": {"uv": [0, 1.875, 1.875, 3.125], "texture": "#0"}, - "south": {"uv": [5.75, 1.875, 7.75, 3.125], "texture": "#0"}, - "west": {"uv": [3.875, 1.875, 5.75, 3.125], "texture": "#0"}, - "up": {"uv": [3.875, 1.875, 1.875, 0], "texture": "#0"}, - "down": {"uv": [5.875, 0, 3.875, 1.875], "texture": "#0"} - } - }, - { - "from": [0.5, 1, 16.02], - "to": [15.5, 15, 16.02], - "faces": { - "north": {"uv": [8.25, 1.625, 10.125, 3.375], "texture": "#0"}, - "east": {"uv": [8.25, 1.625, 8.25, 3.375], "texture": "#0"}, - "south": {"uv": [10.125, 1.625, 12, 3.375], "texture": "#0"}, - "west": {"uv": [10.125, 1.625, 10.125, 3.375], "texture": "#0"}, - "up": {"uv": [10.125, 1.625, 8.25, 1.625], "texture": "#0"}, - "down": {"uv": [12, 1.625, 10.125, 1.625], "texture": "#0"} - } - }, - { - "from": [0, 10, 0], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [2, 5.125, 4, 5.375], "texture": "#0"}, - "east": {"uv": [0, 5.125, 2, 5.375], "texture": "#0"}, - "south": {"uv": [6, 5.125, 8, 5.375], "texture": "#0"}, - "west": {"uv": [4, 5.125, 6, 5.375], "texture": "#0"}, - "up": {"uv": [4, 5.125, 2, 3.125], "texture": "#0"}, - "down": {"uv": [6, 3.125, 4, 5.125], "texture": "#0"} - } - }, - { - "from": [0, 12, 9], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0.875, 6.25, 2.875, 6.75], "texture": "#0"}, - "east": {"uv": [0, 6.25, 0.875, 6.75], "texture": "#0"}, - "south": {"uv": [3.75, 6.25, 5.75, 6.75], "texture": "#0"}, - "west": {"uv": [2.875, 6.25, 3.75, 6.75], "texture": "#0"}, - "up": {"uv": [2.875, 6.25, 0.875, 5.375], "texture": "#0"}, - "down": {"uv": [4.875, 5.375, 2.875, 6.25], "texture": "#0"} - } - }, - { - "from": [5, 11, 4], - "to": [11, 14, 10], - "rotation": {"angle": -22.5, "axis": "x", "origin": [9, 12, 8]}, - "faces": { - "north": {"uv": [6.5, 6.125, 7.25, 6.5], "texture": "#0"}, - "east": {"uv": [5.75, 6.125, 6.5, 6.5], "texture": "#0"}, - "south": {"uv": [8, 6.125, 8.75, 6.5], "texture": "#0"}, - "west": {"uv": [7.25, 6.125, 8, 6.5], "texture": "#0"}, - "up": {"uv": [7.25, 6.125, 6.5, 5.375], "texture": "#0"}, - "down": {"uv": [8, 5.375, 7.25, 6.125], "texture": "#0"} - } - }, - { - "from": [1, 12, 3], - "to": [4, 13, 6], - "faces": { - "north": {"uv": [0.375, 0.875, 0.75, 1], "texture": "#0"}, - "east": {"uv": [0, 0.875, 0.375, 1], "texture": "#0"}, - "south": {"uv": [1.125, 0.875, 1.5, 1], "texture": "#0"}, - "west": {"uv": [0.75, 0.875, 1.125, 1], "texture": "#0"}, - "up": {"uv": [0.75, 0.875, 0.375, 0.5], "texture": "#0"}, - "down": {"uv": [1.125, 0.5, 0.75, 0.875], "texture": "#0"} - } - }, - { - "from": [12, 12, 3], - "to": [15, 13, 6], - "faces": { - "north": {"uv": [0.375, 0.375, 0.75, 0.5], "texture": "#0"}, - "east": {"uv": [0, 0.375, 0.375, 0.5], "texture": "#0"}, - "south": {"uv": [1.125, 0.375, 1.5, 0.5], "texture": "#0"}, - "west": {"uv": [0.75, 0.375, 1.125, 0.5], "texture": "#0"}, - "up": {"uv": [0.75, 0.375, 0.375, 0], "texture": "#0"}, - "down": {"uv": [1.125, 0, 0.75, 0.375], "texture": "#0"} - } - } - ], - "groups": [ - { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4, 5, 6] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json b/Common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json deleted file mode 100644 index 2068e27..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "credit": "Made by karoter2 (Feulim)", - "parent": "block/cube_all", - "ambientocclusion": false, - "textures": { - "1": "tardim_ic:block/redstone_input", - "2": "tardim_ic:block/redstone_input", - "particle": "tardim_ic:block/redstone_input" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#2"} - } - }, - { - "from": [-0.325, -0.35, -0.35], - "to": [16.35, 16.525, 16.275], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#1"} - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input_lit.json b/Common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input_lit.json deleted file mode 100644 index 18bb49a..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input_lit.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "tardim_ic:block/redstone_tardim_input", - "textures": { - "1": "tardim_ic:block/redstone_input_lit", - "2": "tardim_ic:block/redstone_input_lit", - "particle": "tardim_ic:block/redstone_input_lit" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_dock.json b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_dock.json deleted file mode 100644 index 33ff950..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_dock.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "credit": "Made by karoter2 (Feulim)", - "texture_size": [64, 64], - "textures": { - "1": "tardim_ic:block/tardim_dock", - "particle": "tardim_ic:block/tardim_dock" - }, - "elements": [ - { - "from": [2, 0, 2], - "to": [14, 12, 14], - "faces": { - "north": {"uv": [4, 0, 7, 3], "texture": "#1"}, - "east": {"uv": [4, 3, 7, 6], "texture": "#1"}, - "south": {"uv": [4, 6, 7, 9], "texture": "#1"}, - "west": {"uv": [7, 0, 10, 3], "texture": "#1"}, - "up": {"uv": [10, 6, 7, 3], "texture": "#1"}, - "down": {"uv": [10, 6, 7, 9], "texture": "#1"} - } - }, - { - "from": [0, 12, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 8, 4, 9], "texture": "#1"}, - "east": {"uv": [0, 9, 4, 10], "texture": "#1"}, - "south": {"uv": [4, 9, 8, 10], "texture": "#1"}, - "west": {"uv": [8, 9, 12, 10], "texture": "#1"}, - "up": {"uv": [4, 4, 0, 0], "texture": "#1"}, - "down": {"uv": [4, 4, 0, 8], "texture": "#1"} - } - }, - { - "from": [12, 7, 0], - "to": [12, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "east": {"uv": [10.25, 0, 10, 1.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "west": {"uv": [10, 0, 10.25, 1.25], "texture": "#1"}, - "up": {"uv": [0, 0.5, 0, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#1"} - } - }, - { - "from": [12, 6, 1], - "to": [12, 7, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "east": {"uv": [10.5, 1.25, 10.25, 1.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "west": {"uv": [10.5, 1.25, 10.25, 1.5], "texture": "#1"}, - "up": {"uv": [0, 0.5, 0, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#1"} - } - }, - { - "from": [4, 4, 0], - "to": [4, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "east": {"uv": [1.25, 10, 1, 12], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "west": {"uv": [1, 10, 1.25, 12], "texture": "#1"}, - "up": {"uv": [0, 0.5, 0, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#1"} - } - }, - { - "from": [4, 3, 1], - "to": [4, 4, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "east": {"uv": [1.5, 12, 1.25, 12.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "west": {"uv": [1.25, 12, 1.5, 12.25], "texture": "#1"}, - "up": {"uv": [0, 0.5, 0, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#1"} - } - }, - { - "from": [4, 7, 15], - "to": [4, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "east": {"uv": [10, 0, 10.25, 1.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "west": {"uv": [10.25, 0, 10, 1.25], "texture": "#1"}, - "up": {"uv": [0, 0.5, 0, 0], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [4, 6, 14], - "to": [4, 7, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "east": {"uv": [10.5, 1.25, 10.25, 1.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "west": {"uv": [10.5, 1.25, 10.25, 1.5], "texture": "#1"}, - "up": {"uv": [0, 0.5, 0, 0], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [12, 4, 15], - "to": [12, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "east": {"uv": [1, 10, 1.25, 12], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "west": {"uv": [1.25, 10, 1, 12], "texture": "#1"}, - "up": {"uv": [0, 0.5, 0, 0], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [12, 3, 14], - "to": [12, 4, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "east": {"uv": [1.25, 12, 1.5, 12.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 3], "texture": "#1"}, - "west": {"uv": [1.5, 12, 1.25, 12.25], "texture": "#1"}, - "up": {"uv": [0, 0.5, 0, 0], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0, 0.5], "rotation": 180, "texture": "#1"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, 0.5], - "scale": [0.3, 0.3, 0.3] - }, - "thirdperson_lefthand": { - "scale": [0.3, 0.3, 0.3] - }, - "firstperson_righthand": { - "translation": [1.75, -0.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [3, 0, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, -0.25, 0], - "scale": [0.4, 0.4, 0.4] - }, - "gui": { - "rotation": [18, 45, 0], - "translation": [0, -0.5, 0], - "scale": [0.65, 0.65, 0.65] - }, - "head": { - "rotation": [0, -90, 0], - "scale": [1.2, 1.2, 1.2] - }, - "fixed": { - "rotation": [-90, 0, 0], - "scale": [1.2, 1.2, 1.2] - } - }, - "groups": [ - { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "nbt": "{}", - "children": [ - 0, - 1, - { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "nbt": "{}", - "children": [2, 3, 4, 5] - }, - { - "name": "group", - "origin": [8, 8, 8], - "color": 0, - "nbt": "{}", - "children": [6, 7, 8, 9] - } - ] - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index 5897e27..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_closed.json +++ /dev/null @@ -1,279 +0,0 @@ -{ - "credit": "Made by karoter2", - "texture_size": [64, 64], - "textures": { - "0": "tardim_ic:blocks/tardim_soviet_chronobox", - "particle": "tardim_ic:blocks/tardim_soviet_chronobox" - }, - "elements": [ - { - "from": [13, 0, 0], - "to": [15, 32, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [12.5, 0, 13, 8], "texture": "#0"}, - "east": {"uv": [12.5, 0, 12.75, 8], "texture": "#0"}, - "south": {"uv": [12.5, 0, 13, 8], "texture": "#0"}, - "west": {"uv": [12.75, 0, 13, 8], "texture": "#0"}, - "up": {"uv": [12.5, 0, 13, 0.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [12.5, 7.75, 13, 8], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [3, 0, 0], - "to": [13, 2, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [13, 7.5, 15.5, 8], "texture": "#0"}, - "east": {"uv": [15.25, 7.5, 15.5, 8], "texture": "#0"}, - "south": {"uv": [13, 7.5, 15.5, 8], "texture": "#0"}, - "west": {"uv": [15.75, 7.5, 16, 8], "texture": "#0"}, - "up": {"uv": [15.75, 5.25, 16, 7.75], "rotation": 90, "texture": "#0"}, - "down": {"uv": [15.75, 5.25, 16, 7.75], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [3, 15, 0], - "to": [13, 17, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [13, 3.75, 15.5, 4.25], "texture": "#0"}, - "east": {"uv": [15.25, 7.5, 15.5, 8], "texture": "#0"}, - "south": {"uv": [13, 3.75, 15.5, 4.25], "texture": "#0"}, - "west": {"uv": [15.75, 7.5, 16, 8], "texture": "#0"}, - "up": {"uv": [15.75, 5.25, 16, 7.75], "rotation": 90, "texture": "#0"}, - "down": {"uv": [15.75, 5.25, 16, 7.75], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [3, 17, 0], - "to": [13, 30, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "east": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "south": {"uv": [12.5, 0, 10, 3.25], "texture": "#0"}, - "west": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "up": {"uv": [10, 0, 12.5, 3.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10, 0, 12.5, 3.25], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [3, 17, -16], - "to": [13, 30, -16], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [10, 3.25, 12.5, 6.5], "texture": "#0"}, - "east": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "south": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#0"}, - "west": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "up": {"uv": [10, 0, 12.5, 3.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10, 0, 12.5, 3.25], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [0, 17, -13], - "to": [0, 30, -3], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "east": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "south": {"uv": [12.5, 0, 10, 3.25], "texture": "#0"}, - "west": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "up": {"uv": [10, 0, 12.5, 3.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10, 0, 12.5, 3.25], "rotation": 270, "texture": "#0"} - } - }, - { - "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"}, - "east": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "south": {"uv": [12.5, 0, 10, 3.25], "texture": "#0"}, - "west": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "up": {"uv": [10, 0, 12.5, 3.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10, 0, 12.5, 3.25], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [7, 18, 0.425], - "to": [9, 20, 0.425], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [9.25, 1, 8.75, 1.5], "texture": "#0"}, - "east": {"uv": [9.25, 1, 8.75, 1.5], "texture": "#0"}, - "south": {"uv": [9.25, 1, 8.75, 1.5], "texture": "#0"}, - "west": {"uv": [9.25, 1, 8.75, 1.5], "texture": "#0"}, - "up": {"uv": [9.25, 1, 8.75, 1.5], "texture": "#0"}, - "down": {"uv": [9.25, 1, 8.75, 1.5], "texture": "#0"} - } - }, - { - "from": [6, 19, 0.425], - "to": [7, 20, 0.425], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [8.75, 1, 8.5, 1.25], "texture": "#0"}, - "east": {"uv": [8.75, 1, 8.5, 1.25], "texture": "#0"}, - "south": {"uv": [8.75, 1, 8.5, 1.25], "texture": "#0"}, - "west": {"uv": [8.75, 1, 8.5, 1.25], "texture": "#0"}, - "up": {"uv": [8.75, 1, 8.5, 1.25], "texture": "#0"}, - "down": {"uv": [8.75, 1, 8.5, 1.25], "texture": "#0"} - } - }, - { - "from": [9, 19, 0.425], - "to": [10, 20, 0.425], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [9.5, 1, 9.25, 1.25], "texture": "#0"}, - "east": {"uv": [9.5, 1, 9.25, 1.25], "texture": "#0"}, - "south": {"uv": [9.5, 1, 9.25, 1.25], "texture": "#0"}, - "west": {"uv": [9.5, 1, 9.25, 1.25], "texture": "#0"}, - "up": {"uv": [9.5, 1, 9.25, 1.25], "texture": "#0"}, - "down": {"uv": [9.5, 1, 9.25, 1.25], "texture": "#0"} - } - }, - { - "from": [11, 20, 0.425], - "to": [12, 22, 0.425], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [10, 0.5, 9.75, 1], "texture": "#0"}, - "east": {"uv": [10, 0.5, 9.75, 1], "texture": "#0"}, - "south": {"uv": [10, 0.5, 9.75, 1], "texture": "#0"}, - "west": {"uv": [10, 0.5, 9.75, 1], "texture": "#0"}, - "up": {"uv": [10, 0.5, 9.75, 1], "texture": "#0"}, - "down": {"uv": [10, 0.5, 9.75, 1], "texture": "#0"} - } - }, - { - "from": [4, 20, 0.425], - "to": [5, 22, 0.425], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [8.25, 0.5, 8, 1], "texture": "#0"}, - "east": {"uv": [8.25, 0.5, 8, 1], "texture": "#0"}, - "south": {"uv": [8.25, 0.5, 8, 1], "texture": "#0"}, - "west": {"uv": [8.25, 0.5, 8, 1], "texture": "#0"}, - "up": {"uv": [8.25, 0.5, 8, 1], "texture": "#0"}, - "down": {"uv": [8.25, 0.5, 8, 1], "texture": "#0"} - } - }, - { - "from": [5, 21, 0.425], - "to": [6, 22, 0.425], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [8.5, 0.5, 8.25, 0.75], "texture": "#0"}, - "east": {"uv": [8.5, 0.5, 8.25, 0.75], "texture": "#0"}, - "south": {"uv": [8.5, 0.5, 8.25, 0.75], "texture": "#0"}, - "west": {"uv": [8.5, 0.5, 8.25, 0.75], "texture": "#0"}, - "up": {"uv": [8.5, 0.5, 8.25, 0.75], "texture": "#0"}, - "down": {"uv": [8.5, 0.5, 8.25, 0.75], "texture": "#0"} - } - }, - { - "from": [5, 22, 0.425], - "to": [11, 23, 0.425], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [9.75, 0.25, 8.25, 0.5], "texture": "#0"}, - "east": {"uv": [9.75, 0.25, 8.25, 0.5], "texture": "#0"}, - "south": {"uv": [9.75, 0.25, 8.25, 0.5], "texture": "#0"}, - "west": {"uv": [9.75, 0.25, 8.25, 0.5], "texture": "#0"}, - "up": {"uv": [9.75, 0.25, 8.25, 0.5], "texture": "#0"}, - "down": {"uv": [9.75, 0.25, 8.25, 0.5], "texture": "#0"} - } - }, - { - "from": [7, 23, 0.425], - "to": [9, 24, 0.425], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [9.25, 0, 8.75, 0.25], "texture": "#0"}, - "east": {"uv": [9.25, 0, 8.75, 0.25], "texture": "#0"}, - "south": {"uv": [9.25, 0, 8.75, 0.25], "texture": "#0"}, - "west": {"uv": [9.25, 0, 8.75, 0.25], "texture": "#0"}, - "up": {"uv": [9.25, 0, 8.75, 0.25], "texture": "#0"}, - "down": {"uv": [9.25, 0, 8.75, 0.25], "texture": "#0"} - } - }, - { - "from": [10, 21, 0.425], - "to": [11, 22, 0.425], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [9.75, 0.5, 9.5, 0.75], "texture": "#0"}, - "east": {"uv": [9.75, 0.5, 9.5, 0.75], "texture": "#0"}, - "south": {"uv": [9.75, 0.5, 9.5, 0.75], "texture": "#0"}, - "west": {"uv": [9.75, 0.5, 9.5, 0.75], "texture": "#0"}, - "up": {"uv": [9.75, 0.5, 9.5, 0.75], "texture": "#0"}, - "down": {"uv": [9.75, 0.5, 9.5, 0.75], "texture": "#0"} - } - }, - { - "from": [3, 2, 0], - "to": [13, 15, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#0"}, - "east": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#0"}, - "south": {"uv": [10, 3.25, 12.5, 6.5], "texture": "#0"}, - "west": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#0"}, - "up": {"uv": [12.5, 3.25, 10, 6.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [12.5, 3.25, 10, 6.5], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [3, 30, 0], - "to": [13, 32, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [13, 0, 15.5, 0.5], "texture": "#0"}, - "east": {"uv": [15.25, 7.5, 15.5, 8], "texture": "#0"}, - "south": {"uv": [13, 0, 15.5, 0.5], "texture": "#0"}, - "west": {"uv": [15.75, 7.5, 16, 8], "texture": "#0"}, - "up": {"uv": [15.75, 5.25, 16, 7.75], "rotation": 90, "texture": "#0"}, - "down": {"uv": [15.75, 5.25, 16, 7.75], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [1, 0, 0], - "to": [3, 32, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [15.5, 0, 16, 8], "texture": "#0"}, - "east": {"uv": [15.5, 0, 15.75, 8], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 8], "texture": "#0"}, - "west": {"uv": [15.75, 0, 16, 8], "texture": "#0"}, - "up": {"uv": [15.5, 0, 16, 0.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [15.5, 7.75, 16, 8], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [2, 15.5, 0.5], - "to": [5, 16.5, 1.5], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [7.25, 0, 8, 0.25], "texture": "#0"}, - "east": {"uv": [7, 0.5, 7.25, 0.75], "texture": "#0"}, - "south": {"uv": [7.25, 0, 8, 0.25], "texture": "#0"}, - "west": {"uv": [7.25, 0, 7.5, 0.25], "texture": "#0"}, - "up": {"uv": [7.25, 0, 8, 0.25], "texture": "#0"}, - "down": {"uv": [7.25, 0, 8, 0.25], "texture": "#0"} - } - } - ], - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] - } - ] -} \ No newline at end of file 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 deleted file mode 100644 index cbe3454..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_open.json +++ /dev/null @@ -1,279 +0,0 @@ -{ - "credit": "Made by karoter2", - "texture_size": [64, 64], - "textures": { - "0": "tardim_ic:blocks/tardim_soviet_chronobox", - "particle": "tardim_ic:blocks/tardim_soviet_chronobox" - }, - "elements": [ - { - "from": [14, 0, 1], - "to": [15, 32, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [12.5, 0, 12.75, 8], "texture": "#0"}, - "east": {"uv": [12.5, 0, 13, 8], "texture": "#0"}, - "south": {"uv": [12.75, 0, 13, 8], "texture": "#0"}, - "west": {"uv": [12.5, 0, 13, 8], "texture": "#0"}, - "up": {"uv": [12.5, 0, 13, 0.25], "texture": "#0"}, - "down": {"uv": [12.5, 7.75, 13, 8], "texture": "#0"} - } - }, - { - "from": [14, 0, 3], - "to": [15, 2, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [15.25, 7.5, 15.5, 8], "texture": "#0"}, - "east": {"uv": [13, 7.5, 15.5, 8], "texture": "#0"}, - "south": {"uv": [15.75, 7.5, 16, 8], "texture": "#0"}, - "west": {"uv": [13, 7.5, 15.5, 8], "texture": "#0"}, - "up": {"uv": [15.75, 5.25, 16, 7.75], "texture": "#0"}, - "down": {"uv": [15.75, 5.25, 16, 7.75], "texture": "#0"} - } - }, - { - "from": [14, 15, 3], - "to": [15, 17, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [15.25, 7.5, 15.5, 8], "texture": "#0"}, - "east": {"uv": [13, 3.75, 15.5, 4.25], "texture": "#0"}, - "south": {"uv": [15.75, 7.5, 16, 8], "texture": "#0"}, - "west": {"uv": [13, 3.75, 15.5, 4.25], "texture": "#0"}, - "up": {"uv": [15.75, 5.25, 16, 7.75], "texture": "#0"}, - "down": {"uv": [15.75, 5.25, 16, 7.75], "texture": "#0"} - } - }, - { - "from": [14, 17, 3], - "to": [14, 30, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "east": {"uv": [12.5, 0, 10, 3.25], "texture": "#0"}, - "south": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "west": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "up": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "down": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"} - } - }, - { - "from": [14.425, 18, 7], - "to": [14.425, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [9.25, 1, 8.75, 1.5], "texture": "#0"}, - "east": {"uv": [9.25, 1, 8.75, 1.5], "texture": "#0"}, - "south": {"uv": [9.25, 1, 8.75, 1.5], "texture": "#0"}, - "west": {"uv": [9.25, 1, 8.75, 1.5], "texture": "#0"}, - "up": {"uv": [9.25, 1, 8.75, 1.5], "rotation": 270, "texture": "#0"}, - "down": {"uv": [9.25, 1, 8.75, 1.5], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [14.425, 19, 9], - "to": [14.425, 20, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [8.75, 1, 8.5, 1.25], "texture": "#0"}, - "east": {"uv": [8.75, 1, 8.5, 1.25], "texture": "#0"}, - "south": {"uv": [8.75, 1, 8.5, 1.25], "texture": "#0"}, - "west": {"uv": [8.75, 1, 8.5, 1.25], "texture": "#0"}, - "up": {"uv": [8.75, 1, 8.5, 1.25], "rotation": 270, "texture": "#0"}, - "down": {"uv": [8.75, 1, 8.5, 1.25], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [14.425, 19, 6], - "to": [14.425, 20, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [9.5, 1, 9.25, 1.25], "texture": "#0"}, - "east": {"uv": [9.5, 1, 9.25, 1.25], "texture": "#0"}, - "south": {"uv": [9.5, 1, 9.25, 1.25], "texture": "#0"}, - "west": {"uv": [9.5, 1, 9.25, 1.25], "texture": "#0"}, - "up": {"uv": [9.5, 1, 9.25, 1.25], "rotation": 270, "texture": "#0"}, - "down": {"uv": [9.5, 1, 9.25, 1.25], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [14.425, 20, 4], - "to": [14.425, 22, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [10, 0.5, 9.75, 1], "texture": "#0"}, - "east": {"uv": [10, 0.5, 9.75, 1], "texture": "#0"}, - "south": {"uv": [10, 0.5, 9.75, 1], "texture": "#0"}, - "west": {"uv": [10, 0.5, 9.75, 1], "texture": "#0"}, - "up": {"uv": [10, 0.5, 9.75, 1], "rotation": 270, "texture": "#0"}, - "down": {"uv": [10, 0.5, 9.75, 1], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [14.425, 20, 11], - "to": [14.425, 22, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [8.25, 0.5, 8, 1], "texture": "#0"}, - "east": {"uv": [8.25, 0.5, 8, 1], "texture": "#0"}, - "south": {"uv": [8.25, 0.5, 8, 1], "texture": "#0"}, - "west": {"uv": [8.25, 0.5, 8, 1], "texture": "#0"}, - "up": {"uv": [8.25, 0.5, 8, 1], "rotation": 270, "texture": "#0"}, - "down": {"uv": [8.25, 0.5, 8, 1], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [14.425, 21, 10], - "to": [14.425, 22, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [8.5, 0.5, 8.25, 0.75], "texture": "#0"}, - "east": {"uv": [8.5, 0.5, 8.25, 0.75], "texture": "#0"}, - "south": {"uv": [8.5, 0.5, 8.25, 0.75], "texture": "#0"}, - "west": {"uv": [8.5, 0.5, 8.25, 0.75], "texture": "#0"}, - "up": {"uv": [8.5, 0.5, 8.25, 0.75], "rotation": 270, "texture": "#0"}, - "down": {"uv": [8.5, 0.5, 8.25, 0.75], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [14.425, 22, 5], - "to": [14.425, 23, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [9.75, 0.25, 8.25, 0.5], "texture": "#0"}, - "east": {"uv": [9.75, 0.25, 8.25, 0.5], "texture": "#0"}, - "south": {"uv": [9.75, 0.25, 8.25, 0.5], "texture": "#0"}, - "west": {"uv": [9.75, 0.25, 8.25, 0.5], "texture": "#0"}, - "up": {"uv": [9.75, 0.25, 8.25, 0.5], "rotation": 270, "texture": "#0"}, - "down": {"uv": [9.75, 0.25, 8.25, 0.5], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [14.425, 23, 7], - "to": [14.425, 24, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [9.25, 0, 8.75, 0.25], "texture": "#0"}, - "east": {"uv": [9.25, 0, 8.75, 0.25], "texture": "#0"}, - "south": {"uv": [9.25, 0, 8.75, 0.25], "texture": "#0"}, - "west": {"uv": [9.25, 0, 8.75, 0.25], "texture": "#0"}, - "up": {"uv": [9.25, 0, 8.75, 0.25], "rotation": 270, "texture": "#0"}, - "down": {"uv": [9.25, 0, 8.75, 0.25], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [14.425, 21, 5], - "to": [14.425, 22, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [9.75, 0.5, 9.5, 0.75], "texture": "#0"}, - "east": {"uv": [9.75, 0.5, 9.5, 0.75], "texture": "#0"}, - "south": {"uv": [9.75, 0.5, 9.5, 0.75], "texture": "#0"}, - "west": {"uv": [9.75, 0.5, 9.5, 0.75], "texture": "#0"}, - "up": {"uv": [9.75, 0.5, 9.5, 0.75], "rotation": 270, "texture": "#0"}, - "down": {"uv": [9.75, 0.5, 9.5, 0.75], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [14, 2, 3], - "to": [14, 15, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#0"}, - "east": {"uv": [10, 3.25, 12.5, 6.5], "texture": "#0"}, - "south": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#0"}, - "west": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#0"}, - "up": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#0"}, - "down": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#0"} - } - }, - { - "from": [14, 30, 3], - "to": [15, 32, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [15.25, 7.5, 15.5, 8], "texture": "#0"}, - "east": {"uv": [13, 0, 15.5, 0.5], "texture": "#0"}, - "south": {"uv": [15.75, 7.5, 16, 8], "texture": "#0"}, - "west": {"uv": [13, 0, 15.5, 0.5], "texture": "#0"}, - "up": {"uv": [15.75, 5.25, 16, 7.75], "texture": "#0"}, - "down": {"uv": [15.75, 5.25, 16, 7.75], "texture": "#0"} - } - }, - { - "from": [14, 0, 13], - "to": [15, 32, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [15.5, 0, 15.75, 8], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 8], "texture": "#0"}, - "south": {"uv": [15.75, 0, 16, 8], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 8], "texture": "#0"}, - "up": {"uv": [15.5, 0, 16, 0.25], "texture": "#0"}, - "down": {"uv": [15.5, 7.75, 16, 8], "texture": "#0"} - } - }, - { - "from": [14.5, 15.5, 11], - "to": [15.5, 16.5, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [7, 0.5, 7.25, 0.75], "texture": "#0"}, - "east": {"uv": [7.25, 0, 8, 0.25], "texture": "#0"}, - "south": {"uv": [7.25, 0, 7.5, 0.25], "texture": "#0"}, - "west": {"uv": [7.25, 0, 8, 0.25], "texture": "#0"}, - "up": {"uv": [7.25, 0, 8, 0.25], "rotation": 270, "texture": "#0"}, - "down": {"uv": [7.25, 0, 8, 0.25], "rotation": 90, "texture": "#0"} - } - }, - { - "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"}, - "east": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "south": {"uv": [12.5, 0, 10, 3.25], "texture": "#0"}, - "west": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "up": {"uv": [10, 0, 12.5, 3.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10, 0, 12.5, 3.25], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [0, 17, -13], - "to": [0, 30, -3], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "east": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "south": {"uv": [12.5, 0, 10, 3.25], "texture": "#0"}, - "west": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "up": {"uv": [10, 0, 12.5, 3.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10, 0, 12.5, 3.25], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [3, 17, -16], - "to": [13, 30, -16], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 0, 0]}, - "faces": { - "north": {"uv": [10, 3.25, 12.5, 6.5], "texture": "#0"}, - "east": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "south": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#0"}, - "west": {"uv": [10, 0, 12.5, 3.25], "texture": "#0"}, - "up": {"uv": [10, 0, 12.5, 3.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10, 0, 12.5, 3.25], "rotation": 270, "texture": "#0"} - } - } - ], - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides.json b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides.json deleted file mode 100644 index 5ea61b2..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "credit": "Made by karoter2", - "texture_size": [64, 64], - "textures": { - "particle": "tardim:block/tardim_tt" - }, - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_bottom.json b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_bottom.json deleted file mode 100644 index 5006320..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_bottom.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "credit": "Made by karoter2", - "texture_size": [64, 64], - "textures": { - "1": "tardim_ic:blocks/tardim_soviet_chronobox", - "particle": "tardim:block/tardim_tt" - }, - "elements": [ - { - "from": [1, 0, 0], - "to": [3, 32, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [12.5, 0, 13, 8], "texture": "#1"}, - "east": {"uv": [12.75, 0, 13, 8], "texture": "#1"}, - "south": {"uv": [12.5, 0, 13, 8], "texture": "#1"}, - "west": {"uv": [12.5, 0, 12.75, 8], "texture": "#1"}, - "up": {"uv": [12.5, 0, 13, 0.25], "rotation": 270, "texture": "#1"}, - "down": {"uv": [12.5, 7.75, 13, 8], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [3, 0, 0], - "to": [13, 2, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [13, 7.5, 15.5, 8], "texture": "#1"}, - "east": {"uv": [15.75, 7.5, 16, 8], "texture": "#1"}, - "south": {"uv": [13, 7.5, 15.5, 8], "texture": "#1"}, - "west": {"uv": [15.25, 7.5, 15.5, 8], "texture": "#1"}, - "up": {"uv": [15.75, 5.25, 16, 7.75], "rotation": 270, "texture": "#1"}, - "down": {"uv": [15.75, 5.25, 16, 7.75], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [3, 15, 0], - "to": [13, 17, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [13, 3.75, 15.5, 4.25], "texture": "#1"}, - "east": {"uv": [15.75, 7.5, 16, 8], "texture": "#1"}, - "south": {"uv": [13, 3.75, 15.5, 4.25], "texture": "#1"}, - "west": {"uv": [15.25, 7.5, 15.5, 8], "texture": "#1"}, - "up": {"uv": [15.75, 5.25, 16, 7.75], "rotation": 270, "texture": "#1"}, - "down": {"uv": [15.75, 5.25, 16, 7.75], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [3, 2, 0], - "to": [13, 15, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [10, 3.25, 12.5, 6.5], "texture": "#1"}, - "east": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#1"}, - "south": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#1"}, - "west": {"uv": [12.5, 3.25, 10, 6.5], "texture": "#1"}, - "up": {"uv": [12.5, 3.25, 10, 6.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [12.5, 3.25, 10, 6.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [3, 30, 0], - "to": [13, 32, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [13, 0, 15.5, 0.5], "texture": "#1"}, - "east": {"uv": [15.75, 7.5, 16, 8], "texture": "#1"}, - "south": {"uv": [13, 0, 15.5, 0.5], "texture": "#1"}, - "west": {"uv": [15.25, 7.5, 15.5, 8], "texture": "#1"}, - "up": {"uv": [15.75, 5.25, 16, 7.75], "rotation": 270, "texture": "#1"}, - "down": {"uv": [15.75, 5.25, 16, 7.75], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [13, 0, 0], - "to": [15, 32, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [15.5, 0, 16, 8], "texture": "#1"}, - "east": {"uv": [15.75, 0, 16, 8], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 8], "texture": "#1"}, - "west": {"uv": [15.5, 0, 15.75, 8], "texture": "#1"}, - "up": {"uv": [15.5, 0, 16, 0.25], "rotation": 270, "texture": "#1"}, - "down": {"uv": [15.5, 7.75, 16, 8], "rotation": 90, "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3, 4, 5] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_top.json b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_top.json deleted file mode 100644 index b9980a8..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_top.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "credit": "Made by karoter2", - "texture_size": [64, 64], - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "nbt": "{}", - "children": [] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_closed.json b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_closed.json deleted file mode 100644 index 1ad61f0..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_closed.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "credit": "Made by karoter2", - "texture_size": [64, 64], - "textures": { - "0": "tardim_ic:blocks/tardim_soviet_chronobox", - "particle": "tardim_ic:blocks/tardim_soviet_chronobox" - }, - "elements": [ - { - "from": [-4, 16, 4.15], - "to": [20, 24, 4.15], - "faces": { - "north": {"uv": [0, 2, 6, 4], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "south": {"uv": [0, 2, 6, 4], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "up": {"uv": [0, 0, 6, 0], "texture": "#0"}, - "down": {"uv": [0, 0, 6, 0], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_open.json b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_open.json deleted file mode 100644 index 1ad61f0..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_open.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "credit": "Made by karoter2", - "texture_size": [64, 64], - "textures": { - "0": "tardim_ic:blocks/tardim_soviet_chronobox", - "particle": "tardim_ic:blocks/tardim_soviet_chronobox" - }, - "elements": [ - { - "from": [-4, 16, 4.15], - "to": [20, 24, 4.15], - "faces": { - "north": {"uv": [0, 2, 6, 4], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "south": {"uv": [0, 2, 6, 4], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 2], "texture": "#0"}, - "up": {"uv": [0, 0, 6, 0], "texture": "#0"}, - "down": {"uv": [0, 0, 6, 0], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_floor.json b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_floor.json deleted file mode 100644 index 742139d..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_floor.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made by karoter2", - "texture_size": [64, 64], - "textures": { - "1": "tardim_ic:blocks/tardim_soviet_chronobox", - "particle": "tardim_ic:blocks/tardim_soviet_chronobox" - }, - "elements": [ - { - "from": [0, 0.1, 0], - "to": [16, 0.1, 16], - "faces": { - "north": {"uv": [1.5, 15.75, 5.5, 16], "texture": "#1"}, - "east": {"uv": [1.75, 15.75, 5.75, 16], "texture": "#1"}, - "south": {"uv": [1.5, 15.75, 5.5, 16], "texture": "#1"}, - "west": {"uv": [1.75, 15.75, 5.75, 16], "texture": "#1"}, - "up": {"uv": [12, 8, 16, 12], "texture": "#1"}, - "down": {"uv": [12, 8, 16, 12], "texture": "#1"} - } - }, - { - "from": [-2, 0, -2], - "to": [1, 32, 1], - "faces": { - "north": {"uv": [11.25, 16, 12, 8], "texture": "#1"}, - "east": {"uv": [11.25, 16, 12, 8], "texture": "#1"}, - "south": {"uv": [11.25, 16, 12, 8], "texture": "#1"}, - "west": {"uv": [11.25, 16, 12, 8], "texture": "#1"}, - "up": {"uv": [11.25, 8.75, 12, 8], "texture": "#1"}, - "down": {"uv": [11.25, 16, 12, 15.25], "texture": "#1"} - } - }, - { - "from": [-2, 0, 15], - "to": [1, 32, 18], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, - "faces": { - "north": {"uv": [12, 16, 11.25, 8], "texture": "#1"}, - "east": {"uv": [12, 16, 11.25, 8], "texture": "#1"}, - "south": {"uv": [12, 16, 11.25, 8], "texture": "#1"}, - "west": {"uv": [12, 16, 11.25, 8], "texture": "#1"}, - "up": {"uv": [11.25, 8, 12, 8.75], "texture": "#1"}, - "down": {"uv": [11.25, 15.25, 12, 16], "texture": "#1"} - } - }, - { - "from": [15, 0, -2], - "to": [18, 32, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, - "faces": { - "north": {"uv": [12, 16, 11.25, 8], "texture": "#1"}, - "east": {"uv": [12, 16, 11.25, 8], "texture": "#1"}, - "south": {"uv": [12, 16, 11.25, 8], "texture": "#1"}, - "west": {"uv": [12, 16, 11.25, 8], "texture": "#1"}, - "up": {"uv": [12, 8.75, 11.25, 8], "texture": "#1"}, - "down": {"uv": [12, 16, 11.25, 15.25], "texture": "#1"} - } - }, - { - "from": [15, 0, 15], - "to": [18, 32, 18], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 16]}, - "faces": { - "north": {"uv": [11.25, 16, 12, 8], "texture": "#1"}, - "east": {"uv": [11.25, 16, 12, 8], "texture": "#1"}, - "south": {"uv": [11.25, 16, 12, 8], "texture": "#1"}, - "west": {"uv": [11.25, 16, 12, 8], "texture": "#1"}, - "up": {"uv": [12, 8, 11.25, 8.75], "texture": "#1"}, - "down": {"uv": [12, 15.25, 11.25, 16], "texture": "#1"} - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_roof.json b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_roof.json deleted file mode 100644 index 2558b8c..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_roof.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "credit": "Made by karoter2", - "texture_size": [64, 64], - "textures": { - "0": "tardim_ic:blocks/tardim_soviet_chronobox", - "particle": "tardim_ic:blocks/tardim_soviet_chronobox" - }, - "elements": [ - { - "from": [-4, 0, -4], - "to": [20, 8, 20], - "faces": { - "north": {"uv": [0, 0, 6, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 6, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 6, 2], "texture": "#0"}, - "up": {"uv": [0, 4, 6, 10], "texture": "#0"}, - "down": {"uv": [0, 4, 6, 10], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json b/Common/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json deleted file mode 100644 index 256cd83..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "tardim_ic:block/digital_tardim_interface", - "display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ], - "translation": [ 0, 1, 0 ] - }, - "thirdperson_lefthand": { - "rotation": [ 75, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ], - "translation": [ 0, 1, 0 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/item/food_machine.json b/Common/src/main/resources/assets/tardim_ic/models/item/food_machine.json deleted file mode 100644 index 68b0612..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/item/food_machine.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "tardim_ic:block/food_machine", - "display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ], - "translation": [ 0, 1, 0 ] - }, - "thirdperson_lefthand": { - "rotation": [ 75, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ], - "translation": [ 0, 1, 0 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/item/personal_jammer.json b/Common/src/main/resources/assets/tardim_ic/models/item/personal_jammer.json deleted file mode 100644 index d8930c2..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/item/personal_jammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "tardim_ic:item/personal_jammer" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json b/Common/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json deleted file mode 100644 index 4a3e535..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "tardim_ic:block/redstone_tardim_input", - "display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ], - "translation": [ 0, 1, 0 ] - }, - "thirdperson_lefthand": { - "rotation": [ 75, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ], - "translation": [ 0, 1, 0 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/models/item/tardim_dock.json b/Common/src/main/resources/assets/tardim_ic/models/item/tardim_dock.json deleted file mode 100644 index 72aaf33..0000000 --- a/Common/src/main/resources/assets/tardim_ic/models/item/tardim_dock.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "tardim_ic:block/tardim_dock", - "display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ], - "translation": [ 0, 1, 0 ] - }, - "thirdperson_lefthand": { - "rotation": [ 75, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ], - "translation": [ 0, 1, 0 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/sounds.json b/Common/src/main/resources/assets/tardim_ic/sounds.json deleted file mode 100644 index e66c8c9..0000000 --- a/Common/src/main/resources/assets/tardim_ic/sounds.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "cloister": { - "subtitle": "subtitles.tardim_ic.cloister", - "sounds": [ - "tardim_ic:cloister" - ] - } -} - diff --git a/Common/src/main/resources/assets/tardim_ic/sounds/cloister.ogg b/Common/src/main/resources/assets/tardim_ic/sounds/cloister.ogg deleted file mode 100644 index 9c9f38a..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/sounds/cloister.ogg and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/textures/block/digital_tardim_interface.png b/Common/src/main/resources/assets/tardim_ic/textures/block/digital_tardim_interface.png deleted file mode 100644 index d430bc6..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/textures/block/digital_tardim_interface.png and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/textures/block/food_machine.png b/Common/src/main/resources/assets/tardim_ic/textures/block/food_machine.png deleted file mode 100644 index 8d355f7..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/textures/block/food_machine.png and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png b/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png deleted file mode 100644 index 3ed7480..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png.mcmeta b/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png.mcmeta deleted file mode 100644 index fe2f8d3..0000000 --- a/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "animation": { - "frametime": 10, - "interpolate": true, - "frames": [0, 1, 2, 3] - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png b/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png deleted file mode 100644 index 7809103..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png.mcmeta b/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png.mcmeta deleted file mode 100644 index fe2f8d3..0000000 --- a/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "animation": { - "frametime": 10, - "interpolate": true, - "frames": [0, 1, 2, 3] - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/textures/block/tardim_dock.png b/Common/src/main/resources/assets/tardim_ic/textures/block/tardim_dock.png deleted file mode 100644 index b82f67e..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/textures/block/tardim_dock.png and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/textures/block/tardim_soviet_chronobox.png b/Common/src/main/resources/assets/tardim_ic/textures/block/tardim_soviet_chronobox.png deleted file mode 100644 index ce23168..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/textures/block/tardim_soviet_chronobox.png and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_pins.png b/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_pins.png deleted file mode 100644 index 6aab34a..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_pins.png and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_shell.png b/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_shell.png deleted file mode 100644 index 8f4d59e..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_shell.png and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_blue.png b/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_blue.png deleted file mode 100644 index 76eaaab..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_blue.png and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_green.png b/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_green.png deleted file mode 100644 index 9173df1..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_green.png and /dev/null differ diff --git a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_red.png b/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_red.png deleted file mode 100644 index c930dc0..0000000 Binary files a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_red.png and /dev/null differ diff --git a/Common/src/main/resources/data/computercraft/lua/premade/NavDash.lua b/Common/src/main/resources/data/computercraft/lua/premade/NavDash.lua deleted file mode 100644 index 140884c..0000000 --- a/Common/src/main/resources/data/computercraft/lua/premade/NavDash.lua +++ /dev/null @@ -1,5 +0,0 @@ ---[[ - This is source code of my personal TARDIM Navigation Dashboard (NavDash) - - It needs a 1x2 (2 tall) monitor and a digital TARDIM interface to be available -] \ No newline at end of file diff --git a/Common/src/main/resources/data/computercraft/lua/premade/basicTest.lua b/Common/src/main/resources/data/computercraft/lua/premade/basicTest.lua deleted file mode 100644 index 0918304..0000000 --- a/Common/src/main/resources/data/computercraft/lua/premade/basicTest.lua +++ /dev/null @@ -1,12 +0,0 @@ --- This is a very basic test script --- This basically just verifies the mod works - -local int = peripheral.find("digital_tardim_interface") -if int == nil then - error("No interface found") -end - -print(int.getOwnerName() .. "'s TARDIM") -print("FUEL: " .. int.getFuel() .. "/100") -print("IN FLIGHT? " .. int.isInFlight()) -print("IS LOCKED? " .. int.isLocked()) diff --git a/Common/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json b/Common/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json deleted file mode 100644 index 28ee895..0000000 --- a/Common/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "name": "tardim_ic:digital_tardim_interface", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ] -} diff --git a/Common/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json b/Common/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json deleted file mode 100644 index a988e6a..0000000 --- a/Common/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "name": "tardim_ic:redstone_tardim_input", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ] -} diff --git a/Common/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json b/Common/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json deleted file mode 100644 index 2721c83..0000000 --- a/Common/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "DDD", - "R0R", - "GRG" - ], - "key": { - "G": { - "item": "minecraft:gold_ingot", - "count": 1 - }, - "R": { - "item": "minecraft:redstone", - "count": 1 - }, - "0": { - "item": "minecraft:ender_eye", - "count": 1 - }, - "D": { - "item": "minecraft:polished_deepslate", - "count": 1 - } - }, - "result": { - "item": "tardim_ic:digital_tardim_interface", - "count": 1 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json b/Common/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json deleted file mode 100644 index 9f47666..0000000 --- a/Common/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRG", - "RBR", - "GRG" - ], - "key": { - "G": { - "item": "minecraft:gold_ingot", - "count": 1 - }, - "R": { - "item": "minecraft:redstone", - "count": 1 - }, - "B": { - "item": "minecraft:redstone_block", - "count": 1 - } - }, - "result": { - "item": "tardim_ic:redstone_tardim_input", - "count": 1 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/pack.mcmeta b/Common/src/main/resources/pack.mcmeta deleted file mode 100644 index 52854ec..0000000 --- a/Common/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "description": "${mod_name}", - "pack_format": 8 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/tardim_ic.mixins.json b/Common/src/main/resources/tardim_ic.mixins.json deleted file mode 100644 index 1b9f9ef..0000000 --- a/Common/src/main/resources/tardim_ic.mixins.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "su.a71.tardim_ic.mixin", - "refmap": "${mod_id}.refmap.json", - "compatibilityLevel": "JAVA_17", - "mixins": [ - ], - "injectors": { - "defaultRequire": 1 - } -} - diff --git a/Common/tardim-1.2.2-dev.jar b/Common/tardim-1.2.2-dev.jar deleted file mode 100644 index bc8522a..0000000 Binary files a/Common/tardim-1.2.2-dev.jar and /dev/null differ diff --git a/Fabric/build.gradle b/Fabric/build.gradle deleted file mode 100644 index d79e2ec..0000000 --- a/Fabric/build.gradle +++ /dev/null @@ -1,72 +0,0 @@ -plugins { - id 'java' - id 'idea' - id 'maven-publish' - id 'fabric-loom' -} -base { - archivesName = "${mod_name}-fabric-${minecraft_version}" -} -dependencies { - minecraft "com.mojang:minecraft:${minecraft_version}" - mappings loom.officialMojangMappings() - modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" - implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' - implementation project(":common") - - modImplementation("curse.maven:tardim-531315:4668945") -// modCompileOnly("com.simibubi.create:create-fabric-1.20.1:0.5.1-d-build.1118+mc1.20.1") - modCompileOnly("cc.tweaked:cc-tweaked-$minecraft_version-fabric-api:$cc_version") -} - -loom { - if (project(":common").file("src/main/resources/${mod_id}.accesswidener").exists()) { - accessWidenerPath.set(project(":common").file("src/main/resources/${mod_id}.accesswidener")) - } - mixin { - defaultRefmapName.set("${mod_id}.refmap.json") - } - runs { - client { - client() - setConfigName("Fabric Client") - ideConfigGenerated(true) - runDir("run") - } - server { - server() - setConfigName("Fabric Server") - ideConfigGenerated(true) - runDir("run") - } - } -} - -tasks.withType(JavaCompile).configureEach { - source(project(":common").sourceSets.main.allSource) -} -tasks.withType(Javadoc).configureEach { - source(project(":common").sourceSets.main.allJava) -} -tasks.named("sourcesJar", Jar) { - from(project(":common").sourceSets.main.allSource) -} - -processResources { - from project(":common").sourceSets.main.resources -} - -publishing { - publications { - mavenJava(MavenPublication) { - artifactId base.archivesName.get() - from components.java - } - } - repositories { - maven { - url "file://" + System.getenv("local_maven") - } - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/TardimInControl.java b/Fabric/src/main/java/su/a71/tardim_ic/TardimInControl.java deleted file mode 100644 index 2bc3625..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/TardimInControl.java +++ /dev/null @@ -1,12 +0,0 @@ -package su.a71.tardim_ic; - -import net.fabricmc.api.ModInitializer; -import su.a71.tardim_ic.tardim_ic.registration.Registration; - -public class TardimInControl implements ModInitializer { - - @Override - public void onInitialize() { - Registration.register(); - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlock.java b/Fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlock.java deleted file mode 100644 index de2869f..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlock.java +++ /dev/null @@ -1,94 +0,0 @@ -package su.a71.tardim_ic.blocks.food_machine; - -import com.swdteam.tardim.common.init.TRDDimensions; -import com.swdteam.tardim.common.init.TRDSounds; -import com.swdteam.tardim.tardim.TardimData; -import com.swdteam.tardim.tardim.TardimManager; -import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.sounds.SoundSource; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.DirectionProperty; -import net.minecraft.world.level.material.MapColor; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.Vec3; -import org.jetbrains.annotations.NotNull; -import su.a71.tardim_ic.tardim_ic.registration.Registration; - -import javax.annotation.Nullable; - -public class FoodMachineBlock extends HorizontalDirectionalBlock implements EntityBlock { - public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING; - - public FoodMachineBlock() { - super(Properties.of().strength(2, 4).noOcclusion().mapColor(MapColor.METAL)); // No occlusion? - this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH)); - } - - public BlockState getStateForPlacement(BlockPlaceContext $$0) { - return this.defaultBlockState().setValue(FACING, $$0.getHorizontalDirection().getOpposite()); - } - protected void createBlockStateDefinition(StateDefinition.Builder $$0) { - $$0.add(FACING); - } - - - @Nullable - @Override - public BlockEntity newBlockEntity(@NotNull BlockPos pos, @NotNull BlockState state) { - return Registration.FOOD_MACHINE_BE.create(pos, state); - } - - @Override - public InteractionResult use(BlockState blockState, Level w, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult p_60508_) { - if (!w.isClientSide) { - w.playSound(null, blockPos, TRDSounds.TARDIM_BEEP, SoundSource.BLOCKS, 0.3F, 0.5F); - BlockEntity be = w.getBlockEntity(blockPos); - if (be instanceof FoodMachineBlockEntity && w.dimension() == TRDDimensions.TARDIS) { - TardimData data = TardimManager.getFromPos(blockPos); - if (data != null && data.hasPermission(player)) { - if (data.getFuel() >= 0.2) { - data.setFuel(data.getFuel() - 0.2); // Remove some fuel in exchange for food - ItemEntity food = new ItemEntity(EntityType.ITEM, w); - - // Select type of food here - food.setItem(new ItemStack(Items.BREAD, 1)); - - food.setPos(Vec3.atCenterOf(blockPos).add(new Vec3(0, 0.2, 0))); - w.addFreshEntity(food); - } else { - player.displayClientMessage( - Component.literal("You do not have enough fuel").withStyle(ChatFormatting.DARK_RED).withStyle(ChatFormatting.BOLD), true - ); - } - return InteractionResult.CONSUME; - } - - player.displayClientMessage( - Component.literal("You do not have permission").withStyle(ChatFormatting.DARK_RED).withStyle(ChatFormatting.BOLD), true - ); - } - } - - return InteractionResult.CONSUME; - } - - public boolean canSurvive(BlockState blockState, LevelReader levelReader, BlockPos blockPos) { - return true; - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlockEntity.java b/Fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlockEntity.java deleted file mode 100644 index 4f13e0f..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlockEntity.java +++ /dev/null @@ -1,36 +0,0 @@ -package su.a71.tardim_ic.blocks.food_machine; - -import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; -import su.a71.tardim_ic.tardim_ic.registration.Registration; - -public class FoodMachineBlockEntity extends BlockEntity { - public int curr_food_index; - - public FoodMachineBlockEntity(BlockPos pos, BlockState state) { - super(Registration.FOOD_MACHINE_BE, pos, state); - this.curr_food_index = 0; - } - - public BlockPos getPos() { - return this.worldPosition; - } - - - @Override - public void saveAdditional(CompoundTag tag) { - tag.putInt("curr_food_index", curr_food_index); - //tag.putBoolean("is_powered", isPowered); - super.saveAdditional(tag); - } - - @Override - public void load(CompoundTag tag) { - super.load(tag); - curr_food_index = tag.getInt("curr_food_index"); - //lastPlayer = tag.getUUID("last_player"); - //event.addListener(new FuelMapReloadListener(GSON, "tardim_fuel")); - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlock.java b/Fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlock.java deleted file mode 100644 index 55c0a7b..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlock.java +++ /dev/null @@ -1,104 +0,0 @@ -package su.a71.tardim_ic.blocks.redstone_input; - -import com.swdteam.tardim.common.block.BlockBaseTardimPanel; -import com.swdteam.tardim.common.init.TRDDimensions; -import com.swdteam.tardim.common.init.TRDSounds; -import com.swdteam.tardim.network.NetworkHandler; -import com.swdteam.tardim.network.PacketOpenEditGui; -import com.swdteam.tardim.tardim.TardimData; -import com.swdteam.tardim.tardim.TardimManager; -import com.swdteam.tardim.tileentity.TileEntityBaseTardimPanel; - -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.network.protocol.game.DebugPackets; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.sounds.SoundSource; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.MapColor; -import net.minecraft.world.phys.BlockHitResult; - -import org.jetbrains.annotations.NotNull; -import su.a71.tardim_ic.tardim_ic.registration.Registration; -import su.a71.tardim_ic.utils.FakePlayer; - -import javax.annotation.Nullable; - -public class RedstoneInputBlock extends BlockBaseTardimPanel implements EntityBlock { - - public RedstoneInputBlock() { - super(FabricBlockSettings.create().strength(2, 4).mapColor(MapColor.TERRACOTTA_ORANGE)); // No occlusion? this.setDefaultState((BlockState)this.getDefaultState().with(ON, false)); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(@NotNull BlockPos pos, @NotNull BlockState state) { - return Registration.REDSTONE_INPUT_BE.create(pos, state); - } - - @Override - public InteractionResult use(BlockState blockState, Level w, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult p_60508_) { - if (!w.isClientSide) { - - w.playSound(null, blockPos, TRDSounds.TARDIM_BEEP, SoundSource.BLOCKS, 0.3F, 0.5F); - - BlockEntity be = w.getBlockEntity(blockPos); - if (be instanceof RedstoneInputBlockEntity && w.dimension() == TRDDimensions.TARDIS) { - TardimData data = TardimManager.getFromPos(blockPos); - if (data != null && data.hasPermission(player)) { - ((RedstoneInputBlockEntity) be).lastPlayer = player.getGameProfile().getId(); - NetworkHandler.sendTo((ServerPlayer)player, new PacketOpenEditGui(blockPos, 1)); - return InteractionResult.CONSUME; - } - - player.displayClientMessage( - Component.literal("You do not have permission").withStyle(ChatFormatting.DARK_RED).withStyle(ChatFormatting.BOLD), true - ); - } - } - - return InteractionResult.CONSUME; - } - - public boolean canSurvive(BlockState blockState, LevelReader levelReader, BlockPos blockPos) { - return true; - } - - public void neighborChanged(BlockState blockState, Level level, BlockPos blockPos, Block block, BlockPos fromPos, boolean isMoving) { - DebugPackets.sendNeighborsUpdatePacket(level, blockPos); - - BlockEntity be = level.getBlockEntity(blockPos); - if (!(be instanceof RedstoneInputBlockEntity)) { - return; - } - - // get redstone signal - Direction direction = blockState.getValue(FACING); - int redstoneSignal = level.getSignal(blockPos, direction); - if (redstoneSignal > 0 && !((RedstoneInputBlockEntity) be).isPowered) { - ((RedstoneInputBlockEntity) be).isPowered = true; - if (level.dimension() == TRDDimensions.TARDIS) { - TardimData data = TardimManager.getFromPos(blockPos); - if (data != null && !level.isClientSide && ((RedstoneInputBlockEntity) be).lastPlayer != null) { - if (((TileEntityBaseTardimPanel)be).hasCommand()) { - ((TileEntityBaseTardimPanel)be).execute(new FakePlayer(level, blockPos, ((RedstoneInputBlockEntity) be).lastPlayer)); - } - } - } - - } else if (redstoneSignal == 0 && ((RedstoneInputBlockEntity) be).isPowered) { - ((RedstoneInputBlockEntity) be).isPowered = false; - } - } -} \ No newline at end of file diff --git a/Fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlockEntity.java b/Fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlockEntity.java deleted file mode 100644 index 1451649..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlockEntity.java +++ /dev/null @@ -1,41 +0,0 @@ -package su.a71.tardim_ic.blocks.redstone_input; - -import com.swdteam.tardim.tileentity.TileEntityBaseTardimPanel; - -import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.level.block.state.BlockState; -import su.a71.tardim_ic.tardim_ic.registration.Registration; - -import java.util.UUID; - - -public class RedstoneInputBlockEntity extends TileEntityBaseTardimPanel { - public boolean isPowered = false; - public UUID lastPlayer = null; - - public RedstoneInputBlockEntity(BlockPos pos, BlockState state) { - super(Registration.REDSTONE_INPUT_BE, pos, state); - } - - public BlockPos getPos() { - return this.worldPosition; - } - - - @Override - public void saveAdditional(CompoundTag tag) { - tag.putBoolean("is_powered", isPowered); - if (lastPlayer != null) { - tag.putUUID("last_player", lastPlayer); - } - super.saveAdditional(tag); - } - - @Override - public void load(CompoundTag tag) { - super.load(tag); - isPowered = tag.getBoolean("is_powered"); - lastPlayer = tag.getUUID("last_player"); - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/blocks/roundels/roundels.txt b/Fabric/src/main/java/su/a71/tardim_ic/blocks/roundels/roundels.txt deleted file mode 100644 index b8da5b9..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/blocks/roundels/roundels.txt +++ /dev/null @@ -1 +0,0 @@ -Do we need more roundels? \ No newline at end of file diff --git a/Fabric/src/main/java/su/a71/tardim_ic/command/CommandCloisterBell.java b/Fabric/src/main/java/su/a71/tardim_ic/command/CommandCloisterBell.java deleted file mode 100644 index 2fee5ef..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/command/CommandCloisterBell.java +++ /dev/null @@ -1,63 +0,0 @@ -package su.a71.tardim_ic.command; - -import com.swdteam.tardim.common.command.tardim.CommandTardimBase; -import com.swdteam.tardim.common.command.tardim.ICommand; -import com.swdteam.tardim.tardim.TardimData; -import com.swdteam.tardim.tardim.TardimManager; - -import net.minecraft.core.BlockPos; -import net.minecraft.sounds.SoundSource; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import su.a71.tardim_ic.tardim_ic.registration.Registration; - - -/* -This command transmits the cloister bell sound in a big enough radius that you could hear it in any reasonably sized interior. - */ -public class CommandCloisterBell implements ICommand { - @Override - public void execute(String[] args, Player player, BlockPos pos, CommandTardimBase.CommandSource source) { - if (args.length == 0) { - TardimData data = TardimManager.getFromPos(pos); - if (data != null) { - if (data.hasPermission(player)) { - try { - Level lvl = player.level(); - if (!lvl.isClientSide) { - lvl.playSound( - null, - pos, - Registration.CLOISTER_BELL, - SoundSource.BLOCKS, - 1.5f, - 1f - ); - } - } catch (Exception var9) { - CommandTardimBase.sendResponse(player, "There was an error", CommandTardimBase.ResponseType.FAIL, source); - } - } else { - CommandTardimBase.sendResponse(player, "You do not have permission", CommandTardimBase.ResponseType.FAIL, source); - } - } - } else { - CommandTardimBase.sendResponse(player, this.getUsage(), CommandTardimBase.ResponseType.FAIL, source); - } - } - - @Override - public String getCommandName() { - return "cloister-bell"; - } - - @Override - public String getUsage() { - return "/cloister-bell"; - } - - @Override - public CommandTardimBase.CommandSource allowedSource() { - return CommandTardimBase.CommandSource.BOTH; - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/command/CommandInit.java b/Fabric/src/main/java/su/a71/tardim_ic/command/CommandInit.java deleted file mode 100644 index c6b065a..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/command/CommandInit.java +++ /dev/null @@ -1,15 +0,0 @@ -package su.a71.tardim_ic.command; - -import com.swdteam.tardim.common.init.CommandManager; - -public class CommandInit { - public static void init() { - CommandManager.register(new CommandCloisterBell()); - CommandManager.register(new CommandListBiomes()); - CommandManager.register(new CommandListDimensions()); - } - - public static void addCC() { - CommandManager.register(new CommandModemTransmit()); - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceBlock.java b/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceBlock.java deleted file mode 100644 index 9365b30..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceBlock.java +++ /dev/null @@ -1,26 +0,0 @@ -package su.a71.tardim_ic.computercraft_compat.digital_interface; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.MapColor; -import org.jetbrains.annotations.NotNull; -import su.a71.tardim_ic.tardim_ic.registration.ComputerCraftCompat; - -import javax.annotation.Nullable; - - -public class DigitalInterfaceBlock extends Block implements EntityBlock { - - public DigitalInterfaceBlock() { - super(Properties.of().strength(2, 4).noOcclusion().mapColor(MapColor.METAL)); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(@NotNull BlockPos pos, @NotNull BlockState state) { - return ComputerCraftCompat.DIGITAL_INTERFACE_BE.create(pos, state); - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceTileEntity.java b/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceTileEntity.java deleted file mode 100644 index fddf55a..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceTileEntity.java +++ /dev/null @@ -1,14 +0,0 @@ -package su.a71.tardim_ic.computercraft_compat.digital_interface; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import static su.a71.tardim_ic.tardim_ic.registration.ComputerCraftCompat.DIGITAL_INTERFACE_BE; - - -public class DigitalInterfaceTileEntity extends BlockEntity { - public DigitalInterfaceTileEntity(BlockPos pos, BlockState state) { - super(DIGITAL_INTERFACE_BE, pos, state); - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/DigitalInterfacePeripheral.java b/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/DigitalInterfacePeripheral.java deleted file mode 100644 index 3f47783..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/DigitalInterfacePeripheral.java +++ /dev/null @@ -1,829 +0,0 @@ -package su.a71.tardim_ic.computercraft_compat.peripherals; - -import com.swdteam.tardim.common.command.tardim.CommandTravel; -import com.swdteam.tardim.common.init.TRDSounds; -import com.swdteam.tardim.common.init.TardimRegistry; -import com.swdteam.tardim.common.item.ItemTardim; -import com.swdteam.tardim.tardim.TardimData; -import com.swdteam.tardim.tardim.TardimData.Location; -import com.swdteam.tardim.tardim.TardimManager; - -import dan200.computercraft.api.lua.LuaException; -import dan200.computercraft.api.lua.LuaFunction; -import dan200.computercraft.api.lua.ObjectLuaTable; -import dan200.computercraft.api.peripheral.IPeripheral; - -import com.mojang.datafixers.util.Pair; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.Holder; -import net.minecraft.core.Registry; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.players.PlayerList; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundSource; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.phys.Vec3; - -import su.a71.tardim_ic.computercraft_compat.digital_interface.DigitalInterfaceBlock; -import su.a71.tardim_ic.computercraft_compat.entity.FakeTardimPeripheralTileEntity; -import su.a71.tardim_ic.tardim_ic.registration.Registration; -import su.a71.tardim_ic.utils.FakePlayer; - -import java.util.*; - - -public class DigitalInterfacePeripheral extends TardimPeripheral implements IPeripheral { - /** - * @param tileEntity the tile entity of this peripheral - * @hidden - */ - public DigitalInterfacePeripheral(FakeTardimPeripheralTileEntity tileEntity) { - super(tileEntity, "digital_tardim_interface", (DigitalInterfaceBlock) tileEntity.getBlock()); - } - - // Peripheral methods =============================================================== - - /** - * Return how much fuel is left in the TARDIM - * - * @return Fuel left (Out of 100) - */ - @LuaFunction(mainThread = true) - public final double getFuel() throws LuaException { - return getTardimData().getFuel(); - } - - /** - * Get how much fuel it would take to travel to the destination - * @return Amount of fuel needed (Out of 100) - */ - @LuaFunction(mainThread = true) - public final double calculateFuelForJourney() throws LuaException { - TardimData data = getTardimData(); - - if (data.getTravelLocation() == null) return 0; - - Location curr = data.getCurrentLocation(); - Location dest = data.getTravelLocation(); - - double fuel = 0.0; - - if (curr.getLevel() != dest.getLevel()) - { - fuel = 10.0; - } - - Vec3 posA = new Vec3(curr.getPos().getX(), curr.getPos().getY(), curr.getPos().getZ()); - Vec3 posB = new Vec3(dest.getPos().getX(), dest.getPos().getY(), dest.getPos().getZ()); - fuel += posA.distanceTo(posB) / 100.0; - if (fuel > 100.0) fuel = 100.0; - - return fuel; - } - - /** - * Check whether the TARDIM is locked - * @return true if locked, false if not - */ - @LuaFunction(mainThread = true) - public final boolean isLocked() throws LuaException { - return getTardimData().isLocked(); - } - - /** - * Check whether the TARDIM is in flight - * @return true if in flight, false if not - */ - @LuaFunction(mainThread = true) - public final boolean isInFlight() throws LuaException { return getTardimData().isInFlight(); } - - /** - * Supposedly gets UNIX timestamp of when we entered flight - * @return UNIX timestamp if in flight, -1 if not - */ - @LuaFunction(mainThread = true) - public final long getTimeEnteredFlight() throws LuaException { - TardimData data = getTardimData(); - if (!data.isInFlight()) { - return -1; - } - return data.getTimeEnteredFlight(); - } - - /** - * Get username of the TARDIM's owner - * @return String of the owner's username - */ - @LuaFunction(mainThread = true) - public final String getOwnerName() throws LuaException { - TardimData data = getTardimData(); - return data.getOwnerName(); - } - - /** - * Lock/unlock the TARDIM - * @param locked true to lock, false to unlock - */ - @LuaFunction(mainThread = true) - public final void setLocked(boolean locked) throws LuaException { - getTardimData().setLocked(locked); - } - - /** - * Get the current location of the TARDIM - * @return ObjectLuaTable of the current location with the following keys: - *
    - *
  • dimension - String of the dimension
    • - *
  • pos - table with the keys x, y, z that hold numbers
    • - *
  • facing - String of the facing
    • - *
- */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getCurrentLocation() throws LuaException { - Location loc = getTardimData().getCurrentLocation(); - return new ObjectLuaTable(Map.of( - "dimension", loc.getLevel().location().toString(), - "pos", new ObjectLuaTable(Map.of( - "x", loc.getPos().getX(), - "y", loc.getPos().getY(), - "z", loc.getPos().getZ() - )), - "facing", loc.getFacing().toString() - )); - } - - /** - * Get the current location of the TARDIM - * @return if there is no destination returns null. - *

- * Otherwise, ObjectLuaTable of the current location with the following keys: - *

    - *
  • dimension - String of the dimension
    • - *
  • pos - table with the keys x, y, z that hold numbers
    • - *
  • facing - String of the facing
    • - *
- */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getTravelLocation() throws LuaException { - TardimData data = getTardimData(); - if (data.getTravelLocation() == null) { - data.setTravelLocation(data.getCurrentLocation()); - } - Location loc = data.getTravelLocation(); - return new ObjectLuaTable(Map.of( - "dimension", loc.getLevel().location().toString(), - "pos", new ObjectLuaTable(Map.of( - "x", loc.getPos().getX(), - "y", loc.getPos().getY(), - "z", loc.getPos().getZ() - )), - "facing", loc.getFacing().toString() - )); - } - - /** - * Get list of the TARDIM owner's companions - * @return ObjectLuaTable containing the usernames of the companions - */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getCompanions() throws LuaException { - TardimData data = getTardimData(); - Map companions = new HashMap<>(); - for (int i = 0; i < data.getCompanions().size(); i++) { - companions.put(i + 1, data.getCompanions().get(i).getUsername()); - } - return new ObjectLuaTable(companions); - } - - /** - * CommandTravel.isValidPath is for some reason private on Fabric so we reverse engineer it :/ - * SWDteam pls fix - * @hidden - */ - private boolean isValidPathTemp(String s) { - for(int i = 0; i < s.length(); ++i) { - if (!CommandTravel.validPathChar(s.charAt(i))) { - return false; - } - } - return true; - } - - /** - * DimensionMapReloadListener.toTitleCase is unavailable so we reverse engineer it! :D - * Fabric... pls fix? - * @hidden - */ - private String toTitleCase(String input) { - StringBuilder titleCase = new StringBuilder(input.length()); - boolean nextTitleCase = true; - char[] var3 = input.toCharArray(); - int var4 = var3.length; - - for(int var5 = 0; var5 < var4; ++var5) { - char c = var3[var5]; - if (Character.isSpaceChar(c)) { - nextTitleCase = true; - } else if (nextTitleCase) { - c = Character.toTitleCase(c); - nextTitleCase = false; - } - - titleCase.append(c); - } - - return titleCase.toString(); - } - - /** - * Set dimension for the TARDIM to travel to - *

- * This is a serious hazard right now due to the fact that I am unable to check if the dimension is valid. - *

- * TODO: If invalid dimension is given, the TARDIM is unable to land until the dimension is changed. Add proper checks. - * @param dimension String of the dimension e.g. "minecraft:overworld" - */ - @LuaFunction(mainThread = true) - public final void setDimension(String dimension) throws LuaException { - TardimData data = getTardimData(); - - String key = dimension; - dimension = toTitleCase(dimension); - if (TardimManager.DIMENSION_MAP.containsKey(dimension)) { - key = (String)TardimManager.DIMENSION_MAP.get(dimension); - } else { - dimension = dimension.toLowerCase(); - } - - if (!isValidPathTemp(key)) { - throw new LuaException("Invalid dimension"); - } else { - ResourceKey dim = ResourceKey.create(Registries.DIMENSION, new ResourceLocation(dimension)); - if (data.getTravelLocation() == null) { - data.setTravelLocation(new Location(data.getCurrentLocation())); - } - - data.getTravelLocation().setLocation(dim); - } - } - - /** - * Set the destination's coordinates - * @param x X coordinate - * @param y Y coordinate - * @param z Z coordinate - */ - @LuaFunction(mainThread = true) - public final void setTravelLocation(int x, int y, int z) throws LuaException { - TardimData data = getTardimData(); - if (data.getTravelLocation() == null) { - data.setTravelLocation(new Location(data.getCurrentLocation())); - } - - data.getTravelLocation().setPosition(x, y, z); - } - - - /** - * Set destination to the TARDIM's owner's home (Must be online) - */ - @LuaFunction(mainThread = true) - public final void home() throws LuaException { - if (this.getTileEntity().getLevel().isClientSide()) { - return; - } - TardimData data = getTardimData(); - - UUID uuid = data.getOwner(); - String username = data.getOwnerName(); - if (uuid == null || username == null) { - throw new LuaException("TARDIM has no owner"); - } - - PlayerList playerList = this.getTileEntity().getLevel().getServer().getPlayerList(); - ServerPlayer player = playerList.getPlayer(uuid); - if (player == null) { - throw new LuaException("TARDIM owner is not online"); - } - - ResourceKey dim = player.getRespawnDimension(); - BlockPos pos = player.getRespawnPosition(); - if (pos == null) { - throw new LuaException("TARDIM owner has no home"); - } - - setDimension(dim.location().toString()); - setTravelLocation(pos.getX(), pos.getY(), pos.getZ()); - } - - /** - * Set destination for a player's location (Player must be online) - * @param username - String of the username of the player - */ - @LuaFunction(mainThread = true) - public final void locatePlayer(String username) throws LuaException { - if (this.getTileEntity().getLevel().isClientSide()) { - return; - } - - PlayerList playerList = this.getTileEntity().getLevel().getServer().getPlayerList(); - - ServerPlayer player = playerList.getPlayerByName(username); - if (player == null) { - throw new LuaException("Player not found"); - } - -// for (ItemStack armour : player.getArmorSlots()) { -//// if (armour.is(PERSONAL_JAMMER)) { -//// throw new LuaException("Player location jammed"); -//// }; -// // TODO: Re-add -// } - - ResourceKey dim = player.getCommandSenderWorld().dimension(); - BlockPos pos = player.blockPosition(); - - setDimension(dim.location().toString()); - setTravelLocation(pos.getX(), pos.getY(), pos.getZ()); - } - - /** - * Get online players. Useful for making a GUI for the locate function or just a nice dashboard. - * - * @return ObjectLuaTable of the online players - */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getOnlinePlayers() throws LuaException { - if (this.getTileEntity().getLevel().isClientSide()) { - return null; - } - - PlayerList playerList = this.getTileEntity().getLevel().getServer().getPlayerList(); - Map players = new HashMap<>(); - for (int i = 0; i < playerList.getPlayers().size(); i++) { - players.put(i + 1, playerList.getPlayers().get(i).getGameProfile().getName()); - } - - return new ObjectLuaTable(players); - } - - /** - * Get the rotation of the TARDIM's door - * @return String of the door rotation ("north", "south", "east", "west") - */ - @LuaFunction(mainThread = true) - public final String getDoorRotation() throws LuaException { - TardimData data = getTardimData(); - Direction rotation = data.getTravelLocation().getFacing(); - switch (rotation) { - case NORTH -> { - return "north"; - } - case EAST -> { - return "east"; - } - case SOUTH -> { - return "south"; - } - case WEST -> { - return "west"; - } - default -> { - throw new LuaException("Invalid door rotation"); - } - } - } - - /** - * Set the rotation of the TARDIM's door - * @param rotation String of the door rotation ("north", "south", "east", "west") - */ - @LuaFunction(mainThread = true) - public final void setDoorRotation(String rotation) throws LuaException { - TardimData data = getTardimData(); - switch (rotation) { - case "north" -> data.getTravelLocation().setFacing(Direction.NORTH); - case "east" -> data.getTravelLocation().setFacing(Direction.EAST); - case "south" -> data.getTravelLocation().setFacing(Direction.SOUTH); - case "west" -> data.getTravelLocation().setFacing(Direction.WEST); - default -> throw new LuaException("Invalid door rotation"); - } - - data.save(); - } - - /** - * Toggle the rotation of the TARDIM's door (north -> east -> south -> west -> north) - */ - @LuaFunction(mainThread = true) - public final void toggleDoorRotation() throws LuaException { - TardimData data = getTardimData(); - if (data.getTravelLocation() == null) { - data.setTravelLocation(new Location(data.getCurrentLocation())); - } - - if (data.getTravelLocation().getFacing() == null) { - data.getTravelLocation().setFacing(Direction.NORTH); - } - - switch (data.getTravelLocation().getFacing()) { - case NORTH -> data.getTravelLocation().setFacing(Direction.EAST); - case EAST -> data.getTravelLocation().setFacing(Direction.SOUTH); - case SOUTH -> data.getTravelLocation().setFacing(Direction.WEST); - case WEST -> data.getTravelLocation().setFacing(Direction.NORTH); - default -> data.getTravelLocation().setFacing(Direction.NORTH); - } - - data.save(); - } - - /** - * Add a number to the destination's coordinates - * @param axis String of the axis ("x", "y", "z") - * @param amount Number to add to the axis - */ - @LuaFunction(mainThread = true) - public final void coordAdd(String axis, int amount) throws LuaException { - TardimData data = getTardimData(); - if (data.getTravelLocation() == null) { - data.setTravelLocation(new Location(data.getCurrentLocation())); - } - - Location location = data.getTravelLocation(); - switch (axis) { - case "x" -> location.addPosition(amount, 0, 0); - case "y" -> location.addPosition(0, amount, 0); - case "z" -> location.addPosition(0, 0, amount); - default -> throw new LuaException("Invalid axis"); - } - } - - /** - * Dematerialize the TARDIM - */ - @LuaFunction(mainThread = true) - public final void demat() throws LuaException { - if (this.tileEntity.getLevel().isClientSide()) { - return; - } - - TardimData data = getTardimData(); - - if (data.isInFlight()) { - throw new LuaException("TARDIM is already in flight"); - } - Location loc = data.getCurrentLocation(); - ServerLevel level = this.tileEntity.getLevel().getServer().getLevel(loc.getLevel()); - ItemTardim.destroyTardim(level, loc.getPos(), Direction.NORTH); - data.setInFlight(true); - if (data.getTravelLocation() == null) { - data.setTravelLocation(new Location(data.getCurrentLocation())); - } - - // TODO: This is a horrendous way of doing this. Please fix. - String level_str = "tardim:tardis_dimension"; - this.tileEntity.getLevel().getServer().getLevel(ResourceKey.create(Registries.DIMENSION, new ResourceLocation(level_str))).playSound(null, this.tileEntity.getPos(), (SoundEvent) TRDSounds.TARDIM_TAKEOFF, SoundSource.AMBIENT, 1.0F, 1.0F); - - data.save(); - } - - /** - * Way to use function from Tardim (ModInitializer) - * 1WTC pls fix - * @hidden - */ - public static boolean isPosValid(Level level, BlockPos pos) { - return validPos(level, pos) && validPos(level, pos.above()) && validPos(level, pos.above().above()) && validPos(level, pos.north()) && validPos(level, pos.north().above()) && validPos(level, pos.south()) && validPos(level, pos.south().above()) && validPos(level, pos.east()) && validPos(level, pos.east().above()) && validPos(level, pos.west()) && validPos(level, pos.west().above()); - } - - /** - * @see DigitalInterfacePeripheral#isPosValid(Level, BlockPos) - * @hidden - */ - private static boolean validPos(Level l, BlockPos pos) { - BlockState blockstate = l.getBlockState(pos); - return !blockstate.canBeReplaced() && blockstate.getBlock() != Blocks.SNOW ? blockstate.isAir() : true; - } - - /** - * Materialize the TARDIM at the destination - *

- * Has a LOT of checks to make sure the TARDIM can materialize, so please implement error handling if you use this. - */ - @LuaFunction(mainThread = true) - public final void remat() throws LuaException { - if (this.tileEntity.getLevel().isClientSide()) { - return; - } - - TardimData data = getTardimData(); - - if (data.isInFlight()) { - if (data.getTimeEnteredFlight() < System.currentTimeMillis() / 1000L - 10L) { - Location loc = data.getTravelLocation(); - ServerLevel level = this.tileEntity.getLevel().getServer().getLevel(loc.getLevel()); - double fuel = data.calculateFuelForJourney( - this.tileEntity.getLevel().getServer().getLevel(data.getCurrentLocation().getLevel()), level, data.getCurrentLocation().getPos(), loc.getPos() - ); - if (data.getFuel() >= fuel) { - level.getChunk(loc.getPos()); - BlockPos landingPosButBetter = CommandTravel.getLandingPosition(level, loc.getPos()); - boolean recalc = false; - - for(int jj = 0; jj < 32; ++jj) { - if (!Block.canSupportRigidBlock(level, landingPosButBetter.below())) { - BlockPos pos2 = landingPosButBetter.offset( - level.random.nextInt(10) * (level.random.nextBoolean() ? 1 : -1), - 0, - level.random.nextInt(10) * (level.random.nextBoolean() ? 1 : -1) - ); - landingPosButBetter = CommandTravel.getLandingPosition(level, pos2); - if (Block.canSupportRigidBlock(level, landingPosButBetter.below())) { - recalc = true; - break; - } - } - } - - if (!recalc) { - for(int jj = 0; jj < 32; ++jj) { - if (!Block.canSupportRigidBlock(level, landingPosButBetter.below())) { - BlockPos pos2 = landingPosButBetter.offset( - level.random.nextInt(30) * (level.random.nextBoolean() ? 1 : -1), - 0, - level.random.nextInt(30) * (level.random.nextBoolean() ? 1 : -1) - ); - landingPosButBetter = CommandTravel.getLandingPosition(level, pos2); - if (Block.canSupportRigidBlock(level, landingPosButBetter.below())) { - recalc = true; - break; - } - } - } - } - - if (!recalc) { - for(int jj = 0; jj < 32; ++jj) { - if (!Block.canSupportRigidBlock(level, landingPosButBetter.below())) { - BlockPos pos2 = landingPosButBetter.offset( - level.random.nextInt(50) * (level.random.nextBoolean() ? 1 : -1), - 0, - level.random.nextInt(50) * (level.random.nextBoolean() ? 1 : -1) - ); - landingPosButBetter = CommandTravel.getLandingPosition(level, pos2); - if (Block.canSupportRigidBlock(level, landingPosButBetter.below())) { - recalc = true; - break; - } - } - } - } - - if (Block.canSupportRigidBlock(level, landingPosButBetter.below())) { - loc.setPosition(landingPosButBetter.getX(), landingPosButBetter.getY(), landingPosButBetter.getZ()); - if (isPosValid(level, loc.getPos())) { - TardimRegistry.TardimBuilder builder = TardimRegistry.getTardimBuilder(data.getTardimID()); - builder.buildTardim(level, loc.getPos(), data.getTravelLocation().getFacing(), data.getId()); - data.setCurrentLocation(data.getTravelLocation()); - data.setTravelLocation(null); - data.setInFlight(false); - data.addFuel(-fuel); - data.save(); - -// if (!recalc) { -// sendResponse(player, "TARDIM is landing", CommandTardimBase.ResponseType.COMPLETE, source); -// } else { -// sendResponse(player, "Landing recalculated due to obstruction", CommandTardimBase.ResponseType.INFO, source); -// sendResponse(player, "TARDIM is landing", CommandTardimBase.ResponseType.COMPLETE, source); -// } - - String level_str = "tardim:tardis_dimension"; - this.tileEntity.getLevel().getServer().getLevel(ResourceKey.create(Registries.DIMENSION, new ResourceLocation(level_str))).playSound(null, this.tileEntity.getPos(), (SoundEvent) TRDSounds.TARDIM_LANDING, SoundSource.AMBIENT, 1.0F, 1.0F); - - } else { - throw new LuaException("TARDIM landing obstructed. Aborting..."); - } - } else { - throw new LuaException("TARDIM landing obstructed. Aborting..."); - } - } else { - throw new LuaException("Not enough fuel for journey"); - } - } else { - throw new LuaException("TARDIM is still taking off"); - } - } else { - throw new LuaException("TARDIM has already landed"); - } - } - - /** - * Locate a biome - * @param biome_str String of the biome e.g. "minecraft:plains" - */ - @LuaFunction(mainThread = true) - public final void locateBiome(String biome_str) throws LuaException { - if (this.tileEntity.getLevel().isClientSide()) { - return; - } - - TardimData data = getTardimData(); - if (data.getTravelLocation() == null) { - data.setTravelLocation(new Location(data.getCurrentLocation())); - } - - Optional biome = this.tileEntity.getLevel().getServer() - .registryAccess() - .registryOrThrow(Registries.BIOME) - .getOptional(new ResourceLocation(biome_str)); - if (biome != null && biome.isPresent()) { - if (data.getTravelLocation() == null) { - data.setTravelLocation(new Location(data.getCurrentLocation())); - } - - ServerLevel level = this.tileEntity.getLevel().getServer().getLevel(data.getTravelLocation().getLevel()); - BlockPos blockpos = new BlockPos( - data.getTravelLocation().getPos().getX(), - level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, data.getTravelLocation().getPos()).getY(), - data.getTravelLocation().getPos().getZ() - ); - BlockPos blockpos1 = this.findNearestBiome(level, (Biome)biome.get(), blockpos, 6400, 8); - if (blockpos1 != null) { - data.getTravelLocation().setPosition(blockpos1.getX(), blockpos1.getY(), blockpos1.getZ()); - data.save(); - } else { - throw new LuaException("Biome not found"); - } - } else { - throw new LuaException("Unknown biome"); - } - } - - /** - * Helper method to find a biome - * @param level ServerLevel to search - * @param biome Biome to find - * @param pos BlockPos to start from - * @param i Idk what this is, likely a radius - * @param j No idea about this either - * @return BlockPos of the biome - * @hidden - */ - public BlockPos findNearestBiome(ServerLevel level, Biome biome, BlockPos pos, int i, int j) { - Pair> bb = level.getChunkSource() - .getGenerator() - .getBiomeSource() - .findBiomeHorizontal( - pos.getX(), - pos.getY(), - pos.getZ(), - i, - j, - b_val -> b_val.value() == biome, - level.random, - true, - level.getChunkSource().randomState().sampler() - ); - return bb != null && bb.getFirst() != null ? (BlockPos)bb.getFirst() : null; - } - - /** - * Set the skin of the TARDIM - * @param skin Skin name to change to - * @hidden - */ - @LuaFunction(mainThread = true) - public final void setSkin(String skin) throws LuaException { - if (this.tileEntity.getLevel().isClientSide()) { - return; - } - - TardimData data = getTardimData(); - - ResourceLocation skinToApply = null; - Iterator var13 = TardimRegistry.getRegistry().keySet().iterator(); - - label39: { - ResourceLocation builder; - TardimRegistry.TardimBuilder b; - do { - if (!var13.hasNext()) { - break label39; - } - - builder = (ResourceLocation)var13.next(); - b = TardimRegistry.getTardimBuilder(builder); - } while(!b.getDisplayName().equalsIgnoreCase(skin) && !builder.toString().equalsIgnoreCase(skin)); - - skinToApply = builder; - } - - if (skinToApply == null) { - throw new LuaException("Skin '" + skin + "' not found"); - } - - TardimData.Location loc = data.getCurrentLocation(); - ServerLevel level = this.tileEntity.getLevel().getServer().getLevel(loc.getLevel()); - data.setIdentifier(skinToApply); - - // FakePlayer... - TardimRegistry.getTardimBuilder(skinToApply).changeTardimSkin(data, level, loc.getPos(), loc.getFacing(), new FakePlayer(this.tileEntity.getLevel(), this.tileEntity.getPos())); - } - - /** - * Get all available TARDIM skins. Useful for making a GUI skin selection. - * - * @return ObjectLuaTable of the available skins - */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getSkins() throws LuaException { - if (this.tileEntity.getLevel().isClientSide()) { - return null; - } - - Map skins = new HashMap<>(); - - Iterator var5 = TardimRegistry.getRegistry().keySet().iterator(); - int i = 0; - while(var5.hasNext()) { - ResourceLocation builder = (ResourceLocation)var5.next(); - TardimRegistry.TardimBuilder b = TardimRegistry.getTardimBuilder(builder); - skins.put(i + 1, b.getDisplayName()); - i++; - } - - return new ObjectLuaTable(skins); - } - - /** - * Play cloister bell sound. - */ - @LuaFunction(mainThread = true) - public final void cloisterBell() throws LuaException { - if (this.tileEntity.getLevel().isClientSide()) { - return; - } - try { - Level lvl = this.tileEntity.getLevel(); - if (!lvl.isClientSide) { - lvl.playSound( - null, - this.tileEntity.getPos(), - Registration.CLOISTER_BELL, - SoundSource.BLOCKS, - 1.5f, - 1f - ); - } - } catch (Exception var9) { - throw new LuaException("There was an error trying to play the sound"); - } - } - - /** - * Get a table with all registered biomes' names. - * Useful for creating advanced navigation systems. - * @return ObjectLuaTable with all biomes' technical names - */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getBiomes() throws LuaException { - Map biomes = new HashMap<>(); - Registry biomeRegistry = tileEntity.getLevel().registryAccess().registryOrThrow(Registries.BIOME); - Iterator biome_it = biomeRegistry.keySet().iterator(); - int i = 0; - while (biome_it.hasNext()) { - biomes.put(i + 1, biome_it.next().toString()); - i++; - } - - return new ObjectLuaTable(biomes); - } - - /** - * Get a table with all registered dimensions' names. - * Useful for creating advanced navigation systems. - * @return ObjectLuaTable with all dimensions' technical names - */ - @LuaFunction(mainThread = true) - public final ObjectLuaTable getDimensions() throws LuaException { - Iterator dim_it = this.tileEntity.getLevel().getServer().getAllLevels().iterator(); // TODO: Does this really work? - Map dimensions = new HashMap<>(); - int i = 0; - while (dim_it.hasNext()) { - dimensions.put(i + 1, dim_it.next().dimension().location().toString()); - i++; - } - return new ObjectLuaTable(dimensions); - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/display_source/cartridge_loader/temp_ideas.txt b/Fabric/src/main/java/su/a71/tardim_ic/display_source/cartridge_loader/temp_ideas.txt deleted file mode 100644 index 71ed5da..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/display_source/cartridge_loader/temp_ideas.txt +++ /dev/null @@ -1,3 +0,0 @@ -Display sources for the cartridge loader - -* Inserted X/Y/Z/Dimension \ No newline at end of file diff --git a/Fabric/src/main/java/su/a71/tardim_ic/display_source/dock/temp_ideas.txt b/Fabric/src/main/java/su/a71/tardim_ic/display_source/dock/temp_ideas.txt deleted file mode 100644 index 90d344c..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/display_source/dock/temp_ideas.txt +++ /dev/null @@ -1,5 +0,0 @@ -Display sources for the docking station: - -* Owner of docked TARDIM -* Lock status -* Docked TARDIM's companion list \ No newline at end of file diff --git a/Fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/FuelLevelDisplaySource.java b/Fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/FuelLevelDisplaySource.java deleted file mode 100644 index e31cfd8..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/FuelLevelDisplaySource.java +++ /dev/null @@ -1,61 +0,0 @@ -//package su.a71.tardim_ic.display_source.fuel_storage; -// -// -//import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; -//import com.simibubi.create.content.redstone.displayLink.source.PercentOrProgressBarDisplaySource; -//import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; -//import com.simibubi.create.foundation.utility.Lang; -// -//import com.swdteam.tardim.common.init.TRDDimensions; -//import com.swdteam.tardim.tardim.TardimData; -//import com.swdteam.tardim.tardim.TardimManager; -//import com.swdteam.tardim.tileentity.TileEntityFuelStorage; -// -//import net.minecraft.world.level.block.entity.BlockEntity; -//import net.fabricmc.api.EnvType; -//import net.fabricmc.api.Environment; -// -//import static su.a71.tardim_ic.tardim_ic.Constants.LOG; -// -//public class FuelLevelDisplaySource extends PercentOrProgressBarDisplaySource { -// @Override -// protected Float getProgress(DisplayLinkContext context) { -// if (context.level() != context.level().getServer().getLevel(TRDDimensions.TARDIS)) { -// return null; -// } -// BlockEntity te = context.getSourceBlockEntity(); -// if (!(te instanceof TileEntityFuelStorage fuelStorage)) -// return null; -// TardimData data = TardimManager.getFromPos(fuelStorage.getBlockPos()); -// LOG.info(String.valueOf((float) (data.getFuel()))); -// return (float) (data.getFuel() / 100); -// } -// -// @Override -// protected boolean progressBarActive(DisplayLinkContext context) { -// return context.sourceConfig() -// .getInt("Mode") != 0; -// } -// -// @Override -// protected String getTranslationKey() { -// return "fuel_level"; -// } -// -// @Override -// @Environment(EnvType.CLIENT) -// public void initConfigurationWidgets(DisplayLinkContext context, ModularGuiLineBuilder builder, boolean isFirstLine) { -// super.initConfigurationWidgets(context, builder, isFirstLine); -// if (isFirstLine) -// return; -// builder.addSelectionScrollInput(0, 120, -// (si, l) -> si.forOptions(Lang.translatedOptions("display_source.fuel_level", "percent", "progress_bar")) -// .titled(Lang.translateDirect("display_source.fuel_level.display")), -// "Mode"); -// } -// -// @Override -// protected boolean allowsLabeling(DisplayLinkContext context) { -// return true; -// } -//} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/RequiredFuelDisplaySource.java b/Fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/RequiredFuelDisplaySource.java deleted file mode 100644 index a307808..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/RequiredFuelDisplaySource.java +++ /dev/null @@ -1,54 +0,0 @@ -//package su.a71.tardim_ic.display_source.fuel_storage; -// -//import com.simibubi.create.content.redstone.displayLink.DisplayLinkContext; -//import com.simibubi.create.content.redstone.displayLink.source.NumericSingleLineDisplaySource; -//import com.simibubi.create.content.redstone.displayLink.target.DisplayTargetStats; -//import com.simibubi.create.foundation.utility.Components; -// -//import com.swdteam.tardim.common.init.TRDDimensions; -//import com.swdteam.tardim.tardim.TardimData; -//import com.swdteam.tardim.tardim.TardimManager; -//import com.swdteam.tardim.tileentity.TileEntityFuelStorage; -// -//import net.minecraft.network.chat.MutableComponent; -//import net.minecraft.world.level.block.entity.BlockEntity; -//import net.minecraft.world.phys.Vec3; -// -//public class RequiredFuelDisplaySource extends NumericSingleLineDisplaySource { -// @Override -// protected MutableComponent provideLine(DisplayLinkContext displayLinkContext, DisplayTargetStats displayTargetStats) { -// if (displayLinkContext.level() != displayLinkContext.level().getServer().getLevel(TRDDimensions.TARDIS)) -// return null; -// BlockEntity te = displayLinkContext.getSourceBlockEntity(); -// if (!(te instanceof TileEntityFuelStorage fuelStorage)) -// return null; -// TardimData data = TardimManager.getFromPos(fuelStorage.getBlockPos()); -// -// if (data.getTravelLocation() == null) return ZERO.copy(); -// -// TardimData.Location curr = data.getCurrentLocation(); -// TardimData.Location dest = data.getTravelLocation(); -// -// double fuel = 0.0; -// -// if (curr.getLevel() != dest.getLevel()) -// { -// fuel = 10.0; -// } -// -// Vec3 posA = new Vec3(curr.getPos().getX(), curr.getPos().getY(), curr.getPos().getZ()); -// Vec3 posB = new Vec3(dest.getPos().getX(), dest.getPos().getY(), dest.getPos().getZ()); -// fuel += posA.distanceTo(posB) / 100.0; -// if (fuel > 100.0) fuel = 100.0; -// -// return Components.literal(String.valueOf(fuel)); -// } -// -// protected String getTranslationKey() { -// return "required_fuel"; -// } -// -// protected boolean allowsLabeling(DisplayLinkContext context) { -// return true; -// } -//} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/display_source/scanner/temp_ideas.txt b/Fabric/src/main/java/su/a71/tardim_ic/display_source/scanner/temp_ideas.txt deleted file mode 100644 index 7654e53..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/display_source/scanner/temp_ideas.txt +++ /dev/null @@ -1,5 +0,0 @@ -Display sources for the scanner: - -* Owner name -* Companion list -* Get current TARDIM skin \ No newline at end of file diff --git a/Fabric/src/main/java/su/a71/tardim_ic/display_source/time_rotor/temp_ideas.txt b/Fabric/src/main/java/su/a71/tardim_ic/display_source/time_rotor/temp_ideas.txt deleted file mode 100644 index bb8b488..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/display_source/time_rotor/temp_ideas.txt +++ /dev/null @@ -1,5 +0,0 @@ -Display sources for the time rotor: - -* Both current and destination - X/Y/Z/Dimension -* Flight status YES/NO -* \ No newline at end of file diff --git a/Fabric/src/main/java/su/a71/tardim_ic/jammer/PersonalJammerMaterial.java b/Fabric/src/main/java/su/a71/tardim_ic/jammer/PersonalJammerMaterial.java deleted file mode 100644 index 8fbfe52..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/jammer/PersonalJammerMaterial.java +++ /dev/null @@ -1,56 +0,0 @@ -package su.a71.tardim_ic.jammer; - - -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.ArmorMaterial; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.crafting.Ingredient; -import org.jetbrains.annotations.NotNull; - -public class PersonalJammerMaterial implements ArmorMaterial { - private static final int[] BASE_DURABILITY = new int[] {13, 15, 16, 11}; - private static final int[] PROTECTION_VALUES = new int[] {1, 1, 1, 1}; - - @Override - public int getDurabilityForType(ArmorItem.Type type) { - return BASE_DURABILITY[type.getSlot().getIndex()] * 33; - } - - @Override - public int getDefenseForType(ArmorItem.Type type) { - return PROTECTION_VALUES[type.getSlot().getIndex()]; - } - - @Override - public int getEnchantmentValue() { - return 0; - } - - @Override - public @NotNull SoundEvent getEquipSound() { - return SoundEvents.ARMOR_EQUIP_GENERIC; - } - - @Override - public @NotNull Ingredient getRepairIngredient() { - return Ingredient.of(Items.IRON_INGOT); - } - - @Override - public @NotNull String getName() { - // Must be all lowercase - return "personal_jammer"; - } - - @Override - public float getToughness() { - return 0.0F; - } - - @Override - public float getKnockbackResistance() { - return 0.1F; - } -} \ No newline at end of file diff --git a/Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelMapMixin.java b/Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelMapMixin.java deleted file mode 100644 index f9e11b8..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelMapMixin.java +++ /dev/null @@ -1,32 +0,0 @@ -package su.a71.tardim_ic.mixin; - -import com.swdteam.tardim.tardim.TardimManager; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -import static com.swdteam.tardim.tardim.TardimManager.FUEL_MAP; - -// This mixin aims to make TARDIM fuel system less awful by allowing users to put standard furnace fuel into it. -@Mixin(value = TardimManager.class, remap = true) -public class BetterFuelMapMixin { - - @Overwrite - public static boolean isFuel(Item i) { - return FUEL_MAP.containsKey(i) || AbstractFurnaceBlockEntity.getFuel().containsKey(i); - } - - @Overwrite - public static double getFuel(Item i) { - if (!isFuel(i)) { - return 0.0; - } - - if (!AbstractFurnaceBlockEntity.getFuel().containsKey(i)) { - return (Double)FUEL_MAP.get(i); - } - else - return AbstractFurnaceBlockEntity.getFuel().get(i) / 8000.0; // Adapt with coal's 1600 ticks -> 0.2 fuel - } -} \ No newline at end of file diff --git a/Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelStorageMixin.java b/Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelStorageMixin.java deleted file mode 100644 index f2d1315..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelStorageMixin.java +++ /dev/null @@ -1,50 +0,0 @@ -package su.a71.tardim_ic.mixin; - -import com.swdteam.tardim.common.block.BlockFuelStorage; -import com.swdteam.tardim.common.init.TRDDimensions; -import com.swdteam.tardim.tardim.TardimData; -import com.swdteam.tardim.tardim.TardimManager; -import com.swdteam.tardim.tileentity.TileEntityFuelStorage; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.item.BucketItem; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.HopperBlock; -import net.minecraft.world.level.block.entity.HopperBlockEntity; -import net.minecraft.world.level.block.state.BlockState; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -import static su.a71.tardim_ic.Constants.LOG; - -@Mixin(value = TileEntityFuelStorage.class, remap = true) -public class BetterFuelStorageMixin { - - // This is rather inefficient as we iterate 2 times - // However, the hoppers are so small and this method is called so rarely that it should be fine. - @Inject(method = "serverTick(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lcom/swdteam/tardim/tileentity/TileEntityFuelStorage;)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/HopperBlockEntity;removeItem(II)Lnet/minecraft/world/item/ItemStack;"), - locals = LocalCapture.CAPTURE_FAILHARD) - private static void saveLavaBuckets(Level world, BlockPos pos, BlockState state, TileEntityFuelStorage blockEntity, CallbackInfo ci) { - HopperBlockEntity mixin_hopper = (HopperBlockEntity)world.getBlockEntity(blockEntity.getBlockPos().above()); - for(int j = 0; j < mixin_hopper.getContainerSize(); ++j) { - ItemStack stack = mixin_hopper.getItem(j); - double fuel = TardimManager.getFuel(stack.getItem()); - if (fuel > 0.0) { - if (stack.getItem() instanceof BucketItem) { - LOG.info("THIS IS A BUCKET"); - mixin_hopper.setItem(j, new ItemStack(stack.getItem().getCraftingRemainingItem(), 2)); - } else { - mixin_hopper.removeItem(j, 1); - } - } - } - } -} \ No newline at end of file diff --git a/Fabric/src/main/java/su/a71/tardim_ic/mixin/CommandsMixin.java b/Fabric/src/main/java/su/a71/tardim_ic/mixin/CommandsMixin.java deleted file mode 100644 index c831582..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/mixin/CommandsMixin.java +++ /dev/null @@ -1,22 +0,0 @@ -package su.a71.tardim_ic.mixin; - -import com.swdteam.tardim.common.init.CommandManager; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import su.a71.tardim_ic.command.CommandInit; -import su.a71.tardim_ic.platform.Services; - -@Mixin(value = CommandManager.class, remap = false) -public class CommandsMixin { - @Inject(method="init()V", at=@At("TAIL")) - private static void init(CallbackInfo ci) { - CommandInit.init(); - if (Services.PLATFORM.isModLoaded("computercraft")) { - CommandInit.addCC(); - } - System.out.println("TARDIM: IC added commands using mixin"); - } - -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/platform/FabricPlatformHelper.java b/Fabric/src/main/java/su/a71/tardim_ic/platform/FabricPlatformHelper.java deleted file mode 100644 index f93d790..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/platform/FabricPlatformHelper.java +++ /dev/null @@ -1,23 +0,0 @@ -package su.a71.tardim_ic.platform; - -import su.a71.tardim_ic.platform.services.IPlatformHelper; -import net.fabricmc.loader.api.FabricLoader; - -public class FabricPlatformHelper implements IPlatformHelper { - @Override - public String getPlatformName() { - return "Fabric"; - } - - @Override - public boolean isModLoaded(String modId) { - - return FabricLoader.getInstance().isModLoaded(modId); - } - - @Override - public boolean isDevelopmentEnvironment() { - - return FabricLoader.getInstance().isDevelopmentEnvironment(); - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/soviet_chronobox/SovietChronoboxTileEntity.java b/Fabric/src/main/java/su/a71/tardim_ic/soviet_chronobox/SovietChronoboxTileEntity.java deleted file mode 100644 index 439befc..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/soviet_chronobox/SovietChronoboxTileEntity.java +++ /dev/null @@ -1,13 +0,0 @@ -package su.a71.tardim_ic.soviet_chronobox; - -import com.swdteam.tardim.common.init.TRDTiles; -import com.swdteam.tardim.tileentity.TileEntityTardim; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.state.BlockState; -import su.a71.tardim_ic.tardim_ic.registration.Exteriors; - -public class SovietChronoboxTileEntity extends TileEntityTardim { - public SovietChronoboxTileEntity(BlockPos pos, BlockState state) { - super(Exteriors.TILE_SOVIET_CHRONOBOX, pos, state); - } -} \ No newline at end of file diff --git a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/ComputerCraftCompat.java b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/ComputerCraftCompat.java deleted file mode 100644 index 2bf3892..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/ComputerCraftCompat.java +++ /dev/null @@ -1,56 +0,0 @@ -package su.a71.tardim_ic.tardim_ic.registration; - -import com.swdteam.tardim.common.block.BlockFuelStorage; -import com.swdteam.tardim.common.block.BlockRotor; -import com.swdteam.tardim.common.block.BlockTardimScanner; -import dan200.computercraft.api.peripheral.PeripheralLookup; -import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; -import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; -import su.a71.tardim_ic.Constants; -import su.a71.tardim_ic.computercraft_compat.digital_interface.DigitalInterfaceBlock; -import su.a71.tardim_ic.computercraft_compat.digital_interface.DigitalInterfaceTileEntity; -import su.a71.tardim_ic.computercraft_compat.entity.FakeTardimPeripheralTileEntity; -import su.a71.tardim_ic.computercraft_compat.peripherals.DigitalInterfacePeripheral; -import su.a71.tardim_ic.computercraft_compat.peripherals.FuelStoragePeripheral; -import su.a71.tardim_ic.computercraft_compat.peripherals.TardimScannerPeripheral; -import su.a71.tardim_ic.computercraft_compat.peripherals.TimeRotorPeripheral; - -import static com.swdteam.tardim.common.init.TRDBlocks.*; -import static su.a71.tardim_ic.tardim_ic.registration.Registration.registerBlock; - -public class ComputerCraftCompat { - public static final Block DIGITAL_TARDIM_INTERFACE = new DigitalInterfaceBlock(); - - public static final BlockEntityType DIGITAL_INTERFACE_BE = Registry.register( - BuiltInRegistries.BLOCK_ENTITY_TYPE, - new ResourceLocation("tardim_ic", "digital_tardim_interface"), - FabricBlockEntityTypeBuilder.create(DigitalInterfaceTileEntity::new, DIGITAL_TARDIM_INTERFACE).build() - ); - - public static void register() { - Constants.LOG.info("Loaded ComputerCraft compatibility!"); - - registerBlock("digital_tardim_interface", () -> DIGITAL_TARDIM_INTERFACE, null); - - PeripheralLookup.get().registerForBlockEntity((entity, direction) -> new DigitalInterfacePeripheral(new FakeTardimPeripheralTileEntity(entity.getBlockPos(), entity.getLevel())), DIGITAL_INTERFACE_BE); - PeripheralLookup.get().registerForBlocks((world, pos, state, blockEntity, direction) -> { - if (state.getBlock() instanceof BlockFuelStorage) { - return new FuelStoragePeripheral(new FakeTardimPeripheralTileEntity(pos, world)); - } else if (state.getBlock() instanceof BlockRotor) { - return new TimeRotorPeripheral(new FakeTardimPeripheralTileEntity(pos, world)); - } else if (state.getBlock() instanceof BlockTardimScanner) { - return new TardimScannerPeripheral(new FakeTardimPeripheralTileEntity(pos, world)); - } - return null; - }, FUEL_STORAGE, SCANNER, ROTOR); - } - - public static void addToTab(CreativeModeTab.ItemDisplayParameters itemDisplayParameters, CreativeModeTab.Output output) { - output.accept(DIGITAL_TARDIM_INTERFACE); - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/CreateCompat.java b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/CreateCompat.java deleted file mode 100644 index fb27d1c..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/CreateCompat.java +++ /dev/null @@ -1,22 +0,0 @@ -package su.a71.tardim_ic.tardim_ic.registration; - - -//import com.simibubi.create.content.redstone.displayLink.AllDisplayBehaviours; -import net.minecraft.resources.ResourceLocation; -import su.a71.tardim_ic.Constants; -//import su.a71.tardim_ic.display_source.fuel_storage.FuelLevelDisplaySource; -//import su.a71.tardim_ic.display_source.fuel_storage.RequiredFuelDisplaySource; -// -//import static com.swdteam.tardim.common.init.TRDTiles.TILE_FUEL_STORAGE; - -public class CreateCompat { - - public static void register() { - Constants.LOG.info("Loaded Create compatibility!"); -// -// AllDisplayBehaviours.assignBlockEntity(AllDisplayBehaviours.register(new ResourceLocation(Constants.MOD_ID, "fuel_storage_display_source"), new FuelLevelDisplaySource()), TILE_FUEL_STORAGE); -// AllDisplayBehaviours.assignBlockEntity(AllDisplayBehaviours.register(new ResourceLocation(Constants.MOD_ID, "fuel_required_display_source"), new RequiredFuelDisplaySource()), TILE_FUEL_STORAGE); - } - - -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Exteriors.java b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Exteriors.java deleted file mode 100644 index ca07383..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Exteriors.java +++ /dev/null @@ -1,56 +0,0 @@ -package su.a71.tardim_ic.tardim_ic.registration; - -import com.mojang.datafixers.types.Type; -import com.swdteam.tardim.common.block.BlockTardimDoors; -import com.swdteam.tardim.common.block.BlockTardimFloor; -import com.swdteam.tardim.common.block.BlockTardimRoof; -import com.swdteam.tardim.common.init.TardimRegistry; -import com.swdteam.tardim.tileentity.TileEntityTardim; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; -import net.minecraft.Util; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.datafix.fixes.References; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import su.a71.tardim_ic.Constants; -import su.a71.tardim_ic.soviet_chronobox.SovietChronoboxTileEntity; - -public class Exteriors { - // Soviet Chronobox - public static TardimRegistry.TardimBuilder TARDIM_TYPE_SOVIET; - public static Block DOOR_SOVIET_CHRONOBOX; - public static Block ROOF_SOVIET_CHRONOBOX; - public static Block FLOOR_SOVIET_CHRONOBOX; - public static BlockEntityType TILE_SOVIET_CHRONOBOX; - - private static BlockEntityType createTardimTile(String string, FabricBlockEntityTypeBuilder builder) { - Type type = Util.fetchChoiceType(References.BLOCK_ENTITY, string); - return (BlockEntityType) Registry.register(BuiltInRegistries.BLOCK_ENTITY_TYPE, new ResourceLocation(Constants.MOD_ID, string), builder.build(type)); - } - - public static void register() { - FLOOR_SOVIET_CHRONOBOX = Registry.register(BuiltInRegistries.BLOCK, new ResourceLocation(Constants.MOD_ID, "tardim_floor_soviet"), new BlockTardimFloor(FabricBlockSettings.create().sounds(SoundType.WOOD).strength(-1.0F, 3600000.0F).noLootTable().noOcclusion(), new BlockTardimFloor.TardimTileData() { - public BlockEntityType getType() { - return TILE_SOVIET_CHRONOBOX; - } - public BlockEntityTicker getTicker() { - return TileEntityTardim::serverTick; - } - public BlockEntity createBlockEntity(BlockPos var1, BlockState var2) { - return new SovietChronoboxTileEntity(var1, var2); - } - })); - TILE_SOVIET_CHRONOBOX = createTardimTile("tardim_soviet_chronobox", FabricBlockEntityTypeBuilder.create(SovietChronoboxTileEntity::new, new Block[]{FLOOR_SOVIET_CHRONOBOX})); - DOOR_SOVIET_CHRONOBOX = Registry.register(BuiltInRegistries.BLOCK, new ResourceLocation(Constants.MOD_ID, "tardim_door_soviet"), new BlockTardimDoors(FabricBlockSettings.create().sounds(SoundType.WOOD).strength(-1.0F, 3600000.0F).noLootTable().noOcclusion())); - ROOF_SOVIET_CHRONOBOX = Registry.register(BuiltInRegistries.BLOCK, new ResourceLocation(Constants.MOD_ID, "tardim_roof_soviet"), new BlockTardimRoof(FabricBlockSettings.create().sounds(SoundType.WOOD).strength(-1.0F, 3600000.0F).noLootTable().noOcclusion())); - TARDIM_TYPE_SOVIET = new TardimRegistry.TardimBuilder(new ResourceLocation(Constants.MOD_ID, "tardim_soviet_chronobox"), "TARDIM Soviet Chronobox", ROOF_SOVIET_CHRONOBOX, DOOR_SOVIET_CHRONOBOX, FLOOR_SOVIET_CHRONOBOX); - } -} diff --git a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Registration.java b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Registration.java deleted file mode 100644 index ad6b656..0000000 --- a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Registration.java +++ /dev/null @@ -1,82 +0,0 @@ -package su.a71.tardim_ic.tardim_ic.registration; - -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; -import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; -import su.a71.tardim_ic.Constants; -import su.a71.tardim_ic.blocks.food_machine.FoodMachineBlock; -import su.a71.tardim_ic.blocks.food_machine.FoodMachineBlockEntity; -import su.a71.tardim_ic.blocks.redstone_input.RedstoneInputBlock; -import su.a71.tardim_ic.blocks.redstone_input.RedstoneInputBlockEntity; -import su.a71.tardim_ic.computercraft_compat.digital_interface.DigitalInterfaceBlock; -import su.a71.tardim_ic.computercraft_compat.digital_interface.DigitalInterfaceTileEntity; -import su.a71.tardim_ic.platform.Services; - -import java.util.function.Supplier; - -public class Registration { - public static final Block REDSTONE_INPUT = new RedstoneInputBlock(); - public static final BlockEntityType REDSTONE_INPUT_BE = Registry.register( - BuiltInRegistries.BLOCK_ENTITY_TYPE, - new ResourceLocation(Constants.MOD_ID, "redstone_tardim_input"), - FabricBlockEntityTypeBuilder.create(RedstoneInputBlockEntity::new, REDSTONE_INPUT).build() - ); - - public static final Block FOOD_MACHINE = new FoodMachineBlock(); - public static final BlockEntityType FOOD_MACHINE_BE = Registry.register( - BuiltInRegistries.BLOCK_ENTITY_TYPE, - new ResourceLocation(Constants.MOD_ID, "food_machine"), - FabricBlockEntityTypeBuilder.create(FoodMachineBlockEntity::new, FOOD_MACHINE).build() - ); - - public static final SoundEvent CLOISTER_BELL = SoundEvent.createVariableRangeEvent(new ResourceLocation(Constants.MOD_ID, "cloister")); - - public static final CreativeModeTab TAB = FabricItemGroup.builder() - .icon(() -> new ItemStack(REDSTONE_INPUT)) - .title(Component.translatable("itemGroup.tardim_ic")) - .displayItems(((itemDisplayParameters, output) -> { - output.accept(REDSTONE_INPUT); - output.accept(FOOD_MACHINE); - if (FabricLoader.getInstance().isModLoaded("computercraft")) { - ComputerCraftCompat.addToTab(itemDisplayParameters, output); - } - })) - .build(); - - public static void registerBlock(String name, Supplier supplier, CreativeModeTab tab) - { - Registry.register(BuiltInRegistries.BLOCK, new ResourceLocation(Constants.MOD_ID, name), supplier.get()); - BlockItem blockItem = new BlockItem(supplier.get(), new FabricItemSettings()); - Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(Constants.MOD_ID, name), blockItem); - } - - public static void register() { - Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, new ResourceLocation("tardim_ic", "item_group"), TAB); - - registerBlock("redstone_tardim_input", () -> REDSTONE_INPUT, null); - registerBlock("food_machine", () -> FOOD_MACHINE, null); - - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation(Constants.MOD_ID, "cloister"), CLOISTER_BELL); - - Exteriors.register(); - if (FabricLoader.getInstance().isModLoaded("computercraft")) { - ComputerCraftCompat.register(); - } - if (FabricLoader.getInstance().isModLoaded("create")) { - CreateCompat.register(); - } - } -} diff --git a/Fabric/src/main/resources/META-INF/services/su.a71.tardim_ic.platform.services.IPlatformHelper b/Fabric/src/main/resources/META-INF/services/su.a71.tardim_ic.platform.services.IPlatformHelper deleted file mode 100644 index f9931d6..0000000 --- a/Fabric/src/main/resources/META-INF/services/su.a71.tardim_ic.platform.services.IPlatformHelper +++ /dev/null @@ -1 +0,0 @@ -su.a71.tardim_ic.platform.FabricPlatformHelper \ No newline at end of file diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json deleted file mode 100644 index 46f08da..0000000 --- a/Fabric/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "schemaVersion": 1, - "id": "tardim_ic", - "version": "${version}", - "name": "TARDIM: In Control", - "description": "All of time and space, now automated and improved. This mod aims to improve your TARDIM experience", - "authors": [ - "${mod_author}" - ], - "contact": { - "homepage": "https://tardim.a71.su/", - "sources": "https://github.com/Andrew-71/tardim-in-control" - }, - "license": "MIT", - "icon": "assets/tardim_ic/icon.png", - "environment": "*", - "entrypoints": { - "main": [ - "su.a71.tardim_ic.TardimInControl" - ] - }, - "mixins": [ - "tardim_ic.mixins.json", - "tardim_ic.fabric.mixins.json" - ], - "depends": { - "fabricloader": ">=0.14", - "fabric": "*", - "minecraft": ">=1.20.1", - "java": ">=17", - "tardim": ">=1.2.2" - }, - "suggests": { - "computercraft": ">=${cc_version}" - } -} \ No newline at end of file diff --git a/Fabric/src/main/resources/tardim_ic.fabric.mixins.json b/Fabric/src/main/resources/tardim_ic.fabric.mixins.json deleted file mode 100644 index 91c2cc2..0000000 --- a/Fabric/src/main/resources/tardim_ic.fabric.mixins.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "su.a71.tardim_ic.mixin", - "refmap": "${mod_id}.refmap.json", - "compatibilityLevel": "JAVA_17", - "mixins": [ - "CommandsMixin", - "BetterFuelStorageMixin", - "BetterFuelMapMixin" - ], - "client": [ - ], - "server": [ - ], - "injectors": { - "defaultRequire": 1 - } - } - diff --git a/Forge/build.gradle b/Forge/build.gradle deleted file mode 100644 index 562ac05..0000000 --- a/Forge/build.gradle +++ /dev/null @@ -1,110 +0,0 @@ -plugins { - id 'idea' - id 'maven-publish' - id 'net.minecraftforge.gradle' - id 'org.spongepowered.mixin' -} -base { - archivesName = "${mod_name}-forge-${minecraft_version}" -} -mixin { - add(sourceSets.main, "${mod_id}.refmap.json") - - config("${mod_id}.mixins.json") - config("${mod_id}.forge.mixins.json") -} - -minecraft { - mappings channel: 'official', version: minecraft_version - - // Automatically enable forge AccessTransformers if the file exists - // This location is hardcoded in Forge and can not be changed. - // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123 - if (file('src/main/resources/META-INF/accesstransformer.cfg').exists()) { - accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - } - - runs { - client { - workingDirectory project.file('run') - ideaModule "${rootProject.name}.${project.name}.main" - taskName 'Client' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - mods { - modClientRun { - source sourceSets.main - source project(":common").sourceSets.main - } - } - } - - server { - workingDirectory project.file('run') - ideaModule "${rootProject.name}.${project.name}.main" - taskName 'Server' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - mods { - modServerRun { - source sourceSets.main - source project(":common").sourceSets.main - } - } - } - - data { - workingDirectory project.file('run') - ideaModule "${rootProject.name}.${project.name}.main" - args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') - taskName 'Data' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - mods { - modDataRun { - source sourceSets.main - source project(":common").sourceSets.main - } - } - } - } -} - -sourceSets.main.resources.srcDir 'src/generated/resources' - -dependencies { - minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - compileOnly project(":common") - annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT:processor") -} - -tasks.withType(JavaCompile).configureEach { - source(project(":common").sourceSets.main.allSource) -} -tasks.withType(Javadoc).configureEach { - source(project(":common").sourceSets.main.allJava) -} -tasks.named("sourcesJar", Jar) { - from(project(":common").sourceSets.main.allSource) -} - -processResources { - from project(":common").sourceSets.main.resources -} - -jar.finalizedBy('reobfJar') - -publishing { - publications { - mavenJava(MavenPublication) { - artifactId base.archivesName.get() - from components.java - fg.component(it) - } - } - repositories { - maven { - url "file://" + System.getenv("local_maven") - } - } -} diff --git a/Forge/src/main/java/su/a71/tardim_ic/TardiminControl.java b/Forge/src/main/java/su/a71/tardim_ic/TardiminControl.java deleted file mode 100644 index 8897bcb..0000000 --- a/Forge/src/main/java/su/a71/tardim_ic/TardiminControl.java +++ /dev/null @@ -1,14 +0,0 @@ -package su.a71.tardim_ic; - -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.Mod; - -@Mod(Constants.MOD_ID) -public class TardimInControl { - public TardimInControl() { - Registration.register(); - - // Register ourselves for server and other game events we are interested in. Currently, we do not use any events - MinecraftForge.EVENT_BUS.register(this); - } -} diff --git a/Forge/src/main/java/su/a71/tardim_ic/platform/ForgePlatformHelper.java b/Forge/src/main/java/su/a71/tardim_ic/platform/ForgePlatformHelper.java deleted file mode 100644 index 66ca310..0000000 --- a/Forge/src/main/java/su/a71/tardim_ic/platform/ForgePlatformHelper.java +++ /dev/null @@ -1,26 +0,0 @@ -package su.a71.tardim_ic.platform; - -import com.example.examplemod.platform.services.IPlatformHelper; -import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.loading.FMLLoader; - -public class ForgePlatformHelper implements IPlatformHelper { - - @Override - public String getPlatformName() { - - return "Forge"; - } - - @Override - public boolean isModLoaded(String modId) { - - return ModList.get().isLoaded(modId); - } - - @Override - public boolean isDevelopmentEnvironment() { - - return !FMLLoader.isProduction(); - } -} \ No newline at end of file diff --git a/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputBlock.java b/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputBlock.java deleted file mode 100644 index f1856bc..0000000 --- a/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputBlock.java +++ /dev/null @@ -1,100 +0,0 @@ -package su.a71.tardim_ic.tardim_ic.redsone_input; - -import com.swdteam.common.block.BlockBaseTardimPanel; - -import com.swdteam.common.init.TRDDimensions; -import com.swdteam.common.init.TRDSounds; -import com.swdteam.network.NetworkHandler; -import com.swdteam.network.packets.PacketOpenEditGui; -import com.swdteam.tardim.TardimData; -import com.swdteam.tardim.TardimManager; -import com.swdteam.tileentity.TileEntityBaseTardimPanel; - -import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.network.protocol.game.DebugPackets; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundSource; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraftforge.common.util.FakePlayerFactory; -import net.minecraftforge.server.ServerLifecycleHooks; -import org.jetbrains.annotations.NotNull; - -import su.a71.tardim_ic.tardim_ic.Registration; - -import javax.annotation.Nullable; - -public class RedstoneInputBlock extends BlockBaseTardimPanel implements EntityBlock { - private boolean isPowered = false; - public RedstoneInputBlock() { - super(Properties.of(Material.METAL).strength(2, 4).noOcclusion()); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(@NotNull BlockPos pos, @NotNull BlockState state) { - return Registration.REDSTONE_TARDIM_INPUT_TILEENTITY.get().create(pos, state); - } - - @Override - public InteractionResult use(BlockState blockState, Level w, BlockPos blockPos, Player player, InteractionHand hand, BlockHitResult p_60508_) { - if (!w.isClientSide) { - - w.playSound((Player)null, blockPos, (SoundEvent) TRDSounds.TARDIM_BEEP.get(), SoundSource.BLOCKS, 0.3F, 0.5F); - - BlockEntity be = w.getBlockEntity(blockPos); - if (be instanceof TileEntityBaseTardimPanel && w.dimension() == TRDDimensions.TARDIS) { - TardimData data = TardimManager.getFromPos(blockPos); - if (data != null && data.hasPermission(player)) { - NetworkHandler.sendTo((ServerPlayer)player, new PacketOpenEditGui(1, blockPos)); - return InteractionResult.CONSUME; - } - - player.displayClientMessage( - Component.literal("You do not have permission").withStyle(ChatFormatting.DARK_RED).withStyle(ChatFormatting.BOLD), true - ); - } - } - - return InteractionResult.CONSUME; - } - - public boolean canSurvive(BlockState blockState, LevelReader levelReader, BlockPos blockPos) { - return true; - } - - public void neighborChanged(BlockState blockState, Level level, BlockPos blockPos, Block block, BlockPos fromPos, boolean isMoving) { - DebugPackets.sendNeighborsUpdatePacket(level, blockPos); - - // get redstone signal - Direction direction = blockState.getValue(FACING); - int redstoneSignal = level.getSignal(blockPos, direction); - if (redstoneSignal > 0 && !isPowered) { - isPowered = true; - BlockEntity be = level.getBlockEntity(blockPos); - if (be instanceof TileEntityBaseTardimPanel && level.dimension() == TRDDimensions.TARDIS) { - TardimData data = TardimManager.getFromPos(blockPos); - if (data != null) { - if (((TileEntityBaseTardimPanel)be).hasCommand()) { - ((TileEntityBaseTardimPanel)be).execute(FakePlayerFactory.getMinecraft(ServerLifecycleHooks.getCurrentServer().getLevel(level.dimension()))); - } - } - } - - } else if (redstoneSignal == 0 && isPowered) - isPowered = false; - } -} diff --git a/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputTileEntity.java b/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputTileEntity.java deleted file mode 100644 index a89f18f..0000000 --- a/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputTileEntity.java +++ /dev/null @@ -1,19 +0,0 @@ -package su.a71.tardim_ic.tardim_ic.redsone_input; - -import com.swdteam.tileentity.TileEntityBaseTardimPanel; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.state.BlockState; - -import su.a71.tardim_ic.tardim_ic.Registration; - - -public class RedstoneInputTileEntity extends TileEntityBaseTardimPanel { - public RedstoneInputTileEntity(BlockPos pos, BlockState state) { - super(Registration.REDSTONE_TARDIM_INPUT_TILEENTITY.get(), pos, state); - } - - - public BlockPos getPos() { - return this.worldPosition; - } -} diff --git a/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/sonic/SonicProbe.java b/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/sonic/SonicProbe.java deleted file mode 100644 index 2a3cfe5..0000000 --- a/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/sonic/SonicProbe.java +++ /dev/null @@ -1,22 +0,0 @@ -package su.a71.tardim_ic.tardim_ic.sonic; - -import net.minecraft.world.item.Item; - -import com.swdteam.tardim.TardimData; -import com.swdteam.tardim.TardimManager; - -import com.swdteam.client.gui.GuiCommandScreen; - -public class SonicProbe extends Item { - private TardimData tardim; - public SonicProbe(Properties properties) { - super(properties.stacksTo(1)); - } - - public void setTardim(TardimData tardim) { - this.tardim = tardim; - } - - // Add tile entity - -} diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml deleted file mode 100644 index 7c9fa79..0000000 --- a/Forge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,28 +0,0 @@ -modLoader = "javafml" #mandatory -loaderVersion = "[46,)" #mandatory This is typically bumped every Minecraft version by Forge. See https://files.minecraftforge.net/ for a list of versions. -license = "C0-1.0" # Review your options at https://choosealicense.com/. -#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional -[[mods]] #mandatory -modId = "multiloader" #mandatory -version = "${file.jarVersion}" #mandatory -displayName = "${mod_name}" #mandatory -#updateJSONURL="https://change.me.example.invalid/updates.json" #optional (see https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/) -#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional (displayed in the mod UI) -logoFile = "multiloader.png" #optional (needs to be in the root of your mod jar (root of your 'resources' folder)) -credits = "Thanks for this example mod goes to Java" #optional -authors = "${mod_author}" #optional -description = ''' -This is a long form description of the mod. You can write whatever you want here -''' #mandatory (Supports multiline text) -[[dependencies.multiloader]] #optional -modId = "forge" #mandatory -mandatory = true #mandatory -versionRange = "[46,)" #mandatory -ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory -side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER' -[[dependencies.multiloader]] -modId = "minecraft" -mandatory = true -versionRange = "[1.20,1.21)" -ordering = "NONE" -side = "BOTH" diff --git a/Forge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper b/Forge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper deleted file mode 100644 index ff2910d..0000000 --- a/Forge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper +++ /dev/null @@ -1 +0,0 @@ -com.example.examplemod.platform.ForgePlatformHelper \ No newline at end of file diff --git a/Forge/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json b/Forge/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json deleted file mode 100644 index e396b0d..0000000 --- a/Forge/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "tardim_ic:block/digital_tardim_interface" - } - } -} \ No newline at end of file diff --git a/Forge/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json b/Forge/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json deleted file mode 100644 index a5718cc..0000000 --- a/Forge/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "tardim_ic:block/redstone_tardim_input" - } - } -} \ No newline at end of file diff --git a/Forge/src/main/resources/assets/tardim_ic/icon.png b/Forge/src/main/resources/assets/tardim_ic/icon.png deleted file mode 100644 index 87a18cf..0000000 Binary files a/Forge/src/main/resources/assets/tardim_ic/icon.png and /dev/null differ diff --git a/Forge/src/main/resources/assets/tardim_ic/lang/en_uk.json b/Forge/src/main/resources/assets/tardim_ic/lang/en_uk.json deleted file mode 100644 index 4d99f9d..0000000 --- a/Forge/src/main/resources/assets/tardim_ic/lang/en_uk.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "block.tardim_ic.digital_tardim_interface": "Digital TARDIM Interface", - "block.tardim_ic.redstone_tardim_input": "Redstone TARDIM Input", - "itemGroup.tardim_ic": "TARDIM: In Control" -} \ No newline at end of file diff --git a/Forge/src/main/resources/assets/tardim_ic/lang/en_us.json b/Forge/src/main/resources/assets/tardim_ic/lang/en_us.json deleted file mode 100644 index 4d99f9d..0000000 --- a/Forge/src/main/resources/assets/tardim_ic/lang/en_us.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "block.tardim_ic.digital_tardim_interface": "Digital TARDIM Interface", - "block.tardim_ic.redstone_tardim_input": "Redstone TARDIM Input", - "itemGroup.tardim_ic": "TARDIM: In Control" -} \ No newline at end of file diff --git a/Forge/src/main/resources/assets/tardim_ic/lang/rpr.json b/Forge/src/main/resources/assets/tardim_ic/lang/rpr.json deleted file mode 100644 index d28a924..0000000 --- a/Forge/src/main/resources/assets/tardim_ic/lang/rpr.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "block.tardim_ic.digital_tardim_interface": "Циферный Интерфейсъ Хронобудки", - "block.tardim_ic.redstone_tardim_input": "Краснокаменный Инпутъ Хронобудки", - "itemGroup.tardim_ic": "ТАРДИМЪ: Подъ Контрольемъ" -} \ No newline at end of file diff --git a/Forge/src/main/resources/assets/tardim_ic/lang/ru_ru.json b/Forge/src/main/resources/assets/tardim_ic/lang/ru_ru.json deleted file mode 100644 index 09b05b1..0000000 --- a/Forge/src/main/resources/assets/tardim_ic/lang/ru_ru.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "block.tardim_ic.digital_tardim_interface": "Цифровой интерфейс TARDIM", - "block.tardim_ic.redstone_tardim_input": "Редстоуновый ввод TARDIM", - "itemGroup.tardim_ic": "TARDIM: In Control" -} \ No newline at end of file diff --git a/Forge/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json b/Forge/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json deleted file mode 100644 index d5fccbf..0000000 --- a/Forge/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json +++ /dev/null @@ -1,213 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "digital_tardim_interface", - "texture_size": [64, 64], - "textures": { - "1": "tardim_ic:blocks/digital_tardim_interface", - "particle": "tardim_ic:blocks/digital_tardim_interface" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [4, 4, 8, 7.5], "texture": "#1"}, - "east": {"uv": [0, 4, 4, 7.5], "texture": "#1"}, - "south": {"uv": [12, 4, 16, 7.5], "texture": "#1"}, - "west": {"uv": [8, 4, 12, 7.5], "texture": "#1"}, - "up": {"uv": [8, 4, 4, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 8, 4], "texture": "#1"} - } - }, - { - "from": [5, 14, 5], - "to": [11, 16, 11], - "faces": { - "north": {"uv": [1.5, 9, 3, 9.5], "texture": "#1"}, - "east": {"uv": [0, 9, 1.5, 9.5], "texture": "#1"}, - "south": {"uv": [4.5, 9, 6, 9.5], "texture": "#1"}, - "west": {"uv": [3, 9, 4.5, 9.5], "texture": "#1"}, - "up": {"uv": [3, 9, 1.5, 7.5], "texture": "#1"}, - "down": {"uv": [4.5, 7.5, 3, 9], "texture": "#1"} - } - }, - { - "from": [11, 14, 7], - "to": [14, 16, 9], - "faces": { - "north": {"uv": [12.5, 0.5, 13.25, 1], "texture": "#1"}, - "east": {"uv": [12, 0.5, 12.5, 1], "texture": "#1"}, - "south": {"uv": [13.75, 0.5, 14.5, 1], "texture": "#1"}, - "west": {"uv": [13.25, 0.5, 13.75, 1], "texture": "#1"}, - "up": {"uv": [13.25, 0.5, 12.5, 0], "texture": "#1"}, - "down": {"uv": [14, 0, 13.25, 0.5], "texture": "#1"} - } - }, - { - "from": [12.5, 14, 3.5], - "to": [12.5, 15, 12.5], - "faces": { - "north": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "east": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "south": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "west": {"uv": [13, 3.75, 15.25, 4], "texture": "#1"}, - "up": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "down": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"} - } - }, - { - "from": [3.5, 14, 12.5], - "to": [12.5, 15, 12.5], - "faces": { - "north": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "east": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "south": {"uv": [12.5, 3.75, 14.75, 4], "texture": "#1"}, - "west": {"uv": [13.5, 3.75, 15.75, 4], "texture": "#1"}, - "up": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "down": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"} - } - }, - { - "from": [3.5, 14, 3.5], - "to": [12.5, 15, 3.5], - "faces": { - "north": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "east": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "south": {"uv": [12.5, 3.75, 14.75, 4], "texture": "#1"}, - "west": {"uv": [13.5, 3.75, 15.75, 4], "texture": "#1"}, - "up": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "down": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"} - } - }, - { - "from": [3.5, 14, 3.5], - "to": [3.5, 15, 12.5], - "faces": { - "north": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "east": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "south": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "west": {"uv": [13, 3.75, 15.25, 4], "texture": "#1"}, - "up": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"}, - "down": {"uv": [12, 3.75, 14.25, 4], "texture": "#1"} - } - }, - { - "from": [2, 14, 7], - "to": [5, 16, 9], - "faces": { - "north": {"uv": [5, 8, 5.75, 8.5], "texture": "#1"}, - "east": {"uv": [4.5, 8, 5, 8.5], "texture": "#1"}, - "south": {"uv": [6.25, 8, 7, 8.5], "texture": "#1"}, - "west": {"uv": [5.75, 8, 6.25, 8.5], "texture": "#1"}, - "up": {"uv": [5.75, 8, 5, 7.5], "texture": "#1"}, - "down": {"uv": [6.5, 7.5, 5.75, 8], "texture": "#1"} - } - }, - { - "from": [7, 14, 2], - "to": [9, 16, 5], - "faces": { - "north": {"uv": [3.25, 12.5, 3.75, 13], "texture": "#1"}, - "east": {"uv": [2.5, 12.5, 3.25, 13], "texture": "#1"}, - "south": {"uv": [4.5, 12.5, 5, 13], "texture": "#1"}, - "west": {"uv": [3.75, 12.5, 4.5, 13], "texture": "#1"}, - "up": {"uv": [3.75, 12.5, 3.25, 11.75], "texture": "#1"}, - "down": {"uv": [4.25, 11.75, 3.75, 12.5], "texture": "#1"} - } - }, - { - "from": [7, 14, 11], - "to": [9, 16, 14], - "faces": { - "north": {"uv": [0.75, 12.5, 1.25, 13], "texture": "#1"}, - "east": {"uv": [0, 12.5, 0.75, 13], "texture": "#1"}, - "south": {"uv": [2, 12.5, 2.5, 13], "texture": "#1"}, - "west": {"uv": [1.25, 12.5, 2, 13], "texture": "#1"}, - "up": {"uv": [1.25, 12.5, 0.75, 11.75], "texture": "#1"}, - "down": {"uv": [1.75, 11.75, 1.25, 12.5], "texture": "#1"} - } - }, - { - "from": [6, 13, -2], - "to": [10, 17, 2], - "faces": { - "north": {"uv": [10, 9.5, 11, 10.5], "texture": "#1"}, - "east": {"uv": [9, 9.5, 10, 10.5], "texture": "#1"}, - "south": {"uv": [12, 9.5, 13, 10.5], "texture": "#1"}, - "west": {"uv": [11, 9.5, 12, 10.5], "texture": "#1"}, - "up": {"uv": [11, 9.5, 10, 8.5], "texture": "#1"}, - "down": {"uv": [12, 8.5, 11, 9.5], "texture": "#1"} - } - }, - { - "from": [6, 13, 14], - "to": [10, 17, 18], - "faces": { - "north": {"uv": [7, 8.5, 8, 9.5], "texture": "#1"}, - "east": {"uv": [6, 8.5, 7, 9.5], "texture": "#1"}, - "south": {"uv": [9, 8.5, 10, 9.5], "texture": "#1"}, - "west": {"uv": [8, 8.5, 9, 9.5], "texture": "#1"}, - "up": {"uv": [8, 8.5, 7, 7.5], "texture": "#1"}, - "down": {"uv": [9, 7.5, 8, 8.5], "texture": "#1"} - } - }, - { - "from": [-2, 13, 6], - "to": [2, 17, 10], - "faces": { - "north": {"uv": [1, 3, 2, 4], "texture": "#1"}, - "east": {"uv": [0, 3, 1, 4], "texture": "#1"}, - "south": {"uv": [3, 3, 4, 4], "texture": "#1"}, - "west": {"uv": [2, 3, 3, 4], "texture": "#1"}, - "up": {"uv": [2, 3, 1, 2], "texture": "#1"}, - "down": {"uv": [3, 2, 2, 3], "texture": "#1"} - } - }, - { - "from": [14, 13, 6], - "to": [18, 17, 10], - "faces": { - "north": {"uv": [1, 1, 2, 2], "texture": "#1"}, - "east": {"uv": [0, 1, 1, 2], "texture": "#1"}, - "south": {"uv": [3, 1, 4, 2], "texture": "#1"}, - "west": {"uv": [2, 1, 3, 2], "texture": "#1"}, - "up": {"uv": [2, 1, 1, 0], "texture": "#1"}, - "down": {"uv": [3, 0, 2, 1], "texture": "#1"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, -1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, -1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [-1.25, 0, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [3.75, -1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "translation": [0, -0.5, 0], - "scale": [0.35, 0.35, 0.35] - }, - "gui": { - "rotation": [33, 45, 0], - "scale": [0.6, 0.6, 0.6] - }, - "head": { - "translation": [0, 0.75, 0], - "scale": [1.1, 1.1, 1.1] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, 4.25] - } - } -} \ No newline at end of file diff --git a/Forge/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json b/Forge/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json deleted file mode 100644 index a133d12..0000000 --- a/Forge/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/cube_all", - "ambientocclusion": false, - "textures": { - "1": "tardim_ic:blocks/red_contr", - "2": "tardim_ic:blocks/red_contr2", - "particle": "tardim_ic:blocks/red_contr" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#2"} - } - }, - { - "from": [-0.325, -0.35, -0.35], - "to": [16.35, 16.525, 16.275], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#1"} - } - } - ] -} \ No newline at end of file diff --git a/Forge/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json b/Forge/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json deleted file mode 100644 index 256cd83..0000000 --- a/Forge/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "tardim_ic:block/digital_tardim_interface", - "display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ], - "translation": [ 0, 1, 0 ] - }, - "thirdperson_lefthand": { - "rotation": [ 75, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ], - "translation": [ 0, 1, 0 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/Forge/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json b/Forge/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json deleted file mode 100644 index 4a3e535..0000000 --- a/Forge/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "tardim_ic:block/redstone_tardim_input", - "display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ], - "translation": [ 0, 1, 0 ] - }, - "thirdperson_lefthand": { - "rotation": [ 75, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ], - "translation": [ 0, 1, 0 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.40, 0.40, 0.40 ] - } - } -} \ No newline at end of file diff --git a/Forge/src/main/resources/assets/tardim_ic/textures/blocks/digital_tardim_interface.png b/Forge/src/main/resources/assets/tardim_ic/textures/blocks/digital_tardim_interface.png deleted file mode 100644 index d430bc6..0000000 Binary files a/Forge/src/main/resources/assets/tardim_ic/textures/blocks/digital_tardim_interface.png and /dev/null differ diff --git a/Forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png b/Forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png deleted file mode 100644 index 3ed7480..0000000 Binary files a/Forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png and /dev/null differ diff --git a/Forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png.mcmeta b/Forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png.mcmeta deleted file mode 100644 index fe2f8d3..0000000 --- a/Forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "animation": { - "frametime": 10, - "interpolate": true, - "frames": [0, 1, 2, 3] - } -} \ No newline at end of file diff --git a/Forge/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json b/Forge/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json deleted file mode 100644 index 28ee895..0000000 --- a/Forge/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "name": "tardim_ic:digital_tardim_interface", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ] -} diff --git a/Forge/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json b/Forge/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json deleted file mode 100644 index a988e6a..0000000 --- a/Forge/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "name": "tardim_ic:redstone_tardim_input", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] - } - ] -} diff --git a/Forge/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json b/Forge/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json deleted file mode 100644 index 2721c83..0000000 --- a/Forge/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "DDD", - "R0R", - "GRG" - ], - "key": { - "G": { - "item": "minecraft:gold_ingot", - "count": 1 - }, - "R": { - "item": "minecraft:redstone", - "count": 1 - }, - "0": { - "item": "minecraft:ender_eye", - "count": 1 - }, - "D": { - "item": "minecraft:polished_deepslate", - "count": 1 - } - }, - "result": { - "item": "tardim_ic:digital_tardim_interface", - "count": 1 - } -} \ No newline at end of file diff --git a/Forge/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json b/Forge/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json deleted file mode 100644 index 9f47666..0000000 --- a/Forge/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRG", - "RBR", - "GRG" - ], - "key": { - "G": { - "item": "minecraft:gold_ingot", - "count": 1 - }, - "R": { - "item": "minecraft:redstone", - "count": 1 - }, - "B": { - "item": "minecraft:redstone_block", - "count": 1 - } - }, - "result": { - "item": "tardim_ic:redstone_tardim_input", - "count": 1 - } -} \ No newline at end of file diff --git a/Forge/src/main/resources/examplemod.forge.mixins.json b/Forge/src/main/resources/examplemod.forge.mixins.json deleted file mode 100644 index 95882ac..0000000 --- a/Forge/src/main/resources/examplemod.forge.mixins.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "com.example.examplemod.mixin", - "refmap": "${mod_id}.refmap.json", - "compatibilityLevel": "JAVA_17", - "mixins": [ - ], - "client": [ - "MixinTitleScreen" - ], - "server": [ - ], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file diff --git a/Forge/src/main/resources/pack.mcmeta b/Forge/src/main/resources/pack.mcmeta deleted file mode 100644 index 20f2fe7..0000000 --- a/Forge/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "pack": { - "description": "TARDIM: In Control resources", - "pack_format": 6, - "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods." - } -} diff --git a/LICENSE b/LICENSE index 7508967..466340e 100644 --- a/LICENSE +++ b/LICENSE @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index dd2b6a3..8771517 100644 --- a/README.md +++ b/README.md @@ -1,49 +1,43 @@ -![TARDIM: IC Banner](https://cdn.modrinth.com/data/xsv4H3pa/images/561e86895ec0b73d8fcbfb8bb83d4cc92b15734d.png) -### All of time and space, *now automated and improved*. -This mod is an addon for the [TARDIM mod](https://www.curseforge.com/minecraft/mc-mods/tardim), -and adds a way to control and manage your time (but mostly space) machine with new blocks, redstone, -and even other mods like [ComputerCraft: Tweaked](https://tweaked.cc) or [Create](https://github.com/Creators-of-Create/Create) +Installation information +======= -## Features: -* New commands that let you ring cloister bell or list all biomes and dimensions -* Improved fuel system, which will take in any furnace fuel and won't consume buckets -* Redstone TARDIM Input: New block that lets you execute a TARDIM command with the power of redstone! After saving a command, this block executes it every time it gets powered by redstone -* Full ComputerCraft integration - * Digital TARDIM interface: ComputerCraft peripheral that lets you control a TARDIM using computers! The peripheral supports almost all commands that the TARDIM computer panel has. - * Peripherals for some of the TARDIM blocks that provide a few of digital interface's methods at smaller costs -* New exterior - Soviet Chronobox, styled like a USSR phone booth -* [Coming once Create Fabric is on 1.20] Create integration (display sources): some of the blocks will now be able to act as a display source with Create mod -* [WIP] Food machine - exchange fuel for food. *Currently only in creative mode and half finished.* -* You can see planned features [in the docs](https://tardim.a71.su/planned) +This template repository can be directly cloned to get you started with a new +mod. Simply create a new repository cloned from this one, by following the +instructions at [github](https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template). -## Example use-cases -* Make a dashboard to monitor fuel levels, current location, and other information on a screen in a nice way. -* Get refined control over your TARDIM, such as saving and loading locations, or setting a destination in a GUI. -* Add visual effects that activate during flight e.g. note blocks or Create mod contraptions. +Once you have your clone, you can initialize your copy. -The possibilities are endless, the only limit is your imagination! +Setup Process: +-------- -## Documentation -Information about the mod's blocks and integration, crafting recipes, and plans for development are available at https://tardim.a71.su +Step 1: Open your command-line and browse to the folder where you extracted cloned your copy of this repository to. -## FAQ +Step 2: You're left with a choice. +If you prefer to use Eclipse: +1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux) +2. Open Eclipse, Import > Existing Gradle Project > Select Folder + or run `gradlew eclipse` to generate the project. -**Is this for Fabric or Forge?** -: Both! As a Fabric player who recognises Forge's large playerbase, I support both major modloaders. -However, due to nature of development Fabric versions may get released a bit earlier. +If you prefer to use IntelliJ: +1. Open IDEA, and import project. +2. Select your build.gradle file and have it import. +3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux) +4. Refresh the Gradle Project in IDEA if required. -**Can I use this in my modpack?** -: Sure, as long as you don't claim the mod as your own. A link to this mod's page would be appreciated too. +If at any point you are missing libraries in your IDE, or you've run into problems you can +run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything +{this does not affect your code} and then start the process again. -**Will there be a 1.20.1 version and beyond?** -: I am in the process of moving to 1.20, with Fabric already out and Forge in progress. -I intend to follow latest versions with TARDIM. +Mapping Names: +============ +By default, the MDK is configured to use the official mapping names from Mojang for methods and fields +in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this +license, if you do not agree with it you can change your mapping names to other crowdsourced names in your +build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here: +https://github.com/NeoForged/NeoForm/blob/main/Mojang.md -**I encountered a bug or have a suggestion. What do I do?** -: If you have a problem or suggestion, the best way to get them to me is through the project's Discord server. - -**Do I need to install things like ComputerCraft or Create for this mod?** -: Nope! While I highly suggest you do (because digital interface is in my opinion the star of the show), -you can enjoy a lot of TARDIM: In Control's features with only TARDIM installed. -If you ever decide to add other optional dependencies, the relevant blocks will become available and craftable! \ No newline at end of file +Additional Resources: +========== +Community Documentation: https://docs.neoforged.net/ +NeoForged Discord: https://discord.neoforged.net/ diff --git a/SWD_MOMENT.txt b/SWD_MOMENT.txt deleted file mode 100644 index 8e6d1d4..0000000 --- a/SWD_MOMENT.txt +++ /dev/null @@ -1,15 +0,0 @@ -=== HOW MANY PROBLEMS TARDIM HAS?! === -1. A few log messages definitely left from testing (e.g. aklfjsjsfw) -2. isValidFlightPath is private on Fabric -3. FABRIC AND FORGE HAVE DIFFERENT JAVA IMPORT PATHS -4. [FIXED] Adding custom commands was private for literally 0 reason -5. com.swdteam.tardim.common.data.DimensionMapReloadListener has modid tutorial in - public ResourceLocation getFabricId() { - return new ResourceLocation("tutorial", "tardim_dimension_lookup"); - } -5.1 Forge's MANIFEST.MF too! - -Andrew71's proposals: -1. Quick-return command -2. add support for far more fuel sources via AbstractFurnaceBlockEntity.getFuel() on top of built-in TARDIM method -3. Unify package names on Forge and Fabric \ No newline at end of file diff --git a/TODO b/TODO deleted file mode 100644 index fd65f85..0000000 --- a/TODO +++ /dev/null @@ -1,10 +0,0 @@ -=== TODO === -Doing every fucking thing over again - -* Basics - * Registrate creative mode tab - * Registrate a single block. Any block will do - -* Digital Interface for TARDIM - * Block - * Peripheral \ No newline at end of file diff --git a/build.gradle b/build.gradle index 53c7288..78c0879 100644 --- a/build.gradle +++ b/build.gradle @@ -1,101 +1,209 @@ plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' apply(false) - id 'net.minecraftforge.gradle' version '[6.0,6.2)' apply(false) - id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' apply(false) - id("org.spongepowered.mixin") version "0.7-SNAPSHOT" apply(false) + id 'eclipse' + id 'idea' + id 'maven-publish' + id 'net.neoforged.gradle' version '[6.0.18,6.2)' + id 'org.spongepowered.mixin' version '0.7.+' } -subprojects { - apply plugin: 'java' +version = mod_version +group = mod_group_id - java.toolchain.languageVersion = JavaLanguageVersion.of(17) - java.withSourcesJar() - java.withJavadocJar() - - jar { - from(rootProject.file("LICENSE")) { - rename { "${it}_${mod_name}" } +base { + archivesName = mod_id +} + +// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. +java.toolchain.languageVersion = JavaLanguageVersion.of(17) + +println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" +minecraft { + // The mappings can be changed at any time and must be in the following format. + // Channel: Version: + // official MCVersion Official field/method names from Mojang mapping files + // parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official + // + // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. + // See more information here: https://github.com/NeoForged/NeoForm/blob/main/Mojang.md + // + // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge + // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started + // + // Use non-default mappings at your own risk. They may not always work. + // Simply re-run your setup task after changing the mappings to update your workspace. + mappings channel: mapping_channel, version: mapping_version + + // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game. + // In most cases, it is not necessary to enable. + // enableEclipsePrepareRuns = true + // enableIdeaPrepareRuns = true + + // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game. + // It is REQUIRED to be set to true for this template to function. + // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html + copyIdeResources = true + + // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations. + // The folder name can be set on a run configuration using the "folderName" property. + // By default, the folder name of a run configuration is the name of the Gradle project containing it. + // generateRunFolders = true + + // This property enables access transformers for use in development. + // They will be applied to the Minecraft artifact. + // The access transformer file can be anywhere in the project. + // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge. + // This default location is a best practice to automatically put the file in the right place in the final jar. + // See https://docs.neoforged.net/docs/1.20.x/advanced/accesstransformers/ for more information. + + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + // applies to all the run configs below + configureEach { + workingDirectory project.file("run/${it.name}") + + // Recommended logging data for a userdev environment + // The markers can be added/remove as needed separated by commas. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + property 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + property 'forge.logging.console.level', 'debug' + + mods { + "${mod_id}" { + source sourceSets.main + } + } } - manifest { - attributes([ - 'Specification-Title' : mod_name, - 'Specification-Vendor' : mod_author, - 'Specification-Version' : project.jar.archiveVersion, + + client { + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', mod_id + } + + server { + property 'forge.enabledGameTestNamespaces', mod_id + args '--nogui' + } + + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + property 'forge.enabledGameTestNamespaces', mod_id + } + + data { + // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it + // workingDirectory project.file('run-data') + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + } + } +} + +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } + +repositories { + // Put repositories for dependencies here + // NeoGradle automatically adds the Forge maven and Maven Central for you + + // If you have mod jar dependencies in ./libs, you can declare them as a repository like so. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver + // flatDir { + // dir 'libs' + // } +} + +dependencies { + // Specify the version of Minecraft to use. + // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. + // The "userdev" classifier will be requested and setup by NeoGradle. + // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], + // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. + minecraft "net.neoforged:forge:${minecraft_version}-${neo_version}" + + // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings + // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime + // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}") + // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}") + // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") + + // Example mod dependency using a mod jar from ./libs with a flat dir repository + // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar + // The group id is ignored when searching -- in this case, it is "blank" + // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") + + // For more info: + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html +} + +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. +// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html +tasks.withType(ProcessResources).configureEach { + var replaceProperties = [ + minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range, + neo_version : neo_version, neo_version_range: neo_version_range, + loader_version_range: loader_version_range, + mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, + mod_authors : mod_authors, mod_description: mod_description, pack_format_number: pack_format_number, + ] + inputs.properties replaceProperties + + filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { + expand replaceProperties + [project: project] + } +} + +// Example for how to get properties into the manifest for reading at runtime. +tasks.named('jar', Jar).configure { + manifest { + attributes([ + 'Specification-Title' : mod_id, + 'Specification-Vendor' : mod_authors, + 'Specification-Version' : '1', // We are version 1 of ourselves 'Implementation-Title' : project.name, 'Implementation-Version' : project.jar.archiveVersion, - 'Implementation-Vendor' : mod_author, - 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), - 'Timestamp' : System.currentTimeMillis(), - 'Built-On-Java' : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})", - 'Built-On-Minecraft' : minecraft_version - ]) - } + 'Implementation-Vendor' : mod_authors, + 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) } - sourcesJar { - from(rootProject.file("LICENSE")) { - rename { "${it}_${mod_name}" } + // This is the preferred method to reobfuscate your jar file + finalizedBy 'reobfJar' +} + +// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing: +// tasks.named('publish').configure { +// dependsOn 'reobfJar' +// } + +// Example configuration to allow publishing using the maven-publish plugin +publishing { + publications { + register('mavenJava', MavenPublication) { + artifact jar } } - repositories { - mavenCentral() maven { - name = 'Sponge / Mixin' - url = 'https://repo.spongepowered.org/repository/maven-public/' - } - maven { - name = 'BlameJared Maven (JEI / CraftTweaker / Bookshelf)' - url = 'https://maven.blamejared.com' - } - - // CC: Tweaked - maven { - url "https://squiddev.cc/maven/" - content { - includeGroup("cc.tweaked") - includeModule("org.squiddev", "Cobalt") - } - } - // Curseforge - repositories { - maven { - url "https://cursemaven.com" - } - } - // Create Fabric 1.20 (Jeez that's a lot of mavens) -// maven { -// name "devOSSnapshots" -// url "https://mvn.devos.one/snapshots" -// } -// maven { -// name "tterrag maven" -// url "https://maven.tterrag.com/" -// } -// maven { -// url "https://maven.jamieswhiteshirt.com/libs-release" -// content { -// includeGroup "com.jamieswhiteshirt" -// } -// } - } - - tasks.withType(JavaCompile).configureEach { - - it.options.encoding = 'UTF-8' - it.options.getRelease().set(17) - } - - processResources { - filesMatching(['pack.mcmeta', 'fabric.mod.json', 'mods.toml', '*.mixins.json']) { - expand project.properties + url "file://${project.projectDir}/mcmodsrepo" } } +} - // Disables Gradle's custom module metadata from being published to maven. The - // metadata includes mapped dependencies which are not reasonably consumable by - // other mod developers. - tasks.withType(GenerateModuleMetadata).configureEach { - enabled = false - } -} \ No newline at end of file +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} diff --git a/docs/assets/img/banner.png b/docs/assets/img/banner.png deleted file mode 100644 index 781ece3..0000000 Binary files a/docs/assets/img/banner.png and /dev/null differ diff --git a/docs/assets/img/banner_narrow.png b/docs/assets/img/banner_narrow.png deleted file mode 100644 index 47118db..0000000 Binary files a/docs/assets/img/banner_narrow.png and /dev/null differ diff --git a/docs/assets/img/blocks/cartridge_blue.png b/docs/assets/img/blocks/cartridge_blue.png deleted file mode 100644 index 76eaaab..0000000 Binary files a/docs/assets/img/blocks/cartridge_blue.png and /dev/null differ diff --git a/docs/assets/img/blocks/digital_tardim_interface.png b/docs/assets/img/blocks/digital_tardim_interface.png deleted file mode 100644 index 758588f..0000000 Binary files a/docs/assets/img/blocks/digital_tardim_interface.png and /dev/null differ diff --git a/docs/assets/img/blocks/food_machine.png b/docs/assets/img/blocks/food_machine.png deleted file mode 100644 index c8908bb..0000000 Binary files a/docs/assets/img/blocks/food_machine.png and /dev/null differ diff --git a/docs/assets/img/blocks/fuel_storage.png b/docs/assets/img/blocks/fuel_storage.png deleted file mode 100644 index e8275dd..0000000 Binary files a/docs/assets/img/blocks/fuel_storage.png and /dev/null differ diff --git a/docs/assets/img/blocks/jammer.png b/docs/assets/img/blocks/jammer.png deleted file mode 100644 index 4b1ee16..0000000 Binary files a/docs/assets/img/blocks/jammer.png and /dev/null differ diff --git a/docs/assets/img/blocks/redstone_tardim_input.png b/docs/assets/img/blocks/redstone_tardim_input.png deleted file mode 100644 index c69a389..0000000 Binary files a/docs/assets/img/blocks/redstone_tardim_input.png and /dev/null differ diff --git a/docs/assets/img/blocks/rotor.png b/docs/assets/img/blocks/rotor.png deleted file mode 100644 index 1d5906c..0000000 Binary files a/docs/assets/img/blocks/rotor.png and /dev/null differ diff --git a/docs/assets/img/blocks/scanner.png b/docs/assets/img/blocks/scanner.png deleted file mode 100644 index ab9c024..0000000 Binary files a/docs/assets/img/blocks/scanner.png and /dev/null differ diff --git a/docs/assets/img/blocks/tardim_dock.png b/docs/assets/img/blocks/tardim_dock.png deleted file mode 100644 index 5789b4f..0000000 Binary files a/docs/assets/img/blocks/tardim_dock.png and /dev/null differ diff --git a/docs/assets/img/crafting/digital_interface.png b/docs/assets/img/crafting/digital_interface.png deleted file mode 100644 index ccb2ea2..0000000 Binary files a/docs/assets/img/crafting/digital_interface.png and /dev/null differ diff --git a/docs/assets/img/crafting/redstone_input.png b/docs/assets/img/crafting/redstone_input.png deleted file mode 100644 index 3e9b36f..0000000 Binary files a/docs/assets/img/crafting/redstone_input.png and /dev/null differ diff --git a/docs/assets/img/icon.png b/docs/assets/img/icon.png deleted file mode 100644 index c95943c..0000000 Binary files a/docs/assets/img/icon.png and /dev/null differ diff --git a/docs/assets/style.css b/docs/assets/style.css deleted file mode 100644 index c55ba61..0000000 --- a/docs/assets/style.css +++ /dev/null @@ -1,42 +0,0 @@ -@font-face { - font-family: 'ComputerCraft'; - src: url('fonts/ComputerCraft.woff2') format('woff2'), - url('fonts/ComputerCraft.woff') format('woff'); - font-weight: 500; - font-style: normal; - font-display: swap; -} - -code { - font-family: ComputerCraft, monospace; -} - -.wy-side-nav-search { - background-color: #d2651d; -} - -.wy-side-nav-search input[type="text"] { - border-color: #d96b25; -} - -.wy-menu-vertical header, .wy-menu-vertical p.caption { - color: #e78e53; -} - -.section > h1 > img { - max-width: 15%; -} - - -.rst-content img { - image-rendering: pixelated; - image-rendering: -moz-crisp-edges; - image-rendering: crisp-edges; - width: 50px; -} - - -.section > p:nth-child(5) > img:nth-child(1), .section > p:nth-child(4) > img:nth-child(1) { - max-width: 100%; - width: 75%; -} \ No newline at end of file diff --git a/docs/blocks/food_machine.md b/docs/blocks/food_machine.md deleted file mode 100644 index c8623f7..0000000 --- a/docs/blocks/food_machine.md +++ /dev/null @@ -1,7 +0,0 @@ -# ![Block model](../assets/img/blocks/food_machine.png) Food Machine -This block lets you exchange some of your TARDIM's fuel for food. - -I plan to make it work with datapacks and let you switch between different types of food at different prices. - -However, right now it is creative mode only and dispenses bread. If you want, you can add crafting recipe for it on your own, -but it is not recommended since I haven't finished it yet \ No newline at end of file diff --git a/docs/blocks/redstone_input.md b/docs/blocks/redstone_input.md deleted file mode 100644 index b547683..0000000 --- a/docs/blocks/redstone_input.md +++ /dev/null @@ -1,5 +0,0 @@ -# ![Block model](../assets/img/blocks/redstone_tardim_input.png) Redstone TARDIM Input -This block acts same as other TARDIM control panels, but is activated when redstone signal is passed to it. - -## Crafting -![Crafting recipe](../assets/img/crafting/redstone_input.png) diff --git a/docs/commands.md b/docs/commands.md deleted file mode 100644 index 3c62528..0000000 --- a/docs/commands.md +++ /dev/null @@ -1,22 +0,0 @@ -# New TARDIM commands - -## Cloister bell -Usage - `/cloister-bell` - -Makes a loud cloister bell sound from the TV show, to signal warning or other notifications. Usage with redstone input recommended - ---- - -## List biomes -Usage - `/list-biomes <..search_query>` - -Lists all existing biomes for better experience with `/locate-biome` and parity with CC integration. - -Can be used with no parameters to get all biomes or with a search string to only show biomes that contain it in their name - ---- - -## List dimensions -Usage - `/list-dimensions` - -Lists all existing dimensions for better experience with travel and parity with CC integration. diff --git a/docs/computercraft/index.md b/docs/computercraft/index.md deleted file mode 100644 index d5cbf26..0000000 --- a/docs/computercraft/index.md +++ /dev/null @@ -1,25 +0,0 @@ -# ComputerCraft compatibility -If you have ComputerCraft: Tweaked installed, -TARDIM: IC provides quite a few peripherals. - -The main one is new Digital TARDIM Interface, -which gives you complete control over your TARDIM. -However, some TARDIM blocks also receive getters for information related to them. - -## ComputerCraft for beginners -ComputerCraft adds working computers to minecraft, controlled by Lua language. -If you are new, [CC's official discord](https://discord.com/servers/minecraft-computer-mods-477910221872824320) has a lot of people who can help. -I also suggest taking a look at [Lua's website](https://www.lua.org/start.html) and [CC: Tweaked's documentaion](https://tweaked.cc) - -Please do not ask questions about ComputerCraft itself in TARDIM: IC's Discord. I am far from the most experienced user of that mod. - -## Notes about mod's peripherals -All of the peripherals throw if they are called outside a TARDIM. Only digital interface has ability to **set** data, others can only **get**. - -## Available peripherals -| Type | Description | -|-----------------------------------------------------------|----------------------------------------------------------------------------------------| -| [**Digital Interface**](peripherals/digital_interface.md) | Total control over your TARDIM. | -| [**Fuel Storage**](peripherals/fuel_storage.md) | Gives info about fuel. | -| [**TARDIM Scanner**](peripherals/tardim_scanner.md) | Gives info about TARDIM's inhabitants and things like existing biomes, online players. | -| [**Time Rotor**](peripherals/time_rotor.md) | Gives info about flight status, destination and current location. | diff --git a/docs/computercraft/peripherals/digital_interface.md b/docs/computercraft/peripherals/digital_interface.md deleted file mode 100644 index 2d664af..0000000 --- a/docs/computercraft/peripherals/digital_interface.md +++ /dev/null @@ -1,299 +0,0 @@ -# ![Peripheral model](../../assets/img/blocks/digital_tardim_interface.png) Digital TARDIM Interface -This peripheral allows you to do basically anything any other TARDIM control panel can, but automatically. - -Attach name - `"digital_tardim_interface"` - -## Crafting -![Crafting recipe](../../assets/img/crafting/digital_interface.png) - - -## Methods - -### `getFuel()` -Get how much fuel the TARDIM has. - -**Returns** - -1. `number` The amount of fuel, from 0 to 100. Not rounded. - ---- - -### `calculateFuelForJourney()` - -Get how much fuel the TARDIM would use if you travelled to destination. - -**Returns** - -1. `number` The amount of fuel - ---- - -### `isLocked()` - -Check whether the TARDIM's doors are locked - -**Returns** - -1. `bool` Whether the doors are locked - ---- - -### `setLocked(locked)` - -Sets the TARDIM's lock - -**Parameters** - -1. locked `bool`: true to lock doors, false to unlock - ---- - -### `isInFlight()` - -Check whether the TARDIM is in flight - -**Returns** - -1. `bool` Whether the TARDIM is in flight - ---- - - -### `getTimeEnteredFlight()` - -Get UNIX timestamp of when the TARDIM entered flight - -**Returns** - -1. `number` Unix timestamp or -1 if TARDIM is landed - ---- - -### `getOwnerName()` - -Will write the given input to the linked display. - -**Returns** - -1. `string` The username of TARDIM's owner - ---- - -### `getCurrentLocation()` - -Retrieve the TARDIM's current location - -**Returns** - -1. `table` The location of the tardim: - - ``` - { - dimension = "minecraft:overworld", -- Dimension string - pos = { -- Coordinates - x = 1, - y = 2, - z = 3 - } - } - ``` - ---- - -### `getTravelLocation()` - -The same as `getCurrentLocation()` but for destination - ---- - -### `getCompanions()` - -Get all list of all companions in the TARDIM - -**Returns** - -1. `table` list of companions' names - ---- - -### `setDimension(dimension)` - -Set TARDIM's destination to a dimension - -**Parameters** - -1. dimension `string`: dimension's name e.g. "minecraft:overworld" - ---- - -### `setTravelLocation(x, y, z)` - -Set TARDIM's destination coordinates - -**Parameters** - -1. x `number`: x-axis of destination -2. y `number`: y-axis of destination -3. z `number`: z-axis of destination - ---- - - -### `home()` - -Set TARDIM's destination to roughly owner's respawn point - ---- - -### `locatePlayer(username)` - -Set TARDIM's destination to a player's coordinates - -**Parameters** - -1. username `string`: player's username. the player must be online. - ---- - -### `getOnlinePlayers()` - -Get all list of all online players - -**Returns** - -1. `table` list of players' names - ---- - -### `getDoorRotation()` - -Get current door rotation - -**Returns** - -1. `string` direction - "north"/"west"/"south"/"east" - ---- - -### `setDoorRotation(rotation)` - -Get current door rotation - -**Parameters** - -1. rotation `string` direction string - "north"/"west"/"south"/"east" - ---- - -### `toggleDoorRotation()` - -Toggle door rotation north -> east -> south -> west -> north - ---- - -### `coordAdd(axis, amount)` - -Add a number to the destination's coordinates - -**Parameters** - -1. axis `string` x/y/z -2. amount `number` how much to add/substract - ---- - -### `demat()` - -Dematerialise the TARDIM. Throws if TARDIM is in flight already. - ---- - -### `remat()` - -Re-materialise the TARDIM at the destination. - -**Throws if** - -1. TARDIM landing is obstructed -2. Not enough fuel for journey -3. TARDIM is still taking off -4. TARDIM has already landed - ---- - -### `locateBiome(biome)` - -Set destination to somewhere in a specific biome. - -**Parameters** - -1. biome `string` biome name e.g. minecraft:badlands or terralith:skylands_spring - -**Throws if** - -1. Biome has not been founded near -2. Biome name is wrong - ---- - -### `setSkin(skin)` - -Set TARDIM's exterior to a skin - -**Parameters** - -1. skin `string` exterior name e.g. "TARDIM Type 2k18" or "TARDIM Soviet Chronobox" - -**Throws if** - -1. Skin was not found - ---- - -### `getSkins()` - -Get all list of all available exteriors - -**Returns** - -1. `table` list of exteriors' names - ---- - -### `setSkin(skin)` - -Set TARDIM's exterior to a skin - -**Parameters** - -1. skin `string` exterior name e.g. "TARDIM Type 2k18" or "TARDIM Soviet Chronobox" - ---- - -### `cloisterBell()` - -Play the cloister bell sound in the exterior (originates from the peripheral block) - -**Throws if** - -1. There was an error playing the sound (unlikely) - ---- - -### `getBiomes()` - -Get all list of all existing biomes - -**Returns** - -1. `table` list of biomes' names - ---- - -### `getDimensions()` - -Get all list of all existing dimensions - -**Returns** - -1. `table` list of dimensions' names diff --git a/docs/computercraft/peripherals/fuel_storage.md b/docs/computercraft/peripherals/fuel_storage.md deleted file mode 100644 index 2cf95e9..0000000 --- a/docs/computercraft/peripherals/fuel_storage.md +++ /dev/null @@ -1,23 +0,0 @@ -# ![Peripheral model](../../assets/img/blocks/fuel_storage.png) Fuel Storage Block -This peripheral, attached to a TARDIM fuel storage block, gives you access to 2 fuel-related methods - -Attach name - `"tardim_fuel_storage"` - -## Methods - -### `getFuel()` -Get how much fuel the TARDIM has. - -**Returns** - -1. `number` The amount of fuel, from 0 to 100. Not rounded. - ---- - -### `calculateFuelForJourney()` - -Get how much fuel the TARDIM would use if you travelled to destination. - -**Returns** - -1. `number` The amount of fuel \ No newline at end of file diff --git a/docs/computercraft/peripherals/tardim_scanner.md b/docs/computercraft/peripherals/tardim_scanner.md deleted file mode 100644 index 68a64a7..0000000 --- a/docs/computercraft/peripherals/tardim_scanner.md +++ /dev/null @@ -1,64 +0,0 @@ -# ![Peripheral model](../../assets/img/blocks/scanner.png) TARDIM Scanner Block -This peripheral, attached to TARDIM's scanner block, lets you fetch some data related to world's environment - -Attach name - `"tardim_scanner"` - -## Methods - -### `getOwnerName()` - -Will write the given input to the linked display. - -**Returns** - -1. `string` The username of TARDIM's owner - ---- - -### `getCompanions()` - -Get all list of all companions in the TARDIM - -**Returns** - -1. `table` list of companions' names - ---- - -### `getOnlinePlayers()` - -Get all list of all online players - -**Returns** - -1. `table` list of players' names - ---- - -### `getSkins()` - -Get all list of all available exteriors - -**Returns** - -1. `table` list of exteriors' names - ---- - -### `getBiomes()` - -Get all list of all existing biomes - -**Returns** - -1. `table` list of biomes' names - ---- - -### `getDimensions()` - -Get all list of all existing dimensions - -**Returns** - -1. `table` list of dimensions' names diff --git a/docs/computercraft/peripherals/time_rotor.md b/docs/computercraft/peripherals/time_rotor.md deleted file mode 100644 index 6df4669..0000000 --- a/docs/computercraft/peripherals/time_rotor.md +++ /dev/null @@ -1,52 +0,0 @@ -# ![Peripheral model](../../assets/img/blocks/rotor.png) Rotor Block -This peripheral, attached to TARDIM's time rotor, allows you to get info about TARDIM's flight status. - -Attach name - `"tardim_rotor"` - -## Methods - -### `isInFlight()` - -Check whether the TARDIM is in flight - -**Returns** - -1. `bool` Whether the TARDIM is in flight - ---- - - -### `getTimeEnteredFlight()` - -Get UNIX timestamp of when the TARDIM entered flight - -**Returns** - -1. `number` Unix timestamp or -1 if TARDIM is landed - ---- - -### `getCurrentLocation()` - -Retrieve the TARDIM's current location - -**Returns** - -1. `table` The location of the tardim: - - ``` - { - dimension = "minecraft:overworld", -- Dimension string - pos = { -- Coordinates - x = 1, - y = 2, - z = 3 - } - } - ``` - ---- - -### `getTravelLocation()` - -The same as `getCurrentLocation()` but for destination diff --git a/docs/create/index.md b/docs/create/index.md deleted file mode 100644 index 44949c5..0000000 --- a/docs/create/index.md +++ /dev/null @@ -1,3 +0,0 @@ -# Create compatibility - -This is not yet implemented due to lack of Create Fabric for 1.20. However, I have a few working 1.19.2 display sources that I intend to add when Create is out. \ No newline at end of file diff --git a/docs/index.md b/docs/index.md deleted file mode 100644 index d192106..0000000 --- a/docs/index.md +++ /dev/null @@ -1,4 +0,0 @@ -## Welcome to TARDIM: IC docs! -This mod aims to improve TARDIM by adding new features and integration with other mods such as ComputerCraft or Create. - -Please note that v1.2 is a big jump in terms of rewrites and new features. Therefore, not all features are available yet. If you see errors in the docs, feel free to point it out in Discord. \ No newline at end of file diff --git a/docs/mixins.md b/docs/mixins.md deleted file mode 100644 index 2c587b7..0000000 --- a/docs/mixins.md +++ /dev/null @@ -1,6 +0,0 @@ -# Changes to vanilla TARDIM - -## New fuel system -With TARDIM: In Control, you can insert any furnace-compatible fuel into the fuel storage block without having to make a datapack for it. - -Also, buckets will no longer disappear from hopper, and only their contents will be taken. \ No newline at end of file diff --git a/docs/planned.md b/docs/planned.md deleted file mode 100644 index e77c694..0000000 --- a/docs/planned.md +++ /dev/null @@ -1,6 +0,0 @@ -# Planned features -I do not guarantee these will be added or have a timeline, but here are features I designed and wish to implement in the future - -* ![Block model](assets/img/blocks/tardim_dock.png) TARDIM Dock - A block that lets you get to a location by a simple ID and handles location and rotation for you. This will also let TARDIMs land on Create: Aeronautics contraptions once that mod is out -* ![Item texture](assets/img/blocks/cartridge_blue.png) Location cartridges - No code way to save location to an item and travel there whenever you want. -* ![Wearable model](assets/img/blocks/jammer.png) Personal location jammer - Wearable item that lets you prevent others from locking onto your position. diff --git a/docs/recipes.md b/docs/recipes.md deleted file mode 100644 index e69de29..0000000 diff --git a/gradle.properties b/gradle.properties index 159a927..fb478c8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,24 +1,26 @@ -# Project -version=1.2 -group=su.a71.tardim_ic - -# Common +# Minecraft minecraft_version=1.20.1 +minecraft_version_range=[1.20,1.21) +pack_format_number=15 -# Forge -forge_version=47.1.0 +# Neoforged +neo_version=47.1.65 +neo_version_range=[47.1,) +loader_version_range=[47,) -# Fabric -fabric_version=0.86.1+1.20.1 -fabric_loader_version=0.14.21 +mapping_channel=official +mapping_version=1.20.1 -# Mod options +# Mod Properties +mod_version=1.3 mod_name=TARDIM-IC -mod_author=Andrew_7_1 mod_id=tardim_ic +mod_license=MIT +mod_group_id=su.a71.tardim_ic +mod_authors=Andrew_7_1 +mod_description=Example mod description.\nNewline characters can be used and will be replaced properly. + # Gradle org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false - -cc_version=1.105.0 \ No newline at end of file +org.gradle.daemon=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..943f0cb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae0804..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index f127cfd..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/mkdocs.yml b/mkdocs.yml deleted file mode 100644 index 60c8c7e..0000000 --- a/mkdocs.yml +++ /dev/null @@ -1,55 +0,0 @@ -site_name: "Tardim: In Control" -site_description: "Documentation for mod TARDIM: In Control" -site_author: Andrew_7_1 - -copyright: Copyright © 2023 Andrey N. - -nav: - - Home: - - Home: "index.md" - - Features: - - Blocks: - - Redstone Input: blocks/redstone_input.md - - Commands: commands.md - - Changes to TARDIM: mixins.md - - ComputerCraft compatibility: - - computercraft/index.md - - Peripherals: - - Digital TARDIM Interface: computercraft/peripherals/digital_interface.md - - Fuel Storage Block: computercraft/peripherals/fuel_storage.md - - TARDIM Scanner Block: computercraft/peripherals/tardim_scanner.md - - Time Rotor Block: computercraft/peripherals/time_rotor.md - - Create compatibility: - - create/index.md -# - Display Sources: -# - Fuel Storage Block: create/sources/fuel_storage.md -# - TARDIM Scanner Block: create/sources/tardim_scanner.md -# - Time Rotor Block: create/sources/time_rotor.md - - Planned features: - - planned.md - -site_url: https://tardim.a71.su/ -repo_name: Andrew71/Tardim-In-Control -repo_url: https://git.a71.su/Andrew71/Tardim-In-Control -#edit_uri: https://git.a71.su/Andrew71/Tardim-In-Control/src/branch/1.20/docs - -theme: - name: readthedocs - - features: - - content.code.copy - - navigation.tracking - - navigation.instant - - navigation.tabs - - navigation.indexes - - font: false - palette: - scheme: slate - primary: custom - accent: custom - - favicon: assets/img/icon.png - -extra_css: - - assets/style.css \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index ada7750..24584e9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,26 +2,12 @@ pluginManagement { repositories { gradlePluginPortal() maven { - name = 'Forge' - url = 'https://maven.minecraftforge.net/' - } - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - maven { - name = 'Sponge Snapshots' - url = 'https://repo.spongepowered.org/repository/maven-public/' + name = 'NeoForged' + url = 'https://maven.neoforged.net/releases' } } } plugins { id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' -} - -// This should match the folder name of the project, or else IDEA may complain (see https://youtrack.jetbrains.com/issue/IDEA-317606) -rootProject.name = 'Tardim-In-Control' -include("common") -include("fabric") -include("forge") +} \ No newline at end of file diff --git a/src/main/java/su/a71/tardim_ic/Config.java b/src/main/java/su/a71/tardim_ic/Config.java new file mode 100644 index 0000000..7a6709b --- /dev/null +++ b/src/main/java/su/a71/tardim_ic/Config.java @@ -0,0 +1,63 @@ +package su.a71.tardim_ic; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraftforge.common.ForgeConfigSpec; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.config.ModConfigEvent; +import net.minecraftforge.registries.ForgeRegistries; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +// An example config class. This is not required, but it's a good idea to have one to keep your config organized. +// Demonstrates how to use Forge's config APIs +@Mod.EventBusSubscriber(modid = TardimInControl.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class Config +{ + private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder(); + + private static final ForgeConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER + .comment("Whether to log the dirt block on common setup") + .define("logDirtBlock", true); + + private static final ForgeConfigSpec.IntValue MAGIC_NUMBER = BUILDER + .comment("A magic number") + .defineInRange("magicNumber", 42, 0, Integer.MAX_VALUE); + + public static final ForgeConfigSpec.ConfigValue MAGIC_NUMBER_INTRODUCTION = BUILDER + .comment("What you want the introduction message to be for the magic number") + .define("magicNumberIntroduction", "The magic number is... "); + + // a list of strings that are treated as resource locations for items + private static final ForgeConfigSpec.ConfigValue> ITEM_STRINGS = BUILDER + .comment("A list of items to log on common setup.") + .defineListAllowEmpty("items", List.of("minecraft:iron_ingot"), Config::validateItemName); + + static final ForgeConfigSpec SPEC = BUILDER.build(); + + public static boolean logDirtBlock; + public static int magicNumber; + public static String magicNumberIntroduction; + public static Set items; + + private static boolean validateItemName(final Object obj) + { + return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(new ResourceLocation(itemName)); + } + + @SubscribeEvent + static void onLoad(final ModConfigEvent event) + { + logDirtBlock = LOG_DIRT_BLOCK.get(); + magicNumber = MAGIC_NUMBER.get(); + magicNumberIntroduction = MAGIC_NUMBER_INTRODUCTION.get(); + + // convert the list of strings into a set of items + items = ITEM_STRINGS.get().stream() + .map(itemName -> ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemName))) + .collect(Collectors.toSet()); + } +} diff --git a/src/main/java/su/a71/tardim_ic/TardimInControl.java b/src/main/java/su/a71/tardim_ic/TardimInControl.java new file mode 100644 index 0000000..d28bae9 --- /dev/null +++ b/src/main/java/su/a71/tardim_ic/TardimInControl.java @@ -0,0 +1,120 @@ +package su.a71.tardim_ic; + +import net.minecraft.client.Minecraft; +import net.minecraft.core.registries.Registries; +import net.minecraft.world.food.FoodProperties; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.MapColor; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; +import net.minecraftforge.event.server.ServerStartingEvent; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.common.Mod; + + +import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Mod(TardimInControl.MOD_ID) +public class TardimInControl { + public static final String MOD_ID = "tardim_ic"; + public static final String MOD_NAME = "TARDIM: In Control"; + public static final Logger LOG = LoggerFactory.getLogger(MOD_NAME); + + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MOD_ID); + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID); + public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MOD_ID); + + // Creates a new Block with the id "examplemod:example_block", combining the namespace and path + public static final RegistryObject EXAMPLE_BLOCK = BLOCKS.register("example_block", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE))); + // Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path + public static final RegistryObject EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties())); + + // Creates a new food item with the id "examplemod:example_id", nutrition 1 and saturation 2 + public static final RegistryObject EXAMPLE_ITEM = ITEMS.register("example_item", () -> new Item(new Item.Properties().food(new FoodProperties.Builder() + .alwaysEat().nutrition(1).saturationMod(2f).build()))); + + // Creates a creative tab with the id "examplemod:example_tab" for the example item, that is placed after the combat tab + public static final RegistryObject EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder() + .withTabsBefore(CreativeModeTabs.COMBAT) + .icon(() -> EXAMPLE_ITEM.get().getDefaultInstance()) + .displayItems((parameters, output) -> { + output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event + }).build()); + + public TardimInControl() { + IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + + // Register the commonSetup method for modloading + modEventBus.addListener(this::commonSetup); + + BLOCKS.register(modEventBus); + ITEMS.register(modEventBus); + CREATIVE_MODE_TABS.register(modEventBus); + + // Register ourselves for server and other game events we are interested in + MinecraftForge.EVENT_BUS.register(this); + + modEventBus.addListener(this::addCreative); + + // Register our mod's ForgeConfigSpec so that Forge can create and load the config file for us + ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.SPEC); + } + + + private void commonSetup(final FMLCommonSetupEvent event) + { + // Some common setup code + LOG.info("HELLO FROM COMMON SETUP"); + + if (Config.logDirtBlock) + LOG.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT)); + + LOG.info(Config.magicNumberIntroduction + Config.magicNumber); + + Config.items.forEach((item) -> LOG.info("ITEM >> {}", item.toString())); + } + + // Add the example block item to the building blocks tab + private void addCreative(BuildCreativeModeTabContentsEvent event) + { + if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS) + event.accept(EXAMPLE_BLOCK_ITEM); + } + + // You can use SubscribeEvent and let the Event Bus discover methods to call + @SubscribeEvent + public void onServerStarting(ServerStartingEvent event) + { + // Do something when the server starts + } + + // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent + @Mod.EventBusSubscriber(modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) + public static class ClientModEvents + { + @SubscribeEvent + public static void onClientSetup(FMLClientSetupEvent event) + { + // Some client setup code + LOG.info("HELLO FROM CLIENT SETUP"); + LOG.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName()); + } + } +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..c9e2c40 --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,70 @@ +# This is an example mods.toml file. It contains the data relating to the loading mods. +# There are several mandatory fields (#mandatory), and many more that are optional (#optional). +# The overall format is standard TOML format, v0.5.0. +# Note that there are a couple of TOML lists in this file. +# Find more information on toml format here: https://github.com/toml-lang/toml +# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml +modLoader="javafml" #mandatory +# A version range to match for said mod loader - for regular FML @Mod it will be the the FML version. This is currently 47. +loaderVersion="${loader_version_range}" #mandatory +# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. +# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +license="${mod_license}" +# A URL to refer people to when problems occur with this mod +#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional +# A list of mods - how many allowed here is determined by the individual mod loader +[[mods]] #mandatory +# The modid of the mod +modId="${mod_id}" #mandatory +# The version number of the mod +version="${mod_version}" #mandatory +# A display name for the mod +displayName="${mod_name}" #mandatory +# A URL to query for updates for this mod. See the JSON update specification https://docs.neoforged.net/docs/misc/updatechecker/ +#updateJSONURL="https://change.me.example.invalid/updates.json" #optional +# A URL for the "homepage" for this mod, displayed in the mod UI +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional +# A file name (in the root of the mod JAR) containing a logo for display +#logoFile="examplemod.png" #optional +# A text field displayed in the mod UI +#credits="" #optional +# A text field displayed in the mod UI +authors="${mod_authors}" #optional +# Display Test controls the display for your mod in the server connection screen +# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod. +# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod. +# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component. +# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value. +# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself. +#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional) + +# The description text for the mod (multi line!) (#mandatory) +description='''${mod_description}''' +# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. +[[dependencies.${mod_id}]] #optional + # the modid of the dependency + modId="forge" #mandatory + # Does this dependency have to exist - if not, ordering below must be specified + mandatory=true #mandatory + # The version range of the dependency + versionRange="${neo_version_range}" #mandatory + # An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory + # BEFORE - This mod is loaded BEFORE the dependency + # AFTER - This mod is loaded AFTER the dependency + ordering="NONE" + # Side this dependency is applied on - BOTH, CLIENT, or SERVER + side="BOTH" +# Here's another dependency +[[dependencies.${mod_id}]] + modId="minecraft" + mandatory=true + # This version range declares a minimum of the current minecraft version up to but not including the next major version + versionRange="${minecraft_version_range}" + ordering="NONE" + side="BOTH" + +# Features are specific properties of the game environment, that you may want to declare you require. This example declares +# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't +# stop your mod loading on the server for example. +#[features.${mod_id}] +#openGLVersion="[3.2,)" diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..59c5240 --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "description": { + "text": "${mod_id} resources" + }, + "pack_format": ${pack_format_number} + } +}