Skip to content

Commit

Permalink
backport to 1.19.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@CaelTheColher
CaelTheColher committed Mar 6, 2023
1 parent 0279efa commit 6af5714
Show file tree
Hide file tree
Showing 9 changed files with 61 additions and 68 deletions.
17 changes: 6 additions & 11 deletions common/src/main/kotlin/me/cael/capes/menu/MainMenu.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,15 @@ open class MainMenu(parent: Screen, gameOptions: GameOptions) : GameOptionsScree
val buttonW = 100
val offset = (buttonW / 2) + 5

addDrawableChild(ButtonWidget.builder(Text.translatable("options.capes.selector")) {
addDrawableChild(ButtonWidget((width/2) - (buttonW / 2), 35, buttonW, 20, Text.translatable("options.capes.selector")) {
client!!.setScreen(SelectorMenu(parent, gameOptions))
}.position((width/2) - (buttonW / 2), 35).size(buttonW, 20).build())
.active = this !is SelectorMenu

addDrawableChild(ButtonWidget.builder(Text.translatable("options.capes.toggle")) {
}).active = this !is SelectorMenu
addDrawableChild(ButtonWidget((width/2) - (buttonW + offset), 35, buttonW, 20, Text.translatable("options.capes.toggle")) {
client!!.setScreen(ToggleMenu(parent, gameOptions))
}.position((width/2) - (buttonW + offset), 35).size(buttonW, 20).build())
.active = this !is ToggleMenu

addDrawableChild(ButtonWidget.builder(Text.translatable("options.capes.other")) {
}).active = this !is ToggleMenu
addDrawableChild(ButtonWidget((width/2) + offset, 35, buttonW, 20, Text.translatable("options.capes.other")) {
client!!.setScreen(OtherMenu(parent, gameOptions))
}.position((width/2) + offset, 35).size(buttonW, 20).build())
.active = this !is OtherMenu
})

}

Expand Down
9 changes: 4 additions & 5 deletions common/src/main/kotlin/me/cael/capes/menu/OtherMenu.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class OtherMenu(parent: Screen, gameOptions: GameOptions) : MainMenu(parent, gam

val buttonW = 200

addDrawableChild(ButtonWidget.builder(Text.translatable("options.capes.optifineeditor")) {
addDrawableChild(ButtonWidget((width/2) - (buttonW / 2), height / 7 + 24, buttonW, 20, Text.translatable("options.capes.optifineeditor")) {
try {
val random1Bi = BigInteger(128, Random())
val random2Bi = BigInteger(128, Random(System.identityHashCode(Object()).toLong()))
Expand All @@ -34,12 +34,11 @@ class OtherMenu(parent: Screen, gameOptions: GameOptions) : MainMenu(parent, gam
} catch (_: Exception) {
Capes.LOGGER.error("Failed to authenticate for OptiFine cape editor.")
}
})

}.position((width/2) - (buttonW / 2), height / 7 + 24).size(buttonW, 20).build())

addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE) {
addDrawableChild(ButtonWidget((width/2) - (buttonW / 2), height / 7 + 2 * 24, buttonW, 20, ScreenTexts.DONE) {
client!!.setScreen(parent)
}.position((width/2) - (buttonW / 2), height / 7 + 2 * 24).size(buttonW, 20).build())
})

}

Expand Down
20 changes: 10 additions & 10 deletions common/src/main/kotlin/me/cael/capes/menu/SelectorMenu.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import net.minecraft.client.render.entity.EntityRendererFactory
import net.minecraft.client.util.math.MatrixStack
import net.minecraft.screen.ScreenTexts
import net.minecraft.text.Text
import net.minecraft.util.math.RotationAxis
import net.minecraft.util.math.Vec3f

