diff --git a/build.gradle b/build.gradle index 2493678..ed0a99a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'kotlin' group = 'com.github.octarine-noise' version = "2.1.3" -archivesBaseName = rootProject.name + '-MC1.11' +archivesBaseName = rootProject.name + '-MC1.11.2' buildscript { ext.kotlin_version = '1.0.3' @@ -32,7 +32,7 @@ dependencies { shade "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" } minecraft { - version = '1.11-13.19.1.2188' + version = '1.11.2-13.20.0.2216' mappings = 'snapshot_20161210' runDir = 'run' } diff --git a/src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt b/src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt index f9cffbb..1759445 100644 --- a/src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt +++ b/src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt @@ -30,7 +30,7 @@ object BetterFoliageMod { const val MOD_NAME = "Better Foliage" const val DOMAIN = "betterfoliage" const val LEGACY_DOMAIN = "bettergrassandleaves" - const val MC_VERSIONS = "[1.11]" + const val MC_VERSIONS = "[1.11.2]" const val GUI_FACTORY = "mods.betterfoliage.client.gui.ConfigGuiFactory" lateinit var log: Logger diff --git a/src/main/kotlin/mods/betterfoliage/loader/BetterFoliageCore.kt b/src/main/kotlin/mods/betterfoliage/loader/BetterFoliageCore.kt index 9a26922..2ddc90c 100644 --- a/src/main/kotlin/mods/betterfoliage/loader/BetterFoliageCore.kt +++ b/src/main/kotlin/mods/betterfoliage/loader/BetterFoliageCore.kt @@ -13,7 +13,7 @@ import org.objectweb.asm.Opcodes.* "kotlin", "mods.octarinecore.kotlin" ) -@IFMLLoadingPlugin.MCVersion("1.11") +@IFMLLoadingPlugin.MCVersion("1.11.2") class BetterFoliageLoader : ASMPlugin(BetterFoliageTransformer::class.java) class BetterFoliageTransformer : Transformer() { diff --git a/src/main/kotlin/mods/betterfoliage/loader/Refs.kt b/src/main/kotlin/mods/betterfoliage/loader/Refs.kt index 5a7ca5b..e86b391 100644 --- a/src/main/kotlin/mods/betterfoliage/loader/Refs.kt +++ b/src/main/kotlin/mods/betterfoliage/loader/Refs.kt @@ -16,20 +16,20 @@ object Refs { val Random = ClassRef("java.util.Random") // Minecraft - val IBlockAccess = ClassRef("net.minecraft.world.IBlockAccess", "aju") - val IBlockState = ClassRef("net.minecraft.block.state.IBlockState", "atj") - val BlockStateBase = ClassRef("net.minecraft.block.state.BlockStateBase", "agg") + val IBlockAccess = ClassRef("net.minecraft.world.IBlockAccess", "ajw") + val IBlockState = ClassRef("net.minecraft.block.state.IBlockState", "atl") + val BlockStateBase = ClassRef("net.minecraft.block.state.BlockStateBase", "ati") val BlockPos = ClassRef("net.minecraft.util.math.BlockPos", "co") val MutableBlockPos = ClassRef("net.minecraft.util.math.BlockPos\$MutableBlockPos", "co\$a") - val BlockRenderLayer = ClassRef("net.minecraft.util.BlockRenderLayer", "aji") + val BlockRenderLayer = ClassRef("net.minecraft.util.BlockRenderLayer", "ajk") val EnumFacing = ClassRef("net.minecraft.util.EnumFacing", "cv") - val World = ClassRef("net.minecraft.world.World", "ajq") - val WorldClient = ClassRef("net.minecraft.client.multiplayer.WorldClient", "bno") + val World = ClassRef("net.minecraft.world.World", "ajs") + val WorldClient = ClassRef("net.minecraft.client.multiplayer.WorldClient", "bnq") 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", "als") - val StateImplementation = ClassRef("net.minecraft.block.state.BlockStateContainer\$StateImplementation", "atk\$a") + val Block = ClassRef("net.minecraft.block.Block", "alu") + val StateImplementation = ClassRef("net.minecraft.block.state.BlockStateContainer\$StateImplementation", "atm\$a") val canRenderInLayer = MethodRef(Block, "canRenderInLayer", ClassRef.boolean, IBlockState, BlockRenderLayer) val getAmbientOcclusionLightValue = MethodRef(StateImplementation, "getAmbientOcclusionLightValue", "func_185892_j", "k", ClassRef.float) val useNeighborBrightness = MethodRef(StateImplementation, "useNeighborBrightness", "func_185916_f", "f", ClassRef.boolean) @@ -37,21 +37,21 @@ object Refs { val isOpaqueCube = MethodRef(StateImplementation, "isOpaqueCube", "func_185914_p", "q", 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", "bra") - val AmbientOcclusionFace = ClassRef("net.minecraft.client.renderer.BlockModelRenderer\$AmbientOcclusionFace", "bra\$b") - val ChunkCompileTaskGenerator = ClassRef("net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator", "bsw") - val VertexBuffer = ClassRef("net.minecraft.client.renderer.VertexBuffer", "bpw") + val BlockModelRenderer = ClassRef("net.minecraft.client.renderer.BlockModelRenderer", "brc") + val AmbientOcclusionFace = ClassRef("net.minecraft.client.renderer.BlockModelRenderer\$AmbientOcclusionFace", "brc\$b") + val ChunkCompileTaskGenerator = ClassRef("net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator", "bsy") + val VertexBuffer = ClassRef("net.minecraft.client.renderer.VertexBuffer", "bpy") val AOF_constructor = MethodRef(AmbientOcclusionFace, "", ClassRef.void, BlockModelRenderer) - val RenderChunk = ClassRef("net.minecraft.client.renderer.chunk.RenderChunk", "btc") + val RenderChunk = ClassRef("net.minecraft.client.renderer.chunk.RenderChunk", "bte") 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", "bqy") + val BlockRendererDispatcher = ClassRef("net.minecraft.client.renderer.BlockRendererDispatcher", "bra") val renderBlock = MethodRef(BlockRendererDispatcher, "renderBlock", "func_175018_a", "a", ClassRef.boolean, IBlockState, BlockPos, IBlockAccess, VertexBuffer) - val TextureAtlasSprite = ClassRef("net.minecraft.client.renderer.texture.TextureAtlasSprite", "byw") - val TextureMap = ClassRef("net.minecraft.client.renderer.texture.TextureMap", "byv") - val IResourceManager = ClassRef("net.minecraft.client.resources.IResourceManager", "bzv") + val TextureAtlasSprite = ClassRef("net.minecraft.client.renderer.texture.TextureAtlasSprite", "byz") + val TextureMap = ClassRef("net.minecraft.client.renderer.texture.TextureMap", "byy") + val IResourceManager = ClassRef("net.minecraft.client.resources.IResourceManager", "bzy") val loadTextureAtlas = MethodRef(TextureMap, "loadTextureAtlas", "func_110571_b", "b", ClassRef.void, IResourceManager) val IRegistry = ClassRef("net.minecraft.util.registry.IRegistry", "dh") @@ -60,9 +60,9 @@ object Refs { 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", "brg") + val ModelBlock = ClassRef("net.minecraft.client.renderer.block.model.ModelBlock", "bri") val ResourceLocation = ClassRef("net.minecraft.util.ResourceLocation", "kq") - val ModelResourceLocation = ClassRef("net.minecraft.client.renderer.block.model.ModelResourceLocation", "cbj") + val ModelResourceLocation = ClassRef("net.minecraft.client.renderer.block.model.ModelResourceLocation", "cbm") val VanillaModelWrapper = ClassRef("net.minecraftforge.client.model.ModelLoader\$VanillaModelWrapper") val model_VMW = FieldRef(VanillaModelWrapper, "model", ModelBlock) val location_VMW = FieldRef(VanillaModelWrapper, "location", ModelBlock)