diff --git a/build.gradle b/build.gradle index f501299..cf7e7c6 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'kotlin' group = 'com.github.octarine-noise' version = "2.0.13" -archivesBaseName = rootProject.name + '-MC1.9.4' +archivesBaseName = rootProject.name + '-MC1.10' buildscript { ext.kotlin_version = '1.0.0' @@ -32,8 +32,8 @@ dependencies { } minecraft { - version = '1.9.4-12.17.0.1968' - mappings = 'snapshot_20160619' + version = '1.10-12.18.0.2000-1.10.0' + mappings = 'snapshot_20160627' runDir = 'run' } diff --git a/src/main/kotlin/mods/betterfoliage/loader/Refs.kt b/src/main/kotlin/mods/betterfoliage/loader/Refs.kt index 86106a2..c0b54c0 100644 --- a/src/main/kotlin/mods/betterfoliage/loader/Refs.kt +++ b/src/main/kotlin/mods/betterfoliage/loader/Refs.kt @@ -15,49 +15,49 @@ object Refs { val Random = ClassRef("java.util.Random") // Minecraft - val IBlockAccess = ClassRef("net.minecraft.world.IBlockAccess", "ahx") - val IBlockState = ClassRef("net.minecraft.block.state.IBlockState", "ard") - val BlockStateBase = ClassRef("net.minecraft.block.state.BlockStateBase", "ara") - val BlockPos = ClassRef("net.minecraft.util.math.BlockPos", "cl") - val MutableBlockPos = ClassRef("net.minecraft.util.math.BlockPos\$MutableBlockPos", "cl\$a") - val BlockRenderLayer = ClassRef("net.minecraft.util.BlockRenderLayer", "ahm") - val EnumFacing = ClassRef("net.minecraft.util.EnumFacing", "cs") + val IBlockAccess = ClassRef("net.minecraft.world.IBlockAccess", "aih") + val IBlockState = ClassRef("net.minecraft.block.state.IBlockState", "ars") + val BlockStateBase = ClassRef("net.minecraft.block.state.BlockStateBase", "arp") + val BlockPos = ClassRef("net.minecraft.util.math.BlockPos", "cm") + val MutableBlockPos = ClassRef("net.minecraft.util.math.BlockPos\$MutableBlockPos", "cm\$a") + val BlockRenderLayer = ClassRef("net.minecraft.util.BlockRenderLayer", "ahv") + val EnumFacing = ClassRef("net.minecraft.util.EnumFacing", "ct") - val World = ClassRef("net.minecraft.world.World", "aht") - val WorldClient = ClassRef("net.minecraft.client.multiplayer.WorldClient", "bks") + val World = ClassRef("net.minecraft.world.World", "aid") + val WorldClient = ClassRef("net.minecraft.client.multiplayer.WorldClient", "bln") val showBarrierParticles = MethodRef(WorldClient, "showBarrierParticles", "func_184153_a", "a", ClassRef.void, ClassRef.int, ClassRef.int, ClassRef.int, ClassRef.int, Random, ClassRef.boolean, MutableBlockPos) - val Block = ClassRef("net.minecraft.block.Block", "ajt") - val StateImplementation = ClassRef("net.minecraft.block.state.BlockStateContainer\$StateImplementation", "are\$a") + val Block = ClassRef("net.minecraft.block.Block", "akf") + val StateImplementation = ClassRef("net.minecraft.block.state.BlockStateContainer\$StateImplementation", "art\$a") val canRenderInLayer = MethodRef(Block, "canRenderInLayer", ClassRef.boolean, IBlockState, BlockRenderLayer) val getAmbientOcclusionLightValue = MethodRef(StateImplementation, "getAmbientOcclusionLightValue", "func_185892_j", "j", ClassRef.float) val useNeighborBrightness = MethodRef(StateImplementation, "useNeighborBrightness", "func_185916_f", "f", ClassRef.boolean) val doesSideBlockRendering = MethodRef(StateImplementation, "doesSideBlockRendering", ClassRef.boolean, IBlockAccess, BlockPos, EnumFacing) - val isOpaqueCube = MethodRef(StateImplementation, "isOpaqueCube", "", "p", ClassRef.boolean) + val isOpaqueCube = MethodRef(StateImplementation, "isOpaqueCube", "func_185914_p", "p", ClassRef.boolean) val randomDisplayTick = MethodRef(Block, "randomDisplayTick", "func_180655_c", "a", ClassRef.void, IBlockState, World, BlockPos, Random) - val BlockModelRenderer = ClassRef("net.minecraft.client.renderer.BlockModelRenderer", "bob") - val AmbientOcclusionFace = ClassRef("net.minecraft.client.renderer.BlockModelRenderer\$AmbientOcclusionFace", "bob\$b") - val ChunkCompileTaskGenerator = ClassRef("net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator", "bpw") - val VertexBuffer = ClassRef("net.minecraft.client.renderer.VertexBuffer", "bmx") + val BlockModelRenderer = ClassRef("net.minecraft.client.renderer.BlockModelRenderer", "box") + val AmbientOcclusionFace = ClassRef("net.minecraft.client.renderer.BlockModelRenderer\$AmbientOcclusionFace", "box\$b") + val ChunkCompileTaskGenerator = ClassRef("net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator", "bqs") + val VertexBuffer = ClassRef("net.minecraft.client.renderer.VertexBuffer", "bnt") val AOF_constructor = MethodRef(AmbientOcclusionFace, "", ClassRef.void, BlockModelRenderer) - val RenderChunk = ClassRef("net.minecraft.client.renderer.chunk.RenderChunk", "bqc") + val RenderChunk = ClassRef("net.minecraft.client.renderer.chunk.RenderChunk", "bqy") val rebuildChunk = MethodRef(RenderChunk, "rebuildChunk", "func_178581_b", "b", ClassRef.void, ClassRef.float, ClassRef.float, ClassRef.float, ChunkCompileTaskGenerator) - val BlockRendererDispatcher = ClassRef("net.minecraft.client.renderer.BlockRendererDispatcher", "bnz") + val BlockRendererDispatcher = ClassRef("net.minecraft.client.renderer.BlockRendererDispatcher", "bov") val renderBlock = MethodRef(BlockRendererDispatcher, "renderBlock", "func_175018_a", "a", ClassRef.boolean, IBlockState, BlockPos, IBlockAccess, VertexBuffer) - val TextureAtlasSprite = ClassRef("net.minecraft.client.renderer.texture.TextureAtlasSprite", "bve") + val TextureAtlasSprite = ClassRef("net.minecraft.client.renderer.texture.TextureAtlasSprite", "bwe") - val IRegistry = ClassRef("net.minecraft.util.registry.IRegistry", "dd") + val IRegistry = ClassRef("net.minecraft.util.registry.IRegistry", "de") val ModelLoader = ClassRef("net.minecraftforge.client.model.ModelLoader") val stateModels = FieldRef(ModelLoader, "stateModels", Map) val setupModelRegistry = MethodRef(ModelLoader, "setupModelRegistry", "func_177570_a", "a", IRegistry) val IModel = ClassRef("net.minecraftforge.client.model.IModel") - val ModelBlock = ClassRef("net.minecraft.client.renderer.block.model.ModelBlock", "boh") - val ModelResourceLocation = ClassRef("net.minecraft.client.renderer.block.model.ModelResourceLocation", "bxc") + val ModelBlock = ClassRef("net.minecraft.client.renderer.block.model.ModelBlock", "bpd") + val ModelResourceLocation = ClassRef("net.minecraft.client.renderer.block.model.ModelResourceLocation", "byq") val VanillaModelWrapper = ClassRef("net.minecraftforge.client.model.ModelLoader\$VanillaModelWrapper") val model_VMW = FieldRef(VanillaModelWrapper, "model", ModelBlock) val location_VMW = FieldRef(VanillaModelWrapper, "location", ModelBlock)