class SelectorMenu(parent: Screen, gameOptions: GameOptions) : MainMenu(parent, gameOptions) {

Expand All @@ -26,7 +26,7 @@ class SelectorMenu(parent: Screen, gameOptions: GameOptions) : MainMenu(parent,
var buttonW = 200
val config = Capes.CONFIG

addDrawableChild(ButtonWidget.builder(config.clientCapeType.getText()) {
addDrawableChild(ButtonWidget((width/2) - (buttonW / 2), 60, buttonW, 20, config.clientCapeType.getText()) {
config.clientCapeType = config.clientCapeType.cycle()
config.save()
it.message = config.clientCapeType.getText()
Expand All @@ -35,21 +35,21 @@ class SelectorMenu(parent: Screen, gameOptions: GameOptions) : MainMenu(parent,
val playerListEntry = this.client!!.networkHandler!!.getPlayerListEntry(this.client!!.player!!.uuid) as AccessorPlayerListEntry
playerListEntry.setTexturesLoaded(false)
}
}.position((width / 2) - (buttonW / 2), 60).size(buttonW, 20).build())
})

addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE) {
addDrawableChild(ButtonWidget((width/2) - (buttonW / 2), 220, buttonW, 20, ScreenTexts.DONE) {
client!!.setScreen(parent)
}.position((width / 2) - (buttonW / 2), 220).size(buttonW, 20).build())
})

buttonW = 100

addDrawableChild(ButtonWidget.builder(Text.translatable("options.capes.selector.elytra")) {
addDrawableChild(ButtonWidget((width/4) - (buttonW / 2), 120, buttonW, 20, Text.translatable("options.capes.selector.elytra")) {
PlaceholderEntity.showElytra = !PlaceholderEntity.showElytra
}.position((width / 4) - (buttonW / 2), 120).size(buttonW, 20).build())
})

addDrawableChild(ButtonWidget.builder(Text.translatable("options.capes.selector.player")) {
addDrawableChild(ButtonWidget((width/4) - (buttonW / 2), 145, buttonW, 20, Text.translatable("options.capes.selector.player")) {
PlaceholderEntity.showBody = !PlaceholderEntity.showBody
}.position((width / 4) - (buttonW / 2), 145).size(buttonW, 20).build())
})

}

