Skip to content

Commit 0200171

Browse files
authored
Fix only multiblocks autogenerating the language values with KubeJS (#3203)
1 parent 2cd2277 commit 0200171

2 files changed

Lines changed: 14 additions & 17 deletions

File tree

src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import com.tterrag.registrate.util.nullness.NonNullBiConsumer;
5050
import com.tterrag.registrate.util.nullness.NonNullConsumer;
5151
import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
52+
import dev.latvian.mods.kubejs.client.LangEventJS;
5253
import dev.latvian.mods.rhino.util.HideFromJS;
5354
import it.unimi.dsi.fastutil.objects.Object2IntMap;
5455
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
@@ -92,7 +93,6 @@ public class MachineBuilder<DEFINITION extends MachineDefinition> extends Builde
9293
private RotationState rotationState = RotationState.NON_Y_AXIS;
9394
/**
9495
* Whether this machine can be rotated or face upwards.
95-
* todo: set to true by default if we manage to rotate the model accordingly
9696
*/
9797
@Setter
9898
private boolean allowExtendedFacing = false;
@@ -159,6 +159,7 @@ public class MachineBuilder<DEFINITION extends MachineDefinition> extends Builde
159159
private EditableMachineUI editableUI;
160160
@Getter // getter for KJS
161161
@Setter
162+
@Nullable
162163
private String langValue = null;
163164

164165
protected MachineBuilder(Registrate registrate, String name,
@@ -324,6 +325,14 @@ protected DEFINITION createDefinition() {
324325
return definition.apply(new ResourceLocation(registrate.getModid(), name));
325326
}
326327

328+
@Override
329+
public void generateLang(LangEventJS lang) {
330+
super.generateLang(lang);
331+
if (langValue() != null) {
332+
lang.add(GTCEu.MOD_ID, value.getDescriptionId(), value.getLangValue());
333+
}
334+
}
335+
327336
@HideFromJS
328337
public DEFINITION register() {
329338
var definition = createDefinition();

src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MultiblockMachineBuilder.java

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.gregtechceu.gtceu.api.registry.registrate;
22

3-
import com.gregtechceu.gtceu.GTCEu;
43
import com.gregtechceu.gtceu.api.block.IMachineBlock;
54
import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability;
65
import com.gregtechceu.gtceu.api.data.RotationState;
@@ -43,7 +42,6 @@
4342
import com.tterrag.registrate.builders.ItemBuilder;
4443
import com.tterrag.registrate.util.nullness.NonNullConsumer;
4544
import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
46-
import dev.latvian.mods.kubejs.client.LangEventJS;
4745
import dev.latvian.mods.rhino.util.HideFromJS;
4846
import it.unimi.dsi.fastutil.objects.Object2IntMap;
4947
import lombok.Getter;
@@ -269,7 +267,7 @@ public MultiblockMachineBuilder appearanceBlock(Supplier<? extends Block> block)
269267
}
270268

271269
@Override
272-
public MultiblockMachineBuilder langValue(String langValue) {
270+
public MultiblockMachineBuilder langValue(@Nullable String langValue) {
273271
return (MultiblockMachineBuilder) super.langValue(langValue);
274272
}
275273

@@ -290,14 +288,12 @@ public MultiblockMachineBuilder tooltips(Component... components) {
290288

291289
@Override
292290
public MultiblockMachineBuilder conditionalTooltip(Component component, BooleanSupplier condition) {
293-
return conditionalTooltip(component, condition.getAsBoolean());
291+
return (MultiblockMachineBuilder) super.conditionalTooltip(component, condition);
294292
}
295293

296294
@Override
297295
public MultiblockMachineBuilder conditionalTooltip(Component component, boolean condition) {
298-
if (condition)
299-
tooltips(component);
300-
return this;
296+
return (MultiblockMachineBuilder) super.conditionalTooltip(component, condition);
301297
}
302298

303299
@Override
@@ -379,18 +375,10 @@ public MultiblockMachineBuilder allowExtendedFacing(boolean allowExtendedFacing)
379375
return (MultiblockMachineBuilder) super.allowExtendedFacing(allowExtendedFacing);
380376
}
381377

382-
@Override
383-
public void generateLang(LangEventJS lang) {
384-
super.generateLang(lang);
385-
if (langValue() != null) {
386-
lang.add(GTCEu.MOD_ID, value.getDescriptionId(), value.getLangValue());
387-
}
388-
}
389-
390378
@Override
391379
@HideFromJS
392380
public MultiblockMachineDefinition register() {
393-
var definition = (MultiblockMachineDefinition) super.register();
381+
var definition = super.register();
394382
definition.setGenerator(generator);
395383
if (pattern == null) {
396384
throw new IllegalStateException("missing pattern while creating multiblock " + name);

0 commit comments

Comments
 (0)