Finish 21.1/next

.gitignore

@@ -6,6 +6,7 @@ bin
 .classpath
 .project
 
+.claude
 # idea
 out
 *.ipr
@@ -46,4 +47,4 @@ src/generated/
 
 neoforge-main/src/generated/
 
-neoforge-main/runs/
+neoforge-main/runs/

gradle/libs.versions.toml

@@ -7,5 +7,5 @@ module = "io.reactivex.rxjava3:rxjava"
 version = "3.1.5"
 
 [libraries.reactivestreams]
-module = "io.reactivex.rxjava3:reactive-streams"
-version = "[1.0.4,)"
+module = "org.reactivestreams:reactive-streams"
+version = "1.0.4"

neoforge-datagen/src/main/java/dev/compactmods/crafting/datagen/BlockLootGenerator.java

@@ -24,9 +24,9 @@ public BlockLootGenerator(HolderLookup.Provider holderLookup) {
     @Override
     protected Iterable<Block> getKnownBlocks() {
         return ImmutableList.of(
-                CCBlocks.FIELD_PROJECTOR_BLOCK.get()
-//                CCBlocks.MATCH_FIELD_PROXY_BLOCK.get(),
-//                CCBlocks.RESCAN_FIELD_PROXY_BLOCK.get()
+                CCBlocks.FIELD_PROJECTOR_BLOCK.get(),
+                CCBlocks.MATCH_FIELD_PROXY_BLOCK.get(),
+                CCBlocks.RESCAN_FIELD_PROXY_BLOCK.get()
         );
     }
 
@@ -38,5 +38,18 @@ protected void generate() {
                 .setRolls(ConstantValue.exactly(1))
                 .when(ExplosionCondition.survivesExplosion())
                 .add(LootItem.lootTableItem(CCItems.FIELD_PROJECTOR_ITEM.get()))));
+
+        this.add(CCBlocks.MATCH_FIELD_PROXY_BLOCK.get(), LootTable.lootTable().withPool(LootPool
+                .lootPool()
+                .name(CCBlocks.MATCH_FIELD_PROXY_BLOCK.getId().toString())
+                .setRolls(ConstantValue.exactly(1))
+                .when(ExplosionCondition.survivesExplosion())
+                .add(LootItem.lootTableItem(CCItems.MATCH_PROXY_ITEM.get()))));
+        this.add(CCBlocks.RESCAN_FIELD_PROXY_BLOCK.get(), LootTable.lootTable().withPool(LootPool
+                .lootPool()
+                .name(CCBlocks.RESCAN_FIELD_PROXY_BLOCK.getId().toString())
+                .setRolls(ConstantValue.exactly(1))
+                .when(ExplosionCondition.survivesExplosion())
+                .add(LootItem.lootTableItem(CCItems.RESCAN_PROXY_ITEM.get()))));
     }
 }

neoforge-datagen/src/main/java/dev/compactmods/crafting/datagen/BlockTagGenerator.java

@@ -0,0 +1,32 @@
+package dev.compactmods.crafting.datagen;
+
+import dev.compactmods.crafting.CompactCrafting;
+import dev.compactmods.crafting.core.CCBlocks;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.data.PackOutput;
+import net.minecraft.tags.BlockTags;
+import net.neoforged.neoforge.common.data.BlockTagsProvider;
+import net.neoforged.neoforge.common.data.ExistingFileHelper;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.concurrent.CompletableFuture;
+
+public class BlockTagGenerator extends BlockTagsProvider {
+
+    public BlockTagGenerator(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
+        super(output, lookupProvider, CompactCrafting.MOD_ID, existingFileHelper);
+    }
+
+    @Override
+    protected void addTags(HolderLookup.Provider provider) {
+        tag(BlockTags.MINEABLE_WITH_PICKAXE)
+                .add(CCBlocks.FIELD_PROJECTOR_BLOCK.get())
+                .add(CCBlocks.MATCH_FIELD_PROXY_BLOCK.get())
+                .add(CCBlocks.RESCAN_FIELD_PROXY_BLOCK.get());
+
+        tag(BlockTags.NEEDS_DIAMOND_TOOL)
+                .add(CCBlocks.FIELD_PROJECTOR_BLOCK.get())
+                .add(CCBlocks.MATCH_FIELD_PROXY_BLOCK.get())
+                .add(CCBlocks.RESCAN_FIELD_PROXY_BLOCK.get());
+    }
+}

