mirror of
https://github.com/GTNewHorizons/Gadomancy.git
synced 2026-11-21 20:42:12 +00:00
- Preparations for the 1.0.7 update
This commit is contained in:
1 parent
66f9c06753
commit
0ffbc502f4
10 files changed
+68
-71
No files matched your search
@@ -116,7 +116,7 @@ public class ClientProxy extends CommonProxy {
|
||||
RenderTileEssentiaCompressor renderTileEssentiaCompressor = new RenderTileEssentiaCompressor();
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEssentiaCompressor.class, renderTileEssentiaCompressor);
|
||||
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileAIShutdown.class, new RenderTileAIShutdown());
|
||||
//ClientRegistry.bindTileEntitySpecialRenderer(TileAIShutdown.class, new RenderTileAIShutdown());
|
||||
|
||||
RenderTileAuraPylon renderTileAuraPylon = new RenderTileAuraPylon();
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileAuraPylon.class, renderTileAuraPylon);
|
||||
|
||||
@@ -93,7 +93,7 @@ public class BlockStoneMachine extends Block {
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(Item item, CreativeTabs tab, List list) {
|
||||
for (int i = 0; i < 6; i++) {
|
||||
for (int i = 0; i < 5; i++) {
|
||||
list.add(new ItemStack(item, 1, i));
|
||||
}
|
||||
}
|
||||
@@ -122,9 +122,9 @@ public class BlockStoneMachine extends Block {
|
||||
return new TileManipulationFocus();
|
||||
} else if(metadata == 4) {
|
||||
return new TileArcanePackager();
|
||||
} else if(metadata == 5) {
|
||||
}/* else if(metadata == 5) {
|
||||
return new TileAIShutdown();
|
||||
}
|
||||
}*/
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -278,9 +278,9 @@ public class BlockStoneMachine extends Block {
|
||||
setBlockBounds(0, 0, 0, 1, 3/16f, 1);
|
||||
} else if(metadata == 4) {
|
||||
setBlockBounds(0, 0, 0, 1, 12/16f, 1);
|
||||
} else if(metadata == 5) {
|
||||
}/* else if(metadata == 5) {
|
||||
setBlockBounds(0, 0, 0, 1, 1, 1);
|
||||
}
|
||||
}*/
|
||||
super.setBlockBoundsBasedOnState(world, x, y, z);
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@ package makeo.gadomancy.common.blocks.tiles;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import makeo.gadomancy.client.effect.fx.FXVortex;
|
||||
import makeo.gadomancy.client.events.ClientHandler;
|
||||
import makeo.gadomancy.common.network.packets.PacketAnimationAbsorb;
|
||||
import makeo.gadomancy.common.registration.RegisteredBlocks;
|
||||
@@ -34,7 +33,6 @@ import thaumcraft.client.fx.bolt.FXLightningBolt;
|
||||
import thaumcraft.client.fx.particles.FXEssentiaTrail;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.config.ConfigBlocks;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import thaumcraft.common.lib.events.EssentiaHandler;
|
||||
import thaumcraft.common.lib.network.PacketHandler;
|
||||
import thaumcraft.common.lib.network.fx.PacketFXEssentiaSource;
|
||||
@@ -99,7 +97,7 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA
|
||||
}
|
||||
|
||||
if(isMasterTile() && ((incSize < MAX_SIZE && (ticksExisted % 40) == 0) || (coordPedestal != null))) {
|
||||
consumeVoidmetal();
|
||||
consumeElements();
|
||||
}
|
||||
} else {
|
||||
if(isMasterTile() && isMultiblockFormed()) {
|
||||
@@ -116,7 +114,7 @@ public class TileEssentiaCompressor extends SynchronizedTileEntity implements IA
|
||||
}
|
||||
}
|
||||
|
||||
private void consumeVoidmetal() {
|
||||
private void consumeElements() {
|
||||
if(coordPedestal != null) {
|
||||
if(!checkPedestal(coordPedestal)) {
|
||||
consumeTick = 0;
|
||||
|
||||
@@ -119,7 +119,7 @@ public class ItemAuraCore extends Item {
|
||||
AIR(Aspect.AIR),
|
||||
FIRE(Aspect.FIRE),
|
||||
WATER(Aspect.WATER),
|
||||
EARTH(Aspect.EARTH),
|
||||
EARTH(Aspect.EARTH, true),
|
||||
ORDER(Aspect.ORDER),
|
||||
ENTROPY(Aspect.ENTROPY, true);
|
||||
|
||||
|
||||
@@ -128,7 +128,7 @@ public class RegisteredBlocks {
|
||||
registerTile(TileArcanePackager.class);
|
||||
registerTile(TileKnowledgeBook.class);
|
||||
registerTile(TileEssentiaCompressor.class);
|
||||
registerTile(TileAIShutdown.class);
|
||||
//registerTile(TileAIShutdown.class);
|
||||
}
|
||||
|
||||
private static void registerTile(Class<? extends TileEntity> tile, String name) {
|
||||
|
||||
@@ -279,7 +279,7 @@ public class RegisteredRecipes {
|
||||
ItemStack earthCore = new ItemStack(RegisteredItems.itemAuraCore);
|
||||
RegisteredItems.itemAuraCore.setCoreType(earthCore, ItemAuraCore.AuraCoreType.EARTH);
|
||||
|
||||
recipeAiShutdown = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".AI_SHUTDOWN", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 5), 9,
|
||||
/*recipeAiShutdown = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".AI_SHUTDOWN", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 5), 9,
|
||||
new AspectList().add(Aspect.ENTROPY, 16).add(Aspect.BEAST, 23).add(Aspect.EARTH, 22).add(Aspect.AURA, 12).add(Aspect.MIND, 17),
|
||||
earthCore, new ItemStack[] {
|
||||
new ItemStack(ConfigItems.itemZombieBrain), new ItemStack(ConfigBlocks.blockTube),
|
||||
@@ -288,7 +288,7 @@ public class RegisteredRecipes {
|
||||
new ItemStack(ConfigItems.itemZombieBrain), new ItemStack(ConfigBlocks.blockTube),
|
||||
new ItemStack(ConfigBlocks.blockJar), new ItemStack(ConfigItems.itemShard, 1, 5),
|
||||
new ItemStack(ConfigItems.itemWandRod), new ItemStack(ConfigBlocks.blockTube)
|
||||
});
|
||||
});*/
|
||||
|
||||
|
||||
auraCoreRecipes = createAuraCoreRecipes();
|
||||
|
||||
@@ -317,7 +317,8 @@ public class RegisteredResearches {
|
||||
.setHidden()
|
||||
.setParents(researchAuraCore.key, "GOGGLES", "THAUMATORIUM")
|
||||
.setItemTriggers(new ItemStack(RegisteredItems.itemAuraCore, 1, ItemAuraCore.AuraCoreType.ORDER.ordinal()))
|
||||
.setPages(new ResearchPage("gadomancy.research_page.KNOWLEDGE_BOOK.1"), new ResearchPage(RegisteredRecipes.recipeKnowledgeBook)).registerResearchItem();
|
||||
.setPages(new ResearchPage("gadomancy.research_page.KNOWLEDGE_BOOK.1"), new ResearchPage(RegisteredRecipes.recipeKnowledgeBook),
|
||||
new ResearchPage("gadomancy.research_page.KNOWLEDGE_BOOK.3"), new ResearchPage("gadomancy.research_page.KNOWLEDGE_BOOK.4")).registerResearchItem();
|
||||
|
||||
ResearchItem researchVReservoir = PseudoResearchItem.create("ESSENTIARESERVOIR", -5, 9).registerResearchItem();
|
||||
|
||||
@@ -333,14 +334,14 @@ public class RegisteredResearches {
|
||||
new ResearchPage(RegisteredRecipes.multiblockEssentiaCompressor), new ResearchPage("gadomancy.research_page.ESSENTIA_COMPRESSOR.8"),
|
||||
new ResearchPage("gadomancy.research_page.ESSENTIA_COMPRESSOR.9")).registerResearchItem();
|
||||
|
||||
researchAiShutdown = new SimpleResearchItem("AI_SHUTDOWN",
|
||||
/*researchAiShutdown = new SimpleResearchItem("AI_SHUTDOWN",
|
||||
-3, 5, 2, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 5),
|
||||
new AspectList().add(Aspect.MIND, 10).add(Aspect.ENTROPY, 20).add(Aspect.AURA, 12).add(Aspect.BEAST, 16).add(Aspect.MECHANISM, 12))
|
||||
.setHidden()
|
||||
.setParents(researchAuraCore.key, "ROD_greatwood")
|
||||
.setItemTriggers(new ItemStack(RegisteredItems.itemAuraCore, 1, ItemAuraCore.AuraCoreType.EARTH.ordinal()))
|
||||
.setPages(new ResearchPage("gadomancy.research_page.AI_SHUTDOWN.1"), new ResearchPage(RegisteredRecipes.recipeAiShutdown))
|
||||
.registerResearchItem();
|
||||
.registerResearchItem();*/
|
||||
|
||||
String[] packagerParents = Config.wardedStone ? new String[] { researchAuraCore.key, "WARDEDARCANA" } : new String[] { researchAuraCore.key };
|
||||
researchArcanePackager = new SimpleResearchItem("ARCANE_PACKAGER",
|
||||
|
||||
@@ -2,8 +2,6 @@ package makeo.gadomancy.coremod;
|
||||
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import cpw.mods.fml.common.asm.transformers.AccessTransformer;
|
||||
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.Label;
|
||||
@@ -12,7 +10,6 @@ import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.tree.*;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Iterator;
|
||||
|
||||
/**
|
||||
* This class is part of the Gadomancy Mod
|
||||
@@ -29,16 +26,16 @@ public class GadomancyTransformer extends AccessTransformer {
|
||||
public static final String NAME_NODE_RENDERER = "thaumcraft.client.renderers.tile.TileNodeRenderer";
|
||||
public static final String NAME_RENDER_EVENT_HANDLER = "thaumcraft.client.lib.RenderEventHandler";
|
||||
public static final String NAME_NEI_ITEMPANEL = "codechicken.nei.ItemPanel";
|
||||
public static final String NAME_ENTITY_LIVING_BASE = "net.minecraft.entity.EntityLivingBase";
|
||||
//public static final String NAME_ENTITY_LIVING_BASE = "net.minecraft.entity.EntityLivingBase";
|
||||
|
||||
public GadomancyTransformer() throws IOException {}
|
||||
|
||||
@Override
|
||||
public byte[] transform(String name, String transformedName, byte[] bytes) {
|
||||
boolean needsTransform = transformedName.equalsIgnoreCase(NAME_ENCHANTMENT_HELPER) ||
|
||||
name.equalsIgnoreCase(NAME_WANDMANAGER) || name.equalsIgnoreCase(NAME_NODE_RENDERER)
|
||||
|| name.equalsIgnoreCase(NAME_RENDER_EVENT_HANDLER) || name.equals(NAME_NEI_ITEMPANEL) ||
|
||||
name.equalsIgnoreCase(NAME_ENTITY_LIVING_BASE);
|
||||
transformedName.equalsIgnoreCase(NAME_WANDMANAGER) || transformedName.equalsIgnoreCase(NAME_NODE_RENDERER)
|
||||
|| transformedName.equalsIgnoreCase(NAME_RENDER_EVENT_HANDLER) || transformedName.equals(NAME_NEI_ITEMPANEL)/* ||
|
||||
transformedName.equalsIgnoreCase(NAME_ENTITY_LIVING_BASE)*/;
|
||||
if(!needsTransform) return super.transform(name, transformedName, bytes);
|
||||
|
||||
FMLLog.info("[GadomancyTransformer] Transforming " + name + ": " + transformedName);
|
||||
@@ -67,7 +64,7 @@ public class GadomancyTransformer extends AccessTransformer {
|
||||
mn.instructions.add(new InsnNode(Opcodes.IRETURN));
|
||||
}
|
||||
}
|
||||
} else if(name.equalsIgnoreCase(NAME_WANDMANAGER)) {
|
||||
} else if(transformedName.equalsIgnoreCase(NAME_WANDMANAGER)) {
|
||||
for(MethodNode mn : node.methods) {
|
||||
if(mn.name.equals("getTotalVisDiscount")) {
|
||||
InsnList updateTotal = new InsnList();
|
||||
@@ -81,7 +78,7 @@ public class GadomancyTransformer extends AccessTransformer {
|
||||
mn.instructions.insertBefore(mn.instructions.get(mn.instructions.size() - 5), updateTotal);
|
||||
}
|
||||
}
|
||||
} else if(name.equalsIgnoreCase(NAME_NODE_RENDERER)) {
|
||||
} else if(transformedName.equalsIgnoreCase(NAME_NODE_RENDERER)) {
|
||||
for (MethodNode mn : node.methods) {
|
||||
if (mn.name.equals("renderTileEntityAt")) {
|
||||
InsnList setBefore = new InsnList();
|
||||
@@ -106,7 +103,7 @@ public class GadomancyTransformer extends AccessTransformer {
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if(name.equalsIgnoreCase(NAME_RENDER_EVENT_HANDLER)) {
|
||||
} else if(transformedName.equalsIgnoreCase(NAME_RENDER_EVENT_HANDLER)) {
|
||||
for(MethodNode mn : node.methods) {
|
||||
if (mn.name.equals("blockHighlight")) {
|
||||
InsnList setBefore = new InsnList();
|
||||
@@ -131,7 +128,7 @@ public class GadomancyTransformer extends AccessTransformer {
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if(name.equalsIgnoreCase(NAME_NEI_ITEMPANEL)) {
|
||||
} else if(transformedName.equalsIgnoreCase(NAME_NEI_ITEMPANEL)) {
|
||||
for (MethodNode mn : node.methods) {
|
||||
if(mn.name.equals("updateItemList")) {
|
||||
InsnList newInstructions = new InsnList();
|
||||
@@ -142,7 +139,7 @@ public class GadomancyTransformer extends AccessTransformer {
|
||||
mn.instructions = newInstructions;
|
||||
}
|
||||
}
|
||||
} else if(name.equalsIgnoreCase(NAME_ENTITY_LIVING_BASE)) {
|
||||
}/* else if(transformedName.equalsIgnoreCase(NAME_ENTITY_LIVING_BASE)) {
|
||||
FieldNode fn = new FieldNode(Opcodes.ACC_PUBLIC, "ignoreCollisions", Type.BOOLEAN_TYPE.getDescriptor(), null, true);
|
||||
node.fields.add(fn);
|
||||
|
||||
@@ -182,7 +179,7 @@ public class GadomancyTransformer extends AccessTransformer {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
node.accept(writer);
|
||||
|
||||
Reference in new issue
Block a user