Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,18 @@ import groovyx.net.http.Method
buildscript {
repositories {
mavenCentral()
maven { url = "http://files.minecraftforge.net/maven" }
maven {
url = "https://jitpack.io"
}
maven {
url = "https://maven.minecraftforge.net/"
}
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath("com.github.GregTechCE:ForgeGradle:FG_2.3-SNAPSHOT") {
changing = true
}
classpath "org.codehaus.groovy.modules.http-builder:http-builder:0.7"
classpath "org.apache.httpcomponents:httpmime:4.5.1"
}
Expand All @@ -42,7 +49,7 @@ minecraft {
version = "1.12.2-14.23.5.2847"
runDir = "run"

mappings = "snapshot_20171003"
mappings = "stable_39"
makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.

replace "GRADLE:VERSION", project.version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public ECCreativeTab() {

@Nonnull
@Override
public ItemStack getTabIconItem() {
public ItemStack createIcon() {
return ModConfig.confCraftingCoreEnabled ? new ItemStack(ModBlocks.blockCraftingCore) : new ItemStack(ModItems.itemMaterial);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void breakBlock(World world, BlockPos pos, IBlockState state) {
}

@Override
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT_MIPPED;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public int getComparatorInputOverride(IBlockState state, World world, BlockPos p

@Override
public IBlockState getStateFromMeta(int meta) {
EnumFacing enumfacing = EnumFacing.getFront(meta);
EnumFacing enumfacing = EnumFacing.byIndex(meta);

if (enumfacing.getAxis() == EnumFacing.Axis.Y) {
enumfacing = EnumFacing.NORTH;
Expand Down Expand Up @@ -164,7 +164,7 @@ public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) {

@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT_MIPPED;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public boolean isOpaqueCube(IBlockState state) {
@Nonnull
@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT_MIPPED;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public boolean isOpaqueCube(IBlockState state) {
@Nonnull
@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT_MIPPED;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public ItemBlockLamp(Block block) {
}

@Override
public String getUnlocalizedName(ItemStack stack) {
return super.getUnlocalizedName() + "_" + BlockLamp.Type.byMetadata(stack.getMetadata()).getName();
public String getTranslationKey(ItemStack stack) {
return super.getTranslationKey() + "_" + BlockLamp.Type.byMetadata(stack.getMetadata()).getName();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public ItemBlockStorage(Block block) {
}

@Override
public String getUnlocalizedName(ItemStack stack) {
return super.getUnlocalizedName() + "_" + BlockStorage.Type.byMetadata(stack.getMetadata()).getName();
public String getTranslationKey(ItemStack stack) {
return super.getTranslationKey() + "_" + BlockStorage.Type.byMetadata(stack.getMetadata()).getName();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public ItemBlockTrimmed(Block block) {
}

@Override
public String getUnlocalizedName(ItemStack stack) {
return super.getUnlocalizedName() + "_" + BlockTrimmed.Type.byMetadata(stack.getMetadata()).getName();
public String getTranslationKey(ItemStack stack) {
return super.getTranslationKey() + "_" + BlockTrimmed.Type.byMetadata(stack.getMetadata()).getName();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ public void registerCategories(IRecipeCategoryRegistration registry) {

@Override
public void register(IModRegistry registry) {
blocks.forEach(block -> registry.addIngredientInfo(new ItemStack(block), VanillaTypes.ITEM, "desc." + block.getUnlocalizedName()));
items.forEach(item -> registry.addIngredientInfo(new ItemStack(item), VanillaTypes.ITEM, "desc." + item.getUnlocalizedName()));
blocks.forEach(block -> registry.addIngredientInfo(new ItemStack(block), VanillaTypes.ITEM, "desc." + block.getTranslationKey()));
items.forEach(item -> registry.addIngredientInfo(new ItemStack(item), VanillaTypes.ITEM, "desc." + item.getTranslationKey()));

IJeiHelpers helpers = registry.getJeiHelpers();
IRecipeTransferRegistry transfer = registry.getRecipeTransferRegistry();
Expand Down