Skip to content

Commit

Permalink
oil && oil barrels
Browse files Browse the repository at this point in the history
  • Loading branch information
Thepigcat76 committed Dec 15, 2024
1 parent 6c10e08 commit b0bc1e3
Show file tree
Hide file tree
Showing 53 changed files with 545 additions and 202 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-12-15T19:07:20.8340143 Item Models: nautec
// 1.21.1 2024-12-15T22:05:05.897545572 Item Models: nautec
53692692f57914fc54eb6ebf416ce1cb7789e57b assets/nautec/models/item/air_bottle.json
cc6ee3887ec6e0c53216dc681ac7b32b34182253 assets/nautec/models/item/anchor.json
2e336fce57acffa1d0eb621baa30a26f665b4924 assets/nautec/models/item/aquarine_steel_axe.json
Expand Down Expand Up @@ -46,10 +46,10 @@ ed25e860594336997f83adfb9143324db4569abc assets/nautec/models/item/diving_boots.
8ab1faa99a5bfcc960d471854c6416ca0a1573e3 assets/nautec/models/item/diving_leggings.json
c085f601646336ad76e9a613649bcffc3a304c9a assets/nautec/models/item/dolphin_fin.json
0620a4b87e92446ecf5521b595d2f1a6a9401529 assets/nautec/models/item/drowned_lungs.json
4d2bc30dbb5e9bca7902cfeafeb133ff4facbee8 assets/nautec/models/item/eas_bucket.json
61a7044af6e7a6c51552eb1abfa03e96aa677420 assets/nautec/models/item/eas_bucket.json
81b061a707ce97739bf742ee8c4832e9612c3f18 assets/nautec/models/item/eas_vial.json
7bdd896a173f2dbd2cf64ff41e82f6c5525dcf49 assets/nautec/models/item/eldritch_heart.json
d26c5a9588cd86145f6c2e03e5fd5eabc4ed0f07 assets/nautec/models/item/etching_acid_bucket.json
3e19378d1e8cd3808548edc4bbb93a4dfe4ade74 assets/nautec/models/item/etching_acid_bucket.json
cb07777d8dcd1c00bea806efc2b7f64c6c13a8c3 assets/nautec/models/item/fishing_station.json
490588573d27c343b055c02b137c221a71866aa8 assets/nautec/models/item/gear.json
2b617afc38ea0b797aeba3ca00dfb25f33be4bd3 assets/nautec/models/item/glass_vial.json
Expand All @@ -60,16 +60,18 @@ d30193c75aab5ff8f4d4945df8689f575874c0f0 assets/nautec/models/item/laser_channel
e2a54f360d7c345a624bfd88678359ffce2af94d assets/nautec/models/item/long_distance_laser.json
2a5b3ee493a3b20a37c3f391ebd960de088f2b7c assets/nautec/models/item/mixer.json
420392d152f0164245752585ea3f0e85b95b0cce assets/nautec/models/item/mutator.json
da47351a6e7410de2b6761d4c90edf257d4620aa assets/nautec/models/item/oil_barrel.json
8664d92d6fab3566ac9169968450df573210f227 assets/nautec/models/item/oil_bucket.json
c30b2391537fbc383c41aebe69a6eab8b2f9bd31 assets/nautec/models/item/petri_dish.json
888fbf8e3629b4cd0df267581ac130f534f80ac5 assets/nautec/models/item/petri_dish_bacteria.json
e8d19ed0a058c92c28efb20a5f8887ff0b78770f assets/nautec/models/item/polished_prismarine.json
113d63fc1bd37fbe0fb477446a06eafa25ce09b1 assets/nautec/models/item/prism_monocle.json
8e22e42d27bc66bc91cc76fd66d0ff5457b585b1 assets/nautec/models/item/prismarine_crystal.json
8b90a03798a28c038b1c16da2f723e90694d182b assets/nautec/models/item/prismarine_crystal_shard.json
09882392c9745a728907f265dd968977ca0f171b assets/nautec/models/item/prismarine_laser_relay.json
b01055cbe0dd02e958fe1063758658a9be6b753a assets/nautec/models/item/prismarine_sand.json
e0209c5f64b38c19f4b8cc62dc90d23fd5f3bad0 assets/nautec/models/item/prismatic_battery.json
113d63fc1bd37fbe0fb477446a06eafa25ce09b1 assets/nautec/models/item/prism_monocle.json
0441fb5aafacad25af44cc70caad7de17d4d7762 assets/nautec/models/item/rusty_crate.json
546756658cb53a34f117de278d075cbdd09c70ba assets/nautec/models/item/rusty_gear.json
8af43812b6a13031c60720373e6e2aa8b3aa3367 assets/nautec/models/item/salt_water_bucket.json
e706cc4892f1d7f29d5b1940770668d233d0bf94 assets/nautec/models/item/saltwater_bucket.json
5d79cd8fb5d6550d2d8a61aa19dbf6f13ceecb72 assets/nautec/models/item/whisk.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-12-15T13:39:38.353720754 Block States: nautec
// 1.21.1 2024-12-15T22:34:29.540723671 Block States: nautec
3f3049296b6ec6590b05af441a717618bb232b69 assets/nautec/blockstates/aquarine_steel_block.json
414381329d7663eb1d1db8c3f42df8d9932d2cfe assets/nautec/blockstates/aquatic_catalyst.json
920d567f0ae8731bc428c8970aac5400741ea87d assets/nautec/blockstates/augmentation_station.json
Expand All @@ -16,6 +16,7 @@ db6a852fb0c5f4ea3f9dc93c00de3525ae2c3c66 assets/nautec/blockstates/deep_sea_drai
7fd72e44fd8677c659e8b261fcaa92b12a845b78 assets/nautec/blockstates/laser_junction.json
ad55c3b07839453f1153e1bb0eafcfd55cd2f9e1 assets/nautec/blockstates/long_distance_laser.json
64a25cd06f6d770e7408fbde89cfb1413550aeb5 assets/nautec/blockstates/mixer.json
2cff0fd603426a38baa3cc8123cace04d0d5adf1 assets/nautec/blockstates/oil_barrel.json
bc5914e8ef7efce89c87e7320a64f1f02348ac6c assets/nautec/blockstates/polished_prismarine.json
60fb5b3f304282655d6b248eeea7e227ec8055bd assets/nautec/blockstates/prismarine_laser_relay.json
7930832874f271dd9739dd2fd92a54954d014df8 assets/nautec/blockstates/prismarine_sand.json
Expand Down Expand Up @@ -57,6 +58,8 @@ bc44096b66b26bf80656c02a0e512fa19c975f52 assets/nautec/models/block/deep_sea_dra
0c5628852a14882a978590d77c2eb5db5947f6c9 assets/nautec/models/block/deep_sea_drain_part_8_open.json
e7497701db027ba0deb6bc9e037e68ab2daac886 assets/nautec/models/block/deep_sea_drain_wall.json
b37caee681c78c96ef2e66c6a0d4584a47d5b1e3 assets/nautec/models/block/long_distance_laser.json
27172c9baefa576bf8a79ccdc5b3b0ed3884af8b assets/nautec/models/block/oil_barrel.json
72d472aea78ba1bd9deec024c16a52c5ed241876 assets/nautec/models/block/oil_barrel_horizontal.json
670931d9593810682e11609b5c7ed2a908ef9b39 assets/nautec/models/block/polished_prismarine.json
f5f0d62affc876c65918c16c43280cb89f629648 assets/nautec/models/block/prismarine_sand.json
f0941592f6b903fd57c9c8b95ec434d91d1f69f2 assets/nautec/models/block/rusty_crate.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-11-05T21:59:37.295948882 Recipes
// 1.21.1 2024-12-15T20:55:07.969230843 Recipes
11639f08778ec1107c05d822f9beaa1f90e3bb32 data/minecraft/advancement/recipes/misc/cast_iron_ingot_blasting.json
5f305b97f7366fc61918bd266d0bacfa386b16c1 data/minecraft/advancement/recipes/misc/cast_iron_nugget_to_ingot.json
c01db9d69b288d37c769cf605b945ebf60a08e21 data/minecraft/advancement/recipes/misc/diving_chestplate.json
Expand Down Expand Up @@ -90,9 +90,9 @@ a4bdb97abe0834d405f7584452f78242585e02ff data/nautec/recipe/item_transformation/
3ff56013c9c1926be24f71bdb57c93527ef7ee28 data/nautec/recipe/laser_junction.json
11d23344db3f6e98c1520328fd6c883bccd8ca57 data/nautec/recipe/long_distance_laser.json
4925f952a200ae56a4e1ad04a45897be4988aad4 data/nautec/recipe/mixer.json
35a2d38352317596d0e56958db954ee65944fd30 data/nautec/recipe/mixing/dried_kelp_slime_ball_prismarine_crystals_seagrass.json
33cb8c2e11304d00aa38c66d64e202ca4230e924 data/nautec/recipe/mixing/pufferfish_gunpowder_bone_meal.json
e1a573744441ccee013b6f985c3872142911e29b data/nautec/recipe/mixing/raw_iron_prismarine_crystals_to_aquarine_steel_compound.json
9374bb4c1bb1a3e8eb1312ee701560a68be7d033 data/nautec/recipe/mixing/dried_kelp_slime_ball_prismarine_crystals_seagrass.json
b00568e1261638147c0e1f2433821bb6aa9f42b9 data/nautec/recipe/mixing/pufferfish_gunpowder_bone_meal.json
ac8c8ef9122a3e1312b101ce23af51ae019143e5 data/nautec/recipe/mixing/raw_iron_prismarine_crystals_to_aquarine_steel_compound.json
674df651148d747a200794f496996b82ca94e72f data/nautec/recipe/nautec_guide.json
cd9bfbdf0f0468399cc4700d0c360b8283253c96 data/nautec/recipe/polished_prismarine.json
4fe8f6115c759c654e132afedec76d846f0a89d5 data/nautec/recipe/prism_monocle.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.1 2024-12-15T19:56:36.865469462 Languages: en_us
2b776d2e529ff9f3da361d89a83dcc9c16fcd923 assets/nautec/lang/en_us.json
// 1.21.1 2024-12-15T20:55:07.97208459 Languages: en_us
02e2bf78f797075e71df78423d05779abc093c05 assets/nautec/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-30T17:58:20.5863696 Books: nautec
// 1.21.1 2024-12-15T20:55:07.9620151 Books: nautec
6d944fd1b3f4f8d8baf18317dbdea1e50476ed05 data/nautec/modonomicon/books/nautec_guide/book.json
ea5fe754ad19a1903e7a9d19f39e3b1488e59cfe data/nautec/modonomicon/books/nautec_guide/categories/getting_started.json
41b01f32b9f23cf1eb5a33085b98bd30f0a1f943 data/nautec/modonomicon/books/nautec_guide/categories/laser_augmentation.json
Expand All @@ -19,7 +19,7 @@ a46ba5de3d71172e50fe191f2d6ef51327d7f188 data/nautec/modonomicon/books/nautec_gu
513198812cfe6695951eb9e1f60fd3fcf8d36ee6 data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/long_distance_laser.json
c03c7b650f9ea70b95dcb4465e44d1abaa28d838 data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/mob_augments.json
d70be2eaf9729ca163499da6d7a33730cf7e07f2 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/charger.json
86bf0538af8e99ca0d8477c0c301c0a7938dea44 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/chemistry_introduction.json
bb25a50ac33f339011a5a153e21eff93381ae8b5 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/chemistry_introduction.json
36ffcf02fad4cee8ac0db723f1c03bc2df14049e data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/crystal_shards.json
34c421cb513a6d5ac4631180a2bbd14aa09d021a data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/drain.json
a7779a4159c603668355d3064d5bf7b4560a3490 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/laser_manipulation.json
Expand Down
6 changes: 3 additions & 3 deletions src/generated/resources/assets/nautec/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@
"book.nautec.nautec_guide.tooltip": "Nautec Guide Tooltip",
"curios.identifier.battery": "Battery",
"curios.identifier.prism_monocle": "Monocle",
"fluid_type.nautec.electrolyte_algae_serum": "Electrolyte Algae Serum",
"fluid_type.nautec.eas": "Electrolyte Algae Serum",
"fluid_type.nautec.etching_acid": "Etching Acid",
"fluid_type.nautec.soap_water": "Salt Water",
"fluid_type.nautec.saltwater": "Salt Water",
"item.nautec.air_bottle": "Pressurized Air Bottle",
"item.nautec.ancient_valve": "Ancient Valve",
"item.nautec.aquarine_steel_axe": "Aquarine Steel Axe",
Expand Down Expand Up @@ -198,7 +198,7 @@
"item.nautec.prismarine_crystal_shard": "Prismarine Crystal Shard",
"item.nautec.prismatic_battery": "Prismatic Battery",
"item.nautec.rusty_gear": "Rusty Gear",
"item.nautec.salt_water_bucket": "Salt Water Bucket",
"item.nautec.saltwater_bucket": "Salt Water Bucket",
"item.nautec.syringe_robot_arm": "Syringe Robot Arm",
"item.nautec.valve": "Valve",
"item.nautec.whisk": "Whisk",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "nautec:item/eas_bucket"
}
"parent": "neoforge:item/bucket",
"fluid": "nautec:eas",
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "nautec:item/etching_acid_bucket"
}
"parent": "neoforge:item/bucket",
"fluid": "nautec:etching_acid",
"loader": "neoforge:fluid_container"
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"type": "modonomicon:none"
},
"item": {
"item": "nautec:salt_water_bucket"
"item": "nautec:saltwater_bucket"
},
"text": "book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.salt_water.text",
"title": "book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.salt_water.title"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"duration": 200,
"fluid_ingredient": {
"amount": 1000,
"id": "nautec:salt_water"
"id": "nautec:saltwater"
},
"fluid_result": {
"amount": 1000,
"id": "nautec:electrolyte_algae_serum"
"id": "nautec:eas"
},
"ingredients": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"duration": 150,
"fluid_ingredient": {
"amount": 1000,
"id": "nautec:salt_water"
"id": "nautec:saltwater"
},
"fluid_result": {
"amount": 1000,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"duration": 100,
"fluid_ingredient": {
"amount": 1000,
"id": "nautec:salt_water"
"id": "nautec:saltwater"
},
"fluid_result": {},
"ingredients": [
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/portingdeadmods/nautec/Nautec.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,8 @@ public Nautec(IEventBus modEventBus, ModContainer modContainer) {

NTEntities.ENTITIES.register(modEventBus);
NTItems.ITEMS.register(modEventBus);
NTFluids.FLUIDS.register(modEventBus);
NTBlocks.BLOCKS.register(modEventBus);
NTRecipes.SERIALIZERS.register(modEventBus);
NTFluidTypes.FLUID_TYPES.register(modEventBus);
NTDataAttachments.ATTACHMENTS.register(modEventBus);
NTArgumentTypes.ARGUMENT_TYPES.register(modEventBus);
NTBlockEntityTypes.BLOCK_ENTITIES.register(modEventBus);
Expand All @@ -85,6 +83,8 @@ public Nautec(IEventBus modEventBus, ModContainer modContainer) {
NTLootModifier.LOOT_MODIFIERS.register(modEventBus);
NTBacteriaSerializers.SERIALIZERS.register(modEventBus);

NTFluids.HELPER.register(modEventBus);

modEventBus.addListener(this::onRegisterAugments);
modEventBus.addListener(this::registerCapabilities);

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/portingdeadmods/nautec/NautecClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent;
import net.neoforged.neoforge.client.gui.ConfigurationScreen;
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
import net.neoforged.neoforge.client.model.DynamicFluidContainerModel;
import net.neoforged.neoforge.fluids.FluidType;
import net.neoforged.neoforge.fluids.capability.templates.FluidHandlerItemStack;
import net.neoforged.neoforge.registries.DeferredHolder;
Expand Down Expand Up @@ -242,5 +243,6 @@ private void registerColorHandlers(RegisterColorHandlersEvent.Item event) {
Bacteria bacteria = BacteriaHelper.getBacteria(Minecraft.getInstance().level.registryAccess(), stack.get(NTDataComponents.BACTERIA).bacteria());
return layer == 1 ? bacteria.stats().color() : -1;
}, NTItems.PETRI_DISH);
event.register(new DynamicFluidContainerModel.Colors(), NTFluids.SALT_WATER.getBucket());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public interface Bacteria {
*/
ResourceLocation id();

BacteriaStats stats();
BaseBacteriaStats stats();

BacteriaSerializer<?> getSerializer();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.portingdeadmods.nautec.api.bacteria;

import net.minecraft.world.item.Item;

public interface BaseBacteriaStats {
Item resource();

float growthRate();

float mutationResistance();

float productionRate();

int lifespan();

int color();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.portingdeadmods.nautec.api.fluids;

import net.minecraft.resources.ResourceLocation;

public interface FluidTemplate {
ResourceLocation getStillTexture();

ResourceLocation getFlowingTexture();

ResourceLocation getOverlayTexture();
}
71 changes: 71 additions & 0 deletions src/main/java/com/portingdeadmods/nautec/api/fluids/NTFluid.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package com.portingdeadmods.nautec.api.fluids;
import net.minecraft.core.Vec3i;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.LiquidBlock;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.neoforged.neoforge.fluids.BaseFlowingFluid;
import net.neoforged.neoforge.fluids.FluidType;
import net.neoforged.neoforge.registries.DeferredItem;
import org.joml.Vector4i;

import java.util.function.Supplier;

public abstract class NTFluid {
public Supplier<BaseFlowingFluid.Source> stillFluid;
public Supplier<BaseFlowingFluid.Flowing> flowingFluid;

public Supplier<FluidType> fluidType;

public Supplier<LiquidBlock> block;
public Supplier<BucketItem> bucket;
public DeferredItem<BucketItem> deferredBucket;

protected BaseFlowingFluid.Properties properties;

protected final String name;

public NTFluid(String name) {
this.stillFluid = () -> new BaseFlowingFluid.Source(fluidProperties());
this.flowingFluid = () -> new BaseFlowingFluid.Flowing(fluidProperties());
this.name = name;
}

public BlockBehaviour.Properties blockProperties() {
return BlockBehaviour.Properties.of();
}

public BaseFlowingFluid.Properties fluidProperties() {
return new BaseFlowingFluid.Properties(fluidType, stillFluid, flowingFluid);
}

public BaseFlowingFluid.Source getStillFluid() {
return stillFluid.get();
}

public BaseFlowingFluid.Flowing getFlowingFluid() {
return flowingFluid.get();
}

public Supplier<FluidType> getFluidType() {
return fluidType;
}

public Item getBucket() {
return getDeferredBucket().get();
}

public DeferredItem<BucketItem> getDeferredBucket() {
return deferredBucket;
}

public String getName() {
return name;
}

public Supplier<FluidType> registerFluidType(FluidType.Properties properties, Vector4i color, FluidTemplate template) {
return () -> new BaseFluidType(template.getStillTexture(), template.getFlowingTexture(), template.getOverlayTexture(), color, properties);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ public interface Multiblock {
Int2ObjectMap<Block> getDefinition();

/**
* This method provides the block entity type for the controller of your multiblock.
* @return the blockentity type of your controllers blockentity
* This method provides the block entity resource for the controller of your multiblock.
* @return the blockentity resource of your controllers blockentity
*/
BlockEntityType<? extends MultiblockEntity> getMultiBlockEntityType();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,15 @@
import com.mojang.blaze3d.systems.RenderSystem;
import com.portingdeadmods.nautec.Nautec;
import com.portingdeadmods.nautec.data.NTDataComponentsUtils;
import com.portingdeadmods.nautec.registries.NTFluidTypes;
import com.portingdeadmods.nautec.registries.NTItems;
import net.minecraft.client.DeltaTracker;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.FluidTags;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.material.Fluids;
import net.neoforged.neoforge.fluids.FluidType;
import org.jetbrains.annotations.NotNull;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,13 @@ public FishingStationBERenderer(BlockEntityRendererProvider.Context ctx) {
this.model.setupAnim();
}

private int getLightLevel(Level level, BlockPos pos) {
return LevelRenderer.getLightColor(level, pos);
}

@Override
public void render(FishingStationBlockEntity blockEntity, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight, int packedOverlay) {
poseStack.pushPose();
{
poseStack.translate(0.5, 0.5, 0.5);
poseStack.translate(1.75, -0.125, 0);
this.model.renderToBuffer(poseStack, FishingNetModel.MATERIAL.buffer(bufferSource, RenderType::entityCutout), getLightLevel(blockEntity.getLevel(), blockEntity.getBlockPos().above()), packedOverlay);
this.model.renderToBuffer(poseStack, FishingNetModel.MATERIAL.buffer(bufferSource, RenderType::entityCutout), packedLight, packedOverlay);
}
poseStack.popPose();
}
Expand Down
Loading

0 comments on commit b0bc1e3

Please sign in to comment.