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

Minor tweaks

Browse source
This commit is contained in:
Andrew-71 2023-06-26 21:29:21 +03:00
parent 475e6c2437
commit b84144d3aa
18 changed files with 50 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Common/src/main/java/su/a71/tardim_ic/tardim_ic/Constants.java
View file

@ -7,14 +7,12 @@ import org.slf4j.LoggerFactory;
public class Constants {
public static final String MOD_ID;
public static final String MOD_NAME;
public static final String MOD_ID = "tardim_ic";
public static final String MOD_NAME = "TARDIM: In Control";
public static final Logger LOG;
public static final Gson GSON;
static {
MOD_ID = "tardim_ic";
MOD_NAME = "TARDIM: In Control";
LOG = LoggerFactory.getLogger(MOD_NAME);
GSON = (new GsonBuilder()).setPrettyPrinting().create();
}

2
Fabric/build.gradle
View file

@ -27,7 +27,7 @@ dependencies {
modCompileOnly "curse.maven:cc-restitched-462672:3908334"
// Create!
modCompileOnly "curse.maven:create-fabric-624165:4537370"
modCompileOnly "curse.maven:create-fabric-624165:4597892"
}
loom {

5
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/blocks/roundels/roundels.txt
View file

@ -1,4 +1 @@
"Base:"
* Quartz
* Deepslate
* Stone?
Do we need more roundels?

3
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/create_compat/display_source/cartridge_loader/temp_ideas.txt Normal file
View file

@ -0,0 +1,3 @@
Display sources for the cartridge loader
* Inserted X/Y/Z/Dimension

5
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/create_compat/display_source/dock/temp_ideas.txt Normal file
View file

@ -0,0 +1,5 @@
Display sources for the docking station:
* Owner of docked TARDIM
* Lock status
* Docked TARDIM's companion list

7
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/create_compat/display_source/fuel_storage/FuelLevelDisplaySource.java
View file

@ -1,7 +1,8 @@
package su.a71.tardim_ic.tardim_ic.create_compat.display_source.fuel_storage;
import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
import com.simibubi.create.content.logistics.block.display.source.PercentOrProgressBarDisplaySource;
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;
@ -22,7 +23,7 @@ public class FuelLevelDisplaySource extends PercentOrProgressBarDisplaySource {
if (context.level() != context.level().getServer().getLevel(TRDDimensions.TARDIS)) {
return null;
}
BlockEntity te = context.getSourceTE();
BlockEntity te = context.getSourceBlockEntity();
if (!(te instanceof TileEntityFuelStorage fuelStorage))
return null;
TardimData data = TardimManager.getFromPos(fuelStorage.getBlockPos());

8
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/create_compat/display_source/fuel_storage/RequiredFuelDisplaySource.java
View file

@ -1,8 +1,8 @@
package su.a71.tardim_ic.tardim_ic.create_compat.display_source.fuel_storage;
import com.simibubi.create.content.logistics.block.display.DisplayLinkContext;
import com.simibubi.create.content.logistics.block.display.source.NumericSingleLineDisplaySource;
import com.simibubi.create.content.logistics.block.display.target.DisplayTargetStats;
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;
@ -19,7 +19,7 @@ public class RequiredFuelDisplaySource extends NumericSingleLineDisplaySource {
protected MutableComponent provideLine(DisplayLinkContext displayLinkContext, DisplayTargetStats displayTargetStats) {
if (displayLinkContext.level() != displayLinkContext.level().getServer().getLevel(TRDDimensions.TARDIS))
return null;
BlockEntity te = displayLinkContext.getSourceTE();
BlockEntity te = displayLinkContext.getSourceBlockEntity();
if (!(te instanceof TileEntityFuelStorage fuelStorage))
return null;
TardimData data = TardimManager.getFromPos(fuelStorage.getBlockPos());

5
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/create_compat/display_source/scanner/temp_ideas.txt Normal file
View file

@ -0,0 +1,5 @@
Display sources for the scanner:
* Owner name
* Companion list
* Get current TARDIM skin

5
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/create_compat/display_source/time_rotor/temp_ideas.txt Normal file
View file

@ -0,0 +1,5 @@
Display sources for the time rotor:
* Both current and destination - X/Y/Z/Dimension
* Flight status YES/NO
*

1
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/ComputerCraftCompat.java
View file

@ -27,6 +27,7 @@ public class ComputerCraftCompat {
public static void register() {
Constants.LOG.info("Loaded ComputerCraft compatibility!");
Registry.register(Registry.BLOCK, new ResourceLocation(Constants.MOD_ID, "digital_tardim_interface"), DIGITAL_TARDIM_INTERFACE);
Registry.register(Registry.ITEM, new ResourceLocation(Constants.MOD_ID, "digital_tardim_interface"), new BlockItem(DIGITAL_TARDIM_INTERFACE, new FabricItemSettings().tab(Registration.TARDIM_IC_TAB)));

9
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/CreateCompat.java
View file

@ -1,6 +1,7 @@
package su.a71.tardim_ic.tardim_ic.registration;
import com.simibubi.create.content.logistics.block.display.AllDisplayBehaviours;
import com.simibubi.create.content.redstone.displayLink.AllDisplayBehaviours;
import net.minecraft.resources.ResourceLocation;
import su.a71.tardim_ic.tardim_ic.Constants;
import su.a71.tardim_ic.tardim_ic.create_compat.display_source.fuel_storage.FuelLevelDisplaySource;
@ -12,10 +13,8 @@ public class CreateCompat {
public static void register() {
Constants.LOG.info("Loaded Create compatibility!");
// Registry.register(Registry.BLOCK, new ResourceLocation(Constants.MOD_ID, "digital_tardim_interface"), DIGITAL_TARDIM_INTERFACE);
// Registry.register(Registry.ITEM, new ResourceLocation(Constants.MOD_ID, "digital_tardim_interface"), new BlockItem(DIGITAL_TARDIM_INTERFACE, new FabricItemSettings().tab(Registration.TARDIM_IC_TAB)));
AllDisplayBehaviours.assignTile(AllDisplayBehaviours.register(new ResourceLocation(Constants.MOD_ID, "fuel_storage_display_source"), new FuelLevelDisplaySource()), TILE_FUEL_STORAGE);
AllDisplayBehaviours.assignTile(AllDisplayBehaviours.register(new ResourceLocation(Constants.MOD_ID, "fuel_required_display_source"), new RequiredFuelDisplaySource()), TILE_FUEL_STORAGE);
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);
}
}

1
Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Exteriors.java
View file

@ -52,6 +52,5 @@ public class Exteriors {
DOOR_SOVIET_CHRONOBOX = Registry.register(Registry.BLOCK, new ResourceLocation(Constants.MOD_ID, "tardim_door_soviet"), new BlockTardimDoors(FabricBlockSettings.of(Material.WOOD).sounds(SoundType.WOOD).strength(-1.0F, 3600000.0F).noLootTable().noOcclusion()));
ROOF_SOVIET_CHRONOBOX = Registry.register(Registry.BLOCK, new ResourceLocation(Constants.MOD_ID, "tardim_roof_soviet"), new BlockTardimRoof(FabricBlockSettings.of(Material.WOOD).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);
}
}

3
Fabric/src/main/resources/fabric.mod.json
View file

@ -34,7 +34,8 @@
},
"suggests": {
"computercraft": ">=1.101.0"
"computercraft": ">=1.101.0",
"create": ">=0.5.1"
}
}

10
Forge/src/main/java/su/a71/tardim_ic/tardim_ic/Registration.java
View file

@ -26,10 +26,10 @@ import java.util.function.Supplier;
public class Registration {
public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, TardimInControl.MODID);
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, TardimInControl.MODID);
public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, TardimInControl.MODID);
public static final DeferredRegister<SoundEvent> SOUNDS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, TardimInControl.MODID);
public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, Constants.MOD_ID);
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Constants.MOD_ID);
public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, Constants.MOD_ID);
public static final DeferredRegister<SoundEvent> SOUNDS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, Constants.MOD_ID);
public static final CreativeModeTab TARDIM_IC_TAB = new CreativeModeTab("tardim_ic") {
@Override
@ -52,7 +52,7 @@ public class Registration {
public static final RegistryObject<BlockEntityType<RedstoneInputTileEntity>> REDSTONE_TARDIM_INPUT_TILEENTITY = Registration.BLOCK_ENTITIES.register("redstone_tardim_input", () -> new BlockEntityType<>(RedstoneInputTileEntity::new, Sets.newHashSet(REDSTONE_TARDIM_INPUT.get()), null));
// Cloister bell
public static final RegistryObject<SoundEvent> CLOISTER_SOUND = SOUNDS.register("cloister", () -> new SoundEvent(new ResourceLocation(TardimInControl.MODID, "cloister")));
public static final RegistryObject<SoundEvent> CLOISTER_SOUND = SOUNDS.register("cloister", () -> new SoundEvent(new ResourceLocation(Constants.MOD_ID, "cloister")));
// Register our stuff
public static void register() {

3
Forge/src/main/java/su/a71/tardim_ic/tardim_ic/TardimInControl.java
View file

@ -10,9 +10,6 @@ import com.swdteam.tardim.TardimSaveHandler;
@Mod(Constants.MOD_ID)
public class TardimInControl {
// Our mod id
public static final String MODID = Constants.MOD_ID;
public TardimInControl() {
Registration.register();

8
README.md
View file

@ -3,7 +3,7 @@
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) computers or [Create](https://github.com/Creators-of-Create/Create)
and even other mods like [ComputerCraft: Tweaked](https://tweaked.cc) or [Create](https://github.com/Creators-of-Create/Create)
### Features:
TODO: Re-make this for 1.2
@ -27,13 +27,13 @@ The possibilities are endless, the only limit is your imagination!
: Sure, as long as you don't claim the mod as your own. A link to this mod's page would be appreciated too.
**Will there be a 1.20 version and beyond?**
: Right now my focus on 1.19.2, but I will try my best to move to later versions as soon as this mod is fully stable,
: As of v1.2 my focus on 1.19.2, but I will try my best to move to later versions as soon as this mod is fully stable,
and dependencies are out. The intention is to follow latest versions.
**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 ComputerCraft or Create for this mod?**
**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!
If you ever decide to add other optional dependencies, the relevant blocks will become available and craftable!

3
SWD_MOMENT.txt
View file

@ -7,9 +7,10 @@
public ResourceLocation getFabricId() {
return new ResourceLocation("tutorial", "tardim_dimension_lookup");
}
5.1 Forge's MANIFEST.MF too!
6. Panel buttons might still be broken on 1.2.2 1.19.2
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

3
TODO.txt
View file

@ -68,7 +68,6 @@ Blocks:
Redstone TARDIM Interface - add powered blockstate
(TARDIM) Fuel Storage - add comparator output based on fuel (0 - 9 I think)
(TARDIM) Time Rotor - add comparator/redstone output when in flight
Code:
Add config&datapack support (e.g. disable compat, more food machine food, only getters from digital interface)
Make 1WTC fix package names on forge and further improve multi-loader structure
@ -80,6 +79,8 @@ Outside appearance:
Update README and Modrinth/Curse pages
Look into re-licensing and/or making proper public facing source code
Improve Discord server
Improve/Change icon
Make background image for modrinth
LOOK INTO ==============
Things to overall re-search