Skip to content

Commit

Permalink
Implement a proper relay ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@DonovanDMC
DonovanDMC committed Mar 29, 2024
1 parent a2da1c1 commit 105179e
Show file tree
Hide file tree
Showing 33 changed files with 1,679 additions and 294 deletions.
8 changes: 7 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ repositories {
includeGroup 'top.theillusivec4.curios'
}
}
maven {
name = "Jared's maven"
url = "https://maven.blamejared.com/"
}
}

dependencies {
Expand All @@ -101,7 +105,9 @@ dependencies {
compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${getProperty("curiosVersion")}:api")
runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${getProperty("curiosVersion")}")
runtimeOnly fg.deobf("curse.maven:no-chat-reports-634062:${getProperty("ncrVersion")}")
runtimeOnly fg.deobf("curse.maven:jei-238222:${getProperty("jeiVersion")}")
compileOnly fg.deobf("mezz.jei:jei-${getProperty("mcVersion")}-common-api:${getProperty("jeiVersion")}")
compileOnly fg.deobf("mezz.jei:jei-${getProperty("mcVersion")}-forge-api:${getProperty("jeiVersion")}")
runtimeOnly fg.deobf("mezz.jei:jei-${getProperty("mcVersion")}-forge:${getProperty("jeiVersion")}")
runtimeOnly fg.deobf("curse.maven:pipez-443900:${getProperty("pipezVersion")}")
runtimeOnly fg.deobf("curse.maven:ae2-223794:${getProperty("ae2Version")}")
runtimeOnly fg.deobf("curse.maven:itank-256991:${getProperty("itankVersion")}")
Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ projecteVersion = 4860858
curiosVersion = 1.19.2-5.1.1.0
# 1.19.2-v1.5.1
ncrVersion = 4082456
# 11.4.0.285
jeiVersion = 4068188
jeiVersion = 11.4.0.285
# 1.19.2-1.0.1
pipezVersion = 4064952
# 12.9.2
Expand Down
156 changes: 4 additions & 152 deletions src/generated/resources/assets/projectexpansion/lang/en_us.json
View file
Original file line number Diff line number Diff line change
@@ -1,156 +1,4 @@
{
"advancements.projecte.alchemical_coal": "Alchemical Coal",
"advancements.projecte.alchemical_coal.description": "Obtain alchemical coal.",
"advancements.projecte.alchemical_coal_block": "Alchemical Coal Block",
"advancements.projecte.alchemical_coal_block.description": "Obtain an alchemical coal block.",
"advancements.projecte.mobius_fuel": "Mobius Fuel",
"advancements.projecte.mobius_fuel.description": "Obtain mobius fuel.",
"advancements.projecte.mobius_fuel_block": "Mobius Fuel Block",
"advancements.projecte.mobius_fuel_block.description": "Obtain a mobius fuel block.",
"advancements.projecte.aeternalis_fuel": "Aeternalis Fuel",
"advancements.projecte.aeternalis_fuel.description": "Obtain aeternalis fuel.",
"advancements.projecte.aeternalis_fuel_block": "Aeternalis Fuel Block",
"advancements.projecte.aeternalis_fuel_block.description": "Obtain an aeternalis fuel block.",
"advancements.projecte.tome": "Tome of Knowledge",
"advancements.projecte.tome.description": "The entire universe at your fingertips.",
"advancements.projectexpansion.magenta_matter": "Magenta Matter",
"advancements.projectexpansion.magenta_matter.description": "Obtain magenta matter.",
"advancements.projectexpansion.magenta_matter_block": "Magenta Matter Block",
"advancements.projectexpansion.magenta_matter_block.description": "Obtain a magenta matter block.",
"advancements.projectexpansion.pink_matter": "Pink Matter",
"advancements.projectexpansion.pink_matter.description": "Obtain pink matter.",
"advancements.projectexpansion.pink_matter_block": "Pink Matter Block",
"advancements.projectexpansion.pink_matter_block.description": "Obtain a pink matter block.",
"advancements.projectexpansion.purple_matter": "Purple Matter",
"advancements.projectexpansion.purple_matter.description": "Obtain purple matter.",
"advancements.projectexpansion.purple_matter_block": "Purple Matter Block",
"advancements.projectexpansion.purple_matter_block.description": "Obtain a purple matter block.",
"advancements.projectexpansion.violet_matter": "Violet Matter",
"advancements.projectexpansion.violet_matter.description": "Obtain violet matter.",
"advancements.projectexpansion.violet_matter_block": "Violet Matter Block",
"advancements.projectexpansion.violet_matter_block.description": "Obtain a violet matter block.",
"advancements.projectexpansion.blue_matter": "Blue Matter",
"advancements.projectexpansion.blue_matter.description": "Obtain blue matter.",
"advancements.projectexpansion.blue_matter_block": "Blue Matter Block",
"advancements.projectexpansion.blue_matter_block.description": "Obtain a blue matter block.",
"advancements.projectexpansion.cyan_matter": "Cyan Matter",
"advancements.projectexpansion.cyan_matter.description": "Obtain cyan matter.",
"advancements.projectexpansion.cyan_matter_block": "Cyan Matter Block",
"advancements.projectexpansion.cyan_matter_block.description": "Obtain a cyan matter block.",
"advancements.projectexpansion.green_matter": "Green Matter",
"advancements.projectexpansion.green_matter.description": "Obtain green matter.",
"advancements.projectexpansion.green_matter_block": "Green Matter Block",
"advancements.projectexpansion.green_matter_block.description": "Obtain a green matter block.",
"advancements.projectexpansion.lime_matter": "Lime Matter",
"advancements.projectexpansion.lime_matter.description": "Obtain lime matter.",
"advancements.projectexpansion.lime_matter_block": "Lime Matter Block",
"advancements.projectexpansion.lime_matter_block.description": "Obtain a lime matter block.",
"advancements.projectexpansion.yellow_matter": "Yellow Matter",
"advancements.projectexpansion.yellow_matter.description": "Obtain yellow matter.",
"advancements.projectexpansion.yellow_matter_block": "Yellow Matter Block",
"advancements.projectexpansion.yellow_matter_block.description": "Obtain a yellow matter block.",
"advancements.projectexpansion.orange_matter": "Orange Matter",
"advancements.projectexpansion.orange_matter.description": "Obtain orange matter.",
"advancements.projectexpansion.orange_matter_block": "Orange Matter Block",
"advancements.projectexpansion.orange_matter_block.description": "Obtain an orange matter block.",
"advancements.projectexpansion.white_matter": "White Matter",
"advancements.projectexpansion.white_matter.description": "Obtain white matter.",
"advancements.projectexpansion.white_matter_block": "White Matter Block",
"advancements.projectexpansion.white_matter_block.description": "Obtain a white matter block.",
"advancements.projectexpansion.fading_matter": "Fading Matter",
"advancements.projectexpansion.fading_matter.description": "Obtain fading matter.",
"advancements.projectexpansion.fading_matter_block": "Fading Matter Block",
"advancements.projectexpansion.fading_matter_block.description": "Obtain a fading matter block.",
"advancements.projectexpansion.advanced_alchemical_chest": "Take it, and push it somewhere else!",
"advancements.projectexpansion.advanced_alchemical_chest.description": "An even better upgrade??",
"advancements.projectexpansion.magenta_fuel": "Magenta Fuel",
"advancements.projectexpansion.magenta_fuel.description": "Obtain magenta fuel.",
"advancements.projectexpansion.magenta_fuel_block": "Magenta Fuel Block",
"advancements.projectexpansion.magenta_fuel_block.description": "Obtain a magenta fuel block.",
"advancements.projectexpansion.pink_fuel": "Pink Fuel",
"advancements.projectexpansion.pink_fuel.description": "Obtain pink fuel.",
"advancements.projectexpansion.pink_fuel_block": "Pink Fuel Block",
"advancements.projectexpansion.pink_fuel_block.description": "Obtain a pink fuel block.",
"advancements.projectexpansion.purple_fuel": "Purple Fuel",
"advancements.projectexpansion.purple_fuel.description": "Obtain purple fuel.",
"advancements.projectexpansion.purple_fuel_block": "Purple Fuel Block",
"advancements.projectexpansion.purple_fuel_block.description": "Obtain a purple fuel block.",
"advancements.projectexpansion.violet_fuel": "Violet Fuel",
"advancements.projectexpansion.violet_fuel.description": "Obtain violet fuel.",
"advancements.projectexpansion.violet_fuel_block": "Violet Fuel Block",
"advancements.projectexpansion.violet_fuel_block.description": "Obtain a violet fuel block.",
"advancements.projectexpansion.blue_fuel": "Blue Fuel",
"advancements.projectexpansion.blue_fuel.description": "Obtain blue fuel.",
"advancements.projectexpansion.blue_fuel_block": "Blue Fuel Block",
"advancements.projectexpansion.blue_fuel_block.description": "Obtain a blue fuel block.",
"advancements.projectexpansion.cyan_fuel": "Cyan Fuel",
"advancements.projectexpansion.cyan_fuel.description": "Obtain cyan fuel.",
"advancements.projectexpansion.cyan_fuel_block": "Cyan Fuel Block",
"advancements.projectexpansion.cyan_fuel_block.description": "Obtain a cyan fuel block.",
"advancements.projectexpansion.green_fuel": "Green Fuel",
"advancements.projectexpansion.green_fuel.description": "Obtain green fuel.",
"advancements.projectexpansion.green_fuel_block": "Green Fuel Block",
"advancements.projectexpansion.green_fuel_block.description": "Obtain a green fuel block.",
"advancements.projectexpansion.lime_fuel": "Lime Fuel",
"advancements.projectexpansion.lime_fuel.description": "Obtain lime fuel.",
"advancements.projectexpansion.lime_fuel_block": "Lime Fuel Block",
"advancements.projectexpansion.lime_fuel_block.description": "Obtain a lime fuel block.",
"advancements.projectexpansion.orange_fuel": "Orange Fuel",
"advancements.projectexpansion.orange_fuel.description": "Obtain orange fuel.",
"advancements.projectexpansion.orange_fuel_block": "Orange Fuel Block",
"advancements.projectexpansion.orange_fuel_block.description": "Obtain a orange fuel block.",
"advancements.projectexpansion.white_fuel": "White Fuel",
"advancements.projectexpansion.white_fuel.description": "Obtain white fuel.",
"advancements.projectexpansion.white_fuel_block": "White Fuel Block",
"advancements.projectexpansion.white_fuel_block.description": "Obtain a white fuel block.",
"advancements.projectexpansion.fading_fuel": "Fading Fuel",
"advancements.projectexpansion.fading_fuel.description": "Obtain fading fuel.",
"advancements.projectexpansion.fading_fuel_block": "Fading Fuel Block",
"advancements.projectexpansion.fading_fuel_block.description": "Obtain a fading fuel block.",
"advancements.projectexpansion.magnum_star_omega": "Even bigger EMC batteries??",
"advancements.projectexpansion.magnum_star_omega.description": "No one person should have this much power.",
"advancements.projectexpansion.colossal_star_omega": "Why do you even need this much EMC?",
"advancements.projectexpansion.colossal_star_omega.description": "This is getting ridiculous.",
"advancements.projectexpansion.final_star_shard": "You've played this game too much",
"advancements.projectexpansion.final_star_shard.description": "Seriously, go outside.",
"advancements.projectexpansion.transmutation_interface": "Transmutation in your computers??",
"advancements.projectexpansion.transmutation_interface.description": "They just got even better.",
"advancements.projectexpansion.infinite_steak": "Unlimited Steak!!1!11!!!",
"advancements.projectexpansion.infinite_steak.description": "Bread? That's for peasants.",
"advancements.projectexpansion.infinite_fuel": "Is it a star?",
"advancements.projectexpansion.infinite_fuel.description": "Is it a cross? Who cares, chuck it in a furnace and watch it work.",
"advancements.projectexpansion.collector": "Even more sun power",
"advancements.projectexpansion.collector.description": "Now the ridiculousness begins.",
"advancements.projectexpansion.compressed_collector": "Hey look, I took some collectors and made them useless!",
"advancements.projectexpansion.compressed_collector.description": "Useless until they're crafted into something else.",
"advancements.projectexpansion.final_collector": "Final Collector",
"advancements.projectexpansion.final_collector.description": "Do you even need this much EMC?",
"advancements.projectexpansion.final_compressed_collector": "Final Compressed Collector",
"advancements.projectexpansion.final_compressed_collector.description": "The universe just might implode.",
"advancements.projectexpansion.relay": "The first step to the REAL power flower.",
"advancements.projectexpansion.relay.description": "It's a long way to the top.",
"advancements.projectexpansion.final_relay": "Final Relay",
"advancements.projectexpansion.final_relay.description": "No really, do you need this much EMC?",
"advancements.projectexpansion.power_flower": "The REAL Power Flower",
"advancements.projectexpansion.power_flower.description": "Now you're cooking with gas.",
"advancements.projectexpansion.final_power_flower": "Final Power Flower",
"advancements.projectexpansion.final_power_flower.description": "Go touch some grass, please.",
"advancements.projectexpansion.emc_link": "Wait, you can do that?",
"advancements.projectexpansion.emc_link.description": "Condensers be damned.",
"advancements.projectexpansion.final_emc_link": "Final EMC Link",
"advancements.projectexpansion.final_emc_link.description": "Go emc some water for me.",
"advancements.projectexpansion.final_star": "Final Star",
"advancements.projectexpansion.final_star.description": "You're done. Go outside.",
"advancements.projectexpansion.basic_alchemical_book": "Alchemical Teleportation",
"advancements.projectexpansion.basic_alchemical_book.description": "Obtain a basic alchemical book.",
"advancements.projectexpansion.advanced_alchemical_book": "Advanced Alchemical Book",
"advancements.projectexpansion.advanced_alchemical_book.description": "Obtain an advanced alchemical book.",
"advancements.projectexpansion.master_alchemical_book": "Master Alchemical Book",
"advancements.projectexpansion.master_alchemical_book.description": "Obtain a master alchemical book.",
"advancements.projectexpansion.arcane_alchemical_book": "Arcane Alchemical Book",
"advancements.projectexpansion.arcane_alchemical_book.description": "Obtain an arcane alchemical book.",
"advancements.projectexpansion.knowledge_sharing_book": "Sharing is caring!",
"advancements.projectexpansion.knowledge_sharing_book.description": "But I don't care.",
"block.projectexpansion.advanced_alchemical_chest.color_set": "The color has been set to %s.",
"block.projectexpansion.advanced_alchemical_chest.invalid_item": "You must be holding a %s to set the color.",
"block.projectexpansion.advanced_alchemical_chest.color": "Current Color: %s",
Expand All @@ -171,9 +19,11 @@
"block.projectexpansion.green_advanced_alchemical_chest": "Green Advanced Alchemical Chest",
"block.projectexpansion.red_advanced_alchemical_chest": "Red Advanced Alchemical Chest",
"block.projectexpansion.black_advanced_alchemical_chest": "Black Advanced Alchemical Chest",
"block.projectexpansion.collector": "Collector.",
"block.projectexpansion.collector.tooltip": "Generates EMC once per second.",
"block.projectexpansion.collector.emc": "Produced EMC: %s/s",
"block.projectexpansion.collector.stack_emc": "Stack Produced EMC: %s/s",
"block.projectexpansion.collector.max_storage": "Maximum Stored EMC: %s",
"block.projectexpansion.basic_collector": "Basic Collector [MK 1]",
"block.projectexpansion.dark_collector": "Dark Collector [MK 2]",
"block.projectexpansion.red_collector": "Red Collector [MK 3]",
Expand Down Expand Up @@ -397,6 +247,8 @@
"gui.projectexpansion.config.alchemical_collection_sound.desc": "If a sound should be played when something is collected with Alchemical Collection.",
"gui.projectexpansion.config.zero_emc_fluids_are_free": "Zero EMC Fluids are Free",
"gui.projectexpansion.config.zero_emc_fluids_are_free.desc": "If fluids with an EMC value of 0 should be free.",
"gui.projectexpansion.config.enable_collector_optimizations": "Enable Collector Optimizations",
"gui.projectexpansion.config.enable_collector_optimizations.desc": "If optimizations (ticking only once per second) should be enabled for collectors. This will make them process at most one item each second.",
"gui.projectexpansion.advanced_alchemical_chest.title": "Advanced Alchemical Chest",
"gui.projectexpansion.alchemical_book": "Alchemical Chest",
"gui.projectexpansion.alchemical_book.close": "Close",
Expand Down
1 change: 1 addition & 0 deletions src/main/java/cool/furry/mc/forge/projectexpansion/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public ItemStack makeIcon() {
Enchantments.Registry.register(bus);
Items.Registry.register(bus);
SoundEvents.Registry.register(bus);
MenuTypes.Registry.register(bus);
MinecraftForge.EVENT_BUS.addListener(this::serverTick);
bus.addListener(this::registerCapabilities);
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.Spec, "project-expansion.toml");
Expand Down
26 changes: 23 additions & 3 deletions src/main/java/cool/furry/mc/forge/projectexpansion/block/BlockCollector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@
import cool.furry.mc.forge.projectexpansion.config.Config;
import cool.furry.mc.forge.projectexpansion.registries.BlockEntityTypes;
import cool.furry.mc.forge.projectexpansion.util.*;
import moze_intel.projecte.utils.WorldHelper;
import net.minecraft.ChatFormatting;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.BlockGetter;
Expand All @@ -20,10 +25,12 @@
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.network.NetworkHooks;
import org.jetbrains.annotations.NotNull;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.math.BigInteger;
import java.util.List;
Expand All @@ -43,9 +50,8 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new BlockEntityCollector(pos, state);
}

@Nonnull
@Override
public Matter getMatter() {
public @NotNull Matter getMatter() {
return matter;
}

Expand All @@ -58,6 +64,7 @@ public void appendHoverText(ItemStack stack, @Nullable BlockGetter level, List<C
if(stack.getCount() > 1) {
list.add(Lang.Blocks.COLLECTOR_STACK_EMC.translateColored(ChatFormatting.GRAY, EMCFormat.getComponent(getMatter().getCollectorOutputForTicks(Config.tickDelay.get()).multiply(BigInteger.valueOf(stack.getCount()))).setStyle(ColorStyle.GREEN)));
}
list.add(Lang.Blocks.COLLECTOR_MAX_STORAGE.translateColored(ChatFormatting.GRAY, EMCFormat.getComponent(Fuel.getCollectorEMCLimit(getMatter())).setStyle(ColorStyle.GREEN)));
list.add(Lang.SEE_WIKI.translateColored(ChatFormatting.AQUA));
}

Expand All @@ -78,4 +85,17 @@ public MaterialColor getMapColor(BlockState state, BlockGetter level, BlockPos p
MaterialColor color = matter.materialColor == null ? null : matter.materialColor.get();
return color != null ? color : super.getMapColor(state, level, pos, defaultColor);
}

@Override
public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
if (level.isClientSide) {
return InteractionResult.SUCCESS;
}

BlockEntityCollector collector = WorldHelper.getBlockEntity(BlockEntityCollector.class, level, pos);
if (collector != null) {
NetworkHooks.openScreen((ServerPlayer) player, collector, pos);
}
return InteractionResult.CONSUME;
}
}
5 changes: 2 additions & 3 deletions src/main/java/cool/furry/mc/forge/projectexpansion/block/BlockEMCLink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import net.minecraft.world.phys.BlockHitResult;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import org.jetbrains.annotations.NotNull;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;

Expand Down Expand Up @@ -78,9 +78,8 @@ public void setPlacedBy(Level level, BlockPos pos, BlockState state, @Nullable L
if (blockEntity instanceof BlockEntityEMCLink be) be.handlePlace(livingEntity, stack);
}

@Nonnull
@Override
public Matter getMatter() {
public @NotNull Matter getMatter() {
return matter;
}

Expand Down

0 comments on commit 105179e

Please sign in to comment.