aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-12-04 07:29:39 +0900
committerGitHub <noreply@github.com>2023-12-03 23:29:39 +0100
commit5f80611a29b11616aadbb810e7c5510ef5725c06 (patch)
treecbe683a20cb2994a013ca167d2e2ed1e6903a3f9
parentb6d165f9c7695e2bdb646c516fe3b09518dbbdc5 (diff)
downloadGT5-Unofficial-5f80611a29b11616aadbb810e7c5510ef5725c06.tar.gz
GT5-Unofficial-5f80611a29b11616aadbb810e7c5510ef5725c06.tar.bz2
GT5-Unofficial-5f80611a29b11616aadbb810e7c5510ef5725c06.zip
Migrate to new RecipeMap (#104)
* Migrate to new RecipeMap * update gradle+bs+deps --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
-rw-r--r--.gitignore1
-rw-r--r--build.gradle25
-rw-r--r--dependencies.gradle30
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin62076 -> 63375 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties3
-rwxr-xr-xgradlew5
-rw-r--r--src/main/java/kubatech/loaders/DEFCRecipes.java70
-rw-r--r--src/main/java/kubatech/loaders/RecipeLoader.java20
-rw-r--r--src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_DEFusionCrafter.java5
-rw-r--r--src/main/resources/assets/kubatech/lang/en_US.lang4
10 files changed, 76 insertions, 87 deletions
diff --git a/.gitignore b/.gitignore
index 5f5fc93742..5e80e0ae57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ addon.local.gradle
addon.local.gradle.kts
addon.late.local.gradle
addon.late.local.gradle.kts
+layout.json
diff --git a/build.gradle b/build.gradle
index f3a7fa2788..8507c7dfbd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1699290261
+//version: 1701530445
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -28,27 +28,12 @@ import java.util.concurrent.TimeUnit
buildscript {
repositories {
- mavenCentral()
-
- maven {
- name 'forge'
- url 'https://maven.minecraftforge.net'
- }
maven {
// GTNH RetroFuturaGradle and ASM Fork
name "GTNH Maven"
url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
allowInsecureProtocol = true
}
- maven {
- name 'sonatype'
- url 'https://oss.sonatype.org/content/repositories/snapshots/'
- }
- maven {
- name 'Scala CI dependencies'
- url 'https://repo1.maven.org/maven2/'
- }
-
mavenLocal()
}
}
@@ -302,7 +287,7 @@ if (apiPackage) {
}
if (accessTransformersFile) {
- for (atFile in accessTransformersFile.split(",")) {
+ for (atFile in accessTransformersFile.split(" ")) {
String targetFile = "src/main/resources/META-INF/" + atFile.trim()
if (!getFile(targetFile).exists()) {
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
@@ -793,12 +778,12 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
}
dependencies {
- def lwjgl3ifyVersion = '1.5.1'
+ def lwjgl3ifyVersion = '1.5.7'
if (modId != 'lwjgl3ify') {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
if (modId != 'hodgepodge') {
- java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17')
+ java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
}
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
@@ -1310,7 +1295,7 @@ def addCurseForgeRelation(String type, String name) {
// Updating
-def buildscriptGradleVersion = "8.2.1"
+def buildscriptGradleVersion = "8.5"
tasks.named('wrapper', Wrapper).configure {
gradleVersion = buildscriptGradleVersion
diff --git a/dependencies.gradle b/dependencies.gradle
index 7938568d74..ceeddf5d6c 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -35,17 +35,17 @@
*/
dependencies {
- api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.83:dev')
+ api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.96:dev')
api("com.github.GTNewHorizons:EnderCore:0.2.18:dev")
- api("com.github.GTNewHorizons:EnderIO:2.5.4:dev")
+ api("com.github.GTNewHorizons:EnderIO:2.5.6:dev")
api("com.github.GTNewHorizons:ForestryMC:4.7.0:dev")
- api("com.github.GTNewHorizons:ModularUI:1.1.22:dev")
- api("com.github.GTNewHorizons:Mobs-Info:0.1.10-GTNH:dev")
+ api("com.github.GTNewHorizons:ModularUI:1.1.24:dev")
+ api("com.github.GTNewHorizons:Mobs-Info:0.1.12-GTNH:dev")
devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.7.9-GTNH:dev")
//compileOnly("curse.maven:extrautilities-225561:2264384") {
// transitive = false
//}
- compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.30:dev")
+ compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.37:dev")
{
transitive = false
}
@@ -61,19 +61,19 @@ dependencies {
{
transitive = false
}
- compileOnly("com.github.GTNewHorizons:bartworks:0.8.12:dev")
+ compileOnly("com.github.GTNewHorizons:bartworks:0.8.19:dev")
{
transitive = false
}
- compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.38:dev")
+ compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.43:dev")
{
transitive = false
}
- compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.5.2-GTNH:dev")
+ compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.5.3-GTNH:dev")
{
transitive = false
}
- runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.1.16:dev")
+ runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.3:dev")
runtimeOnly("curse.maven:cofh-core-69162:2388751")
/*
{
@@ -83,12 +83,12 @@ dependencies {
*/
// For testing
- //runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.5.2-GTNH:dev")
- //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.10.30:dev")
- //runtimeOnly("com.github.GTNewHorizons:harvestcraft:1.1.1-GTNH:dev")
- //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.38:dev")
- //runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.7.1-GTNH:dev")
- //runtimeOnly("com.github.GTNewHorizons:bartworks:0.8.12:dev")
+ //runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.5.3-GTNH:dev")
+ //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.10.37:dev")
+ //runtimeOnly("com.github.GTNewHorizons:harvestcraft:1.1.3-GTNH:dev")
+ //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.43:dev")
+ //runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.8.1-GTNH:dev")
+ //runtimeOnly("com.github.GTNewHorizons:bartworks:0.8.19:dev")
//runtimeOnly("com.github.GTNewHorizons:CraftTweaker:3.2.13:dev")
//api("com.github.GTNewHorizons:SpecialMobs:3.4.3:dev")
//api("com.github.GTNewHorizons:twilightforest:2.5.1:dev")
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c1962a79e2..033e24c4cd 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 17a8ddce2d..1af9e0930b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index aeb74cbb43..fcb6fca147 100755
--- a/gradlew
+++ b/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
fi
else
JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
+ fi
fi
# Increase the maximum file descriptors if we can.
diff --git a/src/main/java/kubatech/loaders/DEFCRecipes.java b/src/main/java/kubatech/loaders/DEFCRecipes.java
index 65085bec73..852b1ab8a0 100644
--- a/src/main/java/kubatech/loaders/DEFCRecipes.java
+++ b/src/main/java/kubatech/loaders/DEFCRecipes.java
@@ -1,12 +1,9 @@
package kubatech.loaders;
-import static gregtech.api.enums.GT_Values.E;
-import static gregtech.api.enums.Mods.GregTech;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
+import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
+import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
import java.util.Arrays;
-import java.util.HashSet;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
@@ -23,30 +20,27 @@ import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.OrePrefixes;
+import gregtech.api.recipe.RecipeMap;
+import gregtech.api.recipe.RecipeMapBackend;
+import gregtech.api.recipe.RecipeMapBuilder;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
+import gregtech.nei.formatter.SimpleSpecialValueFormatter;
import kubatech.Tags;
import kubatech.api.LoaderReference;
public class DEFCRecipes {
- public static final GT_Recipe.GT_Recipe_Map sFusionCraftingRecipes = new GT_Recipe.GT_Recipe_Map(
- new HashSet<>(16),
- "kubatech.defusioncrafter",
- "Draconic Evolution Fusion Crafter",
- null,
- GregTech.getResourcePath("textures/gui/basicmachines", "FusionCrafter"),
- 9,
- 1,
- 1,
- 0,
- 1,
- "Tier Casing: ",
- 1,
- E,
- false,
- true).setSlotOverlay(false, false, UITexture.fullImage(Tags.MODID, "gui/slot/fusion_crafter"));
+ public static final RecipeMap<RecipeMapBackend> fusionCraftingRecipes = RecipeMapBuilder
+ .of("kubatech.defusioncrafter")
+ .maxIO(9, 1, 1, 1)
+ .minInputs(1, 0)
+ .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("kubatech.defusioncrafter.tier"))
+ .slotOverlays(
+ (index, isFluid, isOutput,
+ isSpecial) -> !isFluid && !isOutput ? UITexture.fullImage(Tags.MODID, "gui/slot/fusion_crafter") : null)
+ .build();
public static void addRecipes() {
@@ -62,7 +56,7 @@ public class DEFCRecipes {
.fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288))
.eut(1_966_080)
.duration(14_000)
- .addTo(sMixerRecipes);
+ .addTo(mixerRecipes);
}
// Casings
@@ -75,7 +69,7 @@ public class DEFCRecipes {
.itemOutputs(kubatech.api.enums.ItemList.DEFCCasingBase.get(1))
.eut(491_520)
.duration(24000)
- .addTo(sAssemblerRecipes);
+ .addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_ModHandler.getModItem("dreamcraft", "tile.BloodyIchorium", 1, 0),
@@ -84,7 +78,7 @@ public class DEFCRecipes {
.itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT1.get(1))
.eut(491_520)
.duration(24000)
- .addTo(sAssemblerRecipes);
+ .addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
kubatech.api.enums.ItemList.DEFCCasingT1.get(1),
@@ -94,7 +88,7 @@ public class DEFCRecipes {
.itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT2.get(1))
.eut(491_520)
.duration(24000)
- .addTo(sAssemblerRecipes);
+ .addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
kubatech.api.enums.ItemList.DEFCCasingT2.get(1),
@@ -104,7 +98,7 @@ public class DEFCRecipes {
.itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT3.get(1))
.eut(1_996_080)
.duration(12000)
- .addTo(sAssemblerRecipes);
+ .addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
kubatech.api.enums.ItemList.DEFCCasingT3.get(1),
@@ -114,7 +108,7 @@ public class DEFCRecipes {
.itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT4.get(1))
.eut(7_864_320)
.duration(12000)
- .addTo(sAssemblerRecipes);
+ .addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
kubatech.api.enums.ItemList.DEFCCasingT4.get(1),
@@ -124,7 +118,7 @@ public class DEFCRecipes {
.itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT5.get(1))
.eut(31_457_280)
.duration(12000)
- .addTo(sAssemblerRecipes);
+ .addTo(assemblerRecipes);
fusionRecipes();
conversionRecipes();
@@ -147,7 +141,7 @@ public class DEFCRecipes {
})
.toArray(ItemStack[]::new);
recipe.mHidden = true;
- sFusionCraftingRecipes.add(recipe);
+ fusionCraftingRecipes.add(recipe);
}
private static void conversionRecipes() {
@@ -179,7 +173,7 @@ public class DEFCRecipes {
.eut(500_000)
.duration(400)
.specialValue(1)
- .addTo(sFusionCraftingRecipes)
+ .addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
GT_Values.RA.stdBuilder()
@@ -194,7 +188,7 @@ public class DEFCRecipes {
.eut(2_000_000)
.duration(800)
.specialValue(2)
- .addTo(sFusionCraftingRecipes)
+ .addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
if (Loader.isModLoaded("supersolarpanel")) {
@@ -210,7 +204,7 @@ public class DEFCRecipes {
.eut(8_000_000)
.duration(1600)
.specialValue(3)
- .addTo(sFusionCraftingRecipes)
+ .addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
} else {
GT_Values.RA.stdBuilder()
@@ -225,7 +219,7 @@ public class DEFCRecipes {
.eut(8_000_000)
.duration(1600)
.specialValue(3)
- .addTo(sFusionCraftingRecipes)
+ .addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
}
@@ -241,7 +235,7 @@ public class DEFCRecipes {
.eut(24_000_000)
.duration(3200)
.specialValue(4)
- .addTo(sFusionCraftingRecipes)
+ .addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
// ENERGY CORES
@@ -257,7 +251,7 @@ public class DEFCRecipes {
.eut(500_000)
.duration(1000)
.specialValue(2)
- .addTo(sFusionCraftingRecipes)
+ .addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
GT_Values.RA.stdBuilder()
@@ -271,7 +265,7 @@ public class DEFCRecipes {
.eut(2_000_000)
.duration(2000)
.specialValue(3)
- .addTo(sFusionCraftingRecipes)
+ .addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
// Dragon Blood
@@ -287,7 +281,7 @@ public class DEFCRecipes {
.duration(4200)
.specialValue(3)
.noOptimize()
- .addTo(sFusionCraftingRecipes);
+ .addTo(fusionCraftingRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
@@ -299,7 +293,7 @@ public class DEFCRecipes {
.duration(3600)
.specialValue(3)
.noOptimize()
- .addTo(sFusionCraftingRecipes);
+ .addTo(fusionCraftingRecipes);
}
}
}
diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java
index 5f9d06ca8a..b8e8abfc8f 100644
--- a/src/main/java/kubatech/loaders/RecipeLoader.java
+++ b/src/main/java/kubatech/loaders/RecipeLoader.java
@@ -20,9 +20,9 @@
package kubatech.loaders;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBenderRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCutterRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
+import static gregtech.api.recipe.RecipeMaps.benderRecipes;
+import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
+import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.TICKS;
@@ -226,7 +226,7 @@ public class RecipeLoader {
.fluidInputs(FluidRegistry.getFluidStack("water", 50))
.eut(32)
.duration(5 * SECONDS)
- .addTo(sMixerRecipes);
+ .addTo(mixerRecipes);
CORE.RA.addDehydratorRecipe(
new ItemStack[] { SteamedTeaLeaf.get(1) },
null,
@@ -240,7 +240,7 @@ public class RecipeLoader {
.itemOutputs(RolledTeaLeaf.get(1))
.eut(32)
.duration(5 * SECONDS)
- .addTo(sBenderRecipes);
+ .addTo(benderRecipes);
CORE.RA.addDehydratorRecipe(
new ItemStack[] { RolledTeaLeaf.get(1) },
null,
@@ -282,7 +282,7 @@ public class RecipeLoader {
.itemOutputs(BruisedTeaLeaf.get(1))
.eut(32)
.duration(5 * SECONDS)
- .addTo(sCutterRecipes);
+ .addTo(cutterRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(BruisedTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1))
.itemOutputs(PartiallyOxidizedTeaLeaf.get(1))
@@ -305,7 +305,7 @@ public class RecipeLoader {
.itemOutputs(EarlGrayTea.get(1))
.eut(32)
.duration(5 * SECONDS)
- .addTo(sMixerRecipes);
+ .addTo(mixerRecipes);
GameRegistry.addSmelting(GreenTeaLeaf.get(1), GreenTea.get(1), 10);
GT_Values.RA.stdBuilder()
.itemInputs(BlackTea.get(1))
@@ -313,14 +313,14 @@ public class RecipeLoader {
.fluidInputs(FluidRegistry.getFluidStack("potion.lemonjuice", 1000))
.eut(32)
.duration(5 * SECONDS)
- .addTo(sMixerRecipes);
+ .addTo(mixerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(BlackTea.get(1))
.itemOutputs(MilkTea.get(1))
.fluidInputs(FluidRegistry.getFluidStack("milk", 1000))
.eut(32)
.duration(5 * SECONDS)
- .addTo(sMixerRecipes);
+ .addTo(mixerRecipes);
GameRegistry.addSmelting(OolongTeaLeaf.get(1), OolongTea.get(1), 10);
GT_Values.RA.stdBuilder()
.itemInputs(GameRegistry.findItemStack("harvestcraft", "peppermintItem", 1))
@@ -328,7 +328,7 @@ public class RecipeLoader {
.fluidInputs(FluidRegistry.getFluidStack("water", 1000))
.eut(32)
.duration(5 * SECONDS)
- .addTo(sMixerRecipes);
+ .addTo(mixerRecipes);
GameRegistry.addSmelting(PuerhTeaLeaf.get(1), PuerhTea.get(1), 10);
GameRegistry.addSmelting(WhiteTeaLeaf.get(1), WhiteTea.get(1), 10);
GameRegistry.addSmelting(YellowTeaLeaf.get(1), YellowTea.get(1), 10);
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_DEFusionCrafter.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_DEFusionCrafter.java
index 0aca357ca3..9ef58ea4a5 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_DEFusionCrafter.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_DEFusionCrafter.java
@@ -42,6 +42,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.logic.ProcessingLogic;
+import gregtech.api.recipe.RecipeMap;
import gregtech.api.recipe.check.CheckRecipeResult;
import gregtech.api.recipe.check.CheckRecipeResultRegistry;
import gregtech.api.render.TextureFactory;
@@ -214,8 +215,8 @@ public class GT_MetaTileEntity_DEFusionCrafter extends KubaTechGTMultiBlockBase<
}
@Override
- public GT_Recipe.GT_Recipe_Map getRecipeMap() {
- return DEFCRecipes.sFusionCraftingRecipes;
+ public RecipeMap<?> getRecipeMap() {
+ return DEFCRecipes.fusionCraftingRecipes;
}
@Override
diff --git a/src/main/resources/assets/kubatech/lang/en_US.lang b/src/main/resources/assets/kubatech/lang/en_US.lang
index 6b01ca661c..774ab754b4 100644
--- a/src/main/resources/assets/kubatech/lang/en_US.lang
+++ b/src/main/resources/assets/kubatech/lang/en_US.lang
@@ -1,6 +1,10 @@
#This file is a translation file for KubaTech
+#RecipeMaps
+kubatech.defusioncrafter=Draconic Evolution Fusion Crafter
+
#NEI
+kubatech.defusioncrafter.tier=Tier Casing: %s
kubatech.mobhandler.eec_chance=§5Chance to drop in EEC: %.2f%%
kubatech.mobhandler.eec_disabled=§5Does not drop in EEC