neoforge-datagen/src/main/java/dev/compactmods/crafting/datagen/DataGeneration.java

@@ -34,6 +34,7 @@ private static void registerServerProviders(DataGenerator generator, GatherDataE
         ));
 
         generator.addProvider(event.includeServer(), new RecipeGenerator(pack, lookup));
+        generator.addProvider(event.includeServer(), new BlockTagGenerator(pack, lookup, event.getExistingFileHelper()));
     }
 
     private static void registerClientProviders(DataGenerator generator, GatherDataEvent event) {
@@ -42,6 +43,6 @@ private static void registerClientProviders(DataGenerator generator, GatherDataE
 
         generator.addProvider(event.includeClient(), new SharedStateGenerator(pack, event.getExistingFileHelper()));
         generator.addProvider(event.includeClient(), new ProjectorStateGenerator(pack, event.getExistingFileHelper()));
-//        generator.addProvider(event.includeClient(), new ProxyStateGenerator(generator, event.getExistingFileHelper()));
+        generator.addProvider(event.includeClient(), new ProxyStateGenerator(pack, event.getExistingFileHelper()));
     }
 }

neoforge-datagen/src/main/java/dev/compactmods/crafting/datagen/ProxyStateGenerator.java

@@ -1,50 +1,50 @@
-//package dev.compactmods.crafting.datagen;
-//
-//import dev.compactmods.crafting.CompactCrafting;
-//import dev.compactmods.crafting.core.CCBlocks;
-//import net.minecraft.client.renderer.block.model.ItemTransforms;
-//import net.minecraft.data.DataGenerator;
-//import net.minecraft.data.PackOutput;
-//import net.neoforged.neoforge.client.model.generators.BlockStateProvider;
-//import net.neoforged.neoforge.common.data.ExistingFileHelper;
-//
-//public class ProxyStateGenerator extends BlockStateProvider {
-//
-//    public ProxyStateGenerator(PackOutput pack, ExistingFileHelper files) {
-//        super(pack, CompactCrafting.MOD_ID, files);
-//    }
-//
-//    @Override
-//    protected void registerStatesAndModels() {
-//        getVariantBuilder(CCBlocks.MATCH_FIELD_PROXY_BLOCK.get())
-//                .forAllStates(state -> ConfiguredModel.builder()
-//                        .modelFile(models().getExistingFile(modLoc("block/base")))
-//                        .build());
-//
-//        getVariantBuilder(CCBlocks.RESCAN_FIELD_PROXY_BLOCK.get())
-//                .forAllStates(state -> ConfiguredModel.builder()
-//                        .modelFile(models().getExistingFile(modLoc("block/base")))
-//                        .build());
-//
-//        SharedStateGenerator.addProjectorBase(models().getBuilder("match_proxy"));
-//        SharedStateGenerator.addProjectorBase(models().getBuilder("rescan_proxy"));
-//
-//        itemModels()
-//                .withExistingParent("match_proxy", modLoc("block/match_proxy"))
-//                .transforms()
-//                .transform(ItemTransforms.TransformType.GUI)
-//                .rotation(33.75f, 45f, 0)
-//                .translation(0, 1, 0)
-//                .scale(0.6f, 0.6f, 0.6f)
-//                .end();
-//
-//        itemModels()
-//                .withExistingParent("rescan_proxy", modLoc("block/rescan_proxy"))
-//                .transforms()
-//                .transform(ItemTransforms.TransformType.GUI)
-//                .rotation(33.75f, 45f, 0)
-//                .translation(0, 1, 0)
-//                .scale(0.6f, 0.6f, 0.6f)
-//                .end();
-//    }
-//}
+package dev.compactmods.crafting.datagen;
+
+import dev.compactmods.crafting.CompactCrafting;
+import dev.compactmods.crafting.core.CCBlocks;
+import net.minecraft.data.PackOutput;
+import net.minecraft.world.item.ItemDisplayContext;
+import net.neoforged.neoforge.client.model.generators.BlockStateProvider;
+import net.neoforged.neoforge.client.model.generators.ConfiguredModel;
+import net.neoforged.neoforge.common.data.ExistingFileHelper;
+
+public class ProxyStateGenerator extends BlockStateProvider {
+
+    public ProxyStateGenerator(PackOutput pack, ExistingFileHelper files) {
+        super(pack, CompactCrafting.MOD_ID, files);
+    }
+
+    @Override
+    protected void registerStatesAndModels() {
+        getVariantBuilder(CCBlocks.MATCH_FIELD_PROXY_BLOCK.get())
+                .forAllStates(state -> ConfiguredModel.builder()
+                        .modelFile(models().getExistingFile(modLoc("block/base")))
+                        .build());
+
+        getVariantBuilder(CCBlocks.RESCAN_FIELD_PROXY_BLOCK.get())
+                .forAllStates(state -> ConfiguredModel.builder()
+                        .modelFile(models().getExistingFile(modLoc("block/base")))
+                        .build());
+
+        SharedStateGenerator.addProjectorBase(models().getBuilder("match_proxy"));
+        SharedStateGenerator.addProjectorBase(models().getBuilder("rescan_proxy"));
+
+        itemModels()
+                .withExistingParent("match_proxy", modLoc("block/match_proxy"))
+                .transforms()
+                .transform(ItemDisplayContext.GUI)
+                .rotation(33.75f, 45f, 0)
+                .translation(0, 1, 0)
+                .scale(0.6f, 0.6f, 0.6f)
+                .end();
+
+        itemModels()
+                .withExistingParent("rescan_proxy", modLoc("block/rescan_proxy"))
+                .transforms()
+                .transform(ItemDisplayContext.GUI)
+                .rotation(33.75f, 45f, 0)
+                .translation(0, 1, 0)
+                .scale(0.6f, 0.6f, 0.6f)
+                .end();
+    }
+}

