asteroid dimension #320

maxryan008 · 2024-05-22T12:14:42Z

Fixed some textures plus added asteroid dimension

Added Asteroids Dimension and configured skybox. Haven't started terrain generation yet.

…e-fixes

Completed Asteroid Dimension Terrain Generation Structures/Features not implemented yet

Canned food items can now be created from any food with ease. planning to add automatic food detection that creates cans for any mods foods.

…e-fixes

canned food items have been almost completed other than fixing appleskins api integration and creating a machine to make cans in survival

canned food items completed - added total nutrition - fixed whitespace - added appleskin integration for canned food Todo - create canning machine to make canned food accessible in survival

food canner fully implemented and works completely. also put licencensing on all new files i have created

sort of started working on asteroid dimension structures

removed TODO: comment in food_canner json because it was causing issues. make sure in future to change the recipe for the food canner block ad the advancement requirements added licencing

fixed json issue added only eat canned food in space sealer code half implemented. uploading github because need backup because rewriting sealer AGAIN...

- added asteroid ores + dense ice - fixed some data generation issues - made asteroid dimension pitch black - fixed air lock seal for the second time - fixed canned food textures

- Fixed translations for canned food - Fixed ores aswell because asteroid ores where broken

Launch pads are now dynamic and are created using one method in the RocketParts class

added Rocket Nose Cone items

This reverts commit 697ed02.

This reverts commit 8087c7e.

This reverts commit 838e1cb.

decided to leave rocket code as is because rebuilding everything from scratch was painful. just going to build ontop of the already implemented system

…e-fixes

Updated everything to work with 1.21

TheMCSpacePro · 2024-11-26T22:51:51Z

Rockets?

…e-fixes

fixed most generated files and moved some to resources

Fixed most of the bugs with the oxygen sealer. Few more to fix but need to fetch the main branch first to fix conflicts

…e-fixes

Sealers are now at a stage where they are usable in the game. They arent perfect but they are usable

Roelymole

I have looked over most things, but there is a lot, so my comments are by no means exhaustive. Hopefully this should be enough for you to get started on making some changes. I do think there is a fair amount of redundancy which you could work on reducing, so maybe the next time someone looks there won't be nearly so much to review.

...main/generated/data/galacticraft/advancement/recipes/building_blocks/raw_aluminum_block.json

src/main/java/dev/galacticraft/api/perlin/FishyNoise.java

src/main/java/dev/galacticraft/mod/GalacticraftClient.java

src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/FoodCannerScreen.java

src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/OxygenSealerScreen.java

src/main/java/dev/galacticraft/mod/content/item/CannedFoodItem.java

src/main/java/dev/galacticraft/mod/data/GCTranslationProvider.java

src/main/java/dev/galacticraft/mod/events/GCEventHandlers.java

src/main/resources/assets/galacticraft/textures/gui/food_canner_screen.png

…e-fixes

code merge updates

dont know what the problem was but i just removed the file and ran datagen again and it was fixed

didnt realise how %s works

total nutrition wasnt displayed correctly due to wrong prefix of item instead of ui

airlock became broken at some point so i fixed it again

marcus8448

This is an extremely large patch so I haven't gone over everything quite yet, but it's probably helpful to get this review in sooner than later (feel free to message me if you have any questions!)

Some general things:

Might need to check files for the correct line endings
Optimize imports should be run (via IntelliJ/your IDE)
License headers need updating (gradlew updateLicenses)
The curly brace placement should be consistent (placement on the same line)

I'm not super sold on the GC4 asteroid generation code - I can't say I understand how that code actually works, and the external save data system is slightly cursed.

marcus8448 · 2025-02-21T03:17:31Z

.gitattributes

It looks like this file was changed to use Windows line endings (CRLF).

marcus8448 · 2025-02-21T03:17:50Z

.gitignore

Line endings again

marcus8448 · 2025-02-21T03:21:56Z

src/main/java/dev/galacticraft/api/accessor/GearInventoryProvider.java

+        boolean mask = false;
+        for (int i = 0; i < this.galacticraft$getAccessories().getContainerSize(); i++) {
+            Item item = this.galacticraft$getAccessories().getItem(i).getItem();
+            if (!mask && item instanceof OxygenMask) {
+                mask = true;
+            }
+        }
+        return mask;


Instead of mask = true, I think its equivalent to just return true immediately after finding a mask, and false otherwise.

marcus8448 · 2025-02-21T03:31:18Z

