diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea40e0a..88781ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,9 +11,13 @@ build: - cd datapacks - mkdir out - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I '{}' sh -c 'cd {} && zip -r ../out/{} .' + + - cd ../resourcepack + - zip -r ../resourcepack-out/resourcepack . artifacts: paths: - ./datapacks/out + - ./resourcepack-out deploy: stage: deploy @@ -33,4 +37,4 @@ deploy: - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "minecraft:reload" only: - - master \ No newline at end of file + - master diff --git a/resourcepack/assets/minecraft/models/block/hopper_down.json b/resourcepack/assets/minecraft/models/block/hopper_down.json new file mode 100755 index 0000000..1c28ee9 --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/hopper_down.json @@ -0,0 +1,235 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/hopper_outside", + "top": "block/hopper_top", + "side": "block/hopper_outside", + "inside": "block/hopper_inside" + }, + "elements": [ + { + "from": [ + 0, + 10, + 0 + ], + "to": [ + 16, + 11, + 16 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#inside" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + }, + { + "from": [ + 0, + 11, + 0 + ], + "to": [ + 2, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#top" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + }, + { + "from": [ + 14, + 11, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#top" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + }, + { + "from": [ + 2, + 11, + 0 + ], + "to": [ + 14, + 16, + 2 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#top" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + }, + { + "from": [ + 2, + 11, + 14 + ], + "to": [ + 14, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#top" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + }, + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 10, + 12 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#side" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + }, + { + "from": [ + 6, + 0, + 6 + ], + "to": [ + 10, + 4, + 10 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#side" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + } + ] +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/block/hopper_side.json b/resourcepack/assets/minecraft/models/block/hopper_side.json new file mode 100755 index 0000000..0b4575b --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/hopper_side.json @@ -0,0 +1,235 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/hopper_outside", + "top": "block/hopper_top", + "side": "block/hopper_outside", + "inside": "block/hopper_inside_side" + }, + "elements": [ + { + "from": [ + 0, + 10, + 0 + ], + "to": [ + 16, + 11, + 16 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#inside" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + }, + { + "from": [ + 0, + 11, + 0 + ], + "to": [ + 2, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#top" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + }, + { + "from": [ + 14, + 11, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#top" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + }, + { + "from": [ + 2, + 11, + 0 + ], + "to": [ + 14, + 16, + 2 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#top" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + }, + { + "from": [ + 2, + 11, + 14 + ], + "to": [ + 14, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#top" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + }, + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 10, + 12 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#side" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + }, + { + "from": [ + 6, + 4, + 0 + ], + "to": [ + 10, + 8, + 4 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#side" + }, + "north": { + "texture": "#side" + }, + "south": { + "texture": "#side" + }, + "west": { + "texture": "#side" + }, + "east": { + "texture": "#side" + } + } + } + ] +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/block/observer.json b/resourcepack/assets/minecraft/models/block/observer.json new file mode 100755 index 0000000..62ec5c1 --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/observer.json @@ -0,0 +1,86 @@ +{ + "parent": "block/block", + "textures": { + "bottom": "block/observer_back", + "side": "block/observer_side", + "top": "block/observer_top", + "front": "block/observer_front", + "particle": "block/observer_front" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 16, + 16, + 0 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#front", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 16, + 0, + 0 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 0 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/block/observer_on.json b/resourcepack/assets/minecraft/models/block/observer_on.json new file mode 100644 index 0000000..f7e43a8 --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/observer_on.json @@ -0,0 +1,85 @@ +{ + "parent": "block/observer", + "textures": { + "bottom": "block/observer_back_on", + "front": "block/observer_front_powered", + "side": "block/observer_side_powered", + "top": "block/observer_top_powered" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 16, + 16, + 0 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#front", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 16, + 0, + 0 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 0 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/block/observer_powered.json b/resourcepack/assets/minecraft/models/block/observer_powered.json new file mode 100755 index 0000000..4c722f0 --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/observer_powered.json @@ -0,0 +1,85 @@ +{ + "parent": "block/observer", + "textures": { + "bottom": "block/observer_back_on", + "front": "block/observer_front_powered", + "side": "block/observer_side_powered", + "top": "block/observer_top_powered" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 16, + 16, + 0 + ], + "texture": "#top", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#front", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "south" + }, + "west": { + "uv": [ + 16, + 16, + 0, + 0 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 16, + 16, + 0 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/block/piston_head_different_arm_tex.json b/resourcepack/assets/minecraft/models/block/piston_head_different_arm_tex.json new file mode 100755 index 0000000..a7f8529 --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/piston_head_different_arm_tex.json @@ -0,0 +1,135 @@ +{ + "textures": { + "particle": "#platform" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 4 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 4 + ], + "texture": "#side", + "cullface": "down", + "rotation": 180 + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4 + ], + "texture": "#side", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#platform", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#unsticky" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4 + ], + "texture": "#side", + "rotation": 270, + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4 + ], + "texture": "#side", + "rotation": 90, + "cullface": "east" + } + } + }, + { + "from": [ + 6, + 6, + 4 + ], + "to": [ + 10, + 10, + 20 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 4 + ], + "texture": "#arm", + "rotation": 90 + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4 + ], + "texture": "#arm", + "rotation": 270 + }, + "west": { + "uv": [ + 16, + 4, + 0, + 0 + ], + "texture": "#arm" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4 + ], + "texture": "#arm" + } + } + } + ] +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/block/piston_head_short_different_arm_tex.json b/resourcepack/assets/minecraft/models/block/piston_head_short_different_arm_tex.json new file mode 100755 index 0000000..3ef035a --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/piston_head_short_different_arm_tex.json @@ -0,0 +1,135 @@ +{ + "textures": { + "particle": "#platform" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 4 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 4 + ], + "texture": "#side", + "cullface": "down", + "rotation": 180 + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4 + ], + "texture": "#side", + "cullface": "up" + }, + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#platform", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#unsticky" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4 + ], + "texture": "#side", + "rotation": 270, + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4 + ], + "texture": "#side", + "rotation": 90, + "cullface": "east" + } + } + }, + { + "from": [ + 6, + 6, + 4 + ], + "to": [ + 10, + 10, + 16 + ], + "faces": { + "down": { + "uv": [ + 4, + 0, + 16, + 4 + ], + "texture": "#arm", + "rotation": 90 + }, + "up": { + "uv": [ + 4, + 0, + 16, + 4 + ], + "texture": "#arm", + "rotation": 270 + }, + "west": { + "uv": [ + 16, + 4, + 4, + 0 + ], + "texture": "#arm" + }, + "east": { + "uv": [ + 4, + 0, + 16, + 4 + ], + "texture": "#arm" + } + } + } + ] +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/block/piston_head_short_sticky.json b/resourcepack/assets/minecraft/models/block/piston_head_short_sticky.json new file mode 100755 index 0000000..e264f1f --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/piston_head_short_sticky.json @@ -0,0 +1,9 @@ +{ + "parent": "block/piston_head_short", + "textures": { + "unsticky": "block/piston_top_sticky", + "side": "block/piston_side_sticky", + "platform": "block/piston_top_sticky", + "arm": "block/piston_side" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/block/piston_head_sticky.json b/resourcepack/assets/minecraft/models/block/piston_head_sticky.json new file mode 100755 index 0000000..e3915b9 --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/piston_head_sticky.json @@ -0,0 +1,9 @@ +{ + "parent": "block/piston_head_different_arm_tex", + "textures": { + "unsticky": "block/piston_top_sticky", + "side": "block/piston_side_sticky", + "platform": "block/piston_top_sticky", + "arm": "block/piston_side" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/block/piston_inventory_sticky.json b/resourcepack/assets/minecraft/models/block/piston_inventory_sticky.json new file mode 100755 index 0000000..0be936a --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/piston_inventory_sticky.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "bottom": "block/piston_bottom", + "side": "block/piston_side_sticky", + "top": "block/piston_top_sticky" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/block/sticky_piston.json b/resourcepack/assets/minecraft/models/block/sticky_piston.json new file mode 100755 index 0000000..1e2705d --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/sticky_piston.json @@ -0,0 +1,8 @@ +{ + "parent": "block/piston", + "textures": { + "bottom": "block/piston_bottom", + "side": "block/piston_side_sticky", + "platform": "block/piston_top_sticky" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/sounds/ambient/weather/rain1.ogg b/resourcepack/assets/minecraft/sounds/ambient/weather/rain1.ogg new file mode 100755 index 0000000..7f77c99 Binary files /dev/null and b/resourcepack/assets/minecraft/sounds/ambient/weather/rain1.ogg differ diff --git a/resourcepack/assets/minecraft/sounds/ambient/weather/rain2.ogg b/resourcepack/assets/minecraft/sounds/ambient/weather/rain2.ogg new file mode 100755 index 0000000..9b55dc7 Binary files /dev/null and b/resourcepack/assets/minecraft/sounds/ambient/weather/rain2.ogg differ diff --git a/resourcepack/assets/minecraft/sounds/ambient/weather/rain3.ogg b/resourcepack/assets/minecraft/sounds/ambient/weather/rain3.ogg new file mode 100755 index 0000000..f67e150 Binary files /dev/null and b/resourcepack/assets/minecraft/sounds/ambient/weather/rain3.ogg differ diff --git a/resourcepack/assets/minecraft/sounds/ambient/weather/rain4.ogg b/resourcepack/assets/minecraft/sounds/ambient/weather/rain4.ogg new file mode 100755 index 0000000..d48ce73 Binary files /dev/null and b/resourcepack/assets/minecraft/sounds/ambient/weather/rain4.ogg differ diff --git a/resourcepack/assets/minecraft/sounds/ambient/weather/rain5.ogg b/resourcepack/assets/minecraft/sounds/ambient/weather/rain5.ogg new file mode 100755 index 0000000..5fbe077 Binary files /dev/null and b/resourcepack/assets/minecraft/sounds/ambient/weather/rain5.ogg differ diff --git a/resourcepack/assets/minecraft/sounds/ambient/weather/rain6.ogg b/resourcepack/assets/minecraft/sounds/ambient/weather/rain6.ogg new file mode 100755 index 0000000..fd010b2 Binary files /dev/null and b/resourcepack/assets/minecraft/sounds/ambient/weather/rain6.ogg differ diff --git a/resourcepack/assets/minecraft/sounds/ambient/weather/rain7.ogg b/resourcepack/assets/minecraft/sounds/ambient/weather/rain7.ogg new file mode 100755 index 0000000..b643c82 Binary files /dev/null and b/resourcepack/assets/minecraft/sounds/ambient/weather/rain7.ogg differ diff --git a/resourcepack/assets/minecraft/sounds/ambient/weather/rain8.ogg b/resourcepack/assets/minecraft/sounds/ambient/weather/rain8.ogg new file mode 100755 index 0000000..e9274b6 Binary files /dev/null and b/resourcepack/assets/minecraft/sounds/ambient/weather/rain8.ogg differ diff --git a/resourcepack/assets/minecraft/textures/block/hopper_inside_side.png b/resourcepack/assets/minecraft/textures/block/hopper_inside_side.png new file mode 100755 index 0000000..051e526 Binary files /dev/null and b/resourcepack/assets/minecraft/textures/block/hopper_inside_side.png differ diff --git a/resourcepack/assets/minecraft/textures/block/observer_front.png b/resourcepack/assets/minecraft/textures/block/observer_front.png new file mode 100755 index 0000000..851bb68 Binary files /dev/null and b/resourcepack/assets/minecraft/textures/block/observer_front.png differ diff --git a/resourcepack/assets/minecraft/textures/block/observer_front_powered.png b/resourcepack/assets/minecraft/textures/block/observer_front_powered.png new file mode 100755 index 0000000..4341ed6 Binary files /dev/null and b/resourcepack/assets/minecraft/textures/block/observer_front_powered.png differ diff --git a/resourcepack/assets/minecraft/textures/block/observer_side.png b/resourcepack/assets/minecraft/textures/block/observer_side.png new file mode 100755 index 0000000..c68370e Binary files /dev/null and b/resourcepack/assets/minecraft/textures/block/observer_side.png differ diff --git a/resourcepack/assets/minecraft/textures/block/observer_side_powered.png b/resourcepack/assets/minecraft/textures/block/observer_side_powered.png new file mode 100755 index 0000000..1f53aa3 Binary files /dev/null and b/resourcepack/assets/minecraft/textures/block/observer_side_powered.png differ diff --git a/resourcepack/assets/minecraft/textures/block/observer_top.png b/resourcepack/assets/minecraft/textures/block/observer_top.png new file mode 100755 index 0000000..924e2d6 Binary files /dev/null and b/resourcepack/assets/minecraft/textures/block/observer_top.png differ diff --git a/resourcepack/assets/minecraft/textures/block/observer_top_powered.png b/resourcepack/assets/minecraft/textures/block/observer_top_powered.png new file mode 100755 index 0000000..e4bc18d Binary files /dev/null and b/resourcepack/assets/minecraft/textures/block/observer_top_powered.png differ diff --git a/resourcepack/assets/minecraft/textures/block/piston_side_sticky.png b/resourcepack/assets/minecraft/textures/block/piston_side_sticky.png new file mode 100755 index 0000000..0234ec7 Binary files /dev/null and b/resourcepack/assets/minecraft/textures/block/piston_side_sticky.png differ diff --git a/resourcepack/assets/minecraft/textures/entity/iron_golem.png b/resourcepack/assets/minecraft/textures/entity/iron_golem.png new file mode 100755 index 0000000..7124f62 Binary files /dev/null and b/resourcepack/assets/minecraft/textures/entity/iron_golem.png differ diff --git a/resourcepack/assets/minecraft/textures/environment/rain.png b/resourcepack/assets/minecraft/textures/environment/rain.png new file mode 100755 index 0000000..3d54add Binary files /dev/null and b/resourcepack/assets/minecraft/textures/environment/rain.png differ diff --git a/resourcepack/assets/minecraft/textures/gui/icons.png b/resourcepack/assets/minecraft/textures/gui/icons.png new file mode 100644 index 0000000..cc4a851 Binary files /dev/null and b/resourcepack/assets/minecraft/textures/gui/icons.png differ diff --git a/resourcepack/assets/minecraft/textures/particle/particles.png b/resourcepack/assets/minecraft/textures/particle/particles.png new file mode 100755 index 0000000..dc2aab5 Binary files /dev/null and b/resourcepack/assets/minecraft/textures/particle/particles.png differ diff --git a/resourcepack/pack.mcmeta b/resourcepack/pack.mcmeta new file mode 100755 index 0000000..87b392e --- /dev/null +++ b/resourcepack/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 4, + "description": "Dodsorfas Resourcepack" + } +}