Skip to content

Commit

Permalink
Merge pull request #11 from Leialoha/1.20
Browse files Browse the repository at this point in the history
v0.3.1 - Ready for release
  • Loading branch information
Leialoha authored May 31, 2024
2 parents 76e71b3 + 1bf5f89 commit 9ae3a30
Show file tree
Hide file tree
Showing 94 changed files with 193 additions and 224 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ forge_version_range=[47,)
mod_id=cuboidmod
mod_name=CuboidDroid's Support Mod
mod_license=LGPL-3.0
mod_version=0.3.0
mod_version=0.3.1
mod_group_id=com.cuboiddroid.cuboidmod
mod_authors=CuboidDroid, Leialoha

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"#forge:dusts/thatldu",
"#forge:dusts/silica",
"#forge:dusts/zinc",
"#forge:dusts/cobalt",
"#cuboidmod:cellulose",
"#forge:dusts/salt",
"#forge:dusts/silica"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"#cuboidmod:quantum_singularities/uranium",
"#cuboidmod:quantum_singularities/uraninite",
"#cuboidmod:quantum_singularities/osmium",
"#cuboidmod:quantum_singularities/cobalt",
"#cuboidmod:quantum_singularities/diamond",
"#cuboidmod:quantum_singularities/emerald",
"#cuboidmod:quantum_singularities/steel",
Expand Down

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/java/com/cuboiddroid/cuboidmod/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ public static void onReload(final ModConfigEvent.Reloading configEvent) {

@SubscribeEvent
public static void onWorldLoad(final LevelEvent.Load event) {
Config.loadConfig(Config.CLIENT_CONFIG, FMLPaths.CONFIGDIR.get().resolve("cuboidmod-client.toml"));
Config.loadConfig(Config.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve("cuboidmod-common.toml"));
Config.loadConfig(Config.CLIENT_CONFIG, FMLPaths.CONFIGDIR.get().resolve(CuboidMod.MOD_ID + "-client.toml"));
Config.loadConfig(Config.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve(CuboidMod.MOD_ID + "-common.toml"));
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/cuboiddroid/cuboidmod/CuboidMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public CuboidMod() {

Registration.register();

Config.loadConfig(Config.CLIENT_CONFIG, FMLPaths.CONFIGDIR.get().resolve("cuboidmod-client.toml"));
Config.loadConfig(Config.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve("cuboidmod-common.toml"));
Config.loadConfig(Config.CLIENT_CONFIG, FMLPaths.CONFIGDIR.get().resolve(CuboidMod.MOD_ID + "-client.toml"));
Config.loadConfig(Config.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve(CuboidMod.MOD_ID + "-common.toml"));

Registration.registerConfigs();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cuboiddroid.cuboidmod.compat.jei;

import com.cuboiddroid.cuboidmod.CuboidMod;
import com.cuboiddroid.cuboidmod.modules.collapser.recipe.QuantumCollapsingRecipe;
import com.cuboiddroid.cuboidmod.modules.collapser.screen.QuantumCollapserScreenBase;
import com.cuboiddroid.cuboidmod.setup.ModBlocks;
Expand Down Expand Up @@ -42,7 +43,7 @@ public CollapsingRecipeCategoryJei(IGuiHelper guiHelper) {
.buildAnimated(200, IDrawableAnimated.StartDirection.LEFT, false);
itemBar = guiHelper.drawableBuilder(QuantumCollapserScreenBase.GUI, 176, 0, 8, 36)
.buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false);
localizedName = Component.translatable("jei.category.cuboidmod.collapsing");
localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".collapsing");
}

private static void renderScaledTextWithShadow(GuiGraphics guiGraphics, Font font, Component text, int x, int y, int width, float scale, int color) {
Expand Down Expand Up @@ -107,7 +108,7 @@ public void draw(QuantumCollapsingRecipe recipe, IRecipeSlotsView recipeSlotsVie

int workSeconds = recipe.getWorkTicks() / 20;
int workDecimal = (recipe.getWorkTicks() % 20) / 2;
String arrowText = "" + workSeconds + "." + workDecimal + " s";
String arrowText = workSeconds + "." + workDecimal + " s";
renderScaledTextWithShadow(guiGraphics, font, Component.literal(arrowText), 78 - GUI_START_X, 61 - GUI_START_Y, 24, 0.6f, 0xFFFFFF);

// required amounts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public DryingRecipeCategoryJei(IGuiHelper guiHelper) {
.buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false);
dryingBar = guiHelper.drawableBuilder(GUI, 184, 0, 6, 13)
.buildAnimated(200, IDrawableAnimated.StartDirection.TOP, false);
localizedName = Component.translatable("jei.category.cuboidmod.drying");
localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".drying");
}