Expand Down Expand Up @@ -82,7 +82,7 @@ class SelectorMenu(parent: Screen, gameOptions: GameOptions) : MainMenu(parent,
matrixStack2.translate(0.0, 0.0, 1000.0)
matrixStack2.scale(size.toFloat(), size.toFloat(), size.toFloat())

val quaternion = RotationAxis.POSITIVE_Z.rotationDegrees(180.0f)
val quaternion = Vec3f.POSITIVE_Z.getDegreesQuaternion(180.0f)
matrixStack2.multiply(quaternion)

DiffuseLighting.method_34742()
Expand Down
46 changes: 23 additions & 23 deletions common/src/main/kotlin/me/cael/capes/menu/ToggleMenu.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,51 +15,51 @@ class ToggleMenu(parent: Screen, gameOptions: GameOptions) : MainMenu(parent, ga

val config = Capes.CONFIG

addDrawableChild(ButtonWidget.builder(CapeType.OPTIFINE.getToggleText(config.enableOptifine)) {
addDrawableChild(ButtonWidget(width / 2 - 155, height / 7 + 24, 150, 20, CapeType.OPTIFINE.getToggleText(config.enableOptifine)) { buttonWidget: ButtonWidget ->
config.enableOptifine = !config.enableOptifine
config.save()
it.message = CapeType.OPTIFINE.getToggleText(config.enableOptifine)
}.position(width / 2 - 155, height / 7 + 24).size(150, 20).build())
buttonWidget.message = CapeType.OPTIFINE.getToggleText(config.enableOptifine)
})

addDrawableChild(ButtonWidget.builder(CapeType.LABYMOD.getToggleText(config.enableLabyMod)) {
addDrawableChild(ButtonWidget(width / 2 - 155 + 160, height / 7 + 24, 150, 20, CapeType.LABYMOD.getToggleText(config.enableLabyMod)) { buttonWidget: ButtonWidget ->
config.enableLabyMod = !config.enableLabyMod
config.save()
it.message = CapeType.LABYMOD.getToggleText(config.enableLabyMod)
}.position(width / 2 - 155 + 160, height / 7 + 24).size(150, 20).build())
buttonWidget.message = CapeType.LABYMOD.getToggleText(config.enableLabyMod)
})

addDrawableChild(ButtonWidget.builder(CapeType.MINECRAFTCAPES.getToggleText(config.enableMinecraftCapesMod)) {
addDrawableChild(ButtonWidget(width / 2 - 155, height / 7 + 2 * 24, 150, 20, CapeType.MINECRAFTCAPES.getToggleText(config.enableMinecraftCapesMod)) { buttonWidget: ButtonWidget ->
config.enableMinecraftCapesMod = !config.enableMinecraftCapesMod
config.save()
it.message = CapeType.MINECRAFTCAPES.getToggleText(config.enableMinecraftCapesMod)
}.position(width / 2 - 155, height / 7 + 2 * 24).size(150, 20).build())
buttonWidget.message = CapeType.MINECRAFTCAPES.getToggleText(config.enableMinecraftCapesMod)
})

addDrawableChild(ButtonWidget.builder(CapeType.WYNNTILS.getToggleText(config.enableWynntils)) {
addDrawableChild(ButtonWidget(width / 2 - 155 + 160, height / 7 + 2 * 24, 150, 20, CapeType.WYNNTILS.getToggleText(config.enableWynntils)) { buttonWidget: ButtonWidget ->
config.enableWynntils = !config.enableWynntils
config.save()
it.message = CapeType.WYNNTILS.getToggleText(config.enableWynntils)
}.position(width / 2 - 155 + 160, height / 7 + 2 * 24).size(150, 20).build())
buttonWidget.message = CapeType.WYNNTILS.getToggleText(config.enableWynntils)
})

addDrawableChild(ButtonWidget.builder(CapeType.COSMETICA.getToggleText(config.enableCosmetica)) {
addDrawableChild(ButtonWidget(width / 2 - 155, height / 7 + 3 * 24, 150, 20, CapeType.COSMETICA.getToggleText(config.enableCosmetica)) { buttonWidget: ButtonWidget ->
config.enableCosmetica = !config.enableCosmetica
config.save()
it.message = CapeType.COSMETICA.getToggleText(config.enableCosmetica)
}.position(width / 2 - 155, height / 7 + 3 * 24).size(150, 20).build())
buttonWidget.message = CapeType.COSMETICA.getToggleText(config.enableCosmetica)
})

addDrawableChild(ButtonWidget.builder(CapeType.CLOAKSPLUS.getToggleText(config.enableCloaksPlus)) {
addDrawableChild(ButtonWidget(width / 2 - 155 + 160, height / 7 + 3 * 24, 150, 20, CapeType.CLOAKSPLUS.getToggleText(config.enableCloaksPlus)) { buttonWidget: ButtonWidget ->
config.enableCloaksPlus = !config.enableCloaksPlus
config.save()
it.message = CapeType.CLOAKSPLUS.getToggleText(config.enableCloaksPlus)
}.position(width / 2 - 155 + 160, height / 7 + 3 * 24).size(150, 20).build())
buttonWidget.message = CapeType.CLOAKSPLUS.getToggleText(config.enableCloaksPlus)
})

addDrawableChild(ButtonWidget.builder(elytraMessage(config.enableElytraTexture)) {
addDrawableChild(ButtonWidget((width/2) - (200 / 2), height / 7 + 4 * 24, 200, 20, elytraMessage(config.enableElytraTexture)) { buttonWidget: ButtonWidget ->
config.enableElytraTexture = !config.enableElytraTexture
config.save()
it.message = elytraMessage(config.enableElytraTexture)
}.position((width/2) - (200 / 2), height / 7 + 4 * 24).size(200, 20).build())
buttonWidget.message = elytraMessage(config.enableElytraTexture)
})

addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE) {
addDrawableChild(ButtonWidget((width/2) - (200 / 2), height / 7 + 5 * 24, 200, 20, ScreenTexts.DONE) {
client!!.setScreen(parent)
}.position((width/2) - (200 / 2), height / 7 + 5 * 24).size(200, 20).build())
})

}

Expand Down
14 changes: 7 additions & 7 deletions common/src/main/kotlin/me/cael/capes/render/DisplayPlayerEntityRenderer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import net.minecraft.client.util.math.MatrixStack
import net.minecraft.entity.LivingEntity
import net.minecraft.util.Identifier
import net.minecraft.util.math.MathHelper
import net.minecraft.util.math.RotationAxis
import net.minecraft.util.math.Vec3f

