diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 5 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/handler/CompatHandler.java | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 418fe71681..73a502bf4e 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -613,7 +613,10 @@ public enum OrePrefixes { blockCasingAdvanced("An Advanced Casing block for a Multiblock-Machine", "Rebolted ", " Casing", true, true, true, true, false, true, false, true, false, false, 0, M * 9, 64, -1), capsuleMolten("Capsule of Molten stuff", "Molten ", " Capsule", true, true, true, true, false, false, false, true, - false, false, 0, M * 1, 64, -1); + false, false, 0, M * 1, 64, -1), + // subatomic particles + particle("A Subatomic Particle", "", "", false, false, true, false, false, false, false, false, false, false, 0, -1, + 64, -1); public static final ImmutableList<OrePrefixes> CELL_TYPES = ImmutableList.of( cell, diff --git a/src/main/java/gtPlusPlus/core/handler/CompatHandler.java b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java index 1c44216344..f6fe748546 100644 --- a/src/main/java/gtPlusPlus/core/handler/CompatHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java @@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import gregtech.api.enums.GTValues; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; @@ -25,8 +26,10 @@ import gtPlusPlus.core.common.compat.CompatThaumcraft; import gtPlusPlus.core.common.compat.CompatWitchery; import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; +import gtPlusPlus.core.item.chemistry.IonParticles; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.Particle; import gtPlusPlus.core.recipe.RecipesGregTech; import gtPlusPlus.core.recipe.RecipesLaserEngraver; import gtPlusPlus.core.recipe.ShapedRecipeObject; @@ -118,6 +121,14 @@ public class CompatHandler { "bufferCore_" + GTValues.VN[i - 1], new ItemStack(ItemUtils.getItemFromFQRN("miscutils:item.itemBufferCore" + i))); } + for (Particle i : Particle.aMap) { + GTOreDictUnificator + .registerOre(OrePrefixes.particle + i.mParticleName.replace(" ", ""), Particle.getBaseParticle(i)); + } + + for (String i : IonParticles.ions) { + GTOreDictUnificator.registerOre(OrePrefixes.particle + i, Particle.getIon(i, 0)); + } } public static void registerGregtechMachines() { |