private static void renderScaledTextWithShadow(GuiGraphics guiGraphics, Font font, Component text, int x, int y, int width, float scale, int color) {
Expand Down Expand Up @@ -121,7 +121,7 @@ public void draw(DryingRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiGraph

int workSeconds = recipe.getWorkTicks() / 20;
int workDecimal = (recipe.getWorkTicks() % 20) / 2;
String dryingTimeText = "" + workSeconds + "." + workDecimal + " s";
String dryingTimeText = workSeconds + "." + workDecimal + " s";
renderScaledTextWithShadow(matrix, font, Component.literal(dryingTimeText), 40 - GUI_START_X, 42 - GUI_START_Y, 24, 0.8f, 0xFFFFFF);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cuboiddroid.cuboidmod.compat.jei;

import com.cuboiddroid.cuboidmod.CuboidMod;
import com.cuboiddroid.cuboidmod.modules.refinedinscriber.recipe.InscribingRecipe;
import com.cuboiddroid.cuboidmod.modules.refinedinscriber.screen.RefinedInscriberScreen;
import com.cuboiddroid.cuboidmod.setup.ModBlocks;
Expand Down Expand Up @@ -42,7 +43,7 @@ public InscribingRecipeCategoryJei(IGuiHelper guiHelper) {
.buildAnimated(200, IDrawableAnimated.StartDirection.LEFT, false);
energyBar = guiHelper.drawableBuilder(RefinedInscriberScreen.GUI, 176, 0, 8, 36)
.buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false);
localizedName = Component.translatable("jei.category.cuboidmod.inscribing");
localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".inscribing");
}

private static void renderScaledTextWithShadow(GuiGraphics guiGraphics, Font font, Component text, int x, int y, int width, float scale, int color) {
Expand Down Expand Up @@ -111,13 +112,13 @@ public void draw(InscribingRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiG

int workSeconds = recipe.getWorkTicks() / 20;
int workDecimal = (recipe.getWorkTicks() % 20) / 2;
String arrowText = "" + workSeconds + "." + workDecimal + " s";
String arrowText = workSeconds + "." + workDecimal + " s";
renderScaledTextWithShadow(matrix, font, Component.literal(arrowText), 104 - GUI_START_X, 73 - GUI_START_Y, 24, 0.6f, 0xFFFFFF);

// energy
energyBar.draw(matrix, 32 - GUI_START_X, 34 - GUI_START_Y);

String energyText = "" + recipe.getEnergyRequired() + " FE";
String energyText = recipe.getEnergyRequired() + " FE";
renderScaledTextWithShadow(matrix, font, Component.literal(energyText), 32 - GUI_START_X, 71 - GUI_START_Y, 8, 0.6f, 0xFFFFFF);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.cuboiddroid.cuboidmod.compat.jei;

import com.cuboiddroid.cuboidmod.Config;
import com.cuboiddroid.cuboidmod.CuboidMod;
import com.cuboiddroid.cuboidmod.modules.powergen.recipe.PowerGeneratingRecipe;
import com.cuboiddroid.cuboidmod.modules.powergen.screen.SingularityPowerGeneratorScreenBase;
import com.cuboiddroid.cuboidmod.setup.ModBlocks;
Expand Down Expand Up @@ -44,7 +45,7 @@ public PowerGeneratingRecipeCategoryJei(IGuiHelper guiHelper) {
icon = guiHelper.createDrawableItemStack(new ItemStack(ModBlocks.THATLDU_SINGULARITY_POWER_GENERATOR.get()));
energyBar = guiHelper.drawableBuilder(SingularityPowerGeneratorScreenBase.GUI, 176, 0, 8, 36)
.buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false);
localizedName = Component.translatable("jei.category.cuboidmod.power_generating");
localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".power_generating");

notsogudiumEnergyPerTick =
Config.notsogudiumSingularityPowerGeneratorBaseEnergyGenerated.get();
Expand Down Expand Up @@ -127,7 +128,7 @@ public void draw(PowerGeneratingRecipe recipe, IRecipeSlotsView recipeSlotsView,
energyBar.draw(matrix, 33 - GUI_START_X, 34 - GUI_START_Y);

float multiplier = recipe.getPowerMultiplier();
String energyText = "" + multiplier + "x";
String energyText = multiplier + "x";
renderScaledTextWithShadow(matrix, font, Component.literal(energyText), 33 - GUI_START_X, 71 - GUI_START_Y, 8, 0.6f, 0xFFFFFF);

renderScaledText(matrix, font, Component.literal("Notso.: " + String.format("%.02f", notsogudiumEnergyPerTick * multiplier) + " FE/t"), 74, 2, 0.6F, 0x444444);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cuboiddroid.cuboidmod.compat.jei;

import com.cuboiddroid.cuboidmod.CuboidMod;
import com.cuboiddroid.cuboidmod.modules.recycler.recipe.RecyclingRecipe;
import com.cuboiddroid.cuboidmod.modules.recycler.screen.MolecularRecyclerScreen;
import com.cuboiddroid.cuboidmod.setup.ModBlocks;
Expand Down Expand Up @@ -44,7 +45,7 @@ public RecyclingRecipeCategoryJei(IGuiHelper guiHelper) {
.buildAnimated(200, IDrawableAnimated.StartDirection.LEFT, false);
energyBar = guiHelper.drawableBuilder(MolecularRecyclerScreen.GUI, 176, 0, 8, 36)
.buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false);
localizedName = Component.translatable("jei.category.cuboidmod.recycling");
localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".recycling");
}

