wip: move everything to shared code

TwelveIterationMods · Feb 28, 2024 · 80e480c · 80e480c
1 parent b8a0f8b
commit 80e480c
Show file tree

Hide file tree

Showing 178 changed files with 175 additions and 415 deletions.
diff --git a/forge/src/main/java/net/blay09/mods/excompressum/compat/IAddon.java b/forge/src/main/java/net/blay09/mods/excompressum/compat/IAddon.java
diff --git a/...src/main/java/net/blay09/mods/excompressum/compat/tconstruct/ModCompressing.java.disabled b/...src/main/java/net/blay09/mods/excompressum/compat/tconstruct/ModCompressing.java.disabled
diff --git a/.../src/main/java/net/blay09/mods/excompressum/compat/tconstruct/ModSmashingII.java.disabled b/.../src/main/java/net/blay09/mods/excompressum/compat/tconstruct/ModSmashingII.java.disabled
diff --git a/...rc/main/java/net/blay09/mods/excompressum/compat/tconstruct/TConstructAddon.java.disabled b/...rc/main/java/net/blay09/mods/excompressum/compat/tconstruct/TConstructAddon.java.disabled
diff --git a/.../mods/excompressum/ForgeExCompressum.java → ...excompressum/forge/ForgeExCompressum.java b/.../mods/excompressum/ForgeExCompressum.java → ...excompressum/forge/ForgeExCompressum.java
@@ -1,9 +1,10 @@
-package net.blay09.mods.excompressum;
+package net.blay09.mods.excompressum.forge;
 
 import net.blay09.mods.balm.api.Balm;
 import net.blay09.mods.balm.api.client.BalmClient;
+import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.client.ExCompressumClient;
-import net.blay09.mods.excompressum.compat.top.TheOneProbeAddon;
+import net.blay09.mods.excompressum.forge.compat.top.TheOneProbeAddon;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModList;

diff --git a/...hilosequentia/ExNihiloSequentiaAddon.java → ...hilosequentia/ExNihiloSequentiaAddon.java b/...hilosequentia/ExNihiloSequentiaAddon.java → ...hilosequentia/ExNihiloSequentiaAddon.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.exnihilosequentia;
+package net.blay09.mods.excompressum.forge.compat.exnihilosequentia;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Maps;

diff --git a/...ompat/jei/ChickenStickRecipeCategory.java → ...ompat/jei/ChickenStickRecipeCategory.java b/...ompat/jei/ChickenStickRecipeCategory.java → ...ompat/jei/ChickenStickRecipeCategory.java
@@ -1,17 +1,14 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
 import mezz.jei.api.helpers.IGuiHelper;
-import mezz.jei.api.recipe.IFocus;
 import mezz.jei.api.recipe.IFocusGroup;
 import mezz.jei.api.recipe.RecipeType;
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.item.ModItems;
-import net.blay09.mods.excompressum.loot.MergedLootTableEntry;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;

diff --git a/...t/jei/CompressedHammerRecipeCategory.java → ...t/jei/CompressedHammerRecipeCategory.java b/...t/jei/CompressedHammerRecipeCategory.java → ...t/jei/CompressedHammerRecipeCategory.java
@@ -1,23 +1,19 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
 import mezz.jei.api.helpers.IGuiHelper;
-import mezz.jei.api.recipe.IFocus;
 import mezz.jei.api.recipe.IFocusGroup;
 import mezz.jei.api.recipe.RecipeType;
 import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.block.ModBlocks;
