Add (rather OP?) hero of the village drops to MI villager (#980)

Technici4n · web-flow · commit 4886d79cf87c · 2024-12-26T23:01:11.000Z
diff --git a/src/generated/resources/data/modern_industrialization/loot_table/gameplay/hero_of_the_village/industrialist_gift.json b/src/generated/resources/data/modern_industrialization/loot_table/gameplay/hero_of_the_village/industrialist_gift.json
@@ -0,0 +1,36 @@
+{
+  "type": "minecraft:gift",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "modern_industrialization:steel_upgrade"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "modern_industrialization:piston"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "modern_industrialization:robot_arm"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "modern_industrialization:basic_machine_hull"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "modern_industrialization:bronze_drill"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "modern_industrialization:steel_drill"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "modern_industrialization:gameplay/hero_of_the_village/industrialist_gift"
+}
diff --git a/src/generated/resources/data/neoforge/data_maps/villager_profession/raid_hero_gifts.json b/src/generated/resources/data/neoforge/data_maps/villager_profession/raid_hero_gifts.json
@@ -0,0 +1,7 @@
+{
+  "values": {
+    "modern_industrialization:industrialist": {
+      "loot_table": "modern_industrialization:gameplay/hero_of_the_village/industrialist_gift"
+    }
+  }
+}
diff --git a/src/main/java/aztech/modern_industrialization/MIRegistries.java b/src/main/java/aztech/modern_industrialization/MIRegistries.java
@@ -36,6 +36,7 @@
 import java.util.Comparator;
 import java.util.Set;
 import java.util.function.Supplier;
+import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
@@ -124,7 +125,7 @@ public class MIRegistries {
     // Villager professions
     public static final DeferredRegister<VillagerProfession> VILLAGER_PROFESSIONS = DeferredRegister.create(Registries.VILLAGER_PROFESSION, MI.ID);
 
-    public static final Supplier<VillagerProfession> INDUSTRIALIST = VILLAGER_PROFESSIONS.register("industrialist", () -> {
+    public static final Holder<VillagerProfession> INDUSTRIALIST = VILLAGER_PROFESSIONS.register("industrialist", () -> {
         return new VillagerProfession(
                 INDUSTRIALIST_POI.getId().toString(),
                 e -> e.is(INDUSTRIALIST_POI.getId()),
diff --git a/src/main/java/aztech/modern_industrialization/MIVillager.java b/src/main/java/aztech/modern_industrialization/MIVillager.java
@@ -33,7 +33,7 @@
 
 public class MIVillager {
     public static void init(VillagerTradesEvent event) {
-        if (event.getType() != MIRegistries.INDUSTRIALIST.get()) {
+        if (event.getType() != MIRegistries.INDUSTRIALIST.value()) {
             return;
         }
 
diff --git a/src/main/java/aztech/modern_industrialization/datagen/MIDatagenServer.java b/src/main/java/aztech/modern_industrialization/datagen/MIDatagenServer.java
@@ -28,6 +28,7 @@
 import aztech.modern_industrialization.datagen.datamap.MIDataMapProvider;
 import aztech.modern_industrialization.datagen.dynreg.DynamicRegistryDatagen;
 import aztech.modern_industrialization.datagen.loot.BlockLootTableProvider;
+import aztech.modern_industrialization.datagen.loot.MIGiftLoot;
 import aztech.modern_industrialization.datagen.recipe.AlloyRecipesProvider;
 import aztech.modern_industrialization.datagen.recipe.AssemblerRecipesProvider;
 import aztech.modern_industrialization.datagen.recipe.CompatRecipesProvider;
@@ -82,7 +83,8 @@ public static void configure(
         aggregate.addProvider(EmptyTestStructureGenerator::new);
 
         gen.addProvider(run, new LootTableProvider(gen.getPackOutput(), Set.of(), List.of(
-                new LootTableProvider.SubProviderEntry(BlockLootTableProvider::new, LootContextParamSets.BLOCK)),
+                new LootTableProvider.SubProviderEntry(BlockLootTableProvider::new, LootContextParamSets.BLOCK),
+                new LootTableProvider.SubProviderEntry(MIGiftLoot::new, LootContextParamSets.GIFT)),
                 lookupProvider));
 
         gen.addProvider(run,
diff --git a/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java b/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java
@@ -26,10 +26,12 @@
 import aztech.modern_industrialization.MI;
 import aztech.modern_industrialization.MIFluids;
 import aztech.modern_industrialization.MIItem;
+import aztech.modern_industrialization.MIRegistries;
 import aztech.modern_industrialization.api.datamaps.FluidFuel;
 import aztech.modern_industrialization.api.datamaps.ItemPipeUpgrade;
 import aztech.modern_industrialization.api.datamaps.MIDataMaps;
 import aztech.modern_industrialization.api.datamaps.MachineUpgrade;
+import aztech.modern_industrialization.datagen.loot.MILootTables;
 import aztech.modern_industrialization.definition.FluidDefinition;
 import aztech.modern_industrialization.definition.ItemDefinition;
 import java.util.concurrent.CompletableFuture;
@@ -40,6 +42,7 @@
 import net.neoforged.neoforge.common.data.DataMapProvider;
 import net.neoforged.neoforge.registries.datamaps.builtin.FurnaceFuel;
 import net.neoforged.neoforge.registries.datamaps.builtin.NeoForgeDataMaps;
+import net.neoforged.neoforge.registries.datamaps.builtin.RaidHeroGift;
 
 public class MIDataMapProvider extends DataMapProvider {
     public MIDataMapProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookupProvider) {
@@ -53,6 +56,9 @@ protected void gather() {
         gatherFluidFuels();
         gatherItemPipeUpgrades();
         gatherMachineUpgrades();
+
+        builder(NeoForgeDataMaps.RAID_HERO_GIFTS)
+                .add(MIRegistries.INDUSTRIALIST, new RaidHeroGift(MILootTables.INDUSTRIALIST_GIFT), false);
     }
 
     private void gatherFurnaceFuels() {
diff --git a/src/main/java/aztech/modern_industrialization/datagen/loot/MIGiftLoot.java b/src/main/java/aztech/modern_industrialization/datagen/loot/MIGiftLoot.java
@@ -0,0 +1,55 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 Azercoco & Technici4n
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package aztech.modern_industrialization.datagen.loot;
+
+import aztech.modern_industrialization.MIBlock;
+import aztech.modern_industrialization.MIItem;
+import aztech.modern_industrialization.materials.MIMaterials;
+import aztech.modern_industrialization.materials.part.MIParts;
+import java.util.function.BiConsumer;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.data.loot.LootTableSubProvider;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.storage.loot.LootPool;
+import net.minecraft.world.level.storage.loot.LootTable;
+import net.minecraft.world.level.storage.loot.entries.LootItem;
+import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
+
+public record MIGiftLoot(HolderLookup.Provider registries) implements LootTableSubProvider {
+    @Override
+    public void generate(BiConsumer<ResourceKey<LootTable>, LootTable.Builder> output) {
+        output.accept(
+                MILootTables.INDUSTRIALIST_GIFT,
+                LootTable.lootTable()
+                        .withPool(
+                                LootPool.lootPool()
+                                        .setRolls(ConstantValue.exactly(1.0F))
+                                        .add(LootItem.lootTableItem(MIItem.STEEL_UPGRADE))
+                                        .add(LootItem.lootTableItem(MIItem.PISTON))
+                                        .add(LootItem.lootTableItem(MIItem.ROBOT_ARM))
+                                        .add(LootItem.lootTableItem(MIBlock.BASIC_MACHINE_HULL))
+                                        .add(LootItem.lootTableItem(MIMaterials.BRONZE.getPart(MIParts.DRILL)))
+                                        .add(LootItem.lootTableItem(MIMaterials.STEEL.getPart(MIParts.DRILL)))));
+    }
+}
diff --git a/src/main/java/aztech/modern_industrialization/datagen/loot/MILootTables.java b/src/main/java/aztech/modern_industrialization/datagen/loot/MILootTables.java
@@ -0,0 +1,37 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 Azercoco & Technici4n
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package aztech.modern_industrialization.datagen.loot;
+
+import aztech.modern_industrialization.MI;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.storage.loot.LootTable;
+
+public final class MILootTables {
+    private MILootTables() {
+    }
+
+    public static final ResourceKey<LootTable> INDUSTRIALIST_GIFT = ResourceKey.create(Registries.LOOT_TABLE,
+            MI.id("gameplay/hero_of_the_village/industrialist_gift"));
+}

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`
`34`	`34`	`public class MIVillager {`
`35`	`35`	`public static void init(VillagerTradesEvent event) {`
`36`		`- if (event.getType() != MIRegistries.INDUSTRIALIST.get()) {`
	`36`	`+ if (event.getType() != MIRegistries.INDUSTRIALIST.value()) {`
`37`	`37`	`return;`
`38`	`38`	`}`
`39`	`39`