From 79ad4777b374a4348ec474f01af3be5cebe1edcd Mon Sep 17 00:00:00 2001 From: Andrey Nikitin Date: Sun, 29 Jan 2023 00:15:31 +0300 Subject: [PATCH] You've redecorated. I like it! --- build.gradle | 14 +++++++------- settings.gradle | 2 +- .../tardim_ic/DigitalInterfaceBlock.java} | 6 +++--- .../tardim_ic/DigitalInterfacePeripheral.java} | 12 +++++------- .../tardim_ic/DigitalInterfaceTileEntity.java} | 8 ++++---- .../a71/tardim_ic/tardim_ic}/Registration.java | 12 ++++++------ .../a71/tardim_ic/tardim_ic/TardimInControl.java} | 10 +++++----- src/main/resources/META-INF/mods.toml | 6 +++--- .../blockstates/digital_tardim_interface.json | 7 ------- .../resources/assets/cctutorial/lang/en_uk.json | 3 --- .../resources/assets/cctutorial/lang/en_us.json | 3 --- .../resources/assets/cctutorial/lang/rpr.json | 3 --- .../models/item/digital_tardim_interface.json | 3 --- .../blockstates/digital_tardim_interface.json | 7 +++++++ .../resources/assets/tardim_ic/lang/en_uk.json | 3 +++ .../resources/assets/tardim_ic/lang/en_us.json | 3 +++ src/main/resources/assets/tardim_ic/lang/rpr.json | 3 +++ .../models/block/digital_tardim_interface.json | 2 +- .../models/item/digital_tardim_interface.json | 3 +++ .../textures/blocks/digital_tardim_interface.png | Bin src/main/resources/pack.mcmeta | 2 +- 21 files changed, 55 insertions(+), 57 deletions(-) rename src/main/java/{de/srendi/cctutorial/cctutorial/CCBlock.java => su/a71/tardim_ic/tardim_ic/DigitalInterfaceBlock.java} (86%) rename src/main/java/{de/srendi/cctutorial/cctutorial/CCPeripheral.java => su/a71/tardim_ic/tardim_ic/DigitalInterfacePeripheral.java} (96%) rename src/main/java/{de/srendi/cctutorial/cctutorial/CCTileEntity.java => su/a71/tardim_ic/tardim_ic/DigitalInterfaceTileEntity.java} (83%) rename src/main/java/{de/srendi/cctutorial/cctutorial => su/a71/tardim_ic/tardim_ic}/Registration.java (75%) rename src/main/java/{de/srendi/cctutorial/cctutorial/CCtutorial.java => su/a71/tardim_ic/tardim_ic/TardimInControl.java} (70%) delete mode 100644 src/main/resources/assets/cctutorial/blockstates/digital_tardim_interface.json delete mode 100644 src/main/resources/assets/cctutorial/lang/en_uk.json delete mode 100644 src/main/resources/assets/cctutorial/lang/en_us.json delete mode 100644 src/main/resources/assets/cctutorial/lang/rpr.json delete mode 100644 src/main/resources/assets/cctutorial/models/item/digital_tardim_interface.json create mode 100644 src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json create mode 100644 src/main/resources/assets/tardim_ic/lang/en_uk.json create mode 100644 src/main/resources/assets/tardim_ic/lang/en_us.json create mode 100644 src/main/resources/assets/tardim_ic/lang/rpr.json rename src/main/resources/assets/{cctutorial => tardim_ic}/models/block/digital_tardim_interface.json (99%) create mode 100644 src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json rename src/main/resources/assets/{cctutorial => tardim_ic}/textures/blocks/digital_tardim_interface.png (100%) diff --git a/build.gradle b/build.gradle index f310d32..3f614a2 100644 --- a/build.gradle +++ b/build.gradle @@ -10,9 +10,9 @@ buildscript { apply plugin: 'net.minecraftforge.gradle' -group = 'de.srendi.cctutorial' +group = 'su.a71.tardim_ic' version = '1.0' -archivesBaseName = 'cctutorial' +archivesBaseName = 'tardim_ic' java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -66,10 +66,10 @@ minecraft { property 'forge.logging.console.level', 'debug' // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - args '--mod', 'cctutorial', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + args '--mod', 'tardim_ic', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') mods { - cctutorial { + tardim_ic { source sourceSets.main } } @@ -101,12 +101,12 @@ dependencies { jar { manifest { attributes([ - "Specification-Title" : "cctutorial", - //"Specification-Vendor": "cctutorial authors", + "Specification-Title" : "tardim_ic", + //"Specification-Vendor": "tardim_ic authors", "Specification-Version" : "1", // We are version 1 of ourselves "Implementation-Title" : project.name, "Implementation-Version" : project.version, - //"Implementation-Vendor": "cctutorial authors", + //"Implementation-Vendor": "tardim_ic authors", "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } diff --git a/settings.gradle b/settings.gradle index a88046d..d13a81c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'cctutorial' +rootProject.name = 'tardim_ic' diff --git a/src/main/java/de/srendi/cctutorial/cctutorial/CCBlock.java b/src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfaceBlock.java similarity index 86% rename from src/main/java/de/srendi/cctutorial/cctutorial/CCBlock.java rename to src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfaceBlock.java index 3c9f315..7aa6edc 100644 --- a/src/main/java/de/srendi/cctutorial/cctutorial/CCBlock.java +++ b/src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfaceBlock.java @@ -1,4 +1,4 @@ -package de.srendi.cctutorial.cctutorial; +package su.a71.tardim_ic.tardim_ic; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.Block; @@ -13,9 +13,9 @@ import javax.annotation.Nullable; /** * This is our block. To tell minecraft that this block has a block entity, we need to implement {@link EntityBlock} */ -public class CCBlock extends Block implements EntityBlock { +public class DigitalInterfaceBlock extends Block implements EntityBlock { - public CCBlock() { + public DigitalInterfaceBlock() { super(Properties.of(Material.METAL).strength(5, 5).noOcclusion()); } diff --git a/src/main/java/de/srendi/cctutorial/cctutorial/CCPeripheral.java b/src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfacePeripheral.java similarity index 96% rename from src/main/java/de/srendi/cctutorial/cctutorial/CCPeripheral.java rename to src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfacePeripheral.java index 0c55a14..6ff7e5f 100644 --- a/src/main/java/de/srendi/cctutorial/cctutorial/CCPeripheral.java +++ b/src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfacePeripheral.java @@ -1,6 +1,5 @@ -package de.srendi.cctutorial.cctutorial; +package su.a71.tardim_ic.tardim_ic; -import com.swdteam.common.command.tardim.CommandTardimBase; import com.swdteam.common.command.tardim.CommandTravel; import com.swdteam.common.data.DimensionMapReloadListener; import dan200.computercraft.api.lua.LuaFunction; @@ -9,7 +8,6 @@ import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.api.lua.ObjectLuaTable; import dan200.computercraft.api.lua.LuaException; -import net.minecraft.core.BlockPos; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -33,15 +31,15 @@ import java.util.Map; /** * Our peripheral class, this is the class where we will register functions for our block. */ -public class CCPeripheral implements IPeripheral { +public class DigitalInterfacePeripheral implements IPeripheral { private final List connectedComputers = new ArrayList<>(); // List of computers connected to the peripheral - private final CCTileEntity tileEntity; // Peripheral's BlockEntity, used for accessing coordinates + private final DigitalInterfaceTileEntity tileEntity; // Peripheral's BlockEntity, used for accessing coordinates /** * @param tileEntity the tile entity of this peripheral */ - public CCPeripheral(CCTileEntity tileEntity) { + public DigitalInterfacePeripheral(DigitalInterfaceTileEntity tileEntity) { this.tileEntity = tileEntity; } @@ -63,7 +61,7 @@ public class CCPeripheral implements IPeripheral { @Override public void attach(@Nonnull IComputerAccess computer) { connectedComputers.add(computer); } - public CCTileEntity getTileEntity() { + public DigitalInterfaceTileEntity getTileEntity() { return tileEntity; } diff --git a/src/main/java/de/srendi/cctutorial/cctutorial/CCTileEntity.java b/src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfaceTileEntity.java similarity index 83% rename from src/main/java/de/srendi/cctutorial/cctutorial/CCTileEntity.java rename to src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfaceTileEntity.java index 95bf197..43b67cb 100644 --- a/src/main/java/de/srendi/cctutorial/cctutorial/CCTileEntity.java +++ b/src/main/java/su/a71/tardim_ic/tardim_ic/DigitalInterfaceTileEntity.java @@ -1,4 +1,4 @@ -package de.srendi.cctutorial.cctutorial; +package su.a71.tardim_ic.tardim_ic; import dan200.computercraft.api.peripheral.IPeripheral; import net.minecraft.core.BlockPos; @@ -11,16 +11,16 @@ import org.jetbrains.annotations.NotNull; import static dan200.computercraft.shared.Capabilities.CAPABILITY_PERIPHERAL; -public class CCTileEntity extends BlockEntity { +public class DigitalInterfaceTileEntity extends BlockEntity { - public CCTileEntity(BlockPos pos, BlockState state) { + public DigitalInterfaceTileEntity(BlockPos pos, BlockState state) { super(Registration.CC_TILEENTITY.get(), pos, state); } /** * Our peripheral, we create a new peripheral for each new tile entity */ - protected CCPeripheral peripheral = new CCPeripheral(this); + protected DigitalInterfacePeripheral peripheral = new DigitalInterfacePeripheral(this); private LazyOptional peripheralCap; public BlockPos getPos() { return this.worldPosition; diff --git a/src/main/java/de/srendi/cctutorial/cctutorial/Registration.java b/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java similarity index 75% rename from src/main/java/de/srendi/cctutorial/cctutorial/Registration.java rename to src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java index d323c89..791ae93 100644 --- a/src/main/java/de/srendi/cctutorial/cctutorial/Registration.java +++ b/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java @@ -1,4 +1,4 @@ -package de.srendi.cctutorial.cctutorial; +package su.a71.tardim_ic.tardim_ic; import com.google.common.collect.Sets; import net.minecraft.world.item.BlockItem; @@ -16,12 +16,12 @@ import java.util.function.Supplier; public class Registration { - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, CCtutorial.MODID); - public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, CCtutorial.MODID); - public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, CCtutorial.MODID); + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, TardimInControl.MODID); + 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); // Blocks - public static final RegistryObject CC_BLOCK = register("digital_tardim_interface", CCBlock::new); + public static final RegistryObject CC_BLOCK = register("digital_tardim_interface", DigitalInterfaceBlock::new); private static RegistryObject register(String name, Supplier block) { RegistryObject registryObject = BLOCKS.register(name, block); @@ -30,7 +30,7 @@ public class Registration { } // Tile Entities - public static final RegistryObject> CC_TILEENTITY = Registration.BLOCK_ENTITIES.register("digital_tardim_interface", () -> new BlockEntityType<>(CCTileEntity::new, Sets.newHashSet(CC_BLOCK.get()), null)); + public static final RegistryObject> CC_TILEENTITY = Registration.BLOCK_ENTITIES.register("digital_tardim_interface", () -> new BlockEntityType<>(DigitalInterfaceTileEntity::new, Sets.newHashSet(CC_BLOCK.get()), null)); // Register our stuff public static void register() { diff --git a/src/main/java/de/srendi/cctutorial/cctutorial/CCtutorial.java b/src/main/java/su/a71/tardim_ic/tardim_ic/TardimInControl.java similarity index 70% rename from src/main/java/de/srendi/cctutorial/cctutorial/CCtutorial.java rename to src/main/java/su/a71/tardim_ic/tardim_ic/TardimInControl.java index c8854b0..f031696 100644 --- a/src/main/java/de/srendi/cctutorial/cctutorial/CCtutorial.java +++ b/src/main/java/su/a71/tardim_ic/tardim_ic/TardimInControl.java @@ -1,16 +1,16 @@ -package de.srendi.cctutorial.cctutorial; +package su.a71.tardim_ic.tardim_ic; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; // The value here should match an entry in the META-INF/mods.toml file -@Mod("cctutorial") -public class CCtutorial { +@Mod("tardim_ic") +public class TardimInControl { // Our mod id - public static final String MODID = "cctutorial"; + public static final String MODID = "tardim_ic"; - public CCtutorial() { + 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/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index c4ef532..bddd714 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -4,13 +4,13 @@ loaderVersion = "[36,)" #mandatory This is typically bumped every Minecraft vers license = "All rights reserved" [[mods]] #mandatory # The modid of the mod -modId = "cctutorial" #mandatory +modId = "tardim_ic" #mandatory version = "1.0" #mandatory # A display name for the mod -displayName = "CCtutorial" #mandatory +displayName = "TARDIM: In Control" #mandatory # The description text for the mod (multi line!) (#mandatory) description = ''' - A mod to show you, how the magic of cc works. + All of time and space, now automated. Control your TARDIM using ComputerCraft: Tweaked. ''' # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. [[dependencies.cctutorial]] #optional diff --git a/src/main/resources/assets/cctutorial/blockstates/digital_tardim_interface.json b/src/main/resources/assets/cctutorial/blockstates/digital_tardim_interface.json deleted file mode 100644 index c8dc74e..0000000 --- a/src/main/resources/assets/cctutorial/blockstates/digital_tardim_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "cctutorial:block/digital_tardim_interface" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/cctutorial/lang/en_uk.json b/src/main/resources/assets/cctutorial/lang/en_uk.json deleted file mode 100644 index 9dd28c0..0000000 --- a/src/main/resources/assets/cctutorial/lang/en_uk.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "block.cctutorial.digital_tardim_interface": "Digital TARDIM Interface" -} \ No newline at end of file diff --git a/src/main/resources/assets/cctutorial/lang/en_us.json b/src/main/resources/assets/cctutorial/lang/en_us.json deleted file mode 100644 index 9dd28c0..0000000 --- a/src/main/resources/assets/cctutorial/lang/en_us.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "block.cctutorial.digital_tardim_interface": "Digital TARDIM Interface" -} \ No newline at end of file diff --git a/src/main/resources/assets/cctutorial/lang/rpr.json b/src/main/resources/assets/cctutorial/lang/rpr.json deleted file mode 100644 index ceea164..0000000 --- a/src/main/resources/assets/cctutorial/lang/rpr.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "block.cctutorial.digital_tardim_interface": "Циферный Интерфейсъ Хрономашины" -} \ No newline at end of file diff --git a/src/main/resources/assets/cctutorial/models/item/digital_tardim_interface.json b/src/main/resources/assets/cctutorial/models/item/digital_tardim_interface.json deleted file mode 100644 index 4a0226c..0000000 --- a/src/main/resources/assets/cctutorial/models/item/digital_tardim_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "cctutorial:block/digital_tardim_interface" -} \ No newline at end of file diff --git a/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json b/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json new file mode 100644 index 0000000..e396b0d --- /dev/null +++ b/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tardim_ic:block/digital_tardim_interface" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tardim_ic/lang/en_uk.json b/src/main/resources/assets/tardim_ic/lang/en_uk.json new file mode 100644 index 0000000..18e60e2 --- /dev/null +++ b/src/main/resources/assets/tardim_ic/lang/en_uk.json @@ -0,0 +1,3 @@ +{ + "block.tardim_ic.digital_tardim_interface": "Digital TARDIM Interface" +} \ 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 new file mode 100644 index 0000000..18e60e2 --- /dev/null +++ b/src/main/resources/assets/tardim_ic/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "block.tardim_ic.digital_tardim_interface": "Digital TARDIM Interface" +} \ 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 new file mode 100644 index 0000000..1b5f525 --- /dev/null +++ b/src/main/resources/assets/tardim_ic/lang/rpr.json @@ -0,0 +1,3 @@ +{ + "block.tardim_ic.digital_tardim_interface": "Циферный Интерфейсъ Хронобудки" +} \ No newline at end of file diff --git a/src/main/resources/assets/cctutorial/models/block/digital_tardim_interface.json b/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json similarity index 99% rename from src/main/resources/assets/cctutorial/models/block/digital_tardim_interface.json rename to src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json index b1e9ef0..68e78fa 100644 --- a/src/main/resources/assets/cctutorial/models/block/digital_tardim_interface.json +++ b/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json @@ -3,7 +3,7 @@ "parent": "digital_tardim_interface", "texture_size": [64, 64], "textures": { - "1": "cctutorial:blocks/digital_tardim_interface" + "1": "tardim_ic:blocks/digital_tardim_interface" }, "elements": [ { diff --git a/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json b/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json new file mode 100644 index 0000000..17a58c0 --- /dev/null +++ b/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json @@ -0,0 +1,3 @@ +{ + "parent": "tardim_ic:block/digital_tardim_interface" +} \ No newline at end of file diff --git a/src/main/resources/assets/cctutorial/textures/blocks/digital_tardim_interface.png b/src/main/resources/assets/tardim_ic/textures/blocks/digital_tardim_interface.png similarity index 100% rename from src/main/resources/assets/cctutorial/textures/blocks/digital_tardim_interface.png rename to src/main/resources/assets/tardim_ic/textures/blocks/digital_tardim_interface.png diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 8a4c6f7..20f2fe7 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "description": "cctutorial resources", + "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." }