aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGlodBlock <1356392126@qq.com>2021-08-27 13:19:41 +0800
committerGlodBlock <1356392126@qq.com>2021-08-27 13:19:41 +0800
commit8c2a3607aac1b58f0c6e3a6bff0c9ca3825cbf12 (patch)
tree166de4036f0776ad67961aa8debfa5dfca1c319e /src
parent0c5e53a982d407daa20a2fd9c39958e26a217e89 (diff)
downloadGT5-Unofficial-8c2a3607aac1b58f0c6e3a6bff0c9ca3825cbf12.tar.gz
GT5-Unofficial-8c2a3607aac1b58f0c6e3a6bff0c9ca3825cbf12.tar.bz2
GT5-Unofficial-8c2a3607aac1b58f0c6e3a6bff0c9ca3825cbf12.zip
fix some tpyo and change something's name
Diffstat (limited to 'src')
-rw-r--r--src/main/java/GoodGenerator/CrossMod/NEI/IMCForNEI.java24
-rw-r--r--src/main/java/GoodGenerator/Items/MyMaterial.java6
-rw-r--r--src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java4
-rw-r--r--src/main/java/GoodGenerator/Main/GoodGenerator.java10
-rw-r--r--src/main/resources/assets/goodgenerator/lang/en_US.lang2
5 files changed, 36 insertions, 10 deletions
diff --git a/src/main/java/GoodGenerator/CrossMod/NEI/IMCForNEI.java b/src/main/java/GoodGenerator/CrossMod/NEI/IMCForNEI.java
new file mode 100644
index 0000000000..c949bd43d2
--- /dev/null
+++ b/src/main/java/GoodGenerator/CrossMod/NEI/IMCForNEI.java
@@ -0,0 +1,24 @@
+package GoodGenerator.CrossMod.NEI;
+
+import GoodGenerator.Main.GoodGenerator;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import net.minecraft.nbt.NBTTagCompound;
+
+public class IMCForNEI {
+ public static void IMCSender() {
+ NBTTagCompound info = new NBTTagCompound();
+ setNBTInfo(info, "gg.recipe.neutron_activator", "gregtech:gt.blockmachines:32013");
+ FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", info);
+ }
+
+ private static void setNBTInfo(NBTTagCompound aNBT, String aName, String aBlock) {
+ aNBT.setString("handler", aName);
+ aNBT.setString("modName", GoodGenerator.MOD_NAME);
+ aNBT.setString("modId", GoodGenerator.MOD_ID);
+ aNBT.setBoolean("modRequired", true);
+ aNBT.setString("itemName", aBlock);
+ aNBT.setInteger("handlerHeight", 135);
+ aNBT.setInteger("handlerWidth", 166);
+ aNBT.setInteger("maxRecipesPerPage", 1);
+ }
+}
diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java
index 5d0a43679d..96a5dfcda7 100644
--- a/src/main/java/GoodGenerator/Items/MyMaterial.java
+++ b/src/main/java/GoodGenerator/Items/MyMaterial.java
@@ -610,7 +610,7 @@ public class MyMaterial implements Runnable {
//Naquadah Rework Materials
public static final Werkstoff naquadahEarth = new Werkstoff(
new short[]{0x4c,0x4c,0x4c},
- "Naquadah Earth",
+ "Naquadah Oxide Mixture",
subscriptNumbers("??NqTiGaAd??"),
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
@@ -767,7 +767,7 @@ public class MyMaterial implements Runnable {
public static final Werkstoff enrichedNaquadahEarth = new Werkstoff(
new short[]{0x82,0x68,0x68},
- "Enriched-Naquadah Earth",
+ "Enriched-Naquadah Oxide Mixture",
subscriptNumbers("??KeNq") + CharExchanger.shifter(8314) + "??",
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.MIXTURE,
@@ -828,7 +828,7 @@ public class MyMaterial implements Runnable {
public static final Werkstoff naquadriaEarth = new Werkstoff(
new short[]{0x4d,0x4d,0x55},
- "Naquadria Earth",
+ "Naquadria Oxide Mixture",
subscriptNumbers("??Nq*BaIn??"),
new Werkstoff.Stats().setRadioactive(true).setToxic(true),
Werkstoff.Types.MIXTURE,
diff --git a/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java b/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java
index 453761cd30..1304955150 100644
--- a/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java
@@ -462,13 +462,13 @@ public class NaquadahReworkRecipeLoader {
);
GT_Values.RA.addBlastRecipe(
- naquadriaEarth.get(OrePrefixes.dust, 1),
+ naquadahEarth.get(OrePrefixes.dust, 2),
GT_Utility.getIntegratedCircuit(2),
Materials.Nitrogen.getGas(1000),
null,
Materials.Naquadah.getNuggets(3),
null,
- 1200,
+ 2400,
7680,
5000
);
diff --git a/src/main/java/GoodGenerator/Main/GoodGenerator.java b/src/main/java/GoodGenerator/Main/GoodGenerator.java
index 82265b563d..7f60272051 100644
--- a/src/main/java/GoodGenerator/Main/GoodGenerator.java
+++ b/src/main/java/GoodGenerator/Main/GoodGenerator.java
@@ -1,6 +1,7 @@
package GoodGenerator.Main;
import GoodGenerator.Common.CommonProxy;
+import GoodGenerator.CrossMod.NEI.IMCForNEI;
import GoodGenerator.CrossMod.Thaumcraft.Research;
import GoodGenerator.Items.MyMaterial;
import GoodGenerator.Loader.*;
@@ -11,15 +12,12 @@ import GoodGenerator.Blocks.MyFluids.FluidsBuilder;
import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.creativetab.CreativeTabs;
import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
import static GoodGenerator.Loader.Loaders.addOreDic;
import static GoodGenerator.Loader.Loaders.addTexturePage;
@@ -32,6 +30,7 @@ import static GoodGenerator.Loader.Loaders.addTexturePage;
+ "required-after:tectech; ")
public final class GoodGenerator {
public static final String MOD_ID = "GoodGenerator";
+ public static final String MOD_NAME = "Good Generator";
public static final String VERSION = "GRADLETOKEN_VERSION";
public static final CreativeTabs GG = new MyTabs("Good Generator");
@@ -54,6 +53,7 @@ public final class GoodGenerator {
Loaders.compactMod();
new FluidsBuilder();
Loaders.Register();
+ IMCForNEI.IMCSender();
addOreDic();
addTexturePage();
proxy.preInit(event);
@@ -82,4 +82,6 @@ public final class GoodGenerator {
NaquadahReworkRecipeLoader.SmallRecipeChange();
NaquadahReworkRecipeLoader.Remover();
}
+
+
} \ No newline at end of file
diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang
index 7c7e570528..d0d188d862 100644
--- a/src/main/resources/assets/goodgenerator/lang/en_US.lang
+++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang
@@ -40,7 +40,7 @@ item.quartzWafer.name=Quartz Wafer
item.microHeater.name=Micro-Heater
item.quartzCrystalResonator.name=Quartz Crystal Resonator
item.inverter.name=Inverter
-item.neutronSource.name=Neutron Source Case
+item.neutronSource.name=Neutron Source
item.naquadahMass.name=Naquadah Mass
item.enrichedNaquadahMass.name=Enriched Naquadah Mass
item.naquadriaMass.name=Naquadria Mass