Skip to content

Commit

Permalink
fixed more compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trinsdar
Trinsdar committed Dec 12, 2024
1 parent f515dd0 commit 2ee293c
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 77 deletions.
8 changes: 4 additions & 4 deletions common/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ dependencies{
implementation(expectPlatform.annotationsDep)

//subprojects
implementation(project(path: ":tesseract-common"))
implementation(project(path: ":antimatter-common"))
implementation(project(":tesseract-common"))
implementation(project(":antimatter-common"))

//gt-reimagined-lib deps
compileOnly("com.blamejared.crafttweaker:CraftTweaker-common-1.18.2:${project.crafttweaker_version}")
Expand All @@ -40,8 +40,8 @@ dependencies{
modCompileOnly("dev.trinsdar:arrp:0.6.7")
implementation("org.gt-reimagined:structurelib-common:${project.structurelib_version}-${project.minecraft_version}")
modImplementation "maven.modrinth:carbon-config:${project.carbon_config_fabric_version}"
modImplementation("earth.terrarium:botarium-common-1.18.2:${project.botarium_version}")
modImplementation "com.teamresourceful.resourcefullib:resourcefullib-common-1.18.2:${project.resourcefullib_version}"
modImplementation("earth.terrarium:botarium-fabric-1.18.2:${project.botarium_version}")
modImplementation "com.teamresourceful.resourcefullib:resourcefullib-fabric-1.18.2:${project.resourcefullib_version}"

//gt5r deps
implementation("org.gt-reimagined:gtcore-common:${project.gt_core_version}-${project.minecraft_version}"){
Expand Down
5 changes: 2 additions & 3 deletions common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityCharcoalPit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ public void saveAdditional(CompoundTag tag) {
}

@Override
public void deserializeNBT(BlockState state, CompoundTag nbt) {
super.deserializeNBT(state, nbt);
public void load(CompoundTag nbt) {
super.load(nbt);
if (nbt.contains("progress")){
progress = nbt.getInt("progress");
maxProgress = nbt.getInt("maxProgress");
Expand All @@ -225,6 +225,5 @@ public void deserializeNBT(BlockState state, CompoundTag nbt) {
blockLists.add(new BlockPos(tag.getInt("x"), tag.getInt("y"), tag.getInt("z")));
});
}

}
}
5 changes: 2 additions & 3 deletions common/src/main/java/org/gtreimagined/gt5r/cover/CoverSteamVent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
import muramasa.antimatter.cover.CoverFactory;
import muramasa.antimatter.machine.MachineState;
import muramasa.antimatter.machine.Tier;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
Expand All @@ -19,6 +17,7 @@
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.AABB;
import org.jetbrains.annotations.Nullable;
import xyz.wagyourtail.unimined.expect.annotation.Environment;

import java.util.Random;

Expand Down Expand Up @@ -70,7 +69,7 @@ public void onUpdate() {
}
}

@Environment(EnvType.CLIENT)
@Environment(Environment.EnvType.CLIENT)
private void addParticle(Level level, BlockPos offset){
ClientLevel clientLevel = (ClientLevel) level;
Random random = level.random;
Expand Down
5 changes: 2 additions & 3 deletions common/src/main/java/org/gtreimagined/gt5r/gui/widgets/CoalBoilerFuelWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
import muramasa.antimatter.integration.jeirei.AntimatterJEIREIPlugin;
import muramasa.antimatter.mixin.client.AbstractContainerScreenAccessor;
import muramasa.antimatter.util.Utils;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import xyz.wagyourtail.unimined.expect.annotation.Environment;

import static muramasa.antimatter.gui.ICanSyncData.SyncDirection.SERVER_TO_CLIENT;

Expand Down Expand Up @@ -58,7 +57,7 @@ public void mouseOver(PoseStack stack, double mouseX, double mouseY, float parti
renderTooltip(stack,"Fuel: " + fuel, mouseX, mouseY + 10, 0, 10, 18, 18);
}

@Environment(EnvType.CLIENT)
@Environment(Environment.EnvType.CLIENT)
protected void renderTooltip(PoseStack matrixStack, String text, double mouseX, double mouseY, int x, int y, int w, int h) {
if (isInside(x, y, w, h, mouseX, mouseY)){
renderTooltip(matrixStack, Utils.literal(text), mouseX, mouseY);
Expand Down
5 changes: 2 additions & 3 deletions common/src/main/java/org/gtreimagined/gt5r/gui/widgets/CoalBoilerWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@
import muramasa.antimatter.gui.widget.WidgetSupplier;
import muramasa.antimatter.mixin.client.AbstractContainerScreenAccessor;
import muramasa.antimatter.util.Utils;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import tesseract.TesseractGraphWrappers;
import xyz.wagyourtail.unimined.expect.annotation.Environment;

import static muramasa.antimatter.gui.ICanSyncData.SyncDirection.SERVER_TO_CLIENT;

Expand Down Expand Up @@ -90,7 +89,7 @@ public void mouseOver(PoseStack stack, double mouseX, double mouseY, float parti
renderTooltip(stack,"Heat: " + heat + "C° out of " + maxHeat, mouseX, mouseY, 26, 0, 10, 54);
}

@Environment(EnvType.CLIENT)
@Environment(Environment.EnvType.CLIENT)
protected void renderTooltip(PoseStack matrixStack, String text, double mouseX, double mouseY, int x, int y, int w, int h) {
if (isInside(x, y, w, h, mouseX, mouseY)){
renderTooltip(matrixStack, Utils.literal(text), mouseX, mouseY);
Expand Down
5 changes: 2 additions & 3 deletions common/src/main/java/org/gtreimagined/gt5r/gui/widgets/LavaBoilerWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@
import muramasa.antimatter.gui.widget.WidgetSupplier;
import muramasa.antimatter.mixin.client.AbstractContainerScreenAccessor;
import muramasa.antimatter.util.Utils;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import tesseract.TesseractGraphWrappers;
import xyz.wagyourtail.unimined.expect.annotation.Environment;

import static muramasa.antimatter.gui.ICanSyncData.SyncDirection.SERVER_TO_CLIENT;

Expand Down Expand Up @@ -107,7 +106,7 @@ public void mouseOver(PoseStack stack, double mouseX, double mouseY, float parti
renderTooltip(stack,"Heat: " + heat + "C° out of " + maxHeat, mouseX, mouseY, 26, 0, 10, 54);
}

@Environment(EnvType.CLIENT)
@Environment(Environment.EnvType.CLIENT)
protected void renderTooltip(PoseStack matrixStack, String text, double mouseX, double mouseY, int x, int y, int w, int h) {
if (isInside(x, y, w, h, mouseX, mouseY)){
renderTooltip(matrixStack, Utils.literal(text), mouseX, mouseY);
Expand Down
5 changes: 2 additions & 3 deletions common/src/main/java/org/gtreimagined/gt5r/gui/widgets/SolarBoilerWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@
import muramasa.antimatter.gui.widget.WidgetSupplier;
import muramasa.antimatter.mixin.client.AbstractContainerScreenAccessor;
import muramasa.antimatter.util.Utils;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import tesseract.TesseractGraphWrappers;
import xyz.wagyourtail.unimined.expect.annotation.Environment;

import static muramasa.antimatter.gui.ICanSyncData.SyncDirection.SERVER_TO_CLIENT;

Expand Down Expand Up @@ -101,7 +100,7 @@ public void mouseOver(PoseStack stack, double mouseX, double mouseY, float parti
renderTooltip(stack,"Heat: " + heat + "C° out of " + maxHeat, mouseX, mouseY, 26, 0, 10, 54);
}

@Environment(EnvType.CLIENT)
@Environment(Environment.EnvType.CLIENT)
protected void renderTooltip(PoseStack matrixStack, String text, double mouseX, double mouseY, int x, int y, int w, int h) {
if (isInside(x, y, w, h, mouseX, mouseY)){
renderTooltip(matrixStack, Utils.literal(text), mouseX, mouseY);
Expand Down
39 changes: 0 additions & 39 deletions common/src/main/resources/forge/GT4ReimaginedForge.java
View file

This file was deleted.

15 changes: 0 additions & 15 deletions common/src/main/resources/forge/mixin/GTCapabilityProviderAccessor.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion fabric/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies{
}
modImplementation("net.feltmc:felt-enchanting-api:1.1.0") { transitive false }
modImplementation("dev.trinsdar:arrp:0.6.7")
modRuntimeOnly("org.gt-reimagined:structurelib-fabric:${project.structurelib_version}-${project.minecraft_version}")
modImplementation("org.gt-reimagined:structurelib-fabric:${project.structurelib_version}-${project.minecraft_version}")
modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${rootProject.rei_version}"
modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-fabric:${rootProject.jei_version}"){
exclude(group: "mezz.jei", module: "jei-1.18.2-fabric-api")
Expand Down

0 comments on commit 2ee293c

Please sign in to comment.