Skip to content

Commit 9faf200

Browse files
progress 2
1 parent 4020305 commit 9faf200

File tree

17 files changed

+740
-723
lines changed

17 files changed

+740
-723
lines changed

neoforge-main/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ dependencies {
139139
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
140140

141141
implementation("curse.maven:jei-238222:7024953")
142+
implementation("curse.maven:the-one-probe-245211:5836106")
142143

143144
jarJar(libs.rxjava)
144145
jarJar(libs.reactivestreams)

neoforge-main/gtfo/compat/jei/JeiMiniaturizationCraftingCategory.java

Lines changed: 0 additions & 519 deletions
This file was deleted.

neoforge-main/gtfo/compat/jei/JeiMiniaturizationPlugin.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

neoforge-main/gtfo/compat/theoneprobe/providers/FieldProjectorProvider.java

Lines changed: 0 additions & 100 deletions
This file was deleted.

neoforge-main/gtfo/compat/theoneprobe/providers/FieldProxyProvider.java

Lines changed: 0 additions & 42 deletions
This file was deleted.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package dev.compactmods.crafting.client.ui;
2+
3+
public class ScreenArea {
4+
public final int x;
5+
public final int y;
6+
public final int width;
7+
public final int height;
8+
9+
public ScreenArea(int x, int y, int width, int height) {
10+
this.x = x;
11+
this.y = y;
12+
this.width = width;
13+
this.height = height;
14+
}
15+
16+
public boolean contains(int mouseX, int mouseY) {
17+
return mouseX >= x && mouseX < x + width && mouseY >= y && mouseY < y + height;
18+
}
19+
20+
public int getRight() {
21+
return x + width;
22+
}
23+
24+
public int getBottom() {
25+
return y + height;
26+
}
27+
}

neoforge-main/gtfo/compat/ModBusEvents.java renamed to neoforge-main/src/main/java/dev/compactmods/crafting/compat/ModBusEvents.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package dev.compactmods.crafting.events;
1+
package dev.compactmods.crafting.compat;
22

33
import dev.compactmods.crafting.CompactCrafting;
44
import dev.compactmods.crafting.compat.theoneprobe.TheOneProbeCompat;
5-
import net.minecraftforge.eventbus.api.SubscribeEvent;
6-
import net.minecraftforge.fml.ModList;
7-
import net.minecraftforge.fml.common.Mod;
8-
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
5+
import net.neoforged.bus.api.SubscribeEvent;
6+
import net.neoforged.fml.ModList;
7+
import net.neoforged.fml.common.EventBusSubscriber;
8+
import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent;
99

10-
@Mod.EventBusSubscriber(modid = CompactCrafting.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
10+
@EventBusSubscriber(modid = CompactCrafting.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
1111
public class ModBusEvents {
1212
@SubscribeEvent
1313
public static void enqueueIMC(final InterModEnqueueEvent event) {

0 commit comments

Comments
 (0)