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

Merge pull request #953 from MauveCloud/1.10.2

Browse source 
Small bugfixes
This commit is contained in:
Archengius 2017-03-12 11:50:26 +07:00 committed by GitHub
commit 50b481b4f1
10 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
View file

@ -456,7 +456,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
if (isItemStackUsable(aStack)) {
IToolStats toolStats = getToolStats(aStack);
if(toolStats != null && toolStats.isMinableBlock(state)) {
if(getHarvestLevel(aStack, null) > state.getBlock().getHarvestLevel(state)) {
if(getHarvestLevel(aStack, null) >= state.getBlock().getHarvestLevel(state)) {
float toolSpeed = toolStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed;
return Math.max(defSpeed, toolSpeed);
}

4
src/main/java/gregtech/common/render/RenderBlocks.java
View file

@ -102,7 +102,9 @@ public class RenderBlocks implements ICCBlockRenderer {
public static void renderFace(CCRenderState state, EnumFacing side, IVertexOperation... ops)
{
face.loadCuboidFace(bounds, side.ordinal());
if (bounds != null) {
face.loadCuboidFace(bounds, side.ordinal());
}
state.setPipeline(face, 0, face.verts.length, ops);
state.render();
}

2
src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java
View file

@ -186,7 +186,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
}
if (getFluidAmount() != 0) {
for (EnumFacing side : EnumFacing.VALUES) {
if (side.getIndex() != aBaseMetaTileEntity.getFrontFacing()) {
if (side.getIndex() != aBaseMetaTileEntity.getFrontFacing() && side != EnumFacing.DOWN) {
int drain = GT_Utility.fillFluidTank(
aBaseMetaTileEntity.getWorldObj(),
aBaseMetaTileEntity.getWorldPos(), side,

2
src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
View file

@ -75,7 +75,7 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler {
}
if (getFluidAmount() != 0) {
for (EnumFacing side : EnumFacing.VALUES) {
if (side.getIndex() != aBaseMetaTileEntity.getFrontFacing()) {
if (side.getIndex() != aBaseMetaTileEntity.getFrontFacing() && side != EnumFacing.DOWN) {
int drain = GT_Utility.fillFluidTank(
aBaseMetaTileEntity.getWorldObj(),
aBaseMetaTileEntity.getWorldPos(), side,

2
src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
View file

@ -74,7 +74,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler {
}
if (getFluidAmount() != 0) {
for (EnumFacing side : EnumFacing.VALUES) {
if (side.getIndex() != aBaseMetaTileEntity.getFrontFacing()) {
if (side.getIndex() != aBaseMetaTileEntity.getFrontFacing() && side != EnumFacing.DOWN) {
int drain = GT_Utility.fillFluidTank(
aBaseMetaTileEntity.getWorldObj(),
aBaseMetaTileEntity.getWorldPos(), side,

2
src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
View file

@ -94,7 +94,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
}
if (getFluidAmount() != 0) {
for (EnumFacing side : EnumFacing.VALUES) {
if (side.getIndex() != aBaseMetaTileEntity.getFrontFacing()) {
if (side.getIndex() != aBaseMetaTileEntity.getFrontFacing() && side != EnumFacing.DOWN) {
int drain = GT_Utility.fillFluidTank(
aBaseMetaTileEntity.getWorldObj(),
aBaseMetaTileEntity.getWorldPos(), side,

2
src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
View file

@ -78,7 +78,7 @@ public class GT_MetaTileEntity_Boiler_Steel extends GT_MetaTileEntity_Boiler {
}
if (getFluidAmount() != 0) {
for (EnumFacing side : EnumFacing.VALUES) {
if (side.getIndex() != aBaseMetaTileEntity.getFrontFacing()) {
if (side.getIndex() != aBaseMetaTileEntity.getFrontFacing() && side != EnumFacing.DOWN) {
int drain = GT_Utility.fillFluidTank(
aBaseMetaTileEntity.getWorldObj(),
aBaseMetaTileEntity.getWorldPos(), side,

2
src/main/java/gregtech/common/tools/GT_Tool.java
View file

@ -34,7 +34,7 @@ public abstract class GT_Tool
protected static boolean isStateEqual(IBlockState state1, IBlockState state2) {
if(state1.getBlock() != state2.getBlock())
return false;
if(!state1.getProperties().equals(state2))
if(!state1.getProperties().equals(state2.getProperties()))
return false;
return true;
}

2
src/main/java/gregtech/jei/JEIGregtechRecipe.java
View file

@ -576,7 +576,7 @@ public class JEIGregtechRecipe implements IRecipeWrapper {
mInputs.addTooltipCallback((slotIndex, input, ingredient, tooltip) -> {
int slotType = slotIndex / 1000;
int inputIndex = slotType % 1000;
int inputIndex = slotIndex % 1000;
switch (slotType) {
case 1:
//it's output

2
src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
View file

@ -261,7 +261,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_Values.RA.addChemicalBathRecipe(ItemList.Food_Raw_Fries.get(1), Materials.FryingOilHot.getFluid(10L), ItemList.Food_Fries.get(1), GT_Values.NI, GT_Values.NI, null, 16, 4);
GT_Values.RA.addChemicalBathRecipe(GT_ModHandler.getIC2Item(BlockName.te, TeBlock.itnt, 1), Materials.Glue.getFluid(10L), GT_ModHandler.getIC2Item(ItemName.dynamite_sticky, 1), GT_Values.NI, GT_Values.NI, null, 16, 4);
GT_Values.RA.addChemicalRecipe(new ItemStack(Items.PAPER,1), new ItemStack(Items.STRING,1), Materials.Glyceryl.getFluid(150), GT_Values.NF, GT_ModHandler.getIC2Item(BlockName.te, TeBlock.itnt, 1), 160, 4);
GT_Values.RA.addChemicalRecipe(new ItemStack(Items.PAPER,1), new ItemStack(Items.STRING,1), Materials.Glyceryl.getFluid(150), GT_Values.NF, GT_ModHandler.getIC2Item(ItemName.dynamite, 1), 160, 4);
GT_Values.RA.addChemicalBathRecipe(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), Materials.Concrete.getMolten(144L), GT_ModHandler.getIC2Item(BlockName.resource, ResourceBlock.reinforced_stone, 1), GT_Values.NI, GT_Values.NI, null, 200, 4);
GT_Values.RA.addChemicalBathRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1), Materials.Water.getFluid(125L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1), GT_Values.NI, GT_Values.NI, null, 12, 4);
GT_Values.RA.addChemicalBathRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1), Materials.Water.getFluid(100L), new ItemStack(Items.PAPER, 1, 0), GT_Values.NI, GT_Values.NI, null, 200, 4);