chylex/Hardcore-Ender-Expansion-2
1
0
Fork 0
mirror of https://github.com/chylex/Hardcore-Ender-Expansion-2.git synced 2025-04-11 03:15:44 +02:00
Code

Revert mappings to 20200119-1.14.3

Browse Source
This commit is contained in:
chylex 2020-05-18 01:13:03 +02:00
parent 02bbb1b850
commit ea2f042886
10 changed files with 7 additions and 13 deletions

2
build.gradle
View File

@ -72,7 +72,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile){
}
minecraft{
mappings channel: "snapshot", version: "20200119-1.14.4"
mappings channel: "snapshot", version: "20200119-1.14.3"
accessTransformer = file("src/main/resources/META-INF/accesstransformer.cfg")

1
src/main/java/chylex/hee/game/commands/server/CommandDebugStructure.kt
View File

@ -5,7 +5,6 @@ import chylex.hee.game.commands.util.executes
import chylex.hee.game.commands.util.getLong
import chylex.hee.game.commands.util.getString
import chylex.hee.game.commands.util.returning
import chylex.hee.game.commands.util.world
import chylex.hee.game.world.feature.energyshrine.EnergyShrinePieces
import chylex.hee.game.world.feature.obsidiantower.ObsidianTowerPieces
import chylex.hee.game.world.feature.stronghold.StrongholdPieces

1
src/main/java/chylex/hee/game/commands/server/CommandServerLootChest.kt
View File

@ -5,7 +5,6 @@ import chylex.hee.game.commands.util.exception
import chylex.hee.game.commands.util.getPos
import chylex.hee.game.commands.util.message
import chylex.hee.game.commands.util.returning
import chylex.hee.game.commands.util.world
import chylex.hee.proxy.Environment
import chylex.hee.system.util.getTile
import com.mojang.brigadier.builder.ArgumentBuilder

4
src/main/java/chylex/hee/game/commands/util/CommandExt.kt
View File

@ -8,7 +8,6 @@ import net.minecraft.command.CommandSource
import net.minecraft.command.arguments.LocationInput
import net.minecraft.util.math.BlockPos
import net.minecraft.util.text.ITextComponent
import net.minecraft.world.server.ServerWorld
fun <C, T : ArgumentBuilder<CommandSource, T>> ArgumentBuilder<CommandSource, T>.executes(function: (CommandContext<CommandSource>, C) -> Int, extra: C): T{
return this.executes { function(it, extra) }
@ -27,9 +26,6 @@ fun ICommand.exception(name: String): SimpleCommandExceptionType{
return SimpleCommandExceptionType(TextComponentTranslation("commands.hee.${this.name}.$name"))
}
inline val CommandSource.world: ServerWorld
get() = this.func_197023_e() // RENAME
inline fun <reified T : Enum<T>> CommandContext<CommandSource>.getEnum(name: String): T{
return this.getArgument(name, T::class.java)
}

2
src/main/java/chylex/hee/game/commands/util/EnumArgument.kt
View File

@ -21,7 +21,7 @@ class EnumArgument<T : Enum<T>>(private val enumClass: Class<T>) : ArgumentType<
}
object Serializer : IArgumentSerializer<EnumArgument<*>>{
override fun func_197072_a(argument: EnumArgument<*>, buffer: PacketBuffer) = buffer.use {
override fun write(argument: EnumArgument<*>, buffer: PacketBuffer) = buffer.use {
writeString(argument.enumClass.name, 256)
}

2
src/main/java/chylex/hee/game/commands/util/ValidatedStringArgument.kt
View File

@ -22,7 +22,7 @@ class ValidatedStringArgument(private val strings: Set<String>) : ArgumentType<S
}
object Serializer : IArgumentSerializer<ValidatedStringArgument>{
override fun func_197072_a(argument: ValidatedStringArgument, buffer: PacketBuffer) = buffer.use {
override fun write(argument: ValidatedStringArgument, buffer: PacketBuffer) = buffer.use {
writeVarInt(argument.strings.size)
argument.strings.forEach { writeString(it, MAX_LENGTH) }
}

2
src/main/java/chylex/hee/game/entity/living/ai/AIWanderLightStartle.kt
View File

@ -83,7 +83,7 @@ class AIWanderLightStartle(
val testLight = getCombinedLight(testPos)
if (startLight - testLight >= minCombinedLightDecrease && testLight < foundLight && nav.func_179680_a(testPos, 0)?.let { validatePath(it, testPos) } == true){ // RENAME getPathToPos
if (startLight - testLight >= minCombinedLightDecrease && testLight < foundLight && nav.getPathToPos(testPos, 0)?.let { validatePath(it, testPos) } == true){
foundTarget = testPos
foundLight = testLight
}

2
src/main/java/chylex/hee/game/entity/living/ai/path/PathNavigateGroundUnrestricted.kt
View File

@ -30,7 +30,7 @@ class PathNavigateGroundUnrestricted(entity: EntityLiving, world: World) : Groun
}
override fun tryMoveToEntityLiving(entity: Entity, speed: Double): Boolean{
val path = func_75494_a(entity, 1) // RENAME getPathToEntityLiving
val path = getPathToEntityLiving(entity, 1)
if (path != null){
overrideSpeed = 0.0

2
src/main/java/chylex/hee/game/world/territory/TerritoryInstance.kt
View File

@ -79,7 +79,7 @@ data class TerritoryInstance(val territory: TerritoryType, val index: Int){
}
val endWorld: ServerWorld
get() = Environment.getServer().func_71218_a(HEE.dim)
get() = Environment.getServer().getWorld(HEE.dim)
}
private val ordinal

2
src/main/java/chylex/hee/proxy/Environment.kt
View File

@ -25,7 +25,7 @@ object Environment{
}
fun getDimension(dimension: DimensionType): ServerWorld{
return getServer().func_71218_a(dimension)
return getServer().getWorld(dimension)
}
fun getLootTable(location: ResourceLocation): LootTable{