Recipe Repair (#208)

Co-authored-by: Clayton T <[email protected]>
Co-authored-by: MagicMaan <[email protected]>

common/src/main/java/whocraft/tardis_refined/TardisRefined.java

@@ -9,7 +9,6 @@
 import org.slf4j.Logger;
 import whocraft.tardis_refined.client.TRParticles;
 import whocraft.tardis_refined.common.capability.upgrades.Upgrades;
-import whocraft.tardis_refined.common.crafting.ManipulatorCrafting;
 import whocraft.tardis_refined.common.hum.TardisHums;
 import whocraft.tardis_refined.common.network.TardisNetwork;
 import whocraft.tardis_refined.common.network.messages.sync.SyncConsolePatternsMessage;
@@ -21,7 +20,6 @@
 import whocraft.tardis_refined.common.tardis.themes.ShellTheme;
 import whocraft.tardis_refined.common.world.ChunkGenerators;
 import whocraft.tardis_refined.common.world.Features;
-import whocraft.tardis_refined.registry.ARSStructurePieceRegistry;
 import whocraft.tardis_refined.patterns.ConsolePatterns;
 import whocraft.tardis_refined.patterns.ShellPatterns;
 import whocraft.tardis_refined.registry.*;
@@ -72,7 +70,6 @@ public static void init() {
         TardisHums.registerDefaultHums();
 
         ARSStructurePieceRegistry.register();
-        ManipulatorCrafting.registerRecipes();
     }
 
 }

common/src/main/java/whocraft/tardis_refined/command/arguments/UpgradeArgumentType.java

@@ -13,9 +13,6 @@
 import net.minecraft.resources.ResourceLocation;
 import whocraft.tardis_refined.common.capability.upgrades.Upgrade;
 import whocraft.tardis_refined.common.capability.upgrades.Upgrades;
-import whocraft.tardis_refined.common.tardis.TardisDesktops;
-import whocraft.tardis_refined.common.tardis.themes.DesktopTheme;
-import whocraft.tardis_refined.common.tardis.themes.ShellTheme;
 import whocraft.tardis_refined.constants.ModMessages;
 
 import java.util.Collection;