private static void renderScaledTextWithShadow(GuiGraphics guiGraphics, Font font, Component text, int x, int y, int width, float scale, int color) {
Expand Down Expand Up @@ -126,13 +127,13 @@ public void draw(RecyclingRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiGr

int workSeconds = recipe.getWorkTicks() / 20;
int workDecimal = (recipe.getWorkTicks() % 20) / 2;
String arrowText = "" + workSeconds + "." + workDecimal + " s";
String arrowText = workSeconds + "." + workDecimal + " s";
renderScaledTextWithShadow(matrix, font, Component.literal(arrowText), 78 - GUI_START_X, 61 - GUI_START_Y, 24, 0.6f, 0xFFFFFF);

// energy
energyBar.draw(matrix, 32 - GUI_START_X, 34 - GUI_START_Y);

String energyText = "" + recipe.getEnergyRequired() + " FE";
String energyText = recipe.getEnergyRequired() + " FE";
renderScaledTextWithShadow(matrix, font, Component.literal(energyText), 32 - GUI_START_X, 71 - GUI_START_Y, 8, 0.6f, 0xFFFFFF);

// % chances on outputs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.cuboiddroid.cuboidmod.compat.jei;

import com.cuboiddroid.cuboidmod.Config;
import com.cuboiddroid.cuboidmod.CuboidMod;
import com.cuboiddroid.cuboidmod.modules.resourcegen.recipe.ResourceGeneratingRecipe;
import com.cuboiddroid.cuboidmod.modules.resourcegen.screen.SingularityResourceGeneratorScreenBase;
import com.cuboiddroid.cuboidmod.setup.ModBlocks;
Expand Down Expand Up @@ -48,7 +49,7 @@ public ResourceGeneratingRecipeCategoryJei(IGuiHelper guiHelper) {
.buildAnimated(200, IDrawableAnimated.StartDirection.LEFT, false);
itemBar = guiHelper.drawableBuilder(SingularityResourceGeneratorScreenBase.GUI, 176, 0, 8, 36)
.buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false);
localizedName = Component.translatable("jei.category.cuboidmod.resource_generating");
localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".resource_generating");

notsogudiumItemsPerSecond =
20.0F * Config.notsogudiumSingularityResourceGeneratorItemsPerOperation.get()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cuboiddroid.cuboidmod.compat.jei;

import com.cuboiddroid.cuboidmod.CuboidMod;
import com.cuboiddroid.cuboidmod.modules.transmuter.recipe.TransmutingRecipe;
import com.cuboiddroid.cuboidmod.modules.transmuter.screen.QuantumTransmutationChamberScreen;
import com.cuboiddroid.cuboidmod.setup.ModBlocks;
Expand Down Expand Up @@ -42,7 +43,7 @@ public TransmutingRecipeCategoryJei(IGuiHelper guiHelper) {
.buildAnimated(200, IDrawableAnimated.StartDirection.LEFT, false);
energyBar = guiHelper.drawableBuilder(QuantumTransmutationChamberScreen.GUI, 176, 0, 8, 36)
.buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false);
localizedName = Component.translatable("jei.category.cuboidmod.transmuting");
localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".transmuting");
}

