Skip to content

Commit

Permalink
renaming && resources
Browse files Browse the repository at this point in the history
  • Loading branch information
Thepigcat76 committed Dec 15, 2024
1 parent 940dff9 commit 6327c09
Show file tree
Hide file tree
Showing 16 changed files with 91 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "nautec:block/fishing_station"
}
}
}
3 changes: 3 additions & 0 deletions src/generated/resources/assets/nautec/models/item/anchor.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "nautec:block/anchor"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "nautec:block/fishing_station"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "nautec:item/petri_dish",
"layer1": "nautec:item/petri_dish_overlay"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "minecraft:air",
"color": 0,
"growth_rate": 0.0,
"id": "nautec:empty",
"lifespan": 0,
"mutation_resistance": 0.0,
"production_rate": 0.0
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public static void onGatherData(GatherDataEvent event) {
generator.addProvider(event.includeClient(), blockTagProvider);
generator.addProvider(event.includeClient(), new ItemTagProvider(output, lookupProvider, blockTagProvider.contentsGetter()));
generator.addProvider(event.includeServer(),new LootModifierProvider(output,lookupProvider));
generator.addProvider(event.includeServer(), new WorldGenProvider(output, lookupProvider));
generator.addProvider(event.includeServer(), new DatapackRegistryProvider(output, lookupProvider));
// generator.addProvider(event.includeServer(), new BacteriaProvider(output, lookupProvider));

if (ModList.get().isLoaded("modonomicon")) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import net.minecraft.data.PackOutput;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BlockTags;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.levelgen.VerticalAnchor;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
Expand All @@ -20,15 +19,13 @@
import net.minecraft.world.level.levelgen.placement.*;
import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest;
import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest;
import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
import net.neoforged.neoforge.common.Tags;
import net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider;

import java.util.List;
import java.util.Set;
import java.util.concurrent.CompletableFuture;

public class WorldGenProvider extends DatapackBuiltinEntriesProvider {
public class DatapackRegistryProvider extends DatapackBuiltinEntriesProvider {

public static ResourceKey<ConfiguredFeature<?, ?>> registerConfigKey(String name) {
return ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.fromNamespaceAndPath(Nautec.MODID, name));
Expand All @@ -37,7 +34,7 @@ public static ResourceKey<PlacedFeature> registerPlaceKey(String name) {
return ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.fromNamespaceAndPath(Nautec.MODID, name));
}

public WorldGenProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
public DatapackRegistryProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
super(output, registries, BUILDER, Set.of(Nautec.MODID));
}

Expand Down
58 changes: 58 additions & 0 deletions src/main/resources/assets/nautec/models/block/fishing_station.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"credit": "Made with Blockbench",
"textures": {
"0": "nautec:block/fishing_station_bottom",
"1": "nautec:block/fishing_station_side",
"2": "nautec:block/fishing_station_top",
"3": "nautec:block/fishing_station_middle",
"particle": "nautec:block/fishing_station_bottom"
},
"elements": [
{
"from": [0, 10, 0],
"to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 10, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 6], "texture": "#1"},
"east": {"uv": [0, 0, 16, 6], "texture": "#1"},
"south": {"uv": [0, 0, 16, 6], "texture": "#1"},
"west": {"uv": [0, 0, 16, 6], "texture": "#1"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#2"}
}
},
{
"from": [4, 6, 4],
"to": [12, 10, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 6, 0]},
"faces": {
"north": {"uv": [4, 6, 12, 10], "texture": "#3"},
"east": {"uv": [4, 6, 12, 10], "texture": "#3"},
"south": {"uv": [4, 6, 12, 10], "texture": "#3"},
"west": {"uv": [4, 6, 12, 10], "texture": "#3"},
"up": {"uv": [0, 0, 8, 8], "texture": "#missing"},
"down": {"uv": [0, 0, 8, 8], "texture": "#missing"}
}
},
{
"from": [0, 0, 0],
"to": [16, 6, 16],
"faces": {
"north": {"uv": [0, 10, 16, 16], "texture": "#1"},
"east": {"uv": [0, 10, 16, 16], "texture": "#1"},
"south": {"uv": [0, 10, 16, 16], "texture": "#1"},
"west": {"uv": [0, 10, 16, 16], "texture": "#1"},
"up": {"uv": [0, 0, 16, 16], "texture": "#2"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
}
],
"groups": [
{
"name": "group",
"origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"meta":{"format_version":"4.10","model_format":"modded_entity","box_uv":true},"name":"fishing_net","model_identifier":"","modded_entity_entity_class":"","modded_entity_version":"1.17","modded_entity_flip_y":true,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":64,"height":64},"elements":[{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-8,1,-1],"to":[20,3,1],"autouv":0,"color":9,"origin":[0,1,0],"faces":{"north":{"uv":[2,2,30,4],"texture":0},"east":{"uv":[0,2,2,4],"texture":0},"south":{"uv":[32,2,60,4],"texture":0},"west":{"uv":[30,2,32,4],"texture":0},"up":{"uv":[30,2,2,0],"texture":0},"down":{"uv":[58,0,30,2],"texture":0}},"type":"cube","uuid":"9482d1d7-c911-59b0-dbfb-5dd3841c3e0a"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[20,0,-2],"to":[24,4,2],"autouv":0,"color":9,"origin":[4,1,0],"uv_offset":[26,4],"faces":{"north":{"uv":[30,8,34,12],"texture":0},"east":{"uv":[26,8,30,12],"texture":0},"south":{"uv":[38,8,42,12],"texture":0},"west":{"uv":[34,8,38,12],"texture":0},"up":{"uv":[34,8,30,4],"texture":0},"down":{"uv":[38,4,34,8],"texture":0}},"type":"cube","uuid":"713584b1-ddcf-1051-9bde-ac0ae339823a"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-8,-10.25,-0.25],"to":[-6,1.75,1.75],"autouv":0,"color":9,"rotation":[-22.499999999999993,0,0],"origin":[-8,-0.25,0.75],"uv_offset":[26,12],"faces":{"north":{"uv":[28,14,30,26],"texture":0},"east":{"uv":[26,14,28,26],"texture":0},"south":{"uv":[32,14,34,26],"texture":0},"west":{"uv":[30,14,32,26],"texture":0},"up":{"uv":[30,14,28,12],"texture":0},"down":{"uv":[32,12,30,14],"texture":0}},"type":"cube","uuid":"d1290be5-8199-26db-4d74-56ab4ce7a42b"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[7,-10.25,-0.25],"to":[9,1.75,1.75],"autouv":0,"color":9,"rotation":[-22.499999999999993,0,0],"origin":[7,-0.25,0.75],"uv_offset":[26,26],"faces":{"north":{"uv":[28,28,30,40],"texture":0},"east":{"uv":[26,28,28,40],"texture":0},"south":{"uv":[32,28,34,40],"texture":0},"west":{"uv":[30,28,32,40],"texture":0},"up":{"uv":[30,28,28,26],"texture":0},"down":{"uv":[32,26,30,28],"texture":0}},"type":"cube","uuid":"aa8eddb7-8e0e-d4ff-b74d-72c656fa8b0d"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-3,-9.25,2],"to":[-3,2.75,15],"autouv":0,"color":9,"rotation":[-89.99999999999987,67.49999999999983,-89.99999999999987],"origin":[-5,0.75,3],"uv_offset":[0,4],"faces":{"north":{"uv":[13,17,13,29],"texture":0},"east":{"uv":[0,17,13,29],"texture":0},"south":{"uv":[26,17,26,29],"texture":0},"west":{"uv":[13,17,26,29],"texture":0},"up":{"uv":[13,17,13,4],"texture":0},"down":{"uv":[13,4,13,17],"texture":0}},"type":"cube","uuid":"2492b102-0739-eb6b-6f8b-9d4f4257e14d"}],"outliner":[{"name":"main","origin":[0,0,0],"color":0,"uuid":"bd25bbe8-40aa-ed12-3591-9ffb250af5a9","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["9482d1d7-c911-59b0-dbfb-5dd3841c3e0a","713584b1-ddcf-1051-9bde-ac0ae339823a",{"name":"fishing_net","origin":[-5,-0.25,3.75],"color":0,"uuid":"d7ae6433-87cd-59f2-a6b5-8c154262e591","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["d1290be5-8199-26db-4d74-56ab4ce7a42b","2492b102-0739-eb6b-6f8b-9d4f4257e14d","aa8eddb7-8e0e-d4ff-b74d-72c656fa8b0d"]}]}],"textures":[{"path":"/home/thepigcat/IdeaProjects/Nautec/src/main/resources/assets/nautec/textures/entity/fishing_net_1.png","name":"fishing_net_1.png","folder":"block","namespace":"","id":"0","group":"","width":64,"height":64,"uv_width":64,"uv_height":64,"particle":false,"use_as_default":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"a9d13620-4c06-76cf-b3e4-3d1077c59bb6","relative_path":"../../textures/entity/fishing_net_1.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAspJREFUeF7tWruOwjAQJB0lEiUlfAkldPCflJR8CZSUSJR0OY11Ey0rJwvKxZtzHAkR/Ii9s7OztkM1+70Oh0ON29frFT685vP5bLVazR6PR1OOMlzL5TKUf3uh3+12exuj7RlyLnJOsn1XG9ZdLpcqNkZTCAAs41EP4/Gh8fiWFwBhGUGTgLEtAGC5BpyO6AI21rervQnAbrcLALR5PmY820oQPgWAfckgPTZ/w1DeyzL0JwgSMLI1xmaUaSAaBmy32xACfLBEWBt/v9/fwqStj/QInxcLpy4GaE/3BaEVgG/juG97AM5w0pRH+el0isZs33F1/ySDxCZNxlFkKYoEpQAwBQbIjAJdkcKWHQOkyGqx1akUYGgRbktjfTUhmQZQ9GKCh8yAS+uAXJdkDQC9/Xw+39JwdgBouso0yDqd5wnCv2eANp6aMJRhn2pDMg2IAQAGnM9ntzlgTskGx16DYseU55H23FaCoPxisQjjxzY+XkxIxgBst+U2WQPhBkBd12EXiBy8Xq+bfPzX98fj8e2cAAPJtOcGAGPier3Wm80mMGKIe4QAQaUGMBQQGqmWvq0aACZUVRUAGOK+CwDPbFClCoH9fh/ED97WJzyTZQDTIABx14AhaC+fyZUfGQDaj0IEvUJAboAmEQI8dR4dA5gWUoUAPS+PuzEHNw1IFQJMsQScjBjNbnBoBox+Ozw0APLNE3SAGYCp0C0EPj046NtOHopiSYxXYhIEr1BIthuUDNAAjCIN9vWw1R8AsA3fD5IBkwFA7v6KBkxNAyYvghIAnQahDSULJHob7HYqLLOA3ApjQiULOL4gSbYQ0v9B0n9ty14DrIWSV30yBngZaI1bALAQyr2+MCB3D1v2FQZYCOVeXxiQu4ct+woDLIRyry8MyN3Dln2FARZCudcXBuTuYcu+wgALodzrCwNy97BlX2GAhVDu9T/BVHtuJ/Ko3gAAAABJRU5ErkJggg=="}]}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6327c09

Please sign in to comment.