@@ -28,6 +25,7 @@ public class UpgradeArgumentType implements ArgumentType<ResourceLocation> {
     private static final Collection<String> EXAMPLES = Stream.of(Upgrades.COORDINATE_INPUT).map((upgrade) -> {
         return upgrade != null ? upgrade.getId().toString() : "";
     }).collect(Collectors.toList());
+
     public static final DynamicCommandExceptionType INVALID_UPGRADE_EXCEPTION = new DynamicCommandExceptionType((upgrade) -> Component.translatable(ModMessages.CMD_ARG_UPGRADE_INVALID, upgrade));
 
     public static UpgradeArgumentType upgradeArgumentType() {
@@ -41,11 +39,13 @@ public ResourceLocation parse(StringReader reader) throws CommandSyntaxException
 
     @Override
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
+
         return SharedSuggestionProvider.suggestResource(Upgrades.UPGRADE_REGISTRY.keySet(), builder);
     }
 
     @Override
     public Collection<String> getExamples() {
+        EXAMPLES.add("*");
         return EXAMPLES;
     }
 

common/src/main/java/whocraft/tardis_refined/common/crafting/ManipulatorCrafting.java

@@ -2,7 +2,6 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.Blocks;
-import whocraft.tardis_refined.TardisRefined;
 import whocraft.tardis_refined.common.blockentity.device.ManipulatorCraftingRecipe;
 import whocraft.tardis_refined.common.blockentity.device.ManipulatorCraftingRecipeItem;
 import whocraft.tardis_refined.registry.BlockRegistry;
@@ -18,6 +17,8 @@ public class ManipulatorCrafting {
 
     public static void registerRecipes() {
 
+        MANIPULATOR_CRAFTING_RECIPES.clear();
+
         register(new ManipulatorCraftingRecipe(Arrays.asList(
                 new ManipulatorCraftingRecipeItem(new BlockPos(0, 0, 0), Blocks.SMOOTH_STONE_SLAB),
                 new ManipulatorCraftingRecipeItem(new BlockPos(0, 0, 1), BlockRegistry.ZEITON_FUSED_IRON_BLOCK.get()),

common/src/main/java/whocraft/tardis_refined/registry/ARSStructurePieceRegistry.java

@@ -13,10 +13,8 @@ public class ARSStructurePieceRegistry {
     public static List<ARSStructurePiece> ROOMS = new ArrayList<>();
 
     public static void register() {
-
         registerCorridors();
         registerRooms();
-
     }
 
     public static void registerCorridors() {

fabric/src/main/java/whocraft/tardis_refined/fabric/events/ModEvents.java

@@ -1,10 +1,9 @@
 package whocraft.tardis_refined.fabric.events;
 
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
+import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
-import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
 import net.minecraft.server.level.ServerLevel;
@@ -14,6 +13,7 @@
 import whocraft.tardis_refined.client.TardisClientData;
 import whocraft.tardis_refined.command.TardisRefinedCommand;
 import whocraft.tardis_refined.common.capability.TardisLevelOperator;
+import whocraft.tardis_refined.common.crafting.ManipulatorCrafting;
 import whocraft.tardis_refined.common.dimension.TardisTeleportData;
 import whocraft.tardis_refined.common.dimension.fabric.DimensionHandlerImpl;
 import whocraft.tardis_refined.common.util.MiscHelper;
@@ -36,8 +36,13 @@ public static void addCommonEvents() {
             }
         });
         ServerLifecycleEvents.SERVER_STARTED.register(server -> {
+
+            // Load Levels
             ServerLevel world = server.getLevel(Level.OVERWORLD);
             DimensionHandlerImpl.loadLevels(world);
+
+            //Register Recipes
+            ManipulatorCrafting.registerRecipes();
         });
 
         ServerLifecycleEvents.SERVER_STOPPING.register(server -> DimensionHandlerImpl.clear());

forge/src/main/java/whocraft/tardis_refined/common/capability/neoforge/TardisLevelOperatorImpl.java

@@ -59,7 +59,7 @@ public static void onLevelTick(TickEvent.LevelTickEvent event) {
     }
 
     public static Optional<TardisLevelOperator> get(ServerLevel level) {
-        if(level == null) {
+        if (level == null) {
             return Optional.empty();
         }
         return level.getCapability(TARDIS_DATA).resolve();

forge/src/main/java/whocraft/tardis_refined/common/data/BiomeModifierProvider.java

@@ -1,47 +1,21 @@
 package whocraft.tardis_refined.common.data;
 
-import com.google.common.collect.ImmutableList;
 import net.minecraft.core.HolderGetter;
 import net.minecraft.core.HolderSet;
-import net.minecraft.core.RegistrySetBuilder;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.data.DataGenerator;
-import net.minecraft.data.DataProvider;
 import net.minecraft.data.worldgen.BootstapContext;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BiomeTags;
-import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.levelgen.GenerationStep;
-import net.minecraft.world.level.levelgen.VerticalAnchor;
-import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
-import net.minecraft.world.level.levelgen.feature.Feature;
-import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
-import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
-import net.minecraft.world.level.levelgen.placement.HeightRangePlacement;
-import net.minecraft.world.level.levelgen.placement.InSquarePlacement;
 import net.minecraft.world.level.levelgen.placement.PlacedFeature;
-import net.minecraft.world.level.levelgen.placement.RarityFilter;
-import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
-import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
-import net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider;
 import net.neoforged.neoforge.common.world.BiomeModifier;
 import net.neoforged.neoforge.common.world.BiomeModifiers;
-import net.neoforged.neoforge.data.event.GatherDataEvent;
 import net.neoforged.neoforge.registries.NeoForgeRegistries;
 import whocraft.tardis_refined.TardisRefined;
-import whocraft.tardis_refined.common.world.Features;
-import whocraft.tardis_refined.common.world.feature.NbtTemplateFeature;
-import whocraft.tardis_refined.common.world.feature.config.NbtTemplateFeatureConfig;
-import whocraft.tardis_refined.registry.BlockRegistry;
 import whocraft.tardis_refined.registry.FeatureKeys;
 import whocraft.tardis_refined.registry.TagKeys;
 
-import java.util.List;
-import java.util.Set;
-
-import static net.minecraft.data.worldgen.features.FeatureUtils.createKey;
-import static whocraft.tardis_refined.common.data.ProviderConfiguredFeatures.TARDIS_ROOT_CLUSTER_CONF_FEATURE;
 import static whocraft.tardis_refined.common.data.ProviderPlacedFeatures.TARDIS_ROOT_CLUSTER_PLACED_FEATUE;
 
 public class BiomeModifierProvider {

forge/src/main/java/whocraft/tardis_refined/common/data/ConsolePatternProvider.java

@@ -8,13 +8,15 @@
 import net.minecraft.data.DataProvider;
 import net.minecraft.resources.ResourceLocation;
 import whocraft.tardis_refined.TardisRefined;
-import whocraft.tardis_refined.common.tardis.themes.ConsoleTheme;
 import whocraft.tardis_refined.patterns.ConsolePattern;
 import whocraft.tardis_refined.patterns.ConsolePatternCollection;
 import whocraft.tardis_refined.patterns.ConsolePatterns;
 
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 public class ConsolePatternProvider implements DataProvider {

forge/src/main/java/whocraft/tardis_refined/common/data/HumProvider.java

@@ -10,7 +10,6 @@
 import whocraft.tardis_refined.TardisRefined;
 import whocraft.tardis_refined.common.hum.HumEntry;
 import whocraft.tardis_refined.common.hum.TardisHums;
-import whocraft.tardis_refined.registry.SoundRegistry;
 
 import java.util.ArrayList;
 import java.util.HashMap;

forge/src/main/java/whocraft/tardis_refined/common/data/ItemModelProvider.java

@@ -53,10 +53,6 @@ protected void registerModels() {
         basicItem(ItemRegistry.RAW_ZEITON.getId());
 
 
-
-
-
-
     }
 
 

forge/src/main/java/whocraft/tardis_refined/common/data/LangProviderEnglish.java

@@ -17,12 +17,6 @@
 import whocraft.tardis_refined.registry.ItemRegistry;
 import whocraft.tardis_refined.registry.SoundRegistry;
 
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
 public class LangProviderEnglish extends LanguageProvider {
 
     public LangProviderEnglish(DataGenerator gen) {
@@ -216,7 +210,6 @@ protected void addTranslations() {
     }
 
 
-
     public void addControl(ConsoleControl control, String name) {
         add(control.getTranslationKey(), name);
     }

forge/src/main/java/whocraft/tardis_refined/common/data/ProviderBlockTags.java

@@ -12,7 +12,6 @@
 import org.jetbrains.annotations.Nullable;
 import whocraft.tardis_refined.TardisRefined;
 import whocraft.tardis_refined.registry.BlockRegistry;
-import whocraft.tardis_refined.registry.RegistrySupplier;
 
 import java.util.concurrent.CompletableFuture;
 

forge/src/main/java/whocraft/tardis_refined/common/data/ProviderConfiguredFeatures.java

@@ -40,8 +40,8 @@ public static void bootstrap(BootstapContext<ConfiguredFeature<?, ?>> context) {
         ConfiguredFeature<NbtTemplateFeatureConfig, NbtTemplateFeature> tardisRootCluster = new ConfiguredFeature<>(Features.NBT_FEATURE.get(), new NbtTemplateFeatureConfig(templateLocation, 0));
 
         HolderGetter<ConfiguredFeature<?, ?>> configuredFeatures = context.lookup(Registries.CONFIGURED_FEATURE);
-        register(context, ORE_ZEITON, Feature.ORE,  new OreConfiguration(ImmutableList.of(OreConfiguration.target(stoneReplaceable, BlockRegistry.ZEITON_ORE.get().defaultBlockState()), OreConfiguration.target(deepslateReplaceable, BlockRegistry.ZEITON_ORE_DEEPSLATE.get().defaultBlockState())), 9));
-        register(context, ORE_ZEITON_SMALL, Feature.ORE,  new OreConfiguration(ImmutableList.of(OreConfiguration.target(stoneReplaceable,BlockRegistry.ZEITON_ORE.get().defaultBlockState()), OreConfiguration.target(deepslateReplaceable, BlockRegistry.ZEITON_ORE_DEEPSLATE.get().defaultBlockState())), 4));
+        register(context, ORE_ZEITON, Feature.ORE, new OreConfiguration(ImmutableList.of(OreConfiguration.target(stoneReplaceable, BlockRegistry.ZEITON_ORE.get().defaultBlockState()), OreConfiguration.target(deepslateReplaceable, BlockRegistry.ZEITON_ORE_DEEPSLATE.get().defaultBlockState())), 9));
+        register(context, ORE_ZEITON_SMALL, Feature.ORE, new OreConfiguration(ImmutableList.of(OreConfiguration.target(stoneReplaceable, BlockRegistry.ZEITON_ORE.get().defaultBlockState()), OreConfiguration.target(deepslateReplaceable, BlockRegistry.ZEITON_ORE_DEEPSLATE.get().defaultBlockState())), 4));
         context.register(TARDIS_ROOT_CLUSTER_CONF_FEATURE, tardisRootCluster);
     }
 

forge/src/main/java/whocraft/tardis_refined/common/data/ProviderEntityTags.java

@@ -20,7 +20,6 @@ public class ProviderEntityTags extends EntityTypeTagsProvider {
     public static final TagKey<EntityType<?>> ENTITY_BLACKLIST = TagKey.create(Registries.ENTITY_TYPE, new ResourceLocation("carryon", "entity_blacklist"));
 
 
-
     public ProviderEntityTags(PackOutput output, CompletableFuture<HolderLookup.Provider> completableFuture, @Nullable ExistingFileHelper existingFileHelper) {
         super(output, completableFuture, TardisRefined.MODID, existingFileHelper);
     }

forge/src/main/java/whocraft/tardis_refined/common/data/ProviderLootTable.java

@@ -11,7 +11,6 @@
 import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 import org.jetbrains.annotations.NotNull;
-import whocraft.tardis_refined.TardisRefined;
 import whocraft.tardis_refined.registry.BlockRegistry;
 import whocraft.tardis_refined.registry.EntityRegistry;
 import whocraft.tardis_refined.registry.ItemRegistry;
@@ -48,7 +47,7 @@ protected Iterable<Block> getKnownBlocks() {
             ArrayList<@NotNull Block> blocks = new ArrayList<>();
             for (Block entry : BlockRegistry.BLOCKS.getRegistry().stream().toList()) {
                 ResourceLocation blockId = BlockRegistry.BLOCKS.getRegistry().getKey(entry);
-                if(!blockId.toString().contains("minecraft")) {
+                if (!blockId.toString().contains("minecraft")) {
                     blocks.add(entry);
                 }
             }

forge/src/main/java/whocraft/tardis_refined/common/data/RecipeProvider.java

@@ -36,7 +36,7 @@ protected void buildRecipes(RecipeOutput consumer) {
         ShapelessRecipeBuilder.shapeless(RecipeCategory.TOOLS, BlockRegistry.ZEITON_FUSED_COPPER_BLOCK.get()).requires(ItemRegistry.ZEITON_INGOT.get()).requires(Items.COPPER_BLOCK).unlockedBy("has_crafting_table", has(ItemRegistry.ZEITON_INGOT.get())).save(consumer);
         ShapelessRecipeBuilder.shapeless(RecipeCategory.TOOLS, BlockRegistry.ZEITON_FUSED_IRON_BLOCK.get()).requires(ItemRegistry.ZEITON_INGOT.get()).requires(Items.IRON_BLOCK).unlockedBy("has_crafting_table", has(ItemRegistry.ZEITON_INGOT.get())).save(consumer);
 
-        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, BlockRegistry.ZEITON_BLOCK.get()).pattern("ZZZ").pattern("ZZZ").pattern("ZZZ").define('Z',  ItemRegistry.ZEITON_INGOT.get()).unlockedBy("has_crafting_table", has(ItemRegistry.ZEITON_INGOT.get())).save(consumer);
+        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, BlockRegistry.ZEITON_BLOCK.get()).pattern("ZZZ").pattern("ZZZ").pattern("ZZZ").define('Z', ItemRegistry.ZEITON_INGOT.get()).unlockedBy("has_crafting_table", has(ItemRegistry.ZEITON_INGOT.get())).save(consumer);
 
         // Smelting
         SimpleCookingRecipeBuilder.smelting(Ingredient.of(ItemRegistry.RAW_ZEITON.get()), RecipeCategory.MISC, ItemRegistry.ZEITON_INGOT.get(), 0.7F, 300).unlockedBy("has_any_zeiton", has(ItemRegistry.RAW_ZEITON.get())).save(consumer, new ResourceLocation(TardisRefined.MODID, "smelt_zeiton"));

forge/src/main/java/whocraft/tardis_refined/common/data/ShellPatternProvider.java

@@ -13,15 +13,18 @@
 import whocraft.tardis_refined.patterns.ShellPatterns;
 
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 public class ShellPatternProvider implements DataProvider {
 
     protected final DataGenerator generator;
     private final boolean addDefaults;
-    protected Map<ResourceLocation, ShellPatternCollection> data = new HashMap<>();
     private final String modid;
+    protected Map<ResourceLocation, ShellPatternCollection> data = new HashMap<>();
 
     public ShellPatternProvider(DataGenerator generator, String modid) {
         this(generator, modid, true);

forge/src/main/java/whocraft/tardis_refined/common/data/TRBlockModelProvider.java

@@ -15,8 +15,6 @@
 import whocraft.tardis_refined.common.block.device.TerraformerBlock;
 import whocraft.tardis_refined.registry.BlockRegistry;
 
-import java.io.IOException;
-
 import static whocraft.tardis_refined.registry.BlockRegistry.BLOCKS;
 
 public class TRBlockModelProvider extends BlockStateProvider {
@@ -31,7 +29,6 @@ public JsonObject emptyBlockState(Block block) {
     }
 
 
-
     public JsonObject terraformer(Block block) {
         VariantBlockStateBuilder builder = getVariantBuilder(block).forAllStates(blockState -> blockState.getValue(TerraformerBlock.ACTIVE) ?
                 ConfiguredModel.builder().modelFile(models().getExistingFile(new ResourceLocation(TardisRefined.MODID, "block/terraformer_on"))).build() :
@@ -79,7 +76,6 @@ public JsonObject antiGravityBlock(Block block) {
     }
 
 
-
     @Override
     protected void registerStatesAndModels() {
         ResourceLocation leavesTexture = new ResourceLocation("tardis_refined:block/ars_leaves");
@@ -98,7 +94,6 @@ protected void registerStatesAndModels() {
         emptyBlockState(BlockRegistry.ARS_EGG.get());
 
 
-
         threeDeeRotating(BlockRegistry.LANDING_PAD.get(), new ResourceLocation(TardisRefined.MODID, "block/landing_pad"));
         threeDeeRotating(BlockRegistry.FLIGHT_DETECTOR.get(), new ResourceLocation(TardisRefined.MODID, "block/flight_detector"));
 
@@ -137,5 +132,4 @@ protected void registerStatesAndModels() {
     }
 
 
-
 }

forge/src/main/java/whocraft/tardis_refined/common/data/WorldGenProvider.java

@@ -11,7 +11,6 @@
 import net.neoforged.neoforge.registries.NeoForgeRegistries;
 import whocraft.tardis_refined.TardisRefined;
 
-
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 

forge/src/main/java/whocraft/tardis_refined/common/util/neoforge/CodecJsonReloadListenerImpl.java

@@ -12,13 +12,13 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-public class CodecJsonReloadListenerImpl{
+public class CodecJsonReloadListenerImpl {
 
     public static <T> CodecJsonReloadListener<T> create(String folderName, Codec<T> codec) {
         return new Impl(folderName, codec);
     }
 
-    public static class Impl<T> extends CodecJsonReloadListener<T>{
+    public static class Impl<T> extends CodecJsonReloadListener<T> {
         public Impl(String folderName, Codec<T> codec) {
             super(folderName, codec);
         }
@@ -29,8 +29,10 @@ public CodecJsonReloadListener setSyncPacket(NetworkManager networkManager, Func
             return this;
         }
 
-        /** Generate an event listener function for Forge's dedicated on-datapack-sync event which is timed at the correct point when datapack registries are synced.
-         * The event is fired when a player logs in or if server resources were reloaded successfully, so there is no need to add it in the login event **/
+        /**
+         * Generate an event listener function for Forge's dedicated on-datapack-sync event which is timed at the correct point when datapack registries are synced.
+         * The event is fired when a player logs in or if server resources were reloaded successfully, so there is no need to add it in the login event
+         **/
         private Consumer<OnDatapackSyncEvent> getDatapackSyncListener(final NetworkManager networkManager, final Function<Map<ResourceLocation, T>, MessageS2C> packetFactory) {
             return event -> {
                 this.handleSyncPacket(event.getPlayer(), networkManager, packetFactory);

forge/src/main/java/whocraft/tardis_refined/common/util/neoforge/MergeableCodecJsonReloadListenerImpl.java

@@ -30,8 +30,10 @@ public MergeableCodecJsonReloadListener setSyncPacket(NetworkManager networkMana
             return this;
         }
 
-        /** Generate an event listener function for Forge's dedicated on-datapack-sync event which is timed at the correct point when datapack registries are synced.
-         * The event is fired when a player logs in or if server resources were reloaded successfully, so there is no need to add it in the login event **/
+        /**
+         * Generate an event listener function for Forge's dedicated on-datapack-sync event which is timed at the correct point when datapack registries are synced.
+         * The event is fired when a player logs in or if server resources were reloaded successfully, so there is no need to add it in the login event
+         **/
         private Consumer<OnDatapackSyncEvent> getDatapackSyncListener(final NetworkManager networkManager, final Function<Map<ResourceLocation, PROCESSED>, MessageS2C> packetFactory) {
             return event -> {
                 this.handleSyncPacket(event.getPlayer(), networkManager, packetFactory);