Merge remote-tracking branch 'origin/1.12' into 1.12
This commit is contained in:
commit
623983f20a
7 changed files with 742 additions and 3 deletions
|
@ -29,7 +29,6 @@ import net.minecraft.block.BlockPlanks;
|
|||
import net.minecraft.block.properties.IProperty;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -41,6 +40,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import prospector.shootingstar.ShootingStar;
|
||||
import prospector.shootingstar.model.ModelCompound;
|
||||
import techreborn.Core;
|
||||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
@ -139,6 +139,6 @@ public class BlockRubberLeaves extends BlockLeaves {
|
|||
}
|
||||
|
||||
public boolean fancyLeaves(){
|
||||
return Minecraft.getMinecraft().gameSettings.fancyGraphics;
|
||||
return Core.proxy.fancyGraphics();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -219,6 +219,16 @@ public class ModRecipes {
|
|||
new ItemStack(Items.ENDER_PEARL),
|
||||
ItemDusts.getDustByName("ender_pearl", 2),
|
||||
200, 22));
|
||||
|
||||
RecipeHandler.addRecipe(new GrinderRecipe(
|
||||
new ItemStack(Blocks.LAPIS_ORE),
|
||||
new ItemStack(Items.DYE, 10, 4),
|
||||
170, 19));
|
||||
|
||||
RecipeHandler.addRecipe(new GrinderRecipe(
|
||||
new ItemStack(Blocks.OBSIDIAN),
|
||||
ItemDusts.getDustByName("obsidian", 4),
|
||||
170, 19));
|
||||
|
||||
for (String oreDictionaryName : OreDictionary.getOreNames()) {
|
||||
if (isDictPrefixed(oreDictionaryName, "ore", "gem", "ingot")) {
|
||||
|
|
|
@ -107,4 +107,9 @@ public class ClientProxy extends CommonProxy {
|
|||
return new RenderNukePrimed(manager);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean fancyGraphics() {
|
||||
return Minecraft.getMinecraft().gameSettings.fancyGraphics;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -64,4 +64,8 @@ public class CommonProxy implements ICompatModule {
|
|||
return "";
|
||||
}
|
||||
|
||||
public boolean fancyGraphics(){
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue