diff --git a/AntimatterAPI b/AntimatterAPI index e14f0e34..cf0a050f 160000 --- a/AntimatterAPI +++ b/AntimatterAPI @@ -1 +1 @@ -Subproject commit e14f0e34d3017d9fe635c84a197fdcf96a87dffa +Subproject commit cf0a050f8dbc8931d674cbc4197e161c9d27288b diff --git a/common/src/main/java/trinsdar/gt4r/data/GT4RData.java b/common/src/main/java/trinsdar/gt4r/data/GT4RData.java index 5c70719b..b9c19e0c 100644 --- a/common/src/main/java/trinsdar/gt4r/data/GT4RData.java +++ b/common/src/main/java/trinsdar/gt4r/data/GT4RData.java @@ -3,6 +3,7 @@ import earth.terrarium.botarium.common.registry.fluid.FluidProperties; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.AntimatterConfig; +import muramasa.antimatter.Ref; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.fluid.AntimatterFluid; @@ -130,13 +131,13 @@ private static Block.Properties prepareProperties() { public static ItemBasic CompressedFireClay = new ItemBasic<>(GT4RRef.ID, "compressed_fire_clay").tip("Brick Shaped"); public static ItemBasic FireBrick = new ItemBasic<>(GT4RRef.ID, "fire_brick").tip("Heat Resistant"); public static ItemBasic ItemSuperconductor = new ItemBasic<>(GT4RRef.ID, "superconductor").tip("Conducts Energy Losslessly"); - public static ItemBasic FrequencyTransmitter = new ItemBasic<>(GT4RRef.ID, "frequency_transmitter", new Item.Properties().tab(muramasa.antimatter.Ref.TAB_ITEMS).stacksTo(1)); + public static ItemBasic FrequencyTransmitter = new ItemBasic<>(GT4RRef.ID, "frequency_transmitter", new Item.Properties().tab(Ref.TAB_ITEMS).stacksTo(1)); - public static ItemBasic LavaFilter = new ItemBasic<>(GT4RRef.ID, "lava_filter", new Item.Properties().tab(muramasa.antimatter.Ref.TAB_ITEMS).defaultDurability(100)); + public static ItemBasic LavaFilter = new ItemBasic<>(GT4RRef.ID, "lava_filter", new Item.Properties().tab(Ref.TAB_ITEMS).defaultDurability(100)); public static ItemBasic LighterEmpty = new ItemBasic<>(GT4RRef.ID, "lighter_empty"); - public static ItemBasic Match = new ItemMatch(GT4RRef.ID, "match", new Item.Properties().tab(muramasa.antimatter.Ref.TAB_ITEMS)); - public static ItemBasic MatchBook = new ItemMatch(GT4RRef.ID, "match_book", new Item.Properties().tab(muramasa.antimatter.Ref.TAB_ITEMS).defaultDurability(64)); - public static ItemBasic Lighter = new ItemMatch(GT4RRef.ID, "lighter", new Item.Properties().tab(muramasa.antimatter.Ref.TAB_ITEMS).defaultDurability(100)); + public static ItemBasic Match = new ItemMatch(GT4RRef.ID, "match", new Item.Properties().tab(Ref.TAB_ITEMS)); + public static ItemBasic MatchBook = new ItemMatch(GT4RRef.ID, "match_book", new Item.Properties().tab(Ref.TAB_ITEMS).defaultDurability(64)); + public static ItemBasic Lighter = new ItemMatch(GT4RRef.ID, "lighter", new Item.Properties().tab(Ref.TAB_ITEMS).defaultDurability(100)); public static ItemBasic MixedMetal = new ItemMixedMetal(); public static ItemBasic AdvancedAlloy = new ItemBasic<>(GT4RRef.ID,"advanced_alloy"); diff --git a/common/src/main/java/trinsdar/gt4r/datagen/GT4RLocalizations.java b/common/src/main/java/trinsdar/gt4r/datagen/GT4RLocalizations.java index 89c89de7..7d4473f4 100644 --- a/common/src/main/java/trinsdar/gt4r/datagen/GT4RLocalizations.java +++ b/common/src/main/java/trinsdar/gt4r/datagen/GT4RLocalizations.java @@ -75,16 +75,14 @@ protected void english(String domain, String locale) { AntimatterAPI.all(ItemMatch.class, domain).forEach(i -> { String value = lowerUnderscoreToUpperSpaced(i.getId()); if (i == GT4RData.Lighter) value = value.concat(" (Full)"); - add(i, value); + override(i.getDescriptionId(), value); }); AntimatterAPI.all(ItemPowerUnit.class, domain).forEach(i -> { String value = lowerUnderscoreToUpperSpaced(i.getId()); if (i.getId().startsWith("power_unit")) value = lowerUnderscoreToUpperSpacedRotated(i.getId()); - add(i, value); + override(i.getDescriptionId(), value); }); - AntimatterAPI.all(ItemIntCircuit.class, domain).forEach(i -> add(i, "Integrated Circuit (" + i.circuitId + ")")); - add(GT4RData.MixedMetal, lowerUnderscoreToUpperSpaced(GT4RData.MixedMetal.getId())); - add(GT4RData.CraftingModule, lowerUnderscoreToUpperSpaced(GT4RData.CraftingModule.getId())); + AntimatterAPI.all(ItemIntCircuit.class, domain).forEach(i -> override(i.getDescriptionId(), "Integrated Circuit (" + i.circuitId + ")")); override(ROCK_CUTTER.getToolStack(NULL, NULL).getItem().getDescriptionId(), "Rock Cutter"); override(GT4RData.LighterEmpty.getDescriptionId(), "Lighter (Empty)"); override(GT4RData.StorageDataOrb.getDescriptionId(), "Data Orb"); diff --git a/common/src/main/java/trinsdar/gt4r/integration/jei/GT4RJeiPlugin.java b/common/src/main/java/trinsdar/gt4r/integration/jei/GT4RJeiPlugin.java deleted file mode 100644 index 428467d0..00000000 --- a/common/src/main/java/trinsdar/gt4r/integration/jei/GT4RJeiPlugin.java +++ /dev/null @@ -1,102 +0,0 @@ -package trinsdar.gt4r.integration.jei; - -import io.github.gregtechintergalactical.gtcore.gui.ContainerWorkbench; -import mezz.jei.api.IModPlugin; -import mezz.jei.api.JeiPlugin; -import mezz.jei.api.constants.RecipeTypes; -import mezz.jei.api.constants.VanillaRecipeCategoryUid; -import mezz.jei.api.recipe.RecipeType; -import mezz.jei.api.recipe.transfer.IRecipeTransferInfo; -import mezz.jei.api.registration.IRecipeCatalystRegistration; -import mezz.jei.api.registration.IRecipeTransferRegistration; -import muramasa.antimatter.Antimatter; -import muramasa.antimatter.machine.types.Machine; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.inventory.Slot; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.crafting.CraftingRecipe; -import trinsdar.gt4r.GT4RRef; - -import java.util.ArrayList; -import java.util.List; - -import static muramasa.antimatter.machine.Tier.HV; -import static muramasa.antimatter.machine.Tier.LV; -import static trinsdar.gt4r.data.GT4RMaterialTags.CHARGING_WORKBENCH; -import static trinsdar.gt4r.data.GT4RMaterialTags.WORKBENCH; - -@JeiPlugin -public class GT4RJeiPlugin implements IModPlugin { - public GT4RJeiPlugin(){ - Antimatter.LOGGER.debug("GT4RJEIPlugin created"); - } - - @Override - public ResourceLocation getPluginUid() { - return new ResourceLocation(GT4RRef.ID, "jei_plugin"); - } - - @Override - public void registerRecipeTransferHandlers(IRecipeTransferRegistration registration) { - registration.addRecipeTransferHandler(new GT4RRecipeTransferInfo()); - } - - @Override - public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) { - WORKBENCH.all().forEach(m -> { - registration.addRecipeCatalyst(new ItemStack(Machine.get(m.getId() + "_workbench", GT4RRef.ID).map(mch -> mch.getItem(LV)).orElse(Items.AIR)), RecipeTypes.CRAFTING); - if (m.has(CHARGING_WORKBENCH)){ - registration.addRecipeCatalyst(new ItemStack(Machine.get(m.getId() + "_charging_workbench", GT4RRef.ID).map(mch -> mch.getItem(HV)).orElse(Items.AIR)), RecipeTypes.CRAFTING); - } - }); - } - - public static class GT4RRecipeTransferInfo implements IRecipeTransferInfo{ - @Override - public Class getContainerClass() { - return ContainerWorkbench.class; - } - - @Override - public RecipeType getRecipeType() { - return RecipeTypes.CRAFTING; - } - - @Override - public boolean canHandle(ContainerWorkbench containerWorkbench, CraftingRecipe recipe) { - return true; - } - - @Override - public List getRecipeSlots(ContainerWorkbench containerWorkbench, CraftingRecipe recipe) { - List slots = new ArrayList<>(); - for (int i = 17; i < 26; i++) { - slots.add(containerWorkbench.getSlot(i)); - } - return slots; - } - - @Override - public List getInventorySlots(ContainerWorkbench containerWorkbench, CraftingRecipe recipe) { - List slots = new ArrayList<>(); - for (int i = 1; i < 17; i++) { - slots.add(containerWorkbench.getSlot(i)); - } - for (int i = 26; i < 68; i++) { - slots.add(containerWorkbench.getSlot(i)); - } - return slots; - } - - @Override - public Class getRecipeClass() { - return CraftingRecipe.class; - } - - @Override - public ResourceLocation getRecipeCategoryUid() { - return VanillaRecipeCategoryUid.CRAFTING; - } - } -} diff --git a/fabric/build.gradle b/fabric/build.gradle index d3e997d5..41c44afe 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -50,6 +50,7 @@ dependencies{ exclude(group: "net.fabricmc.fabric-api") }*/ modImplementation("com.github.Trinsdar:ARRP:0.6.7-hotfix") + modImplementation "maven.modrinth:carbon-config:2ngFmmhP" implementation("io.github.gregtechintergalactical:gtcore-fabric:${rootProject.gt_core_version}-${rootProject.minecraft_version}:dev-shadow"){ transitive = false }