Skip to content

Commit 0d62410

Browse files
committed
Fix mismatch between chosen and rendered selected side in the carpenter workbench.
1 parent b7c9372 commit 0d62410

File tree

6 files changed

+10
-6
lines changed

6 files changed

+10
-6
lines changed

all/build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ plugins {
33
id 'java'
44
}
55

6-
group = "sunsetsatellite"
7-
archivesBaseName = "catalyst-all"
6+
group = project.mod_group
7+
archivesBaseName = project.mod_name
88
version = project.mod_version
99

1010
loom {
@@ -23,12 +23,14 @@ dependencies {
2323
include(rootProject.project("fluids"))
2424
include(rootProject.project("multiblocks"))
2525
include(rootProject.project("effects"))
26+
include(rootProject.project("multipart"))
2627
} else {
2728
include(project(":catalyst"))
2829
include(project(":catalyst").project("energy"))
2930
include(project(":catalyst").project("fluids"))
3031
include(project(":catalyst").project("multiblocks"))
3132
include(project(":catalyst").project("effects"))
33+
include(project(":catalyst").project("multipart"))
3234
}
3335

3436
}

all/gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
mod_group=sunsetsatellite
2+
mod_name=catalyst-all
13
mod_version=1.11.0

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id 'babric-loom' version '1.4.+'
33
id 'java'
4+
id 'maven-publish'
45
}
56

67
group = project.core_mod_group
@@ -141,4 +142,3 @@ remapJar {
141142
destinationDirectory.set(file("${projectDir}/jars"))
142143
archiveVersion.set(archiveVersion.get()+"-${bta_version}")
143144
}
144-

multipart/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies {
3737

3838
modImplementation "bta-halplibe:halplibe:${project.halplibe_version}"
3939
modImplementation "ModMenu:ModMenu:${project.mod_menu_version}"
40-
modImplementation "DragonFly:dragonfly:${project.dragonfly_version}"
40+
modImplementation "DragonFly:dragonfly:1.5.0-7.2-pre2"
4141
}
4242

4343
java {

multipart/src/main/java/sunsetsatellite/catalyst/multipart/block/entity/TileEntityCarpenterWorkbench.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void tick() {
4444
multipartTag.putInt("Block", contents[0].itemID);
4545
multipartTag.putInt("Meta", contents[0].getMetadata());
4646
if(selectedSide != Side.NONE){
47-
multipartTag.putInt("Side", selectedSide.ordinal());
47+
multipartTag.putInt("Side", selectedSide.getId());
4848
}
4949
tag.putCompound("Multipart",multipartTag);
5050
stack.setData(tag);

multipart/src/main/java/sunsetsatellite/catalyst/multipart/gui/GuiCarpenterWorkbench.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void init() {
3636
}
3737
controlList.add(new GuiButton(0, Math.round((float) width / 2 + 60), Math.round((float) height / 2 - 68), 20, 20, "/\\"));
3838
controlList.add(new GuiButton(1, Math.round((float) width / 2 + 60), Math.round((float) height / 2 - 34), 20, 20, "\\/"));
39-
controlList.add(new GuiButton(2, Math.round((float) width / 2 - 82), Math.round((float) height / 2 - 51), 20, 20, "*"));
39+
controlList.add(new GuiButton(2, Math.round((float) width / 2 - 82), Math.round((float) height / 2 - 51), 20, 20, String.valueOf(this.tile.selectedSide.name().charAt(0))));
4040
}
4141

4242
protected void buttonPressed(GuiButton guibutton) {

0 commit comments

Comments
 (0)