class DisplayPlayerEntityRenderer(val ctx: EntityRendererFactory.Context, slim: Boolean) :
LivingEntityRenderer<LivingEntity, PlayerEntityModel<LivingEntity>> (
Expand All @@ -37,9 +37,9 @@ class DisplayPlayerEntityRenderer(val ctx: EntityRendererFactory.Context, slim:
model.child = false

matrixStack.scale(0.9375f, 0.9375f, 0.9375f)
matrixStack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(180.0f - livingEntity.yaw))
matrixStack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(180.0f - livingEntity.yaw))
matrixStack.scale(-1.0f, -1.0f, 1.0f)
matrixStack.translate(0.0f, -1.501f, 0.0f)
matrixStack.translate(0.0, -1.501, 0.0)

var limbDistance = MathHelper.lerp(tickDelta, livingEntity.lastLimbDistance, livingEntity.limbDistance)
val limbAngle = livingEntity.limbAngle - livingEntity.limbDistance * (1.0f - tickDelta)
Expand All @@ -60,10 +60,10 @@ class DisplayPlayerEntityRenderer(val ctx: EntityRendererFactory.Context, slim:
if (!PlaceholderEntity.showElytra) {
if (PlaceholderEntity.getCapeTexture() == null) return
matrixStack.push()
matrixStack.translate(0.0f, 0.0f, 0.125f)
matrixStack.translate(0.0, 0.0, 0.125)

matrixStack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(3.0f))
matrixStack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(180.0f))
matrixStack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(3.0f))
matrixStack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(180.0f))

val vertexConsumer = vertexConsumerProvider.getBuffer(RenderLayer.getArmorCutoutNoCull(PlaceholderEntity.getCapeTexture()))
ctx.getPart(EntityModelLayers.PLAYER).getChild("cloak")
Expand All @@ -72,7 +72,7 @@ class DisplayPlayerEntityRenderer(val ctx: EntityRendererFactory.Context, slim:
} else {
val identifier = PlaceholderEntity.getElytraTexture()
matrixStack.push()
matrixStack.translate(0.0f, 0.0f, 0.125f)
matrixStack.translate(0.0, 0.0, 0.125)

this.model.copyStateTo(this.elytra)

Expand Down
2 changes: 1 addition & 1 deletion fabric/src/main/kotlin/me/cael/capes/fabric/FabricCapes.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object FabricCapes : ClientModInitializer {

override fun onInitializeClient() {
Capes.CONFIG
ClientCommandRegistrationCallback.EVENT.register { dispatcher, registryAccess ->
ClientCommandRegistrationCallback.EVENT.register { dispatcher, _ ->
dispatcher.register(
literal("capes")
.then(literal("debug")
Expand Down
2 changes: 1 addition & 1 deletion fabric/src/main/resources/fabric.mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"fabricloader": ">=0.14.6",
"fabric": "*",
"fabric-language-kotlin": "*",
"minecraft": "1.19.3",
"minecraft": "1.19.2",
"java": ">=17"
}
}
4 changes: 2 additions & 2 deletions forge/src/main/resources/META-INF/mods.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ logoFile = "assets/capes/icon.png"
[[dependencies.capes]]
modId = "forge"
mandatory = true
versionRange = "[44,)"
versionRange = "[43,)"
ordering = "NONE"
side = "BOTH"

[[dependencies.capes]]
modId = "minecraft"
mandatory = true
versionRange = "[1.19.3,)"
versionRange = "[1.19.2,)"
ordering = "NONE"
side = "BOTH"
15 changes: 7 additions & 8 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
org.gradle.jvmargs=-Xmx8G

minecraft_version=1.19.3
yarn_mappings=1.19.3+build.3
minecraft_version=1.19.2
yarn_mappings=1.19.2+build.28
enabled_platforms=fabric,forge

archives_base_name=capes
mod_version=1.5.2+1.19.3
mod_version=1.5.2+1.19.2
maven_group=me.capes

fabric_loader_version=0.14.11
fabric_api_version=0.69.1+1.19.3
fabric_api_version=0.75.1+1.19.2

forge_version=1.19.3-44.1.8
forge_version=1.19.2-43.2.6

# Other APIs
fabric_kotlin_version=1.8.7+kotlin.1.7.22
forge_kotlin_version=4.+
omega_config_version=1.2.3-1.18.1
modmenu_version=5.0.0-alpha.4
forge_kotlin_version=3.+
modmenu_version=4.1.2
mixinextras_version=0.2.0-beta.1

# Publishing
Expand Down

0 comments on commit 6af5714

Please sign in to comment.