diff --git a/libs/StructureLib-1.0.10-deobf.jar b/libs/StructureLib-1.0.10-deobf.jar
new file mode 100644
index 0000000..3b338ac
Binary files /dev/null and b/libs/StructureLib-1.0.10-deobf.jar differ
diff --git a/libs/gregtech-5.09.34.17-api.jar b/libs/gregtech-5.09.34.17-api.jar
deleted file mode 100644
index baac028..0000000
Binary files a/libs/gregtech-5.09.34.17-api.jar and /dev/null differ
diff --git a/libs/gregtech-5.09.37.12-api.jar b/libs/gregtech-5.09.37.12-api.jar
new file mode 100644
index 0000000..d223af5
Binary files /dev/null and b/libs/gregtech-5.09.37.12-api.jar differ
diff --git a/libs/gregtech-5.09.34.17-dev.jar b/libs/gregtech-5.09.37.12-dev.jar
similarity index 77%
rename from libs/gregtech-5.09.34.17-dev.jar
rename to libs/gregtech-5.09.37.12-dev.jar
index 17f333e..c6669fe 100644
Binary files a/libs/gregtech-5.09.34.17-dev.jar and b/libs/gregtech-5.09.37.12-dev.jar differ
diff --git a/libs/gregtech-5.09.34.17-sources.jar b/libs/gregtech-5.09.37.12-sources.jar
similarity index 79%
rename from libs/gregtech-5.09.34.17-sources.jar
rename to libs/gregtech-5.09.37.12-sources.jar
index 27b73bf..3ed979a 100644
Binary files a/libs/gregtech-5.09.34.17-sources.jar and b/libs/gregtech-5.09.37.12-sources.jar differ
diff --git a/src/main/java/emt/init/EMTRecipes.java b/src/main/java/emt/init/EMTRecipes.java
index c584635..861199c 100644
--- a/src/main/java/emt/init/EMTRecipes.java
+++ b/src/main/java/emt/init/EMTRecipes.java
@@ -368,9 +368,9 @@ public class EMTRecipes {
thaumiumWings = addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(EMTItems.thaumiumWing), EMTCraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(EMTItems.itemEMTItems, 1, 14));
- magicalMachineCasing = addArcaneCraftingRecipe("ResearchCompleter", new ItemStack(GregTech_API.sBlockCasings8, 1, 5), EMTCraftingAspects.magicalMachineCasing, "XYX", "XZX", "XYX", 'X', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1), 'Y', new ItemStack(ConfigItems.itemResource, 1, 14) , 'Z', GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Thaumium, 1));
+ magicalMachineCasing = addArcaneCraftingRecipe("ResearchCompleter", new ItemStack(GregTech_API.sBlockCasings8, 1, 6), EMTCraftingAspects.magicalMachineCasing, "XYX", "XZX", "XYX", 'X', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1), 'Y', new ItemStack(ConfigItems.itemResource, 1, 14) , 'Z', GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Thaumium, 1));
- researchCompleter = addArcaneCraftingRecipe("ResearchCompleter", new ItemStack(GregTech_API.sBlockMachines, 1, 13001), EMTCraftingAspects.researchCompleter, "XYX", "YZY", "XAX", 'X', GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 1L), 'Y', new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 2), 'Z', new ItemStack(GregTech_API.sBlockCasings8, 1, 5), 'A', new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5));
+ researchCompleter = addArcaneCraftingRecipe("ResearchCompleter", new ItemStack(GregTech_API.sBlockMachines, 1, 13001), EMTCraftingAspects.researchCompleter, "XYX", "YZY", "XAX", 'X', GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 1L), 'Y', new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 2), 'Z', new ItemStack(GregTech_API.sBlockCasings8, 1, 6), 'A', new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5));
/** Crucible Recipes **/
diff --git a/src/main/java/emt/init/EMTResearches.java b/src/main/java/emt/init/EMTResearches.java
index 88d3bc9..f316202 100644
--- a/src/main/java/emt/init/EMTResearches.java
+++ b/src/main/java/emt/init/EMTResearches.java
@@ -33,7 +33,7 @@ public class EMTResearches {
new EMTResearchItem("The One Ring", 6, -7, 0, new ItemStack(EMTItems.onering)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""));
new EMTResearchItem("Electric Cloud", 4, -7, 0, new ItemStack(EMTBlocks.electricCloud)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage("2"));
new EMTResearchItem("Feather Wings", 0, 2, 0, new ItemStack(EMTItems.featherWing)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(EMTRecipes.cardboard), new ResearchPage(EMTRecipes.featherWing), new ResearchPage(EMTRecipes.featherWings));
- new EMTResearchItem("ResearchCompleter", EMTResearchAspects.researchCompleter, -4, -2, 0, new ItemStack(GregTech_API.sBlockMachines, 1, 13001)).setParents("Electric Magic Tools").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.magicalMachineCasing), new ResearchPage(EMTRecipes.researchCompleter));
+ new EMTResearchItem("ResearchCompleter", EMTResearchAspects.researchCompleter, -4, -2, 0, new ItemStack(GregTech_API.sBlockMachines, 1, 13001)).setParents("Electric Magic Tools").setParentsHidden("WANDPED").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.magicalMachineCasing), new ResearchPage(EMTRecipes.researchCompleter));
/*************************************/
/** Research that can be disabled **/
diff --git a/src/main/java/emt/tile/TileEntityResearchMultiblockController.java b/src/main/java/emt/tile/TileEntityResearchMultiblockController.java
index 3a8c5c8..777be15 100644
--- a/src/main/java/emt/tile/TileEntityResearchMultiblockController.java
+++ b/src/main/java/emt/tile/TileEntityResearchMultiblockController.java
@@ -58,7 +58,6 @@ public class TileEntityResearchMultiblockController extends GT_MetaTileEntity_Mu
@Override
public boolean onRunningTick(ItemStack aStack) {
- //TODO consider only doing this every x ticks and make sure it finishes x ticks before the end of the recipe
float progressAmount = ((float) this.mProgresstime) / this.mMaxProgresstime;
int requiredVis = (int)Math.ceil(progressAmount * recipeAspectCost - aspectsAbsorbed);
@@ -153,7 +152,7 @@ public class TileEntityResearchMultiblockController extends GT_MetaTileEntity_Mu
public boolean checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX;
int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ;
- //TODO add minimum casing number
+ int casingAmount = 0;
this.length = findLength(iGregTechTileEntity, xDir, zDir);
if (this.length < 2)
return false;
@@ -184,9 +183,11 @@ public class TileEntityResearchMultiblockController extends GT_MetaTileEntity_Mu
} else { //Check for machine casings and buses etc.
if (sidewaysOffset != 0 || forwardsOffset == 0 || Math.abs(forwardsOffset) == this.length - 1) { //Check ring shapes on top and bottom
//TODO change casing index to correct for this multi
- if (!this.addMaintenanceToMachineList(tTileEntity, 16) && !this.addInputToMachineList(tTileEntity, 16) && !this.addOutputToMachineList(tTileEntity, 16) && !this.addEnergyInputToMachineList(tTileEntity, 16)) {
- if ((tBlock != GregTech_API.sBlockCasings8 || tMeta != 5))
+ if (!this.addMaintenanceToMachineList(tTileEntity, 182) && !this.addInputToMachineList(tTileEntity, 182) && !this.addOutputToMachineList(tTileEntity, 182) && !this.addEnergyInputToMachineList(tTileEntity, 182)) {
+ if ((tBlock != GregTech_API.sBlockCasings8 || tMeta != 6))
return false;
+ else
+ casingAmount++;
}
}
}
@@ -194,7 +195,7 @@ public class TileEntityResearchMultiblockController extends GT_MetaTileEntity_Mu
}
}
- return true;
+ return casingAmount >= length * 3;
}
private int findLength(final IGregTechTileEntity iGregTechTileEntity, final int xDir, final int zDir) {
@@ -257,7 +258,7 @@ public class TileEntityResearchMultiblockController extends GT_MetaTileEntity_Mu
.addSeparator()
.beginVariableStructureBlock(3, 3, 3, 3, 3, MAX_LENGTH, true)
.addController("Front center")
- .addOtherStructurePart("[x] machine casing", "Top and bottom layers outside")
+ .addOtherStructurePart("Magical machine casing", "Top and bottom layers outside. 3 x L minimum")
.addOtherStructurePart("Warded glass", "Middle layer outside")
.addEnergyHatch("Any casing")
.addMaintenanceHatch("Any casing")
@@ -271,24 +272,18 @@ public class TileEntityResearchMultiblockController extends GT_MetaTileEntity_Mu
}
}
- //TODO texture
- /*@Override
- public ITexture[] getTexture(IGregTechTileEntity iGregTechTileEntity, byte b, byte b1, byte b2, boolean b3, boolean b4) {
- return new ITexture[0];
- }*/
- //Temp copied from implosion compressor
@Override
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
if (aSide == aFacing) {
if (aActive) return new ITexture[]{
- Textures.BlockIcons.casingTexturePages[0][16],
- TextureFactory.of(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE),
- TextureFactory.builder().addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE_GLOW).glow().build()};
+ Textures.BlockIcons.casingTexturePages[1][54],
+ TextureFactory.of(OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE),
+ TextureFactory.builder().addIcon(OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE_GLOW).extFacing().glow().build()};
return new ITexture[]{
- Textures.BlockIcons.casingTexturePages[0][16],
- TextureFactory.of(OVERLAY_FRONT_IMPLOSION_COMPRESSOR),
- TextureFactory.builder().addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_GLOW).glow().build()};
+ Textures.BlockIcons.casingTexturePages[1][54],
+ TextureFactory.of(OVERLAY_FRONT_RESEARCH_COMPLETER),
+ TextureFactory.builder().addIcon(OVERLAY_FRONT_RESEARCH_COMPLETER_GLOW).extFacing().glow().build()};
}
- return new ITexture[]{Textures.BlockIcons.casingTexturePages[0][16]};
+ return new ITexture[]{Textures.BlockIcons.casingTexturePages[1][54]};
}
}
diff --git a/src/main/resources/assets/emt/lang/en_US.lang b/src/main/resources/assets/emt/lang/en_US.lang
index da645b5..5edb002 100644
--- a/src/main/resources/assets/emt/lang/en_US.lang
+++ b/src/main/resources/assets/emt/lang/en_US.lang
@@ -379,3 +379,7 @@ emt.text.Quantum Wings=After exploring all the possibilities of nanotechnologies
emt.rsname.Infused Quantum Armor=Infused Quantum Сhestplate.
emt.tag.Infused Quantum Armor=The last step is here...
emt.text.Infused Quantum Armor=You had been nothing to do and you decided to do something useful. You had an idea in your head of making armor which you can fasten the wings or backpack for being protected in flight. Take the wings or backpack in your hands and sit down to put their on armor. To remove them, hold Shift + "Unequip"(see in options).
+
+emt.rsname.ResearchCompleter=Automated Research
+emt.tag.ResearchCompleter=No more ordo spam
+emt.text.ResearchCompleter=It was fun at first, but you've decided it's time to find a better way to handle all this research. By mixing technology and magic you have come up with a multiblock that can complete a research note by itself.
To function, it needs nodes to be placed in the center of the structure and will slowly destroy them while running. Node stabilizers are optional but recommended for keeping so many nodes close together without them destroying each other.
\ No newline at end of file