private static void renderScaledTextWithShadow(GuiGraphics guiGraphics, Font font, Component text, int x, int y, int width, float scale, int color) {
Expand Down Expand Up @@ -109,13 +110,13 @@ public void draw(TransmutingRecipe recipe, IRecipeSlotsView recipeSlotsView, Gui

int workSeconds = recipe.getWorkTicks() / 20;
int workDecimal = (recipe.getWorkTicks() % 20) / 2;
String arrowText = "" + workSeconds + "." + workDecimal + " s";
String arrowText = workSeconds + "." + workDecimal + " s";
renderScaledTextWithShadow(matrix, font, Component.literal(arrowText), 78 - GUI_START_X, 61 - GUI_START_Y, 24, 0.6f, 0xFFFFFF);

// energy
energyBar.draw(matrix, 32 - GUI_START_X, 34 - GUI_START_Y);

String energyText = "" + recipe.getEnergyRequired() + " FE";
String energyText = recipe.getEnergyRequired() + " FE";
renderScaledTextWithShadow(matrix, font, Component.literal(energyText), 32 - GUI_START_X, 71 - GUI_START_Y, 8, 0.6f, 0xFFFFFF);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ private void registerGenerators() {
.texture("core", "block/model/singularity_resource_generator_pillar_lit");

withExistingParent(material + "_singularity_power_generator", modLoc("block/templates/singularity_power_generator"))
.texture("frame", "cuboidmod:block/model/" + material + "_singularity_power_gen_frame")
.texture("frame", "block/model/" + material + "_singularity_power_gen_frame")
.texture("core", "block/model/singularity_power_gen_core");
withExistingParent(material + "_singularity_power_generator_lit", modLoc("block/templates/singularity_power_generator"))
.texture("frame", "cuboidmod:block/model/" + material + "_singularity_power_gen_frame")
.texture("frame", "block/model/" + material + "_singularity_power_gen_frame")
.texture("core", "block/model/singularity_power_gen_core_lit");

withExistingParent(material + "_quantum_collapser", modLoc("block/templates/quantum_collapser"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ private void registerQuantumSingularityModels() {
"uranium",
"uraninite",
"osmium",
"cobalt",

"diamond",
"emerald",
Expand Down Expand Up @@ -179,7 +178,6 @@ private void registerItemGeneratedModels() {
builder(itemGenerated, "thatldu_upgrade_smithing_template");

builder(itemGenerated, "zinc_dust");
builder(itemGenerated, "cobalt_dust");

builder(itemGenerated, ArachnuggetItem.ID_STRING);
builder(itemGenerated, BrothItem.ID_STRING);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ private void addDustItemTags() {
tag(ModTags.Items.DUSTS_THATLDU).add(ModItems.THATLDU_DUST.get());
tag(ModTags.Items.DUSTS_SILICA).add(ModItems.SILICA_DUST.get());
tag(ModTags.Items.DUSTS_ZINC).add(ModItems.ZINC_DUST.get());
tag(ModTags.Items.DUSTS_COBALT).add(ModItems.COBALT_DUST.get());
tag(ModTags.Items.DUSTS_SALT).add(ModItems.SALT.get());
tag(ModTags.Items.CELLULOSE).add(ModItems.CELLULOSE.get());

Expand All @@ -154,7 +153,6 @@ private void addDustItemTags() {
tag(ModTags.Items.DUSTS).addTag(ModTags.Items.DUSTS_THATLDU);
tag(ModTags.Items.DUSTS).addTag(ModTags.Items.DUSTS_SILICA);
tag(ModTags.Items.DUSTS).addTag(ModTags.Items.DUSTS_ZINC);
tag(ModTags.Items.DUSTS).addTag(ModTags.Items.DUSTS_COBALT);
tag(ModTags.Items.DUSTS).addTag(ModTags.Items.CELLULOSE);
tag(ModTags.Items.DUSTS).addTag(ModTags.Items.DUSTS_SALT);
tag(ModTags.Items.DUSTS).addTag(ModTags.Items.DUSTS_SILICA);
Expand Down Expand Up @@ -354,7 +352,6 @@ private void addSingularityTags()
tag(ModTags.Items.QUANTUM_SINGULARITIES_URANIUM).add(ModItems.URANIUM_QUANTUM_SINGULARITY.get());
tag(ModTags.Items.QUANTUM_SINGULARITIES_URANINITE).add(ModItems.URANINITE_QUANTUM_SINGULARITY.get());
tag(ModTags.Items.QUANTUM_SINGULARITIES_OSMIUM).add(ModItems.OSMIUM_QUANTUM_SINGULARITY.get());
tag(ModTags.Items.QUANTUM_SINGULARITIES_COBALT).add(ModItems.COBALT_QUANTUM_SINGULARITY.get());

tag(ModTags.Items.QUANTUM_SINGULARITIES_DIAMOND).add(ModItems.DIAMOND_QUANTUM_SINGULARITY.get());
tag(ModTags.Items.QUANTUM_SINGULARITIES_EMERALD).add(ModItems.EMERALD_QUANTUM_SINGULARITY.get());
Expand Down Expand Up @@ -411,7 +408,6 @@ private void addSingularityTags()
ModTags.Items.QUANTUM_SINGULARITIES_URANIUM,
ModTags.Items.QUANTUM_SINGULARITIES_URANINITE,
ModTags.Items.QUANTUM_SINGULARITIES_OSMIUM,
ModTags.Items.QUANTUM_SINGULARITIES_COBALT,

ModTags.Items.QUANTUM_SINGULARITIES_DIAMOND,
ModTags.Items.QUANTUM_SINGULARITIES_EMERALD,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.cuboiddroid.cuboidmod.modules.cdt.block;

import com.cuboiddroid.cuboidmod.Config;
import com.cuboiddroid.cuboidmod.CuboidMod;
import com.cuboiddroid.cuboidmod.modules.cdt.tile.CryogenicDimensionalTeleporterTileEntity;
import com.cuboiddroid.cuboidmod.setup.ModTileEntities;

Expand Down Expand Up @@ -103,7 +104,7 @@ public RenderShape getRenderShape(BlockState p_49232_) {

@Override
public void appendHoverText(ItemStack stack, @Nullable BlockGetter reader, List<Component> list, TooltipFlag flags) {
list.add(Component.translatable("item.cuboidmod.cryogenic_dimensional_teleporter.hover_text"));
list.add(Component.translatable("item." + CuboidMod.MOD_ID + ".cryogenic_dimensional_teleporter.hover_text"));
}

@Nullable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ public EnergizedEndStoneBricksBlock() {

@Override
public void appendHoverText(ItemStack itemStack, @Nullable BlockGetter reader, List<Component> list, TooltipFlag flag) {
list.add(Component.translatable("block.cuboidmod.energized_end_stone_bricks.hover_text"));
list.add(Component.translatable("block." + CuboidMod.MOD_ID + ".energized_end_stone_bricks.hover_text"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ public EnergizedNetherBricksBlock() {

@Override
public void appendHoverText(ItemStack itemStack, @Nullable BlockGetter reader, List<Component> list, TooltipFlag flag) {
list.add(Component.translatable("block.cuboidmod.energized_nether_bricks.hover_text"));
list.add(Component.translatable("block." + CuboidMod.MOD_ID + ".energized_nether_bricks.hover_text"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ public EnergizedStoneBricksBlock() {

@Override
public void appendHoverText(ItemStack itemStack, @Nullable BlockGetter reader, List<Component> list, TooltipFlag flag) {
list.add(Component.translatable("block.cuboidmod.energized_stone_bricks.hover_text"));
list.add(Component.translatable("block." + CuboidMod.MOD_ID + ".energized_stone_bricks.hover_text"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ public EnergizedThatlduviumBlock() {

@Override
public void appendHoverText(ItemStack itemStack, @Nullable BlockGetter reader, List<Component> list, TooltipFlag flag) {
list.add(Component.translatable("block.cuboidmod.energized_thatlduvium.hover_text"));
list.add(Component.translatable("block." + CuboidMod.MOD_ID + ".energized_thatlduvium.hover_text"));
}
}
Loading

0 comments on commit 9ae3a30

Please sign in to comment.