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
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal
# Gradle configuration
org.gradle.jvmargs=-Xmx8192m -Xms8192m
org.gradle.daemon=false
org.gradle.parallel=true
org.gradle.configureondemand=true
org.gradle.parallel.threads=8

loom.ignoreDependencyLoomVersionValidation=true
dgt.minecraft.revision=3
Expand All @@ -14,5 +17,5 @@ dgt.loom.mappings=official-like
# Mod properties
mod.name=OmniCore
mod.id=omnicore
mod.version=1.0.0-beta.38
mod.version=1.0.0-beta.39
mod.group=dev.deftu
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
textile = "1.0.0-beta.8"
textile = "1.0.0-beta.9"
enhancedeventbus = "2.0.0"
brigadier = "1.0.18"
dfu = "4.0.26"
Expand Down
4 changes: 2 additions & 2 deletions root.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

preprocess {
strictExtraMappings.set(false)
strictExtraMappings.set(true)

"1.21.10-neoforge"(1_21_10, "srg") {
"1.21.10-fabric"(1_21_10, "srg") {
Expand Down Expand Up @@ -44,7 +44,7 @@ preprocess {
"1.16.5-forge"(1_16_05, "srg") {
"1.12.2-forge"(1_12_02, "srg", file("versions/mappings/1.16.5-forge+1.12.2-forge.txt")) {
"1.12.2-fabric"(1_12_02, "srg") {
"1.8.9-fabric"(1_08_09, "srg", file("versions/mappings/1.12.2-fabric+1.8.9-fabric.txt")) {
"1.8.9-fabric"(1_08_09, "srg") {
"1.8.9-forge"(1_08_09, "srg")
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public interface OmniPoseStack {
public fun deepCopy(): OmniPoseStack

public fun push()
public fun push(entry: Entry)
public fun pop(): Entry

public fun translate(x: Float, y: Float, z: Float)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ public class OmniPoseStackImpl private constructor(private val stack: Deque<Omni
stack.addLast(current.deepCopy())
}

override fun push(entry: OmniPoseStack.Entry) {
stack.addLast(entry)
}

override fun pop(): OmniPoseStack.Entry {
if (stack.size <= 1) {
throw IllegalStateException("Cannot pop the last matrix stack entry")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ public data object OmniPoseUnit : OmniPoseStack {
// no-op
}

override fun push(entry: OmniPoseStack.Entry) {
// no-op
}

override fun pop(): OmniPoseStack.Entry {
return entry
}
Expand Down
3 changes: 0 additions & 3 deletions versions/mappings/1.12.2-fabric+1.8.9-fabric.txt

This file was deleted.

72 changes: 4 additions & 68 deletions versions/mappings/1.16.5-forge+1.12.2-forge.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
net.minecraft.util.thread.BlockableEventLoop net.minecraft.client.Minecraft
net.minecraft.util.thread.BlockableEventLoop isSameThread() isCallingFromMinecraftThread()
net.minecraft.util.thread.BlockableEventLoop execute() addScheduledTask()
net.minecraft.util.thread.BlockableEventLoop isSameThread() net.minecraft.client.Minecraft isCallingFromMinecraftThread()
net.minecraft.util.thread.BlockableEventLoop execute() net.minecraft.client.Minecraft addScheduledTask()

com.mojang.blaze3d.platform.GlStateManager net.minecraft.client.renderer.GlStateManager
com.mojang.blaze3d.platform.GlStateManager _clear() clear()
com.mojang.blaze3d.platform.GlStateManager _enableDepthTest() enableDepth()
com.mojang.blaze3d.platform.GlStateManager _disableDepthTest() disableDepth()
com.mojang.blaze3d.platform.GlStateManager _viewport() viewport()
com.mojang.blaze3d.platform.GlStateManager _colorMask() colorMask()
com.mojang.blaze3d.platform.GlStateManager _enableColorLogicOp() enableColorLogic()
com.mojang.blaze3d.platform.GlStateManager _disableColorLogicOp() disableColorLogic()
com.mojang.blaze3d.platform.GlStateManager _logicOp() colorLogicOp()
com.mojang.blaze3d.platform.GlStateManager _enablePolygonOffset() enablePolygonOffset()
com.mojang.blaze3d.platform.GlStateManager _disablePolygonOffset() disablePolygonOffset()
com.mojang.blaze3d.platform.GlStateManager _polygonOffset() doPolygonOffset()
Expand All @@ -33,31 +25,22 @@ com.mojang.blaze3d.platform.GlStateManager _bindTexture() bindTexture()
com.mojang.blaze3d.platform.GlStateManager _deleteTexture() deleteTexture()
com.mojang.blaze3d.platform.GlStateManager _clearColor() clearColor()
com.mojang.blaze3d.platform.GlStateManager _clearDepth() clearDepth()
com.mojang.blaze3d.platform.GlStateManager _enableTexture() enableTexture2D()
com.mojang.blaze3d.platform.GlStateManager _disableTexture() disableTexture2D()

net.minecraft.client.gui.screens.inventory.AbstractContainerScreen net.minecraft.client.gui.inventory.GuiContainer

com.mojang.math.Matrix4f org.lwjgl.util.vector.Matrix4f
com.mojang.math.Matrix3f org.lwjgl.util.vector.Matrix3f
com.mojang.math.Vector4f org.lwjgl.util.vector.Vector4f
com.mojang.math.Vector3f org.lwjgl.util.vector.Vector3f
com.mojang.math.Quaternion org.lwjgl.util.vector.Quaternion
net.minecraft.client.util.math.Vector4f org.lwjgl.util.vector.Vector4f
net.minecraft.core.Vec3i net.minecraft.util.math.Vec3i

net.minecraft.server.packs.resources.ReloadableResourceManager net.minecraft.client.resources.IReloadableResourceManager
net.minecraft.server.packs.resources.ResourceManager getResources() getAllResources()
net.minecraft.server.packs.resources.Resource net.minecraft.client.resources.IResource

com.mojang.blaze3d.vertex.BufferBuilder net.minecraft.client.renderer.BufferBuilder
com.mojang.blaze3d.vertex.BufferBuilder end() finishDrawing()
com.mojang.blaze3d.vertex.BufferBuilder discard() reset()

com.mojang.blaze3d.vertex.VertexFormatElement net.minecraft.client.renderer.vertex.VertexFormatElement

com.mojang.blaze3d.vertex.VertexFormatElement$Usage net.minecraft.client.renderer.vertex.VertexFormatElement$EnumUsage

net.minecraft.util.profiling.ProfilerFiller net.minecraft.profiler.Profiler
net.minecraft.util.profiling.ProfilerFiller popPush() endStartSection()

Expand All @@ -66,73 +49,44 @@ net.minecraft.client.multiplayer.ClientLevel net.minecraft.client.multiplayer.Wo
net.minecraft.core.Direction net.minecraft.util.EnumFacing

net.minecraft.client.player.LocalPlayer net.minecraft.client.entity.EntityPlayerSP
net.minecraft.client.player.LocalPlayer getX() posX
net.minecraft.client.player.LocalPlayer getPrevX() getPrevPosX()
net.minecraft.client.player.LocalPlayer getY() getPosY()
net.minecraft.client.player.LocalPlayer getZ() getPosZ()

net.minecraft.server.level.ServerLevel net.minecraft.world.WorldServer

net.minecraft.server.level.ServerPlayer net.minecraft.entity.player.EntityPlayerMP

net.minecraft.world.entity.player.Player net.minecraft.entity.player.EntityPlayer
net.minecraft.world.entity.player.Player getMainArm() getPrimaryHand()

net.minecraft.commands.CommandSource net.minecraft.command.ICommandSender

net.minecraft.client.gui.Gui net.minecraft.client.gui.GuiIngame

net.minecraft.client.gui.components.ChatComponent net.minecraft.client.gui.GuiNewChat

net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen net.minecraft.client.gui.inventory.GuiContainerCreative

net.minecraft.world.item.CreativeModeTab net.minecraft.creativetab.CreativeTabs
net.minecraft.world.item.CreativeModeTab getId() getIndex()

net.minecraft.client.multiplayer.ClientPacketListener net.minecraft.client.network.NetHandlerPlayClient

net.minecraft.client.Options net.minecraft.client.settings.GameSettings

net.minecraft.client.renderer.texture.TextureManager register() loadTexture()
net.minecraft.client.renderer.texture.AbstractTexture load() loadTexture()
net.minecraft.client.renderer.texture.AbstractTexture getId() getGlTextureId()
net.minecraft.client.renderer.texture.AbstractTexture releaseId() deleteGlTexture()

net.minecraft.server.packs.resources.ResourceManager net.minecraft.client.resources.IResourceManager

net.minecraft.client.gui.screens.Screen net.minecraft.client.gui.GuiScreen
net.minecraft.client.gui.screens.Screen isPauseScreen() doesGuiPauseGame()

net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen net.minecraft.client.gui.GuiMultiplayer

net.minecraft.client.gui.screens.ConnectScreen net.minecraft.client.multiplayer.GuiConnecting

net.minecraft.client.gui.screens.ChatScreen net.minecraft.client.gui.GuiChat

net.minecraft.client.resources.sounds.SimpleSoundInstance net.minecraft.client.audio.PositionedSoundRecord
net.minecraft.client.resources.sounds.SimpleSoundInstance forUI() getRecord()

net.minecraft.world.level.block.state.BlockState net.minecraft.block.state.IBlockState

net.minecraft.world.level.block.FenceGateBlock net.minecraft.block.BlockFenceGate

net.minecraft.client.Minecraft setScreen() displayGuiScreen()
net.minecraft.server.network.ServerGamePacketListenerImpl net.minecraft.network.NetHandlerPlayServer
net.minecraft.server.network.ServerGamePacketListenerImpl send() sendPacket()

net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket net.minecraft.network.play.client.CPacketCustomPayload
net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket net.minecraft.network.play.server.SPacketCustomPayload

net.minecraft.network.protocol.game.ClientboundSetTitlesPacket net.minecraft.network.play.server.SPacketTitle
net.minecraft.network.chat.ChatType net.minecraft.util.text.ChatType

net.minecraft.world.entity.Entity net.minecraft.entity.Entity
net.minecraft.world.entity.Entity setPosRaw() setPosition()

net.minecraft.world.entity.LivingEntity net.minecraft.entity.EntityLivingBase
net.minecraft.world.entity.LivingEntity getMainHandItem() getHeldItemMainhand()
net.minecraft.world.entity.LivingEntity getOffhandItem() getHeldItemOffhand()
net.minecraft.world.entity.LivingEntity getItemBySlot() getItemStackFromSlot()

net.minecraft.world.entity.EquipmentSlot net.minecraft.inventory.EntityEquipmentSlot

Expand All @@ -142,31 +96,13 @@ net.minecraft.core.BlockPos net.minecraft.util.math.BlockPos
net.minecraft.core.BlockPos asLong() toLong()
net.minecraft.core.BlockPos of() fromLong()

net.minecraft.world.phys.Vec2 net.minecraft.util.math.Vec2f

net.minecraft.world.phys.Vec3 net.minecraft.util.math.Vec3d

net.minecraft.client.multiplayer.PlayerInfo net.minecraft.client.network.NetworkPlayerInfo
net.minecraft.client.multiplayer.PlayerInfo getGameType() getGameMode()

net.minecraft.nbt.Tag net.minecraft.nbt.NBTBase
net.minecraft.nbt.CompoundTag net.minecraft.nbt.NBTTagCompound
net.minecraft.nbt.CompoundTag put() setTag()
net.minecraft.nbt.ListTag net.minecraft.nbt.NBTTagList
net.minecraft.nbt.ListTag size() tagCount()

net.minecraft.sounds.SoundEvents net.minecraft.init.SoundEvents
net.minecraft.sounds.SoundEvents EXPERIENCE_ORB_PICKUP ENTITY_EXPERIENCE_ORB_PICKUP
net.minecraft.sounds.SoundEvents ITEM_PICKUP ENTITY_ITEM_PICKUP
net.minecraft.sounds.SoundEvents PLAYER_LEVELUP ENTITY_PLAYER_LEVELUP
net.minecraft.sounds.SoundEvents NOTE_BLOCK_BASEDRUM BLOCK_NOTE_BASEDRUM
net.minecraft.sounds.SoundEvents NOTE_BLOCK_BASS BLOCK_NOTE_BASS
net.minecraft.sounds.SoundEvents NOTE_BLOCK_HARP BLOCK_NOTE_HARP
net.minecraft.sounds.SoundEvents NOTE_BLOCK_HAT BLOCK_NOTE_HAT
net.minecraft.sounds.SoundEvents NOTE_BLOCK_PLING BLOCK_NOTE_PLING
net.minecraft.sounds.SoundEvents NOTE_BLOCK_SNARE BLOCK_NOTE_SNARE
net.minecraft.sounds.SoundEvents NOTE_BLOCK_BELL BLOCK_NOTE_BELL
net.minecraft.sounds.SoundEvents NOTE_BLOCK_CHIME BLOCK_NOTE_CHIME
net.minecraft.sounds.SoundEvents NOTE_BLOCK_FLUTE BLOCK_NOTE_FLUTE
net.minecraft.sounds.SoundEvents NOTE_BLOCK_GUITAR BLOCK_NOTE_GUITAR
net.minecraft.sounds.SoundEvents NOTE_BLOCK_XYLOPHONE BLOCK_NOTE_XYLOPHONE

net.minecraft.sounds.SoundEvents net.minecraft.init.SoundEvents
3 changes: 1 addition & 2 deletions versions/mappings/1.19.2-fabric+1.18.2-fabric.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource
net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback
net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback
2 changes: 1 addition & 1 deletion versions/mappings/1.19.4-forge+1.19.2-forge.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ org.joml.Matrix4f com.mojang.math.Matrix4f
org.joml.Matrix3f com.mojang.math.Matrix3f
org.joml.Vector4f com.mojang.math.Vector4f
org.joml.Vector3f com.mojang.math.Vector3f
org.joml.Quaternionf com.mojang.math.Quaternion
org.joml.Quaternionf com.mojang.math.Quaternion
3 changes: 1 addition & 2 deletions versions/mappings/1.20.4-forge+1.20.1-forge.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket

net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket
net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket
2 changes: 1 addition & 1 deletion versions/mappings/1.20.4-neoforge+1.20.4-forge.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
net.neoforged.neoforge.event.TickEvent net.minecraftforge.event.TickEvent
net.neoforged.neoforge.client.event.ScreenEvent net.minecraftforge.client.event.ScreenEvent
net.neoforged.neoforge.client.event.ScreenEvent net.minecraftforge.client.event.ScreenEvent
5 changes: 1 addition & 4 deletions versions/mappings/1.21.1-neoforge+1.20.6-neoforge.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
com.mojang.blaze3d.vertex.VertexFormatElement usage() getUsage()
com.mojang.blaze3d.vertex.VertexFormatElement index() getIndex()

com.mojang.blaze3d.vertex.BufferBuilder setUv1() overlayCoords()
com.mojang.blaze3d.vertex.BufferBuilder setUv1() com.mojang.blaze3d.vertex.VertexConsumer overlayCoords()
2 changes: 1 addition & 1 deletion versions/mappings/1.21.2-fabric+1.21.1-fabric.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
net.minecraft.client.Minecraft getDeltaTracker() getTimer()
net.minecraft.client.Minecraft getDeltaTracker() getTimer()
2 changes: 1 addition & 1 deletion versions/mappings/1.21.5-neoforge+1.21.4-neoforge.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
com.mojang.blaze3d.opengl.GlStateManager com.mojang.blaze3d.platform.GlStateManager
com.mojang.blaze3d.opengl.GlStateManager com.mojang.blaze3d.platform.GlStateManager
2 changes: 1 addition & 1 deletion versions/mappings/1.21.6-fabric+1.21.5-fabric.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
net.minecraft.WorldVersion name() getName()
net.minecraft.WorldVersion name() getName()
2 changes: 1 addition & 1 deletion versions/mappings/1.21.9-neoforge+1.21.8-neoforge.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
com.mojang.authlib.GameProfile id() getId()
com.mojang.authlib.GameProfile id()Ljava/util/UUID; com.mojang.authlib.GameProfile getId()Ljava/util/UUID;
Loading