Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Some TC aspect registering changes

Browse source
This commit is contained in:
Blood-Asp 2015-11-01 01:10:52 +01:00
parent 29fade51aa
commit 97afccb0c3
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/gregtech/common/GT_Proxy.java
View file

@ -13,6 +13,7 @@ import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.GregTech_API; import gregtech.api.GregTech_API;
import gregtech.api.enums.*; import gregtech.api.enums.*;
import gregtech.api.enums.TC_Aspects.TC_AspectStack;
import gregtech.api.interfaces.IProjectileItem; import gregtech.api.interfaces.IProjectileItem;
import gregtech.api.interfaces.internal.IGT_Mod; import gregtech.api.interfaces.internal.IGT_Mod;
import gregtech.api.interfaces.internal.IThaumcraftCompat; import gregtech.api.interfaces.internal.IThaumcraftCompat;
@ -27,6 +28,7 @@ import gregtech.api.objects.MaterialStack;
import gregtech.api.util.*; import gregtech.api.util.*;
import gregtech.common.entities.GT_Entity_Arrow; import gregtech.common.entities.GT_Entity_Arrow;
import gregtech.common.items.GT_MetaGenerated_Tool_01; import gregtech.common.items.GT_MetaGenerated_Tool_01;
import gregtech.api.enums.TC_Aspects;
import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
@ -1112,21 +1114,14 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
tReRegisteredMaterial = (Materials) i$.next(); tReRegisteredMaterial = (Materials) i$.next();
} }
aMaterial.add(GT_Utility.copyAmount(1L, new Object[]{aEvent.Ore})); aMaterial.add(GT_Utility.copyAmount(1L, new Object[]{aEvent.Ore}));
if ((GregTech_API.sThaumcraftCompat != null) && (aPrefix.doGenerateItem(aMaterial)) && (!aPrefix.isIgnored(aMaterial))) {
long tAmount = aPrefix.mMaterialAmount < 0L ? 3628800L : aPrefix.mMaterialAmount; if (GregTech_API.sThaumcraftCompat != null && aPrefix.doGenerateItem(aMaterial) && !aPrefix.isIgnored(aMaterial)) {
List<TC_Aspects.TC_AspectStack> tAspects = new ArrayList(); List<TC_AspectStack> tAspects = new ArrayList<TC_AspectStack>();
TC_Aspects.TC_AspectStack tAspect; for (TC_AspectStack tAspect : aPrefix.mAspects) tAspect.addToAspectList(tAspects);
for (Iterator i$ = aPrefix.mAspects.iterator(); i$.hasNext(); tAspect.addToAspectList(tAspects)) { if (aPrefix.mMaterialAmount >= 3628800 || aPrefix.mMaterialAmount < 0) for (TC_AspectStack tAspect : aMaterial.mAspects) tAspect.addToAspectList(tAspects);
tAspect = (TC_Aspects.TC_AspectStack) i$.next(); GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(GT_Utility.copyAmount(1, aEvent.Ore), tAspects, aEvent.Name);
}
tAspect = null;
for (Iterator i$ = aMaterial.mAspects.iterator(); i$.hasNext(); tAspect.copy(tAspect.mAmount * tAmount / 3628800L)
.addToAspectList(tAspects)) {
tAspect = (TC_Aspects.TC_AspectStack) i$.next();
}
GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(GT_Utility.copyAmount(1L, new Object[]{aEvent.Ore}),
tAspects, aEvent.Name);
} }
switch (aPrefix) { switch (aPrefix) {
case crystal: case crystal:
if ((aMaterial == Materials.CertusQuartz) || (aMaterial == Materials.NetherQuartz) || (aMaterial == Materials.Fluix)) { if ((aMaterial == Materials.CertusQuartz) || (aMaterial == Materials.NetherQuartz) || (aMaterial == Materials.Fluix)) {

2
src/main/java/gregtech/common/items/ItemComb.java
View file

@ -126,7 +126,7 @@ public class ItemComb extends Item {
type.material.mOreByProducts.isEmpty() ? null : type.material.mOreByProducts.get(0).getMolten(144), type.material.mOreByProducts.isEmpty() ? null : type.material.mOreByProducts.get(0).getMolten(144),
GT_OreDictUnificator.get(OrePrefixes.crushedPurified, type.material, 4), 96, 300); GT_OreDictUnificator.get(OrePrefixes.crushedPurified, type.material, 4), 96, 300);
GT_Values.RA.addAutoclaveRecipe(tComb, Materials.UUMatter.getFluid(1), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, type.material, 1),(type==CombType.URANIUM||type==CombType.PLUTONIUM||type==CombType.NAQUADAH)? 3: 10, 300, 24); GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(1), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, type.material, 1),(type==CombType.URANIUM||type==CombType.PLUTONIUM||type==CombType.NAQUADAH)? 300: 1000, 1000, 24);
} else { } else {
if (type == type.IRIDIUM) { if (type == type.IRIDIUM) {
GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iridium, 1), GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iridium, 1),