neoforge-datagen/src/main/java/dev/compactmods/crafting/datagen/RecipeGenerator.java

@@ -47,16 +47,17 @@ protected void buildRecipes(RecipeOutput output, HolderLookup.Provider provider)
                 .unlockedBy("got_ender_eye", has(Items.ENDER_EYE))
                 .save(output);
 
-//        ShapelessRecipeBuilder.shapeless(CCItems.MATCH_PROXY_ITEM.get())
-//                .requires(CCItems.BASE_ITEM.get())
-//                .requires(Items.REDSTONE)
-//                .unlockedBy("got_redstone", has(Items.REDSTONE))
-//                .save(consumer);
-//
-//        ShapelessRecipeBuilder.shapeless(CCItems.RESCAN_PROXY_ITEM.get())
-//                .requires(CCItems.BASE_ITEM.get())
-//                .requires(Items.CRAFTING_TABLE)
-//                .unlockedBy("got_crafting_table", has(Items.CRAFTING_TABLE))
-//                .save(consumer);
+        ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC,CCItems.MATCH_PROXY_ITEM.get())
+                .requires(CCItems.BASE_ITEM.get())
+                .requires(Items.REDSTONE)
+                .unlockedBy("got_redstone", has(Items.REDSTONE))
+                .save(output);
+
+
+        ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC,CCItems.RESCAN_PROXY_ITEM.get())
+                .requires(CCItems.BASE_ITEM.get())
+                .requires(Items.CRAFTING_TABLE)
+                .unlockedBy("got_crafting_table", has(Items.CRAFTING_TABLE))
+                .save(output);
     }
 }

neoforge-main/build.gradle.kts

@@ -62,10 +62,10 @@ neoForge {
             logLevel.set(org.slf4j.event.Level.DEBUG)
             sourceSet = project.sourceSets.main
 
-            // JetBrains Runtime Hotswap
-            if (!System.getenv().containsKey("CI")) {
-              jvmArgument("-XX:+AllowEnhancedClassRedefinition")
-            }
+//            // JetBrains Runtime Hotswap
+//            if (!System.getenv().containsKey("CI")) {
+//              jvmArgument("-XX:+AllowEnhancedClassRedefinition")
+//            }
         }
 
         create("client") {
@@ -121,6 +121,9 @@ repositories {
             password = project.findProperty("gpr.token") as String? ?: System.getenv("GITHUB_TOKEN")
         }
     }
+    maven("https://cursemaven.com"){
+        name = "CurseMaven"
+    }
 }
 
 dependencies {
@@ -135,6 +138,9 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
+    implementation("curse.maven:jei-238222:7024953")
+    implementation("curse.maven:the-one-probe-245211:5836106")
+
     jarJar(libs.rxjava)
     jarJar(libs.reactivestreams)
 }