Dev

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.caching=true
 org.gradle.configuration-cache=true
 minecraft_version=26.1.2
 minecraft_version_range=[26.1,26.2]
-neo_version=26.1.2.44-beta
+neo_version=26.1.2.75
 
 ## Mod Properties
 
@@ -15,14 +15,14 @@ jei_version=29.5.0.28
 mod_id=justdynathings
 mod_name=Just Dyna Things
 mod_license=Ora Et Labora License
-mod_version=2.0-alpha-build6
+mod_version=2.0-alpha-build7
 mod_group_id=com.devdyna.justdynathings
 mod_authors=DevDyna
 mod_description=Just Dire Things addon to add more stuff and qol things
 
 ## lib
 cakesticklib_version=[1.10,)
-cakesticklib=8103279
+cakesticklib=8279313
 
 justdirethings_version=[1.6.8,)
 justdirethings=8042519

src/main/java/com/devdyna/justdynathings/Config.java

@@ -17,6 +17,7 @@ public class Config {
         private static final ModConfigSpec.Builder qCOMMON = new ModConfigSpec.Builder();
 
         public static BooleanValue ENABLE_ALL_JEI_FUELS;
+        public static BooleanValue DISABLE_FUEL_JEI;
 
         public static ConfigValue<List<? extends String>> UNSTABLE_TIME_CRYSTAL_TOOLTIPS;
 
@@ -185,29 +186,31 @@ private static void misc() {
                                 .comment("Include any fuel item to Generator JEI category")
                                 .define("include_any_jei_fuels", true);
 
-             UNSTABLE_TIME_CRYSTAL_TOOLTIPS = qCOMMON
-    .comment("Define the pool of strings that will show as tooltip below Void Crystal")
-    .defineList(
-        List.of("void_crystal_tooltips"),
-        () -> List.of(
-            "Unstable Stability",
-            "This is time",
-            "Fragment of reality",
-            "The paradox must grow",
-            "Is the time a lie?",
-            "There is a paradox on your timeline",
-            "Time to collapse",
-            "Time is relative",
-            "Its time to collapse",
-            "You collapse me round",
-            "Press T to collapse",
-            "Paradox mentioned",
-            "Never gone collapse up",
-            "Better with Time"
-        ),
-        () -> "",
-        o -> o instanceof String
-    );
+                DISABLE_FUEL_JEI = qCOMMON
+                                .comment("Disable Fuel JEI categories when Just Tiered Generators is installed")
+                                .define("disable_jei_fuels", true);
+
+                UNSTABLE_TIME_CRYSTAL_TOOLTIPS = qCOMMON
+                                .comment("Define the pool of strings that will show as tooltip below Void Crystal")
+                                .defineList(
+                                                List.of("void_crystal_tooltips"),
+                                                () -> List.of(
+                                                                "Unstable Stability",
+                                                                "This is time",
+                                                                "Fragment of reality",
+                                                                "The paradox must grow",
+                                                                "Is the time a lie?",
+                                                                "There is a paradox on your timeline",
+                                                                "Time to collapse",
+                                                                "Time is relative",
+                                                                "Its time to collapse",
+                                                                "You collapse me round",
+                                                                "Press T to collapse",
+                                                                "Paradox mentioned",
+                                                                "Never gone collapse up",
+                                                                "Better with Time"),
+                                                () -> "",
+                                                o -> o instanceof String);
 
                 qCOMMON.pop();
         }

src/main/java/com/devdyna/justdynathings/compat/jei/JEIPlugin.java

@@ -5,6 +5,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.devdyna.cakesticklib.api.utils.ModAddonUtil;
 import com.devdyna.cakesticklib.api.utils.x;
 import com.devdyna.justdynathings.Client;
 import com.devdyna.justdynathings.Config;
@@ -92,34 +93,38 @@ public void registerCategories(IRecipeCategoryRegistration r) {
         @Override
         public void registerRecipes(IRecipeRegistration r) {
 
-                Map<Integer, List<ItemStack>> fuels = new HashMap<>();
+                if (!(ModAddonUtil.checkMod("justtieredgens") && Config.DISABLE_FUEL_JEI.get())) {
 
-                // Process fuels
-                for (ItemStack stack : FuelUtils.getAllSolidFuels()) {
-                        int burnTime = stack.getBurnTime(null, Minecraft.getInstance().level.fuelValues());
+                        Map<Integer, List<ItemStack>> fuels = new HashMap<>();
 
-                        // Add JDT fuels before
-                        if (stack.getItem() instanceof Coal_T1 ||
-                                        (stack.getItem() instanceof BlockItem bi
-                                                        && bi.getBlock() instanceof CoalBlock_T1)) {
-                                r.addRecipes(FuelRecipeCategory.TYPE,
-                                                List.of(new FuelRecords.Items(List.of(stack))));
-                                continue;
-                        }
+                        // Process fuels
+                        for (ItemStack stack : FuelUtils.getAllSolidFuels()) {
+                                int burnTime = stack.getBurnTime(null, Minecraft.getInstance().level.fuelValues());
 
-                        if (burnTime > 0)
-                                fuels.computeIfAbsent(burnTime, k -> new ArrayList<>()).add(stack);
+                                // Add JDT fuels before
+                                if (stack.getItem() instanceof Coal_T1 ||
+                                                (stack.getItem() instanceof BlockItem bi
+                                                                && bi.getBlock() instanceof CoalBlock_T1)) {
+                                        r.addRecipes(FuelRecipeCategory.TYPE,
+                                                        List.of(new FuelRecords.Items(List.of(stack))));
+                                        continue;
+                                }
 
-                }
+                                if (burnTime > 0)
+                                        fuels.computeIfAbsent(burnTime, k -> new ArrayList<>()).add(stack);
 
-                // Add remaining fuels
-                if (Config.ENABLE_ALL_JEI_FUELS.get()) {
-                        fuels.entrySet().stream()
-                                        .sorted(Map.Entry.<Integer, List<ItemStack>>comparingByKey().reversed())
-                                        .forEach(entry -> r.addRecipes(FuelRecipeCategory.TYPE,
-                                                        List.of(new FuelRecords.Items(entry.getValue()))));
-                }
+                        }
 
+                        // Add remaining fuels
+                        if (Config.ENABLE_ALL_JEI_FUELS.get()) {
+                                fuels.entrySet().stream()
+                                                .sorted(Map.Entry.<Integer, List<ItemStack>>comparingByKey().reversed())
+                                                .forEach(entry -> r.addRecipes(FuelRecipeCategory.TYPE,
+                                                                List.of(new FuelRecords.Items(entry.getValue()))));
+                        }
+
+                }
+                // TODO COMPAT : include fluid
                 FuelUtils.getAllRefinedFuels().stream()
                                 .collect(Collectors.groupingBy(f -> ((RefinedFuel) f.getFluid()).fePerMb()))
                                 .entrySet().stream()

src/main/java/com/devdyna/justdynathings/compat/jei/categories/FuelRecipeCategory.java

@@ -100,9 +100,10 @@ else if (recipe.getFuels().getFirst().getItem() instanceof BlockItem bi
                         : maxburn + " ticks",
                 46, 4,
                 0xFFFFFFFF);
-        guiGraphics.text(Minecraft.getInstance().font, rate + " FE/tick", 46, 18, 0xFFFFFFFF);
         guiGraphics.text(Minecraft.getInstance().font,
-                (hasShiftDown() ? MagicHelpers.withSuffix(total) : total + " FE"), 46,
+                (hasShiftDown() ? MagicHelpers.withSuffix(rate) : rate) + " FE/tick", 46, 18, 0xFFFFFFFF);
+        guiGraphics.text(Minecraft.getInstance().font,
+                (hasShiftDown() ? MagicHelpers.withSuffix(total) : total) + " FE", 46,
                 32,
                 0xFFFFFFFF);
         stack.popMatrix();

src/main/java/com/devdyna/justdynathings/datagen/client/DataLang.java

@@ -175,6 +175,7 @@ protected void addTranslations() {
                 // misc
                 add(MODULE_ID + ".configuration.answer", "A questionable question");
                 add(MODULE_ID + ".configuration.include_any_jei_fuels", "Include Any Fuel to JEI fuel category");
+                add(MODULE_ID + ".configuration.disable_jei_fuels", "Disable Fuel JEI categories when Just Tiered Generators is installed");
 
                 add(MODULE_ID + ".configuration.void_crystal_tooltips",
                                 "All possible strings rendered below Void Crystal");

src/main/java/com/devdyna/justdynathings/init/builder/AbstractParadox.java

@@ -37,7 +37,6 @@ public void inventoryTick(ItemStack itemStack, ServerLevel level, Entity entity,
 
     @Override
     public Component getName(ItemStack stack) {
-        //TODO ColorUtils.pulse milli -> seconds
         return Component.translatable(getDescriptionId())
                 .withColor(ColorUtils.pulse(Color.BLUE, Color.MAGENTA, 4).getRGB());
     }