Skip to content

Commit 70f10e8

Browse files
authored
make addData* methods no longer conflict in KubeJS (GregTechCEu#1699)
1 parent 89fa3a6 commit 70f10e8

1 file changed

Lines changed: 17 additions & 11 deletions

File tree

src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -496,10 +496,6 @@ public GTRecipeJS chancedFluidOutput(FluidStackJS stack, int chance, int tierCha
496496
return this;
497497
}
498498

499-
public GTRecipeJS chancedFluidOutput(FluidStackJS stack, double chance, double tierChanceBoost) {
500-
return chancedFluidOutput(stack, (int) chance, (int) tierChanceBoost);
501-
}
502-
503499
public GTRecipeJS chancedFluidOutput(FluidStackJS stack, String fraction, int tierChanceBoost) {
504500
if (stack.getAmount() == 0) {
505501
return this;
@@ -637,35 +633,45 @@ public GTRecipeJS addData(String key, Tag data) {
637633
return this;
638634
}
639635

636+
@HideFromJS
640637
public GTRecipeJS addData(String key, int data) {
641638
if (getValue(DATA) == null) setValue(DATA, new CompoundTag());
642639
getValue(DATA).putInt(key, data);
643640
save();
644641
return this;
645642
}
646643

644+
@HideFromJS
647645
public GTRecipeJS addData(String key, long data) {
648646
if (getValue(DATA) == null) setValue(DATA, new CompoundTag());
649647
getValue(DATA).putLong(key, data);
650648
save();
651649
return this;
652650
}
653651

654-
public GTRecipeJS addData(String key, String data) {
652+
public GTRecipeJS addDataString(String key, String data) {
655653
if (getValue(DATA) == null) setValue(DATA, new CompoundTag());
656654
getValue(DATA).putString(key, data);
657655
save();
658656
return this;
659657
}
660658

661-
public GTRecipeJS addData(String key, Float data) {
659+
@HideFromJS
660+
public GTRecipeJS addData(String key, float data) {
662661
if (getValue(DATA) == null) setValue(DATA, new CompoundTag());
663662
getValue(DATA).putFloat(key, data);
664663
save();
665664
return this;
666665
}
667666

668-
public GTRecipeJS addData(String key, boolean data) {
667+
public GTRecipeJS addDataNumber(String key, double data) {
668+
if (getValue(DATA) == null) setValue(DATA, new CompoundTag());
669+
getValue(DATA).putDouble(key, data);
670+
save();
671+
return this;
672+
}
673+
674+
public GTRecipeJS addDataBool(String key, boolean data) {
669675
if (getValue(DATA) == null) setValue(DATA, new CompoundTag());
670676
getValue(DATA).putBoolean(key, data);
671677
save();
@@ -689,23 +695,23 @@ public GTRecipeJS solderMultiplier(int multiplier) {
689695
}
690696

691697
public GTRecipeJS disableDistilleryRecipes(boolean flag) {
692-
return addData("disable_distillery", flag);
698+
return addDataBool("disable_distillery", flag);
693699
}
694700

695701
public GTRecipeJS fusionStartEU(long eu) {
696702
return addData("eu_to_start", eu);
697703
}
698704

699705
public GTRecipeJS researchScan(boolean isScan) {
700-
return addData("scan_for_research", isScan);
706+
return addDataBool("scan_for_research", isScan);
701707
}
702708

703709
public GTRecipeJS durationIsTotalCWU(boolean durationIsTotalCWU) {
704-
return addData("duration_is_total_cwu", durationIsTotalCWU);
710+
return addDataBool("duration_is_total_cwu", durationIsTotalCWU);
705711
}
706712

707713
public GTRecipeJS hideDuration(boolean hideDuration) {
708-
return addData("hide_duration", hideDuration);
714+
return addDataBool("hide_duration", hideDuration);
709715
}
710716

711717
//////////////////////////////////////

0 commit comments

Comments
 (0)