diff --git a/gradle.properties b/gradle.properties index 9f10e8502..5f6f9bde3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ api_version = 0.14.1+build.372-1.16 # Mod mod_name = astromine -mod_version = 1.0.18 +mod_version = 1.0.19 mod_group = com.github.chainmailstudios version_meta = fabric-1.16.1 @@ -19,7 +19,7 @@ version_meta = fabric-1.16.1 cardinal_components_version = 2.4.1 spinnery_version = 3.0.48+fabric-1.16.x shapes_version = 2.0.0+build.10 -patchouli_version = 1.16-37.20-FABRIC +patchouli_version = 1.16-37.21-FABRIC lba_version=0.7.0 # Conveniences diff --git a/src/main/java/com/github/chainmailstudios/astromine/AstromineClient.java b/src/main/java/com/github/chainmailstudios/astromine/AstromineClient.java index f917e9cd7..11614fb96 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/AstromineClient.java +++ b/src/main/java/com/github/chainmailstudios/astromine/AstromineClient.java @@ -8,6 +8,17 @@ import com.github.chainmailstudios.astromine.client.render.entity.SpaceSlimeEntityRenderer; import com.github.chainmailstudios.astromine.client.render.entity.SuperSpaceSlimeEntityRenderer; +import com.github.chainmailstudios.astromine.registry.client.AstromineBlockEntityRenderers; +import com.github.chainmailstudios.astromine.registry.client.AstromineClientCallbacks; +import com.github.chainmailstudios.astromine.registry.client.AstromineClientModels; +import com.github.chainmailstudios.astromine.registry.client.AstromineClientPackets; +import com.github.chainmailstudios.astromine.registry.client.AstromineEntityRenderers; +import com.github.chainmailstudios.astromine.registry.client.AstromineParticleFactories; +import com.github.chainmailstudios.astromine.registry.client.AstrominePatchouliPages; +import com.github.chainmailstudios.astromine.registry.client.AstromineRenderLayers; +import com.github.chainmailstudios.astromine.registry.client.AstromineScreens; +import com.github.chainmailstudios.astromine.registry.client.AstromineSkyboxes; +import com.github.chainmailstudios.astromine.registry.client.AstromineSounds; @Environment(EnvType.CLIENT) public class AstromineClient implements ClientModInitializer { @@ -24,9 +35,6 @@ public void onInitializeClient() { AstromineClientCallbacks.initialize(); AstromineClientPackets.initialize(); AstromineRenderLayers.initialize(); - - EntityRendererRegistry.INSTANCE.register(AstromineEntityTypes.SPACE_SLIME, (dispatcher, context) -> new SpaceSlimeEntityRenderer(dispatcher)); - - EntityRendererRegistry.INSTANCE.register(AstromineEntityTypes.SUPER_SPACE_SLIME, (dispatcher, context) -> new SuperSpaceSlimeEntityRenderer(dispatcher)); + AstrominePatchouliPages.initialize(); } } diff --git a/src/main/java/com/github/chainmailstudios/astromine/client/patchouli/SortingPage.java b/src/main/java/com/github/chainmailstudios/astromine/client/patchouli/SortingPage.java new file mode 100644 index 000000000..71f9adbbe --- /dev/null +++ b/src/main/java/com/github/chainmailstudios/astromine/client/patchouli/SortingPage.java @@ -0,0 +1,10 @@ +package com.github.chainmailstudios.astromine.client.patchouli; + +import com.github.chainmailstudios.astromine.common.recipe.SortingRecipe; +import vazkii.patchouli.client.book.page.abstr.PageSimpleProcessingRecipe; + +public class SortingPage extends PageSimpleProcessingRecipe { + public SortingPage() { + super(SortingRecipe.Type.INSTANCE); + } +} diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/HolographicBridgeProjectorBlockEntity.java b/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/HolographicBridgeProjectorBlockEntity.java index 4ab5f5d9c..1e30a3c40 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/HolographicBridgeProjectorBlockEntity.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/HolographicBridgeProjectorBlockEntity.java @@ -19,7 +19,7 @@ import com.github.chainmailstudios.astromine.registry.AstromineBlockEntityTypes; import com.github.chainmailstudios.astromine.registry.AstromineBlocks; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; -import com.github.chainmailstudios.astromine.registry.AstromineSounds; +import com.github.chainmailstudios.astromine.registry.client.AstromineSounds; import nerdhub.cardinal.components.api.component.ComponentProvider; import org.jetbrains.annotations.NotNull; import spinnery.widget.api.Color; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/entity/RocketEntity.java b/src/main/java/com/github/chainmailstudios/astromine/common/entity/RocketEntity.java index 8d45d4fe8..af815affe 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/entity/RocketEntity.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/entity/RocketEntity.java @@ -54,12 +54,12 @@ protected void initDataTracker() { @Override protected void readCustomDataFromTag(CompoundTag tag) { - tag.put("fluid", fluidInventory.write(fluidInventory, Optional.empty(), Optional.empty())); + fluidInventory.read(fluidInventory, tag.getCompound("fluid"), Optional.empty(), Optional.empty()); } @Override protected void writeCustomDataToTag(CompoundTag tag) { - fluidInventory.read(fluidInventory, tag.getCompound("fluid"), Optional.empty(), Optional.empty()); + tag.put("fluid", fluidInventory.write(fluidInventory, Optional.empty(), Optional.empty())); } public Box getHardCollisionBox(Entity collidingEntity) { diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/item/FireExtinguisherItem.java b/src/main/java/com/github/chainmailstudios/astromine/common/item/FireExtinguisherItem.java index f47ca2bb0..7035c9e20 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/item/FireExtinguisherItem.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/item/FireExtinguisherItem.java @@ -20,7 +20,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import com.github.chainmailstudios.astromine.registry.AstromineSounds; +import com.github.chainmailstudios.astromine.registry.client.AstromineSounds; public class FireExtinguisherItem extends Item { long lastPlayed = 0; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/item/HolographicConnectorItem.java b/src/main/java/com/github/chainmailstudios/astromine/common/item/HolographicConnectorItem.java index 3f8f590da..948dfc360 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/item/HolographicConnectorItem.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/item/HolographicConnectorItem.java @@ -13,7 +13,7 @@ import com.github.chainmailstudios.astromine.common.block.HolographicBridgeProjectorBlock; import com.github.chainmailstudios.astromine.common.block.entity.HolographicBridgeProjectorBlockEntity; -import com.github.chainmailstudios.astromine.registry.AstromineSounds; +import com.github.chainmailstudios.astromine.registry.client.AstromineSounds; import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; public class HolographicConnectorItem extends Item { diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/item/SuperSpaceSlimeShooterItem.java b/src/main/java/com/github/chainmailstudios/astromine/common/item/SuperSpaceSlimeShooterItem.java index b0187c104..1d438ab6e 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/item/SuperSpaceSlimeShooterItem.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/item/SuperSpaceSlimeShooterItem.java @@ -22,7 +22,7 @@ import com.github.chainmailstudios.astromine.registry.AstromineEntityTypes; import com.github.chainmailstudios.astromine.registry.AstromineItems; import com.github.chainmailstudios.astromine.registry.AstromineParticles; -import com.github.chainmailstudios.astromine.registry.AstromineSounds; +import com.github.chainmailstudios.astromine.registry.client.AstromineSounds; import java.util.Optional; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/item/weapon/BaseWeapon.java b/src/main/java/com/github/chainmailstudios/astromine/common/item/weapon/BaseWeapon.java index fadc538c2..9443363e6 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/item/weapon/BaseWeapon.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/item/weapon/BaseWeapon.java @@ -18,7 +18,7 @@ import com.github.chainmailstudios.astromine.common.entity.projectile.BulletEntity; import com.github.chainmailstudios.astromine.common.utilities.ClientUtilities; import com.github.chainmailstudios.astromine.registry.AstromineEntityTypes; -import com.github.chainmailstudios.astromine.registry.AstromineSounds; +import com.github.chainmailstudios.astromine.registry.client.AstromineSounds; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/item/weapon/variant/Weaponry.java b/src/main/java/com/github/chainmailstudios/astromine/common/item/weapon/variant/Weaponry.java index 834bc00d5..dec22cb6f 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/item/weapon/variant/Weaponry.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/item/weapon/variant/Weaponry.java @@ -9,7 +9,7 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.item.weapon.BaseWeapon; import com.github.chainmailstudios.astromine.registry.AstromineItems; -import com.github.chainmailstudios.astromine.registry.AstromineSounds; +import com.github.chainmailstudios.astromine.registry.client.AstromineSounds; public class Weaponry { public static final class ScarH extends BaseWeapon { diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/recipe/ElectrolyzingRecipe.java b/src/main/java/com/github/chainmailstudios/astromine/common/recipe/ElectrolyzingRecipe.java index 700762a1e..af5fa73ac 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/recipe/ElectrolyzingRecipe.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/recipe/ElectrolyzingRecipe.java @@ -23,6 +23,7 @@ import com.github.chainmailstudios.astromine.common.utilities.FractionUtilities; import com.github.chainmailstudios.astromine.common.volume.energy.EnergyVolume; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.registry.AstromineBlocks; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import com.google.gson.Gson; @@ -117,6 +118,11 @@ public DefaultedList getPreviewInputs() { return DefaultedList.of(); // we are not dealing with items } + @Override + public ItemStack getRecipeKindIcon() { + return new ItemStack(AstromineBlocks.ELECTROLYZER); + } + public Identifier getIdentifier() { return identifier; } diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/recipe/FuelMixingRecipe.java b/src/main/java/com/github/chainmailstudios/astromine/common/recipe/FuelMixingRecipe.java index bbb0ff5c9..5d8a58cf3 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/recipe/FuelMixingRecipe.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/recipe/FuelMixingRecipe.java @@ -23,6 +23,7 @@ import com.github.chainmailstudios.astromine.common.utilities.FractionUtilities; import com.github.chainmailstudios.astromine.common.volume.energy.EnergyVolume; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.registry.AstromineBlocks; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import com.google.gson.Gson; @@ -117,6 +118,11 @@ public DefaultedList getPreviewInputs() { return DefaultedList.of(); // we are not dealing with items } + @Override + public ItemStack getRecipeKindIcon() { + return new ItemStack(AstromineBlocks.FUEL_MIXER); + } + public Identifier getIdentifier() { return identifier; } diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/recipe/LiquidGeneratingRecipe.java b/src/main/java/com/github/chainmailstudios/astromine/common/recipe/LiquidGeneratingRecipe.java index 8ff9c3259..34bbc8826 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/recipe/LiquidGeneratingRecipe.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/recipe/LiquidGeneratingRecipe.java @@ -23,6 +23,7 @@ import com.github.chainmailstudios.astromine.common.utilities.FractionUtilities; import com.github.chainmailstudios.astromine.common.volume.energy.EnergyVolume; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.registry.AstromineBlocks; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import com.google.gson.Gson; @@ -100,7 +101,12 @@ public RecipeType getType() { public DefaultedList getPreviewInputs() { return DefaultedList.of(); // we are not dealing with items } - + + @Override + public ItemStack getRecipeKindIcon() { + return new ItemStack(AstromineBlocks.LIQUID_GENERATOR); + } + public Fluid getFluid() { return fluid.get(); } diff --git a/src/main/java/com/github/chainmailstudios/astromine/common/recipe/SortingRecipe.java b/src/main/java/com/github/chainmailstudios/astromine/common/recipe/SortingRecipe.java index 677b06691..edb05c058 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/common/recipe/SortingRecipe.java +++ b/src/main/java/com/github/chainmailstudios/astromine/common/recipe/SortingRecipe.java @@ -1,5 +1,6 @@ package com.github.chainmailstudios.astromine.common.recipe; +import net.minecraft.block.Blocks; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; @@ -20,6 +21,7 @@ import com.github.chainmailstudios.astromine.common.utilities.PacketUtilities; import com.github.chainmailstudios.astromine.common.utilities.ParsingUtilities; import com.github.chainmailstudios.astromine.common.utilities.StackUtilities; +import com.github.chainmailstudios.astromine.registry.AstromineBlocks; import com.google.common.collect.Lists; import com.google.gson.Gson; @@ -100,6 +102,11 @@ public DefaultedList getPreviewInputs() { defaultedList.add(this.input); return defaultedList; } + + @Override + public ItemStack getRecipeKindIcon() { + return new ItemStack(AstromineBlocks.SORTER); + } public int getTimeTotal() { return timeTotal; diff --git a/src/main/java/com/github/chainmailstudios/astromine/mixin/BuiltinModelItemRendererMixin.java b/src/main/java/com/github/chainmailstudios/astromine/mixin/BuiltinModelItemRendererMixin.java index 80cd21123..7ac06fce8 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/mixin/BuiltinModelItemRendererMixin.java +++ b/src/main/java/com/github/chainmailstudios/astromine/mixin/BuiltinModelItemRendererMixin.java @@ -1,7 +1,7 @@ package com.github.chainmailstudios.astromine.mixin; import com.github.chainmailstudios.astromine.client.model.RocketEntityModel; -import com.github.chainmailstudios.astromine.registry.AstromineClientModels; +import com.github.chainmailstudios.astromine.registry.client.AstromineClientModels; import com.github.chainmailstudios.astromine.registry.AstromineItems; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/com/github/chainmailstudios/astromine/mixin/InGameHudMixin.java b/src/main/java/com/github/chainmailstudios/astromine/mixin/InGameHudMixin.java index 05abb51cc..5b839a2d5 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/mixin/InGameHudMixin.java +++ b/src/main/java/com/github/chainmailstudios/astromine/mixin/InGameHudMixin.java @@ -10,7 +10,7 @@ import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.util.math.MatrixStack; -import com.github.chainmailstudios.astromine.registry.AstromineScreens; +import com.github.chainmailstudios.astromine.registry.client.AstromineScreens; import spinnery.widget.api.Position; @Mixin(InGameHud.class) diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineArmorMaterials.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineArmorMaterials.java index 6f9fb1729..f481a37e1 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineArmorMaterials.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineArmorMaterials.java @@ -9,6 +9,8 @@ import net.minecraft.sound.SoundEvent; import net.minecraft.util.Lazy; +import com.github.chainmailstudios.astromine.registry.client.AstromineSounds; + import java.util.function.Supplier; public class AstromineArmorMaterials { diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineEntityRenderers.java b/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineEntityRenderers.java deleted file mode 100644 index 41fbf19bc..000000000 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineEntityRenderers.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.chainmailstudios.astromine.registry; - -import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; - -import com.github.chainmailstudios.astromine.client.render.entity.BulletEntityRenderer; -import com.github.chainmailstudios.astromine.client.render.entity.RocketEntityRenderer; - -public class AstromineEntityRenderers { - public static void initialize() { - EntityRendererRegistry.INSTANCE.register(AstromineEntityTypes.BULLET_ENTITY_TYPE, BulletEntityRenderer::new); - EntityRendererRegistry.INSTANCE.register(AstromineEntityTypes.ROCKET, RocketEntityRenderer::new); - } -} diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBlockEntityRenderers.java b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineBlockEntityRenderers.java similarity index 85% rename from src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBlockEntityRenderers.java rename to src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineBlockEntityRenderers.java index 084235895..c79c377d9 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBlockEntityRenderers.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineBlockEntityRenderers.java @@ -1,4 +1,4 @@ -package com.github.chainmailstudios.astromine.registry; +package com.github.chainmailstudios.astromine.registry.client; import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry; @@ -8,6 +8,7 @@ import net.minecraft.client.render.block.entity.BlockEntityRenderer; import com.github.chainmailstudios.astromine.client.render.block.HolographicBridgeBlockEntityRenderer; +import com.github.chainmailstudios.astromine.registry.AstromineBlockEntityTypes; import java.util.function.Function; diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineClientCallbacks.java b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientCallbacks.java similarity index 76% rename from src/main/java/com/github/chainmailstudios/astromine/registry/AstromineClientCallbacks.java rename to src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientCallbacks.java index 6b025aec9..2260ba7b2 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineClientCallbacks.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientCallbacks.java @@ -1,4 +1,4 @@ -package com.github.chainmailstudios.astromine.registry; +package com.github.chainmailstudios.astromine.registry.client; import net.fabricmc.fabric.api.event.client.ClientTickCallback; diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineClientModels.java b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientModels.java similarity index 98% rename from src/main/java/com/github/chainmailstudios/astromine/registry/AstromineClientModels.java rename to src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientModels.java index 6ce5bd065..3b91534ef 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineClientModels.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientModels.java @@ -1,4 +1,4 @@ -package com.github.chainmailstudios.astromine.registry; +package com.github.chainmailstudios.astromine.registry.client; import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.client.model.RocketEntityModel; diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineClientPackets.java b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientPackets.java similarity index 87% rename from src/main/java/com/github/chainmailstudios/astromine/registry/AstromineClientPackets.java rename to src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientPackets.java index 4a8c46efa..71a60a5b8 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineClientPackets.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientPackets.java @@ -1,4 +1,4 @@ -package com.github.chainmailstudios.astromine.registry; +package com.github.chainmailstudios.astromine.registry.client; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -9,6 +9,8 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.entity.RocketEntity; +import com.github.chainmailstudios.astromine.registry.AstromineCommonPackets; +import com.github.chainmailstudios.astromine.registry.AstromineEntityTypes; import java.util.UUID; diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineEntityRenderers.java b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineEntityRenderers.java new file mode 100644 index 000000000..2400a28eb --- /dev/null +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineEntityRenderers.java @@ -0,0 +1,18 @@ +package com.github.chainmailstudios.astromine.registry.client; + +import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; + +import com.github.chainmailstudios.astromine.client.render.entity.BulletEntityRenderer; +import com.github.chainmailstudios.astromine.client.render.entity.RocketEntityRenderer; +import com.github.chainmailstudios.astromine.client.render.entity.SpaceSlimeEntityRenderer; +import com.github.chainmailstudios.astromine.client.render.entity.SuperSpaceSlimeEntityRenderer; +import com.github.chainmailstudios.astromine.registry.AstromineEntityTypes; + +public class AstromineEntityRenderers { + public static void initialize() { + EntityRendererRegistry.INSTANCE.register(AstromineEntityTypes.BULLET_ENTITY_TYPE, BulletEntityRenderer::new); + EntityRendererRegistry.INSTANCE.register(AstromineEntityTypes.ROCKET, RocketEntityRenderer::new); + EntityRendererRegistry.INSTANCE.register(AstromineEntityTypes.SPACE_SLIME, (dispatcher, context) -> new SpaceSlimeEntityRenderer(dispatcher)); + EntityRendererRegistry.INSTANCE.register(AstromineEntityTypes.SUPER_SPACE_SLIME, (dispatcher, context) -> new SuperSpaceSlimeEntityRenderer(dispatcher)); + } +} diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineParticleFactories.java b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineParticleFactories.java similarity index 82% rename from src/main/java/com/github/chainmailstudios/astromine/registry/AstromineParticleFactories.java rename to src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineParticleFactories.java index a54758274..921059c58 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineParticleFactories.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineParticleFactories.java @@ -1,6 +1,9 @@ -package com.github.chainmailstudios.astromine.registry; +package com.github.chainmailstudios.astromine.registry.client; import com.github.chainmailstudios.astromine.client.particle.RocketFlameParticle; +import com.github.chainmailstudios.astromine.registry.AstromineItems; +import com.github.chainmailstudios.astromine.registry.AstromineParticles; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstrominePatchouliPages.java b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstrominePatchouliPages.java new file mode 100644 index 000000000..091f1ad8c --- /dev/null +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstrominePatchouliPages.java @@ -0,0 +1,16 @@ +package com.github.chainmailstudios.astromine.registry.client; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.client.patchouli.SortingPage; +import vazkii.patchouli.client.book.ClientBookRegistry; + +@Environment(EnvType.CLIENT) +public class AstrominePatchouliPages { + @Environment(EnvType.CLIENT) + public static void initialize() { + ClientBookRegistry.INSTANCE.pageTypes.put(AstromineCommon.identifier("sorting"), SortingPage.class); + } +} diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineRenderLayers.java b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineRenderLayers.java similarity index 90% rename from src/main/java/com/github/chainmailstudios/astromine/registry/AstromineRenderLayers.java rename to src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineRenderLayers.java index d5c70e612..0695db5c0 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineRenderLayers.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineRenderLayers.java @@ -1,4 +1,4 @@ -package com.github.chainmailstudios.astromine.registry; +package com.github.chainmailstudios.astromine.registry.client; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineScreens.java b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineScreens.java similarity index 96% rename from src/main/java/com/github/chainmailstudios/astromine/registry/AstromineScreens.java rename to src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineScreens.java index 7a2d95d08..b8ffecf4b 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineScreens.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineScreens.java @@ -1,4 +1,4 @@ -package com.github.chainmailstudios.astromine.registry; +package com.github.chainmailstudios.astromine.registry.client; import com.github.chainmailstudios.astromine.client.screen.*; import com.github.chainmailstudios.astromine.common.container.*; @@ -7,6 +7,7 @@ import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry; import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.registry.AstromineContainers; import spinnery.client.screen.InGameHudScreen; import spinnery.widget.WInterface; import spinnery.widget.WStaticImage; diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineSkyboxes.java b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineSkyboxes.java similarity index 86% rename from src/main/java/com/github/chainmailstudios/astromine/registry/AstromineSkyboxes.java rename to src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineSkyboxes.java index e288e224d..a8a265e87 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineSkyboxes.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineSkyboxes.java @@ -1,8 +1,9 @@ -package com.github.chainmailstudios.astromine.registry; +package com.github.chainmailstudios.astromine.registry.client; import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.client.registry.SkyboxRegistry; import com.github.chainmailstudios.astromine.client.render.sky.skybox.SpaceSkybox; +import com.github.chainmailstudios.astromine.registry.AstromineDimensionTypes; public class AstromineSkyboxes { public static void initialize() { diff --git a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineSounds.java b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineSounds.java similarity index 96% rename from src/main/java/com/github/chainmailstudios/astromine/registry/AstromineSounds.java rename to src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineSounds.java index f1129b3d5..3e9193814 100644 --- a/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineSounds.java +++ b/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineSounds.java @@ -1,4 +1,4 @@ -package com.github.chainmailstudios.astromine.registry; +package com.github.chainmailstudios.astromine.registry.client; import net.minecraft.sound.SoundEvent; import net.minecraft.util.registry.Registry; diff --git a/src/main/resources/assets/astromine/lang/en_us.json b/src/main/resources/assets/astromine/lang/en_us.json index 8b10a10cc..1c88e21dd 100644 --- a/src/main/resources/assets/astromine/lang/en_us.json +++ b/src/main/resources/assets/astromine/lang/en_us.json @@ -370,5 +370,7 @@ "text.astromine.world.meteors.page_one.text": "Foreign bodies that, cruising through the stairs, collided with a planetary body; said to contain $(thing)$(l:world/meteor_ores)extraterrestrial ores$().", "text.astromine.world.ore_clusters.title": "Ore Clusters", "text.astromine.world.ore_clusters.page_one.title": "Ore Clusters", - "text.astromine.world.ore_clusters.page_one.text": "Clusters of ores obtained from $(thing)$(l:world/asteroid_ores)asteroid ores$() or $(thing)$(l:world/meteor_ores)meteor ores$(), which may be processed for resources." + "text.astromine.world.ore_clusters.page_one.text": "Clusters of ores obtained from $(thing)$(l:world/asteroid_ores)asteroid ores$() or $(thing)$(l:world/meteor_ores)meteor ores$(), which may be processed for resources.", + "text.astromine.world.ore_clusters.page_two.title": "Processing", + "text.astromine.world.ore_clusters.page_two.text": "Sorting clusters will result in two of their respective $(thing)dusts$()." } diff --git a/src/main/resources/data/astromine/patchouli_books/manual/en_us/entries/world/ore_clusters.json b/src/main/resources/data/astromine/patchouli_books/manual/en_us/entries/world/ore_clusters.json index 0b49fa3a9..5fa0b5296 100644 --- a/src/main/resources/data/astromine/patchouli_books/manual/en_us/entries/world/ore_clusters.json +++ b/src/main/resources/data/astromine/patchouli_books/manual/en_us/entries/world/ore_clusters.json @@ -8,6 +8,12 @@ "type": "text", "title": "text.astromine.world.ore_clusters.page_one.title", "text": "text.astromine.world.ore_clusters.page_one.text" + }, + { + "type": "astromine:sorting", + "recipe": "astromine:metite_dust_from_sorting_cluster", + "title": "text.astromine.world.ore_clusters.page_two.title", + "text": "text.astromine.world.ore_clusters.page_two.text" } ] } \ No newline at end of file