Skip to content

Commit

Permalink
update model loader namespaces, fix objs
Browse files Browse the repository at this point in the history
  • Loading branch information
TropheusJ committed Jul 17, 2023
1 parent 7485d4a commit cf18c19
Show file tree
Hide file tree
Showing 41 changed files with 81 additions and 81 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ reach_entity_attributes_version = 2.4.0
registrate_version = 1.3.61-MC1.20
milk_lib_version = 1.2.60

port_lib_version = 2.1.1058+1.20
port_lib_version = 2.1.1060+1.20
# adding a module also requires adding a dependency to the FMJ
port_lib_modules = accessors,base,entity,extensions,fake_players,networking,obj_loader,tags,transfer,models,tool_actions,client_events,brewing

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "block/block",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/blaze_burner/blaze_cage.obj",
"textures": {
Expand All @@ -17,4 +17,4 @@
"scale": [0.5, 0.5, 0.5]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "block/block",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/blaze_burner/item.obj",
"textures": {
Expand All @@ -18,4 +18,4 @@
"scale": [0.5, 0.5, 0.5]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"parent": "block/block",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/blaze_burner/campfire.obj",
"textures": {
"0": "create:block/blaze_heater_brazier",
"1": "block/campfire_fire",
"particle": "create:block/dark_metal_block"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"parent": "block/block",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/blaze_burner/campfire.obj",
"textures": {
"0": "create:block/blaze_heater_brazier_soul",
"1": "block/soul_campfire_fire",
"particle": "create:block/dark_metal_block"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"parent": "block/block",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/blaze_burner/blaze_flame.obj",
"textures": {
"0": "create:block/blaze_burner_flame"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"parent": "block/block",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/blaze_burner/blaze_rods_large.obj",
"textures": {
"0": "create:block/blaze_active"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"parent": "block/block",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/blaze_burner/blaze_rods_small.obj",
"textures": {
"0": "create:block/blaze_active"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"parent": "block/block",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/blaze_burner/blaze_rods_large.obj",
"textures": {
"0": "create:block/blaze_super"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"parent": "block/block",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/blaze_burner/blaze_rods_small.obj",
"textures": {
"0": "create:block/blaze_super"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/crushing_wheel/textures",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/crushing_wheel/crushing_wheel.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/crushing_wheel/textures",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/crushing_wheel/crushing_wheel.obj",
"display": {
Expand All @@ -15,4 +15,4 @@
"scale":[ 0.45, 0.45, 0.45 ]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"credit": "Made with Blockbench",
"loader": "forge:composite",
"loader": "porting_lib:composite",
"parent": "block/block",
"textures": {
"0": "create:block/display_link",
Expand Down Expand Up @@ -122,4 +122,4 @@
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/flywheel/flywheel",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/flywheel/flywheel_shaftless.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/flywheel/flywheel",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/flywheel/flywheel.obj",
"display": {
Expand All @@ -15,4 +15,4 @@
"scale":[ 0.4, 0.4, 0.4 ]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/large_water_wheel/textures",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/large_water_wheel/waterwheel_large.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/large_water_wheel/textures",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/large_water_wheel/waterwheel_large_extension.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/large_water_wheel/textures",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/large_water_wheel/waterwheel_large.obj",
"textures": {
Expand Down Expand Up @@ -38,4 +38,4 @@
"scale": [0.2, 0.2, 0.2]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "block/block",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/mechanical_roller/item.obj",
"textures": {
Expand Down Expand Up @@ -44,4 +44,4 @@
"scale": [0.4, 0.4, 0.4]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"parent": "block/block",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/mechanical_roller/wheel.obj",
"textures": {
"wheel": "create:block/roller_wheel"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"credit": "Made with Blockbench",
"loader": "forge:composite",
"loader": "porting_lib:composite",
"parent": "block/block",
"textures": {
"0": "create:block/nixie_tube",
Expand Down Expand Up @@ -78,4 +78,4 @@
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"loader": "forge:obj",
"loader": "porting_lib:obj",
"ambientocclusion": false,
"flip_v": true,
"model": "create:models/block/track/ascending.obj",
Expand All @@ -8,4 +8,4 @@
"1": "create:block/standard_track_mip",
"particle": "create:block/palettes/stone_types/polished/andesite_cut_polished"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/track/bogey/textures",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/track/bogey/bogey_drive.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/track/bogey/textures",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/track/bogey/bogey_drive_piston.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/track/bogey/textures",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/track/bogey/bogey_drive_wheel.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/track/bogey/textures",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/track/bogey/bogey_drive_wheel_pin.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/track/bogey/textures",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/track/bogey/bogey_frame.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/track/bogey/textures",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/track/bogey/bogey_wheel.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/track/obj_track",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/track/cross_d1_xo.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/track/obj_track",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/track/cross_d1_zo.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/track/obj_track",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/track/cross_d2_xo.obj"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "create:block/track/obj_track",
"loader": "forge:obj",
"loader": "porting_lib:obj",
"flip_v": true,
"model": "create:models/block/track/cross_d2_zo.obj"
}
}
Loading

0 comments on commit cf18c19

Please sign in to comment.