Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update gt, rename #20

Merged
merged 1 commit into from
Sep 3, 2024
Merged

update gt, rename #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

dependencies {
api('com.github.GTNewHorizons:StructureLib:1.3.1:dev')
implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.64:dev")
implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.56:dev")
compileOnly("com.github.GTNewHorizons:NotEnoughEnergistics:1.6.0:dev")

runtimeOnlyNonPublishable("com.github.GTNewHorizons:StructureCompat:0.6.3:dev")
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/blockrenderer6343/client/renderer/WorldSceneRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@
import org.lwjgl.util.glu.GLU;
import org.lwjgl.util.vector.Vector3f;

import com.github.bartimaeusnek.bartworks.common.blocks.BW_GlasBlocks;

import bartworks.common.blocks.BWBlocksGlass;
import blockrenderer6343.BlockRenderer6343;
import blockrenderer6343.api.utils.BlockPosition;
import blockrenderer6343.api.utils.Position;
Expand All @@ -64,7 +63,7 @@
import blockrenderer6343.client.utils.ProjectionUtils;
import blockrenderer6343.client.world.TrackedDummyWorld;
import codechicken.lib.vec.Vector3;
import gregtech.common.render.GT_Renderer_Block;
import gregtech.common.render.GTRendererBlock;

/**
* Created with IntelliJ IDEA.
Expand Down Expand Up @@ -286,7 +285,7 @@ protected void drawWorld() {
bufferBuilder.blockAccess = world;
bufferBuilder.setRenderBounds(0, 0, 0, 1, 1, 1);
bufferBuilder.renderAllFaces = renderAllFaces;
if (BlockRenderer6343.isBartworksLoaded && block instanceof BW_GlasBlocks bwGlass) {
if (BlockRenderer6343.isBartworksLoaded && block instanceof BWBlocksGlass bwGlass) {
// this mod cannot render renderpass = 1 blocks for now
bufferBuilder.renderStandardBlockWithColorMultiplier(
block,
Expand All @@ -297,7 +296,7 @@ protected void drawWorld() {
bwGlass.getColor(world.getBlockMetadata(pos.x, pos.y, pos.z))[1] / 255f,
bwGlass.getColor(world.getBlockMetadata(pos.x, pos.y, pos.z))[2] / 255f);
} else if (BlockRenderer6343.isGTLoaded) {
if (!GT_Renderer_Block.INSTANCE.renderWorldBlock(
if (!GTRendererBlock.INSTANCE.renderWorldBlock(
world,
pos.x,
pos.y,
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/blockrenderer6343/integration/gregtech/GT_GUI_MultiblockHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.interfaces.tileentity.ITurnable;
import gregtech.api.threads.GT_Runnable_MachineBlockUpdate;
import gregtech.api.threads.RunnableMachineUpdate;

public class GT_GUI_MultiblockHandler extends GUI_MultiblockHandler<IConstructable> {

Expand All @@ -26,8 +26,8 @@ public GT_GUI_MultiblockHandler() {

@Override
protected void placeMultiblock() {
if (GT_Runnable_MachineBlockUpdate.isCurrentThreadEnabled()) {
GT_Runnable_MachineBlockUpdate.setCurrentThreadEnabled(false);
if (RunnableMachineUpdate.isCurrentThreadEnabled()) {
RunnableMachineUpdate.setCurrentThreadEnabled(false);
}

IConstructable constructable = null;
Expand Down Expand Up @@ -75,8 +75,8 @@ protected void placeMultiblock() {
StructureLibAPI.disableInstrument();
}

if (!GT_Runnable_MachineBlockUpdate.isCurrentThreadEnabled()) {
GT_Runnable_MachineBlockUpdate.setCurrentThreadEnabled(true);
if (!RunnableMachineUpdate.isCurrentThreadEnabled()) {
RunnableMachineUpdate.setCurrentThreadEnabled(true);
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/blockrenderer6343/integration/gregtech/GT_NEI_MultiblockHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package blockrenderer6343.integration.gregtech;

import static blockrenderer6343.integration.nei.IMCForNEI.GT_NEI_MB_HANDLER_NAME;
import static gregtech.api.GregTech_API.METATILEENTITIES;
import static gregtech.api.GregTechAPI.METATILEENTITIES;

import java.util.ArrayList;
import java.util.List;
Expand Down