DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Make main source set compile against 1.19.4

Browse Source
This commit is contained in:
DBotThePony 2024-01-01 12:10:02 +07:00
parent 31268e33ef
commit b6643a6dd3
Signed by: DBot
GPG Key ID: DCC23B5715498507
4 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/ru/dbotthepony/mc/otm/mixin/GuiGraphicsMixin.java
View File

@ -1,25 +0,0 @@
package ru.dbotthepony.mc.otm.mixin;
import net.minecraft.client.Minecraft;
;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import static ru.dbotthepony.mc.otm.client.render.RenderHelperKt.popScissorRect;
import static ru.dbotthepony.mc.otm.client.render.RenderHelperKt.pushScissorRect;
// because scissor stack fucking sucks.
// mostly because it is not a stack at all.
@Mixin(GuiGraphics.class)
public abstract class GuiGraphicsMixin {
@Overwrite
public void enableScissor(int x0, int y0, int x1, int y1) {
double scale = Minecraft.getInstance().getWindow().getGuiScale();
pushScissorRect((int) (scale * x0), (int) (scale * y0), (int) (scale * (x1 - x0)), (int) (scale * (y1 - y0)));
}
@Overwrite
public void disableScissor() {
popScissorRect();
}
}

2
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/ItemMonitorBlockEntity.kt
View File

@ -430,7 +430,7 @@ class ItemMonitorBlockEntity(blockPos: BlockPos, blockState: BlockState) : Matte
check(this.settings.put(UUID.fromString(key), ItemMonitorPlayerSettings().also { it.deserializeNBT(settings.getCompound(key)) }) == null)
}
craftingGrid.deserializeNBT(nbt["crafting_grid"])
craftingGrid.deserializeNBT(nbt["crafting_grid"] as? CompoundTag)
}
fun getSettings(ply: ServerPlayer): ItemMonitorPlayerSettings {

6
src/main/kotlin/ru/dbotthepony/mc/otm/container/MatteryCraftingContainer.kt
View File

@ -44,10 +44,6 @@ open class MatteryCraftingContainer private constructor(private val listener: Ma
parent.deserializeNBT(nbt)
}
fun deserializeNBT(nbt: Tag?) {
parent.deserializeNBT(nbt as? CompoundTag)
}
override fun clearContent() {
parent.clearContent()
}
@ -112,7 +108,7 @@ open class MatteryCraftingContainer private constructor(private val listener: Ma
return parent.countItem(p_18948_)
}
override fun hasAnyOf(p_18950_: MutableSet<Item>): Boolean {
override fun hasAnyOf(p_18950_: Set<Item>): Boolean {
return parent.hasAnyOf(p_18950_)
}

3
src/main/resources/overdrive_that_matters.mixins.json
View File

@ -17,8 +17,7 @@
"InventoryChangeTriggerMixin",
"MixinPlayer",
"HopperBlockEntityMixin",
"DispenserBlockEntityMixin",
"GuiGraphicsMixin"
"DispenserBlockEntityMixin"
],
"client": [
"MixinGameRenderer",