diff options
3 files changed, 28 insertions, 11 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java index 7b634ae9f0..07d4a6c54f 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java @@ -10,6 +10,7 @@ import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_ModHandler.RecipeBits; +import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; import ic2.core.Ic2Items; @@ -657,10 +658,26 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ case 2: return (!mRequiresFluidForFiltering || getFillableStack() != null) && (((getInputAt(0) != null && getInputAt(1) != null) || (getInputAt(0) == null && getInputAt(1) == null ? getRecipeList().containsInput(aStack) : (getRecipeList().containsInput(aStack) && null != getRecipeList().findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, V[mTier], new FluidStack[]{getFillableStack()}, getSpecialSlot(), aIndex == getInputSlot() ? new ItemStack[]{aStack, getInputAt(1)} : new ItemStack[]{getInputAt(0), aStack}))))); default: - return getRecipeList().containsInput(aStack); + GT_Recipe_Map gt_recipe_map = getRecipeList(); + if (GT_Recipe_Map.sCircuitAssemblerRecipes == gt_recipe_map) // assemblers IDs + { + if (GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitBasic") || + GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitGood") || + GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitAdvanced") || + GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitData") || + GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitElite") || + GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitUltimate") || + GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitSuperconductor") || + GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitInfinity") || + GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitBio"))return true;; + // allow input all of this oredict circuits for assemblers + return getRecipeList().containsInput(aStack); + } } + return true; } + @Override public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.onPreTick(aBaseMetaTileEntity, aTick); diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 5a154b8c23..7a4738e16b 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -1717,7 +1717,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.requireResource(GregTech_API.sBlockMetal4, 3); } }, - AMERICUM(GT_BranchDefinition.RADIOACTIVE, "Americum", false, 0xE6E6FF, 0xC8C8C8) { + AMERICIUM(GT_BranchDefinition.RADIOACTIVE, "Americium", false, 0xE6E6FF, 0xC8C8C8) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.AMERICUM), 0.05f); @@ -1759,7 +1759,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(NAQUADRIA.species, AMERICUM.species, 1,2); + IBeeMutationCustom tMutation = registerMutation(NAQUADRIA.species, AMERICIUM.species, 1,2); tMutation.requireResource(GregTech_API.sBlockMetal5, 2); } }, @@ -2550,7 +2550,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(46, "Oberon"));//Oberon Dim } }, - NEPTUN(GT_BranchDefinition.PLANET, "Neptun", false, 0x334CFF, 0x576DFF) { + NEPTUNE(GT_BranchDefinition.PLANET, "Neptune", false, 0x334CFF, 0x576DFF) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.50f); @@ -2592,7 +2592,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(NEPTUN.species, COPPER.species, 7); + IBeeMutationCustom tMutation = registerMutation(NEPTUNE.species, COPPER.species, 7); if (Loader.isModLoaded("GalaxySpace")) tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "proteusblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(47, "Proteus"));//Proteus Dim @@ -2615,7 +2615,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(NEPTUN.species, GOLD.species, 7); + IBeeMutationCustom tMutation = registerMutation(NEPTUNE.species, GOLD.species, 7); if (Loader.isModLoaded("GalaxySpace")) tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "tritonblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(48, "Triton"));//Triton Dim @@ -2640,7 +2640,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(NEPTUN.species, PLUTONIUM.species, 5); + IBeeMutationCustom tMutation = registerMutation(NEPTUNE.species, PLUTONIUM.species, 5); if (Loader.isModLoaded("GalaxySpace")) tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "plutoblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(49, "Pluto"));//Pluto Dim @@ -2821,7 +2821,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(BARNARDA.species, AMERICUM.species, 3, 2); + IBeeMutationCustom tMutation = registerMutation(BARNARDA.species, AMERICIUM.species, 3, 2); if (Loader.isModLoaded("GalaxySpace")) tMutation.requireResource(GameRegistry.findBlock("GalaxySpace", "barnardaEgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(32, "Barnarda C"));//Barnarda C Dim @@ -2997,7 +2997,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { GT_BeeDefinition(GT_BranchDefinition branch, String binomial, boolean dominant, int primary, int secondary) { String lowercaseName = this.toString().toLowerCase(Locale.ENGLISH); - String species = "species" + WordUtils.capitalize(lowercaseName); + String species = WordUtils.capitalize(lowercaseName); String uid = "gregtech.bee." + species; String description = "for.description." + species; diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index b0c54f8e39..9880fdb4f0 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -883,7 +883,7 @@ for.bees.species.naquadria=Naquadria for.bees.species.dob=D-O-B for.bees.species.thorium=Thorium for.bees.species.lutetium=Lutetium -for.bees.species.americum=Americum +for.bees.species.americium=Americium for.bees.species.neutronium=Neutronium for.bees.species.naga=Naga for.bees.species.lich=Lich @@ -919,7 +919,7 @@ for.bees.species.titan=Titan for.bees.species.uranus=Uranus for.bees.species.miranda=Miranda for.bees.species.oberon=Oberon -for.bees.species.neptun=Neptun +for.bees.species.neptune=Neptune for.bees.species.proteus=Proteus for.bees.species.triton=Triton for.bees.species.pluto=Pluto |