-import net.blay09.mods.excompressum.loot.MergedLootTableEntry;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nonnull;
-import java.util.List;
 
 public class CompressedHammerRecipeCategory implements IRecipeCategory<JeiCompressedHammerRecipe> {
 

diff --git a/...m/compat/jei/CraftChickenStickRecipe.java → ...e/compat/jei/CraftChickenStickRecipe.java b/...m/compat/jei/CraftChickenStickRecipe.java → ...e/compat/jei/CraftChickenStickRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
 import net.blay09.mods.excompressum.item.ModItems;
 import net.minecraft.nbt.CompoundTag;

diff --git a/.../jei/CraftChickenStickRecipeCategory.java → .../jei/CraftChickenStickRecipeCategory.java b/.../jei/CraftChickenStickRecipeCategory.java → .../jei/CraftChickenStickRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;

diff --git a/...ssum/compat/jei/HammerRecipeCategory.java → ...orge/compat/jei/HammerRecipeCategory.java b/...ssum/compat/jei/HammerRecipeCategory.java → ...orge/compat/jei/HammerRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;

diff --git a/.../compat/jei/HeavySieveRecipeCategory.java → .../compat/jei/HeavySieveRecipeCategory.java b/.../compat/jei/HeavySieveRecipeCategory.java → .../compat/jei/HeavySieveRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;

diff --git a/...ods/excompressum/compat/jei/JEIAddon.java → ...compressum/forge/compat/jei/JEIAddon.java b/...ods/excompressum/compat/jei/JEIAddon.java → ...compressum/forge/compat/jei/JEIAddon.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
@@ -9,6 +9,7 @@
 import mezz.jei.api.registration.IRecipeCatalystRegistration;
 import mezz.jei.api.registration.IRecipeCategoryRegistration;
 import mezz.jei.api.registration.IRecipeRegistration;
+import net.blay09.mods.balm.api.Balm;
 import net.blay09.mods.excompressum.ExCompressum;
 import net.blay09.mods.excompressum.api.ExNihiloProvider;
 import net.blay09.mods.excompressum.api.IHammerRecipe;
@@ -37,7 +38,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.storage.loot.LootTable;
-import net.minecraftforge.registries.ForgeRegistries;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -92,12 +92,12 @@ public void registerRecipes(IRecipeRegistration registry) {
         ArrayListMultimap<ResourceLocation, WoodenCrucibleRecipe> fluidOutputMap = ArrayListMultimap.create();
         List<WoodenCrucibleRecipe> woodenCrucibleRecipes = recipeManager.getAllRecipesFor(ModRecipeTypes.woodenCrucibleRecipeType);
         for (WoodenCrucibleRecipe entry : woodenCrucibleRecipes) {
-            fluidOutputMap.put(entry.getFluid(), entry);
+            fluidOutputMap.put(entry.getFluidId(), entry);
         }
 
         List<JeiWoodenCrucibleRecipe> jeiWoodenCrucibleRecipes = new ArrayList<>();
         for (ResourceLocation fluidName : fluidOutputMap.keySet()) {
-            Fluid fluid = ForgeRegistries.FLUIDS.getValue(fluidName);
+            Fluid fluid = Balm.getRegistries().getFluid(fluidName);
             if (fluid == null) {
                 continue;
             }
@@ -128,7 +128,7 @@ private void loadGeneratedHeavySieveRecipe(boolean waterlogged, GeneratedHeavySi
         BlockState waterLoggedState = ModBlocks.heavySieves[0].defaultBlockState().setValue(HeavySieveBlock.WATERLOGGED, waterlogged);
         for (SieveMeshRegistryEntry mesh : SieveMeshRegistry.getEntries().values()) {
             int rolls = HeavySieveRegistry.getGeneratedRollCount(generatedRecipe);
-            ItemLike source = ForgeRegistries.ITEMS.getValue(generatedRecipe.getSource());
+            ItemLike source = Balm.getRegistries().getItem(generatedRecipe.getSource());
             LootTable lootTable = ExNihilo.getInstance().generateHeavySieveLootTable(waterLoggedState, source, rolls, mesh);
             if (!LootTableUtils.isLootTableEmpty(lootTable)) {
                 HeavySieveRecipe recipe = new HeavySieveRecipe(generatedRecipe.getId(), generatedRecipe.getInput(), new LootTableProvider(lootTable), waterlogged, null, Sets.newHashSet(mesh.getMeshType()));

diff --git a/...sum/compat/jei/JeiChickenStickRecipe.java → ...rge/compat/jei/JeiChickenStickRecipe.java b/...sum/compat/jei/JeiChickenStickRecipe.java → ...rge/compat/jei/JeiChickenStickRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
 import net.blay09.mods.excompressum.loot.LootTableEntry;
 import net.blay09.mods.excompressum.loot.LootTableUtils;

diff --git a/...compat/jei/JeiCompressedHammerRecipe.java → ...compat/jei/JeiCompressedHammerRecipe.java b/...compat/jei/JeiCompressedHammerRecipe.java → ...compat/jei/JeiCompressedHammerRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
 import net.blay09.mods.excompressum.loot.LootTableEntry;
 import net.blay09.mods.excompressum.loot.LootTableUtils;

diff --git a/...ompressum/compat/jei/JeiHammerRecipe.java → ...sum/forge/compat/jei/JeiHammerRecipe.java b/...ompressum/compat/jei/JeiHammerRecipe.java → ...sum/forge/compat/jei/JeiHammerRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
 import net.blay09.mods.excompressum.api.IHammerRecipe;
 import net.blay09.mods.excompressum.loot.LootTableEntry;

diff --git a/...essum/compat/jei/JeiHeavySieveRecipe.java → ...forge/compat/jei/JeiHeavySieveRecipe.java b/...essum/compat/jei/JeiHeavySieveRecipe.java → ...forge/compat/jei/JeiHeavySieveRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
 import net.blay09.mods.excompressum.api.sievemesh.CommonMeshType;
 import net.blay09.mods.excompressum.api.sievemesh.SieveMeshRegistryEntry;

diff --git a/...ods/excompressum/compat/jei/JeiUtils.java → ...compressum/forge/compat/jei/JeiUtils.java b/...ods/excompressum/compat/jei/JeiUtils.java → ...compressum/forge/compat/jei/JeiUtils.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
 import net.blay09.mods.excompressum.loot.LootTableEntry;
 import net.blay09.mods.excompressum.loot.LootTableUtils;

diff --git a/...m/compat/jei/JeiWoodenCrucibleRecipe.java → ...e/compat/jei/JeiWoodenCrucibleRecipe.java b/...m/compat/jei/JeiWoodenCrucibleRecipe.java → ...e/compat/jei/JeiWoodenCrucibleRecipe.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
 import com.mojang.datafixers.util.Pair;
 import net.blay09.mods.excompressum.registry.woodencrucible.WoodenCrucibleRecipe;

diff --git a/...pat/jei/WoodenCrucibleRecipeCategory.java → ...pat/jei/WoodenCrucibleRecipeCategory.java b/...pat/jei/WoodenCrucibleRecipeCategory.java → ...pat/jei/WoodenCrucibleRecipeCategory.java
@@ -1,4 +1,4 @@
-package net.blay09.mods.excompressum.compat.jei;
+package net.blay09.mods.excompressum.forge.compat.jei;
 
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;