Merge branch 'development' into 1.8.9

* development:
  Fixed Turbine Stats crash
  Fixed Turbine container crash
  Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash
  ja_JP.lang - translate generators and ores tooltip, fix some entries
  ja_JP.lang - translate general machinery and Blocks(without ores) tooltip.
  ja_JP.lang - little fix/change
  ja_JP.lang - fix/change some entries
  ja_JP.lang - translate tooltip and gui text
  ja_JP.lang - gui and tooltip translation progress
  ja_JP.lang - fix/change some translation(items and blocks)
  ja_JP.lang tweak some entries based on v9

Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/util/RecipeUtils.java
This commit is contained in:
aidancbrady committed 2016-05-21 15:31:26 -04:00
commit d5656b0264
15 files changed
+1129 -984

No files matched your search

@@ -111,13 +111,6 @@ public class MekanismRenderer
{
type.setIcon(event.map.registerSprite(type.iconResource));
}
/*
if(RenderPartTransmitter.getInstance() != null)
{
RenderPartTransmitter.getInstance().resetDisplayInts();
}
*/
RenderDynamicTank.resetDisplayInts();
RenderThermalEvaporationController.resetDisplayInts();
+5 -9
View File
@@ -160,7 +160,7 @@ import com.mojang.authlib.GameProfile;
* @author AidanBrady
*
*/
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.1", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "after:mcmultipart;after:JEI;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" +
"after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore")
public class Mekanism
@@ -186,7 +186,7 @@ public class Mekanism
public static Configuration configuration;
/** Mekanism version number */
public static Version versionNumber = new Version(9, 0, 0);
public static Version versionNumber = new Version(9, 0, 1);
/** MultiblockManagers for various structrures */
public static MultiblockManager<SynchronizedTankData> tankManager = new MultiblockManager<SynchronizedTankData>("dynamicTank");
@@ -359,9 +359,9 @@ public class Mekanism
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 9, 7),
"OOO", "OGO", "OOO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('G'), "ingotRefinedGlowstone"
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 8),
" S ", "SPS", " S ", Character.valueOf('S'), "ingotSteel", Character.valueOf('P'), "ingotOsmium"
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 8), new Object[] {
"SGS", "GPG", "SGS", Character.valueOf('S'), "ingotSteel", Character.valueOf('P'), "ingotOsmium", Character.valueOf('G'), "blockGlass"
}));
BlockStateMachine.MachineType.ENERGIZED_SMELTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 10),
"RCR", "GIG", "RCR", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), "alloyBasic", Character.valueOf('G'), "blockGlass", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
));
@@ -662,7 +662,6 @@ public class Mekanism
//Add the bin recipe system to the CraftingManager
CraftingManager.getInstance().getRecipeList().add(new BinRecipe());
/*
//Transmitters
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 0),
"SRS", Character.valueOf('S'), "ingotSteel", Character.valueOf('R'), "dustRedstone"
@@ -730,7 +729,6 @@ public class Mekanism
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 21),
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 20)
));
*/
//Plastic stuff
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 1),
@@ -745,11 +743,9 @@ public class Mekanism
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, 15),
"SSS", "S S", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2)
));
/*
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, 15),
"PSP", "S S", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('G'), Items.glowstone_dust
));
*/
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticFence, 3, 15),
"BSB", "BSB", Character.valueOf('B'), new ItemStack(MekanismBlocks.PlasticBlock, 1, 15), Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 3)
));
@@ -101,7 +101,22 @@ public interface IFactory
}
else if(this == INFUSING)
{
return getRecipe(slotStack, infuse);
if(infuse.type != null)
{
return RecipeHandler.getMetallurgicInfuserRecipe(new InfusionInput(infuse, slotStack));
}
else {
for(Object obj : Recipe.METALLURGIC_INFUSER.get().entrySet())
{
Map.Entry entry = (Map.Entry)obj;
InfusionInput input = (InfusionInput)entry.getKey();
if(input.inputStack.isItemEqual(slotStack))
{
return (MetallurgicInfuserRecipe)entry.getValue();
}
}
}
}
return getRecipe(slotStack);
@@ -192,22 +192,19 @@ public class ContainerFactory extends Container
}
}
}
else if(tileEntity.recipeType == RecipeType.INFUSING)
else if(tileEntity.recipeType == RecipeType.INFUSING && InfuseRegistry.getObject(slotStack) != null && (tileEntity.infuseStored.type == null || tileEntity.infuseStored.type == InfuseRegistry.getObject(slotStack).type))
{
if(InfuseRegistry.getObject(slotStack) != null && (tileEntity.infuseStored.type == null || tileEntity.infuseStored.type == InfuseRegistry.getObject(slotStack).type))
if(slotID > tileEntity.inventory.length-1)
{
if(slotID > tileEntity.inventory.length-1)
if(!mergeItemStack(slotStack, 3, 4, false))
{
if(!mergeItemStack(slotStack, 3, 4, false))
{
return null;
}
return null;
}
else {
if(!mergeItemStack(slotStack, tileEntity.inventory.length-1, inventorySlots.size(), true))
{
return null;
}
}
else {
if(!mergeItemStack(slotStack, tileEntity.inventory.length-1, inventorySlots.size(), true))
{
return null;
}
}
}
@@ -42,7 +42,6 @@ import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.integration.IComputerIntegration;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.recipe.RecipeHandler;
import mekanism.common.recipe.RecipeHandler.Recipe;
import mekanism.common.recipe.inputs.InfusionInput;
import mekanism.common.recipe.machines.AdvancedMachineRecipe;
import mekanism.common.recipe.machines.BasicMachineRecipe;
@@ -632,24 +631,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
}
else if(recipeType == RecipeType.INFUSING)
{
if(infuseStored.type != null)
{
if(RecipeHandler.getMetallurgicInfuserRecipe(new InfusionInput(infuseStored, itemstack)) != null)
{
return true;
}
}
else {
for(Object obj : Recipe.METALLURGIC_INFUSER.get().keySet())
{
InfusionInput input = (InfusionInput)obj;
if(input.inputStack.isItemEqual(itemstack))
{
return true;
}
}
}
return InfuseRegistry.getObject(itemstack) != null && (infuseStored.type == null || infuseStored.type == InfuseRegistry.getObject(itemstack).type);
}
}
@@ -228,7 +228,7 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement
@Override
public double getInverseConductionCoefficient()
{
return 1;
return 5;
}
@Override
@@ -220,7 +220,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl
@Override
public double getInverseConductionCoefficient()
{
return 1;
return 5;
}
@Override
@@ -210,7 +210,7 @@ public class RecipeUtils
{
ItemStack itemstack = inv.getStackInSlot(i);
if(BasicBlockType.get(itemstack) == BasicBlockType.BIN)
if(itemstack != null && BasicBlockType.get(itemstack) == BasicBlockType.BIN)
{
InventoryBin binInv = new InventoryBin(itemstack);
@@ -61,7 +61,7 @@ public class RenderIndustrialTurbine extends TileEntitySpecialRenderer
RenderTurbineRotor.internalRender = false;
if(tileEntity.structure.fluidStored != null && tileEntity.structure.fluidStored.amount != 0)
if(tileEntity.structure.fluidStored != null && tileEntity.structure.fluidStored.amount != 0 && tileEntity.structure.volLength > 0)
{
RenderData data = new RenderData();
@@ -3,6 +3,7 @@ package mekanism.generators.common;
import mekanism.api.MekanismConfig.generators;
import mekanism.common.Mekanism;
import mekanism.common.base.IGuiProvider;
import mekanism.common.inventory.container.ContainerFilter;
import mekanism.common.inventory.container.ContainerNull;
import mekanism.common.tile.TileEntityContainerBlock;
import mekanism.generators.common.inventory.container.ContainerBioGenerator;
@@ -151,6 +152,7 @@ public class GeneratorsCommonProxy implements IGuiProvider
case 5:
return new ContainerWindGenerator(player.inventory, (TileEntityWindGenerator)tileEntity);
case 6:
return new ContainerFilter(player.inventory, (TileEntityTurbineCasing)tileEntity);
case 7:
return new ContainerNull(player, (TileEntityTurbineCasing)tileEntity);
case 10:
@@ -43,7 +43,7 @@ import net.minecraftforge.oredict.OreDictionary;
import buildcraft.api.fuels.BuildcraftFuelRegistry;
import buildcraft.api.fuels.IFuel;
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory")
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.0.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory")
public class MekanismGenerators implements IModule
{
@SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy")
@@ -53,7 +53,7 @@ public class MekanismGenerators implements IModule
public static MekanismGenerators instance;
/** MekanismGenerators version number */
public static Version versionNumber = new Version(9, 0, 0);
public static Version versionNumber = new Version(9, 0, 1);
public static MultiblockManager<SynchronizedTurbineData> turbineManager = new MultiblockManager<SynchronizedTurbineData>("industrialTurbine");
@@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.0.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
public class MekanismTools implements IModule
{
@SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy")
@@ -38,7 +38,7 @@ public class MekanismTools implements IModule
public static MekanismTools instance;
/** MekanismTools version number */
public static Version versionNumber = new Version(9, 0, 0);
public static Version versionNumber = new Version(9, 0, 1);
//Enums: Tools
public static ToolMaterial toolOBSIDIAN;