src/main/java/dev/galacticraft/impl/internal/fabric/GalacticraftAPI.java

 import org.jetbrains.annotations.ApiStatus;

+import javax.swing.event.ChangeEvent;


It would probably be a good idea to run optimize imports across this patch. (I was very concerned when I saw this import)

marcus8448 · 2025-02-21T03:32:20Z

src/main/java/dev/galacticraft/mod/Constant.java

@@ -39,6 +41,7 @@

 public interface Constant {
    String MOD_ID = "galacticraft";
+    public static final String GCDATAFOLDER = "../galacticraft/";


public static final is extraneous in an interface

marcus8448 · 2025-02-21T03:54:32Z

src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java

 import org.jetbrains.annotations.Contract;

 import java.util.List;
+import java.util.function.Supplier;
+
+import static dev.galacticraft.machinelib.api.block.MachineBlock.ACTIVE;


Unused import?

marcus8448 · 2025-02-21T04:00:30Z

src/main/java/dev/galacticraft/mod/mixin/client/ClientTooltipMixin.java

+
+@Mixin(ClientTooltipComponent.class)
+public interface ClientTooltipMixin {
+    @Overwrite


@Overwrites should be avoided as much as possible - I think fabric api's TooltipComponentCallback should do the same thing.

marcus8448 · 2025-02-21T04:02:37Z

src/main/java/dev/galacticraft/mod/mixin/client/FabricItemMixin.java

I think DataComponents.FOOD should be set on the canned food item, rather than overriding the component.

marcus8448 · 2025-02-21T04:13:39Z

src/main/java/dev/galacticraft/mod/content/block/entity/machine/FoodCannerBlockEntity.java

+    public void loadAdditional(CompoundTag tag, HolderLookup.Provider lookup) {
+        super.loadAdditional(tag, lookup);
+        setProgress(tag.getInt(Constant.Nbt.PROGRESS));
+        this.transferring_can = tag.getBoolean("TRANSFERRING_CAN");
+        this.transferring_food = tag.getBoolean("TRANSFERRING_FOOD");
+        ItemStack itemStack = GCItems.CANNED_FOOD.getDefaultInstance();
+        itemStack.set(DataComponents.BLOCK_ENTITY_DATA, CustomData.of(listTagToCompoundTag(tag.getList("STORAGE", ListTag.TAG_COMPOUND))));
+        this.storage = itemStack;
+
+    }
+
+
+    @Override
+    public void saveAdditional(CompoundTag tag, HolderLookup.Provider lookup) {
+        super.saveAdditional(tag, lookup);
+        tag.putInt(Constant.Nbt.PROGRESS, this.progress);
+        tag.putBoolean("TRANSFERRING_CAN", this.transferring_can);
+        tag.putBoolean("TRANSFERRING_FOOD", this.transferring_food);
+        tag.put("STORAGE", compoundTagToListTag(Objects.requireNonNull(this.storage.get(DataComponents.BLOCK_ENTITY_DATA)).copyTag()));
+    }


NBT tag names should be PascalCase, fields should be in camelCase

marcus8448 · 2025-02-21T04:15:10Z

src/main/java/dev/galacticraft/mod/machine/SealerManager.java

+import java.util.*;
+
+public class SealerManager {
+    public static final SealerManager INSTANCE = new SealerManager();


Would it be possible to attach this to a Level instead of a global state?

Roelymole

I had already started this review before Marcus made his, but I have identified some different things and a possible solution to your Windows line ending problem with the .gitattributes and .gitignore files.

I can work with you on updating the worldgen rather than just porting GC4 code too.

Roelymole · 2025-02-18T14:11:54Z

.gitattributes

Could you run the comand git checkout <sha> .gitattributes where <sha> is the hash of the latest commit to main to prevent the .gitattributes file from being updated without any actual changes to avoid confusing the Git history.

Roelymole · 2025-02-18T14:15:46Z

.gitignore

Are there any actual changes to this file? If not, could you run the comand git checkout <sha> .gitignore as well.

Roelymole · 2025-02-18T23:52:20Z

...main/generated/data/galacticraft/advancement/recipes/building_blocks/raw_aluminum_block.json

Rather than deleting this can you just revert it back to what it was before so that the raw aluminum block can still be crafted.

You could use the git checkout <sha> src/main/.../raw_aluminum_block.json command for this as well.

Roelymole · 2025-02-19T00:46:10Z

src/main/java/dev/galacticraft/mod/Constant.java

@@ -27,6 +27,8 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
+import net.minecraft.data.models.model.ModelTemplate;
+import net.minecraft.data.models.model.TextureSlot;


Remove unused imports.

Roelymole · 2025-02-19T00:48:52Z

src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/FoodCannerScreen.java

The brackets in this file need updating. The license header is also out-of-date (2019-2025).

Roelymole · 2025-02-19T01:11:30Z

src/main/resources/assets/galacticraft/models/block/air_lock_seal.json

+    "bottom": "galacticraft:block/tin_decoration"
+  },
+  "elements": [
+    {   "from": [ 4, 0, 0 ],


New line, please.

Roelymole · 2025-02-19T01:15:50Z

src/main/java/dev/galacticraft/mod/mixin/client/FabricItemMixin.java

+        if (isCannedFoodItem(stack)) {
+            //data component holder has parent of canned food item
+            if (type.equals(DataComponents.FOOD))
+            {


Put this bracket on the line before.

Roelymole · 2025-02-19T01:18:25Z

src/main/java/dev/galacticraft/mod/events/GCEventHandlers.java

+                {
+                    return InteractionResultHolder.pass(heldItem);
+                } else {
+                    player.displayClientMessage(Component.translatable("chat.cannotEatWithMask").withColor(Color.RED.getRGB()), true);


Put this translation key in the Translations class and use .withStyle(Constant.Text.RED_STYLE) or .withStyle(ChatFormatting.RED) instead of .withColor(Color.RED.getRGB()).

Roelymole · 2025-02-19T01:18:45Z

src/main/java/dev/galacticraft/mod/events/GCEventHandlers.java

+                }
+            }
+        } else if (!oxygenWorld && !world.isBreathable(new BlockPos((int) Math.floor(playerEyePos.x), (int) Math.floor(playerEyePos.y), (int) Math.floor(playerEyePos.z)))) { //sealed atmosphere check. they dont have a mask on so make sure they can breathe before eating
+            player.displayClientMessage(Component.translatable("chat.cannotEatInNoAtmosphere").withColor(Color.RED.getRGB()), true);


Put this translation key in the Translations class too.

Roelymole · 2025-02-19T01:22:22Z

src/main/java/dev/galacticraft/mod/events/GCEventHandlers.java

 import org.jetbrains.annotations.Nullable;

+import java.awt.*;


Is this used anywhere?

maxryan008 added 4 commits May 22, 2024 22:11

first commit

a6604e4

Added Asteroids Dimension

b7cfc2d

Added Asteroids Dimension and configured skybox. Haven't started terrain generation yet.

Merge remote-tracking branch 'upstream/main' into 1.20.4-block-textur…

b2b9c89

…e-fixes

Asteroid Dimension Terrain Generation

c25e0c6

Completed Asteroid Dimension Terrain Generation Structures/Features not implemented yet

maxryan008 changed the title ~~texture/model fixes~~ asteroid dimension May 28, 2024

maxryan008 added 8 commits May 29, 2024 10:00

Fixed File not exists when loading Asteroid Dimension

25ec673

Reworked canned food items

b2cc1c3

Canned food items can now be created from any food with ease. planning to add automatic food detection that creates cans for any mods foods.

Merge remote-tracking branch 'upstream/main' into 1.20.4-block-textur…

ffc8942

…e-fixes

Merge remote-tracking branch 'upstream/main' into 1.20.4-block-textur…

a980842

…e-fixes

canned food items

7010fda

canned food items have been almost completed other than fixing appleskins api integration and creating a machine to make cans in survival

canned food complete

af5ca3b

canned food items completed - added total nutrition - fixed whitespace - added appleskin integration for canned food Todo - create canning machine to make canned food accessible in survival

Fully finished food canner

55ad014

food canner fully implemented and works completely. also put licencensing on all new files i have created

started rudimentary work on structures

ac3acde

sort of started working on asteroid dimension structures

marcus8448 marked this pull request as draft July 31, 2024 18:08

maxryan008 added 15 commits August 19, 2024 19:39

fixed licenscing + more

1db30d3

removed TODO: comment in food_canner json because it was causing issues. make sure in future to change the recipe for the food canner block ad the advancement requirements added licencing

no summary???

76b6233

fixed json issue added only eat canned food in space sealer code half implemented. uploading github because need backup because rewriting sealer AGAIN...

working more on sealers

0115cd9

Fixed data generation and ran data generation

b116b82

minor tweaks

580ffb6

- added asteroid ores + dense ice - fixed some data generation issues - made asteroid dimension pitch black - fixed air lock seal for the second time - fixed canned food textures

Translation fixes

e4c20f3

- Fixed translations for canned food - Fixed ores aswell because asteroid ores where broken

Made launch pads dynamic

838e1cb

Launch pads are now dynamic and are created using one method in the RocketParts class

Rocket Nose Cone Part added

8087c7e

added Rocket Nose Cone items

made machines autogenerated

697ed02

Revert "made machines autogenerated"

a643484

This reverts commit 697ed02.

Revert "Rocket Nose Cone Part added"

d198e83

This reverts commit 8087c7e.

Revert "Made launch pads dynamic"

90f54b5

This reverts commit 838e1cb.

Reverted all rocket changes but left machine changes

2611ae7

decided to leave rocket code as is because rebuilding everything from scratch was painful. just going to build ontop of the already implemented system

Merge remote-tracking branch 'upstream/main' into 1.20.4-block-textur…

8d8cd83

…e-fixes

Merged into main 1.21 branch

8e8a2e2

Updated everything to work with 1.21

maxryan008 force-pushed the 1.20.4-block-texture-fixes branch from 4c5d2c2 to 8e8a2e2 Compare September 3, 2024 14:06

maxryan008 added 5 commits December 4, 2024 13:31

Merge remote-tracking branch 'upstream/main' into 1.20.4-block-textur…

fb40b39

…e-fixes

fixed generated files

69012f2

fixed most generated files and moved some to resources

Oxygen Sealer Implemented Better

f36c464

Fixed most of the bugs with the oxygen sealer. Few more to fix but need to fetch the main branch first to fix conflicts

Merge remote-tracking branch 'upstream/main' into 1.20.4-block-textur…

0e7aea1

…e-fixes

Finished Sealers Sort Of

a3be2ac

Sealers are now at a stage where they are usable in the game. They arent perfect but they are usable

maxryan008 marked this pull request as ready for review February 12, 2025 10:38

Roelymole requested changes Feb 12, 2025

View reviewed changes

maxryan008 added 5 commits February 18, 2025 14:42

Merge remote-tracking branch 'upstream/main' into 1.20.4-block-textur…

9fd733e

…e-fixes

code updates for the review to merge

8a5adee

code merge updates

fixed the raw aluminum block issue

3df8dda

dont know what the problem was but i just removed the file and ran datagen again and it was fixed

fixed %s issues

c04978c

didnt realise how %s works

fixed total nutrition not working

bcf34b6

total nutrition wasnt displayed correctly due to wrong prefix of item instead of ui

maxryan008 requested a review from Roelymole February 18, 2025 13:25

fixed airlock (again)

c850d78

airlock became broken at some point so i fixed it again

marcus8448 requested changes Feb 21, 2025

View reviewed changes

Roelymole requested changes Feb 21, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

asteroid dimension #320

asteroid dimension #320

maxryan008 commented May 22, 2024 •

edited

Loading

TheMCSpacePro commented Nov 26, 2024

Roelymole left a comment

marcus8448 left a comment

marcus8448 Feb 21, 2025

marcus8448 Feb 21, 2025

marcus8448 Feb 21, 2025 •

edited

Loading

marcus8448 Feb 21, 2025

marcus8448 Feb 21, 2025

marcus8448 Feb 21, 2025

marcus8448 Feb 21, 2025

marcus8448 Feb 21, 2025

marcus8448 Feb 21, 2025 •

edited

Loading

marcus8448 Feb 21, 2025

Roelymole left a comment

Roelymole Feb 18, 2025

Roelymole Feb 18, 2025

Roelymole Feb 18, 2025

Roelymole Feb 19, 2025

Roelymole Feb 19, 2025

Roelymole Feb 19, 2025

Roelymole Feb 19, 2025

Roelymole Feb 19, 2025

Roelymole Feb 19, 2025

Roelymole Feb 19, 2025

		import org.jetbrains.annotations.ApiStatus;

		import javax.swing.event.ChangeEvent;

		import org.jetbrains.annotations.Nullable;

		import java.awt.*;

asteroid dimension #320

Are you sure you want to change the base?

asteroid dimension #320

Conversation

maxryan008 commented May 22, 2024 • edited Loading

TheMCSpacePro commented Nov 26, 2024

Roelymole left a comment

Choose a reason for hiding this comment

marcus8448 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcus8448 Feb 21, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcus8448 Feb 21, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Roelymole left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

maxryan008 commented May 22, 2024 •

edited

Loading

marcus8448 Feb 21, 2025 •

edited

Loading

marcus8448 Feb 21, 2025 •

edited

Loading