From 6d6de9f71a830eea7a36415f55e66bdfe089f67f Mon Sep 17 00:00:00 2001 From: Andrew71 Date: Mon, 30 Jan 2023 10:34:05 +0300 Subject: [PATCH] 11th hour over now --- build.gradle | 12 ++++----- gradle.properties | 4 +++ .../tardim_ic/DigitalInterfacePeripheral.java | 14 ++++++++++ .../a71/tardim_ic/tardim_ic/Registration.java | 10 ++++++- .../assets/tardim_ic/lang/en_uk.json | 3 ++- .../assets/tardim_ic/lang/en_us.json | 3 ++- .../resources/assets/tardim_ic/lang/rpr.json | 3 ++- .../assets/tardim_ic/lang/ru_ru.json | 4 +++ .../recipes/digital_tardim_interface.json | 26 +++++++++++++++++++ 9 files changed, 69 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/tardim_ic/lang/ru_ru.json create mode 100644 src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json diff --git a/build.gradle b/build.gradle index dbaea1c..2788ba0 100644 --- a/build.gradle +++ b/build.gradle @@ -10,9 +10,9 @@ buildscript { apply plugin: 'net.minecraftforge.gradle' -group = 'su.a71.tardim_ic' -version = '0.5' -archivesBaseName = 'tardim_ic' +group = project.group +version = project.version +archivesBaseName = project.archivesBaseName java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -82,6 +82,8 @@ sourceSets.main.resources { srcDir 'src/generated/resources' } repositories { maven { url 'https://squiddev.cc/maven/' } + + maven { url "https://cursemaven.com"} } dependencies { @@ -90,9 +92,7 @@ dependencies { // The userdev artifact is a special name and will get all sorts of transformations applied to it. minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}" - - implementation files("/home/andrew71/.local/share/multimc/instances/TardimInControl/.minecraft/mods/tardim-1.1.5.jar") - + implementation fg.deobf("curse.maven:tardim-531315:3983700") implementation fg.deobf("org.squiddev:cc-tweaked-1.19.1:${cc_version}") } diff --git a/gradle.properties b/gradle.properties index 0af5ab3..096b0cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,3 +4,7 @@ org.gradle.daemon=false cc_version=1.100.9 mc_version=1.19.2 forge_version=43.1.3 + +group = 'su.a71.tardim_ic' +version = '0.6' +archivesBaseName = 'tardim_ic' \ No newline at end of file diff --git a/src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfacePeripheral.java b/src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfacePeripheral.java index b9a86a9..4a92390 100644 --- a/src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfacePeripheral.java +++ b/src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfacePeripheral.java @@ -385,6 +385,20 @@ public class DigitalInterfacePeripheral implements IPeripheral { 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 { + PlayerList playerList = ServerLifecycleHooks.getCurrentServer().getPlayerList(); + ObjectLuaTable players = new ObjectLuaTable(Map.of()); + for (int i = 0; i < playerList.getPlayers().size(); i++) { + players.put(i + 1, playerList.getPlayers().get(i).getGameProfile().getName()); + } + return players; + } + /** * Get the rotation of the TARDIM's door * @return String of the door rotation ("north", "south", "east", "west") diff --git a/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java b/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java index 878a533..a6c036a 100644 --- a/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java +++ b/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java @@ -4,6 +4,7 @@ import com.google.common.collect.Sets; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraftforge.eventbus.api.IEventBus; @@ -20,12 +21,19 @@ public class Registration { public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, TardimInControl.MODID); public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, TardimInControl.MODID); + public static final CreativeModeTab TARDIM_IC_TAB = new CreativeModeTab("tardim_ic") { + @Override + public ItemStack makeIcon() { + return new ItemStack(Registration.DIGITAL_TARDIM_INTERFACE.get()); + } + }; + // Blocks public static final RegistryObject DIGITAL_TARDIM_INTERFACE = register("digital_tardim_interface", DigitalInterfaceBlock::new); private static RegistryObject register(String name, Supplier block) { RegistryObject registryObject = BLOCKS.register(name, block); - ITEMS.register(name, () -> new BlockItem(registryObject.get(), new Item.Properties().tab(CreativeModeTab.TAB_REDSTONE))); + ITEMS.register(name, () -> new BlockItem(registryObject.get(), new Item.Properties().tab(TARDIM_IC_TAB))); return registryObject; } diff --git a/src/main/resources/assets/tardim_ic/lang/en_uk.json b/src/main/resources/assets/tardim_ic/lang/en_uk.json index 18e60e2..78baa60 100644 --- a/src/main/resources/assets/tardim_ic/lang/en_uk.json +++ b/src/main/resources/assets/tardim_ic/lang/en_uk.json @@ -1,3 +1,4 @@ { - "block.tardim_ic.digital_tardim_interface": "Digital TARDIM Interface" + "block.tardim_ic.digital_tardim_interface": "Digital TARDIM Interface", + "itemGroup.tardim_ic": "TARDIM: In Control" } \ No newline at end of file diff --git a/src/main/resources/assets/tardim_ic/lang/en_us.json b/src/main/resources/assets/tardim_ic/lang/en_us.json index 18e60e2..78baa60 100644 --- a/src/main/resources/assets/tardim_ic/lang/en_us.json +++ b/src/main/resources/assets/tardim_ic/lang/en_us.json @@ -1,3 +1,4 @@ { - "block.tardim_ic.digital_tardim_interface": "Digital TARDIM Interface" + "block.tardim_ic.digital_tardim_interface": "Digital TARDIM Interface", + "itemGroup.tardim_ic": "TARDIM: In Control" } \ No newline at end of file diff --git a/src/main/resources/assets/tardim_ic/lang/rpr.json b/src/main/resources/assets/tardim_ic/lang/rpr.json index 1b5f525..1cd15ba 100644 --- a/src/main/resources/assets/tardim_ic/lang/rpr.json +++ b/src/main/resources/assets/tardim_ic/lang/rpr.json @@ -1,3 +1,4 @@ { - "block.tardim_ic.digital_tardim_interface": "Циферный Интерфейсъ Хронобудки" + "block.tardim_ic.digital_tardim_interface": "Циферный Интерфейсъ Хронобудки", + "itemGroup.tardim_ic": "ТАРДИМЪ: Подъ Контрольемъ" } \ No newline at end of file diff --git a/src/main/resources/assets/tardim_ic/lang/ru_ru.json b/src/main/resources/assets/tardim_ic/lang/ru_ru.json new file mode 100644 index 0000000..d3bfc8b --- /dev/null +++ b/src/main/resources/assets/tardim_ic/lang/ru_ru.json @@ -0,0 +1,4 @@ +{ + "block.tardim_ic.digital_tardim_interface": "Цифровой интерфейс TARDIM", + "itemGroup.tardim_ic": "TARDIM: In Control" +} \ No newline at end of file diff --git a/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json b/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json new file mode 100644 index 0000000..2bee8c3 --- /dev/null +++ b/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "R0R", + "GRG" + ], + "key": { + "G": { + "item": "minecraft:gold_ingot", + "count": 1 + }, + "R": { + "item": "minecraft:redstone", + "count": 1 + }, + "0": { + "item": "minecraft:ender_eye", + "count": 1 + } + }, + "result": { + "item": "tardim_ic:digital_tardim_interface", + "count": 1 + } +} \ No newline at end of file