From eb508602e23e781b7a9b28d4b44118b692a15255 Mon Sep 17 00:00:00 2001 From: Luiz Feikes <33578169+Luligabi1@users.noreply.github.com> Date: Thu, 14 Mar 2024 01:27:52 -0300 Subject: [PATCH] Missing files --- .../rei/category/CrushingDisplayCategory.kt | 4 ++-- build.gradle | 19 ++++++++++++++----- gradle.properties | 11 ++++------- .../effects/FeatherFallingEffect.kt | 2 -- .../models/block/matter_condenser.bbmodel | 2 +- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/base/src/main/kotlin/dev/nathanpb/dml/compat/rei/category/CrushingDisplayCategory.kt b/base/src/main/kotlin/dev/nathanpb/dml/compat/rei/category/CrushingDisplayCategory.kt index 29f595d5..b9cda008 100644 --- a/base/src/main/kotlin/dev/nathanpb/dml/compat/rei/category/CrushingDisplayCategory.kt +++ b/base/src/main/kotlin/dev/nathanpb/dml/compat/rei/category/CrushingDisplayCategory.kt @@ -22,8 +22,8 @@ package dev.nathanpb.dml.compat.rei.category import dev.nathanpb.dml.MOD_ID import dev.nathanpb.dml.compat.rei.ReiPlugin import dev.nathanpb.dml.compat.rei.display.CrushingRecipeDisplay -import dev.nathanpb.dml.compat.rei.widgets.EntityDisplayWidget import dev.nathanpb.dml.compat.rei.itemStack +import dev.nathanpb.dml.compat.rei.widgets.EntityDisplayWidget import dev.nathanpb.dml.item.ITEM_SOOT_REDSTONE import me.shedaniel.math.Point import me.shedaniel.math.Rectangle @@ -69,7 +69,7 @@ class CrushingDisplayCategory: DisplayCategory { blockSlot, Widgets.createSlot(Point(startPoint.x + 80, startPoint.y + 38)).entries(output.flatten()) ).also { widgets -> - MinecraftClient.getInstance().player?.let { player -> + MinecraftClient.getInstance().player?.let { player -> // FIXME swing is seen on actual player EntityDisplayWidget( listOf(player), startPoint.x + 24, diff --git a/build.gradle b/build.gradle index 24d8dbb0..9f63b171 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.4-SNAPSHOT' + id 'fabric-loom' version '1.2-SNAPSHOT' id 'maven-publish' id 'org.jetbrains.kotlin.jvm' version '1.8.22' id 'com.matthewprenger.cursegradle' version '1.4.0' @@ -21,13 +21,17 @@ def RELEASE_TYPE = @SuppressWarnings('GrMethodMayBeStatic') def getChangeLog() { - return "https://github.com/CafeteriaGuild/DeepMobLearning-Refabricated/releases/tag/${URLEncoder.encode(project.mod_version, "utf-8")}" + return "" } +def ENV = System.getenv() + repositories { maven { url = "https://jitpack.io" } maven { url = "https://maven.terraformersmc.com/releases/" } + maven { url = "https://maven.cafeteria.dev/releases/" } + maven { url = "https://maven.cafeteria.dev/" } } dependencies { @@ -134,7 +138,10 @@ jar { } curseforge { - apiKey = project.property("curseforgeToken") + if(ENV.CURSEFORGE_API_KEY) { + apiKey = ENV.CURSEFORGE_API_KEY + } + project { id = project.curseforge_id changelog = getChangeLog() @@ -164,10 +171,12 @@ curseforge { } modrinth { - token = project.property("modrinthToken") + if(ENV.MODRINTH_TOKEN) { + token = ENV.MODRINTH_TOKEN + } projectId = project.modrinth_id - versionNumber = project.mod_version + "+" + project.minecraft_version + versionNumber = project.mod_version uploadFile = remapJar gameVersions = [project.minecraft_version] loaders = ['fabric'] diff --git a/gradle.properties b/gradle.properties index 39dd2dd9..3d14bd50 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ kotlin.code.style=official org.gradle.jvmargs=-Xmx2G +org.gradle.configureondemand=false fabric.loom.multiProjectOptimisation=true # Fabric Properties @@ -10,11 +11,10 @@ loader_version=0.14.22 #Fabric api fabric_version=0.87.0+1.20.1 -loom_version=1.4 +loom_version=1.5 # Mod Properties -# !!! Do not change mod_version manually !!! -mod_version=0.5.14-BETA+1.20.1 +mod_version=0.6.0-BETA+1.20.1 maven_group=dev.nathanpb archives_base_name=deepmoblearning-refabricated curseforge_id=398614 @@ -34,7 +34,4 @@ mixinextrasVersion=0.1.1 modmenuVersion=7.0.0 mcdUsername=mcd -mcdPassword=mcd - -curseforgeToken=1 -modrinthToken=1 \ No newline at end of file +mcdPassword=mcd \ No newline at end of file diff --git a/modular-armor/src/main/kotlin/dev/nathanpb/dml/modular_armor/effects/FeatherFallingEffect.kt b/modular-armor/src/main/kotlin/dev/nathanpb/dml/modular_armor/effects/FeatherFallingEffect.kt index 253c87c4..11bf26a4 100644 --- a/modular-armor/src/main/kotlin/dev/nathanpb/dml/modular_armor/effects/FeatherFallingEffect.kt +++ b/modular-armor/src/main/kotlin/dev/nathanpb/dml/modular_armor/effects/FeatherFallingEffect.kt @@ -41,8 +41,6 @@ class FeatherFallingEffect : ProtectionLikeEffect( override fun protectsAgainst(world: World, source: DamageSource) = source.isIn(DamageTypeTags.IS_FALL) - // FIXME scale protection - override fun acceptTier(tier: DataModelTier) = !tier.isMaxTier() override fun minimumTier(): DataModelTier = DataModelTier.FAULTY } diff --git a/modular-armor/src/main/resources/assets/dml-refabricated/models/block/matter_condenser.bbmodel b/modular-armor/src/main/resources/assets/dml-refabricated/models/block/matter_condenser.bbmodel index 267ac9dc..2d48e435 100644 --- a/modular-armor/src/main/resources/assets/dml-refabricated/models/block/matter_condenser.bbmodel +++ b/modular-armor/src/main/resources/assets/dml-refabricated/models/block/matter_condenser.bbmodel @@ -1 +1 @@ -{"meta":{"format_version":"4.5","model_format":"java_block","box_uv":false},"name":"matter_condenser","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":16,"height":16},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[15,15,1],"to":[16,16,15],"autouv":0,"color":6,"origin":[38,23,13],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"8f314d7c-0284-5b58-a5c8-059f0580b0fe"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,15,1],"to":[1,16,15],"autouv":0,"color":6,"origin":[23,23,13],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"f369c83b-24ab-a65b-76e6-6dd33d755c9e"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,15,15],"to":[16,16,16],"autouv":0,"color":1,"origin":[23,23,23],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"e5e14e48-2a39-ed1e-4aea-cdeb3bf30dc4"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,15,0],"to":[16,16,1],"autouv":0,"color":6,"origin":[23,23,8],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"1a73d46c-9f0a-fc0e-cfa6-885523333e42"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,0,0],"to":[16,1,1],"autouv":0,"color":6,"origin":[23,8,8],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"dedba926-9311-d91b-bd6d-a761fcbea106"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,0,15],"to":[16,1,16],"autouv":0,"color":5,"origin":[23,8,23],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"1c7a5142-a1c9-982a-a107-0adf0a6388a6"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,0,1],"to":[1,1,15],"autouv":0,"color":7,"origin":[23,8,13],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"c806a2a7-9b3e-10eb-7998-29dab77e8778"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[15,0,1],"to":[16,1,15],"autouv":0,"color":2,"origin":[38,8,13],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"a35d19ee-f97f-b590-b661-7886cc4f2138"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,1,15],"to":[1,15,16],"autouv":0,"color":1,"origin":[8,9,23],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"0da60000-d571-6b75-6a74-55a6f56fb793"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,1,0],"to":[1,15,1],"autouv":0,"color":3,"origin":[8,9,8],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"483e6ac3-3083-6890-3fc0-e0bbbc30aa40"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[15,1,15],"to":[16,15,16],"autouv":0,"color":2,"origin":[23,9,23],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"c25b44a9-bede-d01c-5c6e-eea7575ed07f"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[15,1,0],"to":[16,15,1],"autouv":0,"color":6,"origin":[23,9,8],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"71dc9f3b-5ea3-b106-f8e1-ba09fc814366"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[1,11,1],"to":[15,15,15],"autouv":0,"color":5,"origin":[9,9,9],"faces":{"north":{"uv":[2,0,3,1],"texture":0},"east":{"uv":[2,0,3,1],"texture":0},"south":{"uv":[2,0,3,1],"texture":0},"west":{"uv":[2,0,3,1],"texture":0},"up":{"uv":[2,0,3,1],"texture":0},"down":{"uv":[2,0,3,1],"texture":0}},"type":"cube","uuid":"c8687a5b-8dcc-051c-8e8d-4b3277618abe"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[1,1,1],"to":[15,5,15],"autouv":0,"color":5,"origin":[9,-1,9],"faces":{"north":{"uv":[2,0,3,1],"texture":0},"east":{"uv":[2,0,3,1],"texture":0},"south":{"uv":[2,0,3,1],"texture":0},"west":{"uv":[2,0,3,1],"texture":0},"up":{"uv":[2,0,3,1],"texture":0},"down":{"uv":[2,0,3,1],"texture":0}},"type":"cube","uuid":"90fc4a76-0d24-8589-3c5d-6b64d3ba3e79"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[2,10,2],"to":[4,11,14],"autouv":0,"color":5,"origin":[10,5,9],"faces":{"north":{"uv":[0,1,1,2],"texture":0},"east":{"uv":[0,1,1,2],"texture":0},"south":{"uv":[0,1,1,2],"texture":0},"west":{"uv":[0,1,1,2],"texture":0},"up":{"uv":[0,1,1,2],"texture":0},"down":{"uv":[0,1,1,2],"texture":0}},"type":"cube","uuid":"c5f581c8-a7aa-44e6-2283-c53e3c7af0f6"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[2,5,2],"to":[4,6,14],"autouv":0,"color":0,"origin":[10,0,9],"faces":{"north":{"uv":[0,1,1,2],"texture":0},"east":{"uv":[0,1,1,2],"texture":0},"south":{"uv":[0,1,1,2],"texture":0},"west":{"uv":[0,1,1,2],"texture":0},"up":{"uv":[0,1,1,2],"texture":0},"down":{"uv":[0,1,1,2],"texture":0}},"type":"cube","uuid":"67b95bac-18ee-c5e5-c00e-2be649c28b95"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4,10,2],"to":[12,11,4],"autouv":0,"color":6,"origin":[9,5,10],"faces":{"north":{"uv":[0,1,1,2],"rotation":90,"texture":0},"east":{"uv":[0,1,1,2],"rotation":90,"texture":0},"south":{"uv":[0,1,1,2],"rotation":90,"texture":0},"west":{"uv":[0,1,1,2],"rotation":90,"texture":0},"up":{"uv":[0,1,1,2],"rotation":90,"texture":0},"down":{"uv":[0,1,1,2],"rotation":90,"texture":0}},"type":"cube","uuid":"67da9ab2-6a9b-78f5-7b09-683eda891891"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4,5,2],"to":[12,6,4],"autouv":0,"color":3,"origin":[9,0,10],"faces":{"north":{"uv":[0,1,1,2],"rotation":90,"texture":0},"east":{"uv":[0,1,1,2],"rotation":90,"texture":0},"south":{"uv":[0,1,1,2],"rotation":90,"texture":0},"west":{"uv":[0,1,1,2],"rotation":90,"texture":0},"up":{"uv":[0,1,1,2],"rotation":90,"texture":0},"down":{"uv":[0,1,1,2],"rotation":90,"texture":0}},"type":"cube","uuid":"4f38ba4e-74bc-5520-9b14-939c24974ec8"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4,10,12],"to":[12,11,14],"autouv":0,"color":2,"origin":[9,5,20],"faces":{"north":{"uv":[0,1,1,2],"rotation":90,"texture":0},"east":{"uv":[0,1,1,2],"rotation":90,"texture":0},"south":{"uv":[0,1,1,2],"rotation":90,"texture":0},"west":{"uv":[0,1,1,2],"rotation":90,"texture":0},"up":{"uv":[0,1,1,2],"rotation":90,"texture":0},"down":{"uv":[0,1,1,2],"rotation":90,"texture":0}},"type":"cube","uuid":"b73f3bce-3ae0-69d4-c93c-7e326d451ea2"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4,5,12],"to":[12,6,14],"autouv":0,"color":3,"origin":[9,0,20],"faces":{"north":{"uv":[0,1,1,2],"rotation":90,"texture":0},"east":{"uv":[0,1,1,2],"rotation":90,"texture":0},"south":{"uv":[0,1,1,2],"rotation":90,"texture":0},"west":{"uv":[0,1,1,2],"rotation":90,"texture":0},"up":{"uv":[0,1,1,2],"rotation":90,"texture":0},"down":{"uv":[0,1,1,2],"rotation":90,"texture":0}},"type":"cube","uuid":"ab5069ab-9399-54bb-1f0f-80ffd20b4580"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[12,10,2],"to":[14,11,14],"autouv":0,"color":7,"origin":[20,5,9],"faces":{"north":{"uv":[0,1,1,2],"texture":0},"east":{"uv":[0,1,1,2],"texture":0},"south":{"uv":[0,1,1,2],"texture":0},"west":{"uv":[0,1,1,2],"texture":0},"up":{"uv":[0,1,1,2],"texture":0},"down":{"uv":[0,1,1,2],"texture":0}},"type":"cube","uuid":"541cfab2-cfff-edc3-0932-9dc899ba84fe"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[12,5,2],"to":[14,6,14],"autouv":0,"color":7,"origin":[20,0,9],"faces":{"north":{"uv":[0,1,1,2],"texture":0},"east":{"uv":[0,1,1,2],"texture":0},"south":{"uv":[0,1,1,2],"texture":0},"west":{"uv":[0,1,1,2],"texture":0},"up":{"uv":[0,1,1,2],"texture":0},"down":{"uv":[0,1,1,2],"texture":0}},"type":"cube","uuid":"e64f513a-0129-3533-6b02-1410370764b6"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[7,7,7],"to":[9,9,9],"autouv":0,"color":6,"origin":[15,15,15],"faces":{"north":{"uv":[1,0,2,1],"texture":0},"east":{"uv":[1,0,2,1],"texture":0},"south":{"uv":[1,0,2,1],"texture":0},"west":{"uv":[1,0,2,1],"texture":0},"up":{"uv":[1,0,2,1],"texture":0},"down":{"uv":[1,0,2,1],"texture":0}},"type":"cube","uuid":"fe3fefb3-6a1e-4720-e97b-9d321b1bda7a"}],"outliner":[{"name":"Outline","origin":[38,8,13],"color":0,"uuid":"3b3ef1d0-b339-abe4-d81d-4ec3f00fc9cd","export":true,"mirror_uv":false,"isOpen":false,"locked":false,"visibility":true,"autouv":0,"children":["8f314d7c-0284-5b58-a5c8-059f0580b0fe","f369c83b-24ab-a65b-76e6-6dd33d755c9e","e5e14e48-2a39-ed1e-4aea-cdeb3bf30dc4","1a73d46c-9f0a-fc0e-cfa6-885523333e42","dedba926-9311-d91b-bd6d-a761fcbea106","1c7a5142-a1c9-982a-a107-0adf0a6388a6","c806a2a7-9b3e-10eb-7998-29dab77e8778","a35d19ee-f97f-b590-b661-7886cc4f2138","0da60000-d571-6b75-6a74-55a6f56fb793","483e6ac3-3083-6890-3fc0-e0bbbc30aa40","c25b44a9-bede-d01c-5c6e-eea7575ed07f","71dc9f3b-5ea3-b106-f8e1-ba09fc814366"]},{"name":"Cube","origin":[8,8,8],"color":0,"uuid":"cfc0a6b3-0847-57a8-137b-6c8d736062d6","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["c8687a5b-8dcc-051c-8e8d-4b3277618abe","90fc4a76-0d24-8589-3c5d-6b64d3ba3e79","c5f581c8-a7aa-44e6-2283-c53e3c7af0f6","67b95bac-18ee-c5e5-c00e-2be649c28b95","67da9ab2-6a9b-78f5-7b09-683eda891891","4f38ba4e-74bc-5520-9b14-939c24974ec8","b73f3bce-3ae0-69d4-c93c-7e326d451ea2","ab5069ab-9399-54bb-1f0f-80ffd20b4580","541cfab2-cfff-edc3-0932-9dc899ba84fe","e64f513a-0129-3533-6b02-1410370764b6"]},"fe3fefb3-6a1e-4720-e97b-9d321b1bda7a"],"textures":[{"path":"C:\\Users\\Luli\\IdeaProjects\\DeepMobLearning-Refabricated\\base\\src\\main\\resources\\assets\\dml-refabricated\\textures\\block\\palette.png","name":"palette.png","folder":"block","namespace":"dml-refabricated","id":"0","particle":true,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"42f1fe9e-e681-90e8-c349-f6cd0b49a1f1","relative_path":"../../../../../../../../../base/src/main/resources/assets/dml-refabricated/textures/block/palette.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAADpJREFUOE9jZPlz5H/cHWuG9ZZCDO/fv2dkIBEwHnN3/2+1cyfJGmH2kK1x1ABEVI0GIgPDaBhQIQwAk1kMEUrJZicAAAAASUVORK5CYII="}],"display":{"thirdperson_righthand":{"rotation":[67,45.5,0],"translation":[0,2.5,-0.5],"scale":[0.3,0.3,0.3]},"thirdperson_lefthand":{"rotation":[67,45.5,0],"translation":[0,2.5,-0.5],"scale":[0.3,0.3,0.3]},"firstperson_righthand":{"rotation":[5,60,0],"translation":[0,0.5,0.25],"scale":[0.5,0.5,0.5]},"firstperson_lefthand":{"rotation":[5,60,0],"translation":[0,0.5,0.25],"scale":[0.5,0.5,0.5]},"ground":{"translation":[0,2,0],"scale":[0.3,0.3,0.3]},"gui":{"rotation":[30,50,0],"scale":[0.6,0.6,0.6]}}} \ No newline at end of file +{"meta":{"format_version":"4.9","model_format":"java_block","box_uv":false},"name":"matter_condenser","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":16,"height":16},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[15,15,1],"to":[16,16,15],"autouv":0,"color":6,"origin":[38,23,13],"faces":{"north":{"uv":[0,0,1,1],"texture":null},"east":{"uv":[0,0,1,1],"cullface":"east","texture":0},"south":{"uv":[0,0,1,1],"texture":null},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"cullface":"up","texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"8f314d7c-0284-5b58-a5c8-059f0580b0fe"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,15,1],"to":[1,16,15],"autouv":0,"color":6,"origin":[23,23,13],"faces":{"north":{"uv":[0,0,1,1],"texture":null},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":null},"west":{"uv":[0,0,1,1],"cullface":"west","texture":0},"up":{"uv":[0,0,1,1],"cullface":"up","texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"f369c83b-24ab-a65b-76e6-6dd33d755c9e"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,15,15],"to":[16,16,16],"autouv":0,"color":1,"origin":[23,23,23],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"cullface":"east","texture":0},"south":{"uv":[0,0,1,1],"cullface":"south","texture":0},"west":{"uv":[0,0,1,1],"cullface":"west","texture":0},"up":{"uv":[0,0,1,1],"cullface":"up","texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"e5e14e48-2a39-ed1e-4aea-cdeb3bf30dc4"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,15,0],"to":[16,16,1],"autouv":0,"color":6,"origin":[23,23,8],"faces":{"north":{"uv":[0,0,1,1],"cullface":"north","texture":0},"east":{"uv":[0,0,1,1],"cullface":"east","texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"cullface":"west","texture":0},"up":{"uv":[0,0,1,1],"cullface":"up","texture":0},"down":{"uv":[0,0,1,1],"texture":0}},"type":"cube","uuid":"1a73d46c-9f0a-fc0e-cfa6-885523333e42"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,0,0],"to":[16,1,1],"autouv":0,"color":6,"origin":[23,8,8],"faces":{"north":{"uv":[0,0,1,1],"cullface":"north","texture":0},"east":{"uv":[0,0,1,1],"cullface":"east","texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"cullface":"west","texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"cullface":"down","texture":0}},"type":"cube","uuid":"dedba926-9311-d91b-bd6d-a761fcbea106"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,0,15],"to":[16,1,16],"autouv":0,"color":5,"origin":[23,8,23],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"cullface":"east","texture":0},"south":{"uv":[0,0,1,1],"cullface":"south","texture":0},"west":{"uv":[0,0,1,1],"cullface":"west","texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"cullface":"down","texture":0}},"type":"cube","uuid":"1c7a5142-a1c9-982a-a107-0adf0a6388a6"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,0,1],"to":[1,1,15],"autouv":0,"color":7,"origin":[23,8,13],"faces":{"north":{"uv":[0,0,1,1],"texture":null},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":null},"west":{"uv":[0,0,1,1],"cullface":"west","texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"cullface":"down","texture":0}},"type":"cube","uuid":"c806a2a7-9b3e-10eb-7998-29dab77e8778"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[15,0,1],"to":[16,1,15],"autouv":0,"color":2,"origin":[38,8,13],"faces":{"north":{"uv":[0,0,1,1],"texture":null},"east":{"uv":[0,0,1,1],"cullface":"east","texture":0},"south":{"uv":[0,0,1,1],"texture":null},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":0},"down":{"uv":[0,0,1,1],"cullface":"down","texture":0}},"type":"cube","uuid":"a35d19ee-f97f-b590-b661-7886cc4f2138"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,1,15],"to":[1,15,16],"autouv":0,"color":1,"origin":[8,9,23],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"cullface":"south","texture":0},"west":{"uv":[0,0,1,1],"cullface":"west","texture":0},"up":{"uv":[0,0,1,1],"texture":null},"down":{"uv":[0,0,1,1],"texture":null}},"type":"cube","uuid":"0da60000-d571-6b75-6a74-55a6f56fb793"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,1,0],"to":[1,15,1],"autouv":0,"color":3,"origin":[8,9,8],"faces":{"north":{"uv":[0,0,1,1],"cullface":"north","texture":0},"east":{"uv":[0,0,1,1],"texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"cullface":"west","texture":0},"up":{"uv":[0,0,1,1],"texture":null},"down":{"uv":[0,0,1,1],"texture":null}},"type":"cube","uuid":"483e6ac3-3083-6890-3fc0-e0bbbc30aa40"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[15,1,15],"to":[16,15,16],"autouv":0,"color":2,"origin":[23,9,23],"faces":{"north":{"uv":[0,0,1,1],"texture":0},"east":{"uv":[0,0,1,1],"cullface":"east","texture":0},"south":{"uv":[0,0,1,1],"cullface":"south","texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":null},"down":{"uv":[0,0,1,1],"texture":null}},"type":"cube","uuid":"c25b44a9-bede-d01c-5c6e-eea7575ed07f"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[15,1,0],"to":[16,15,1],"autouv":0,"color":6,"origin":[23,9,8],"faces":{"north":{"uv":[0,0,1,1],"cullface":"north","texture":0},"east":{"uv":[0,0,1,1],"cullface":"east","texture":0},"south":{"uv":[0,0,1,1],"texture":0},"west":{"uv":[0,0,1,1],"texture":0},"up":{"uv":[0,0,1,1],"texture":null},"down":{"uv":[0,0,1,1],"texture":null}},"type":"cube","uuid":"71dc9f3b-5ea3-b106-f8e1-ba09fc814366"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[1,11,1],"to":[15,15,15],"autouv":0,"color":5,"origin":[9,9,9],"faces":{"north":{"uv":[2,0,3,1],"texture":0},"east":{"uv":[2,0,3,1],"texture":0},"south":{"uv":[2,0,3,1],"texture":0},"west":{"uv":[2,0,3,1],"texture":0},"up":{"uv":[2,0,3,1],"texture":0},"down":{"uv":[2,0,3,1],"texture":0}},"type":"cube","uuid":"c8687a5b-8dcc-051c-8e8d-4b3277618abe"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[1,1,1],"to":[15,5,15],"autouv":0,"color":5,"origin":[9,-1,9],"faces":{"north":{"uv":[2,0,3,1],"texture":0},"east":{"uv":[2,0,3,1],"texture":0},"south":{"uv":[2,0,3,1],"texture":0},"west":{"uv":[2,0,3,1],"texture":0},"up":{"uv":[2,0,3,1],"texture":0},"down":{"uv":[2,0,3,1],"texture":0}},"type":"cube","uuid":"90fc4a76-0d24-8589-3c5d-6b64d3ba3e79"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[2,10,2],"to":[4,11,14],"autouv":0,"color":5,"origin":[10,5,9],"faces":{"north":{"uv":[0,1,1,2],"texture":0},"east":{"uv":[0,1,1,2],"texture":0},"south":{"uv":[0,1,1,2],"texture":0},"west":{"uv":[0,1,1,2],"texture":0},"up":{"uv":[0,1,1,2],"texture":null},"down":{"uv":[0,1,1,2],"texture":0}},"type":"cube","uuid":"c5f581c8-a7aa-44e6-2283-c53e3c7af0f6"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[2,5,2],"to":[4,6,14],"autouv":0,"color":0,"origin":[10,0,9],"faces":{"north":{"uv":[0,1,1,2],"texture":0},"east":{"uv":[0,1,1,2],"texture":0},"south":{"uv":[0,1,1,2],"texture":0},"west":{"uv":[0,1,1,2],"texture":0},"up":{"uv":[0,1,1,2],"texture":0},"down":{"uv":[0,1,1,2],"texture":null}},"type":"cube","uuid":"67b95bac-18ee-c5e5-c00e-2be649c28b95"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4,10,2],"to":[12,11,4],"autouv":0,"color":6,"origin":[9,5,10],"faces":{"north":{"uv":[0,1,1,2],"rotation":90,"texture":0},"east":{"uv":[0,1,1,2],"rotation":90,"texture":null},"south":{"uv":[0,1,1,2],"rotation":90,"texture":0},"west":{"uv":[0,1,1,2],"rotation":90,"texture":null},"up":{"uv":[0,1,1,2],"rotation":90,"texture":null},"down":{"uv":[0,1,1,2],"rotation":90,"texture":0}},"type":"cube","uuid":"67da9ab2-6a9b-78f5-7b09-683eda891891"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4,5,2],"to":[12,6,4],"autouv":0,"color":3,"origin":[9,0,10],"faces":{"north":{"uv":[0,1,1,2],"rotation":90,"texture":0},"east":{"uv":[0,1,1,2],"rotation":90,"texture":null},"south":{"uv":[0,1,1,2],"rotation":90,"texture":0},"west":{"uv":[0,1,1,2],"rotation":90,"texture":null},"up":{"uv":[0,1,1,2],"rotation":90,"texture":0},"down":{"uv":[0,1,1,2],"rotation":90,"texture":null}},"type":"cube","uuid":"4f38ba4e-74bc-5520-9b14-939c24974ec8"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4,10,12],"to":[12,11,14],"autouv":0,"color":2,"origin":[9,5,20],"faces":{"north":{"uv":[0,1,1,2],"rotation":90,"texture":0},"east":{"uv":[0,1,1,2],"rotation":90,"texture":null},"south":{"uv":[0,1,1,2],"rotation":90,"texture":0},"west":{"uv":[0,1,1,2],"rotation":90,"texture":null},"up":{"uv":[0,1,1,2],"rotation":90,"texture":null},"down":{"uv":[0,1,1,2],"rotation":90,"texture":0}},"type":"cube","uuid":"b73f3bce-3ae0-69d4-c93c-7e326d451ea2"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4,5,12],"to":[12,6,14],"autouv":0,"color":3,"origin":[9,0,20],"faces":{"north":{"uv":[0,1,1,2],"rotation":90,"texture":0},"east":{"uv":[0,1,1,2],"rotation":90,"texture":null},"south":{"uv":[0,1,1,2],"rotation":90,"texture":0},"west":{"uv":[0,1,1,2],"rotation":90,"texture":null},"up":{"uv":[0,1,1,2],"rotation":90,"texture":0},"down":{"uv":[0,1,1,2],"rotation":90,"texture":null}},"type":"cube","uuid":"ab5069ab-9399-54bb-1f0f-80ffd20b4580"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[12,10,2],"to":[14,11,14],"autouv":0,"color":7,"origin":[20,5,9],"faces":{"north":{"uv":[0,1,1,2],"texture":0},"east":{"uv":[0,1,1,2],"texture":0},"south":{"uv":[0,1,1,2],"texture":0},"west":{"uv":[0,1,1,2],"texture":0},"up":{"uv":[0,1,1,2],"texture":null},"down":{"uv":[0,1,1,2],"texture":0}},"type":"cube","uuid":"541cfab2-cfff-edc3-0932-9dc899ba84fe"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[12,5,2],"to":[14,6,14],"autouv":0,"color":7,"origin":[20,0,9],"faces":{"north":{"uv":[0,1,1,2],"texture":0},"east":{"uv":[0,1,1,2],"texture":0},"south":{"uv":[0,1,1,2],"texture":0},"west":{"uv":[0,1,1,2],"texture":0},"up":{"uv":[0,1,1,2],"texture":0},"down":{"uv":[0,1,1,2],"texture":null}},"type":"cube","uuid":"e64f513a-0129-3533-6b02-1410370764b6"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[10,7,10],"to":[12,9,12],"autouv":0,"color":6,"origin":[15,15,15],"faces":{"north":{"uv":[1,0,2,1],"texture":0},"east":{"uv":[1,0,2,1],"texture":0},"south":{"uv":[1,0,2,1],"texture":0},"west":{"uv":[1,0,2,1],"texture":0},"up":{"uv":[1,0,2,1],"texture":0},"down":{"uv":[1,0,2,1],"texture":0}},"type":"cube","uuid":"fe3fefb3-6a1e-4720-e97b-9d321b1bda7a"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4,7,4],"to":[6,9,6],"autouv":0,"color":6,"origin":[15,15,15],"faces":{"north":{"uv":[1,0,2,1],"texture":0},"east":{"uv":[1,0,2,1],"texture":0},"south":{"uv":[1,0,2,1],"texture":0},"west":{"uv":[1,0,2,1],"texture":0},"up":{"uv":[1,0,2,1],"texture":0},"down":{"uv":[1,0,2,1],"texture":0}},"type":"cube","uuid":"782472f8-b6f3-a7ec-46e4-b1921d718256"}],"outliner":[{"name":"Outline","origin":[38,8,13],"color":0,"uuid":"3b3ef1d0-b339-abe4-d81d-4ec3f00fc9cd","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["8f314d7c-0284-5b58-a5c8-059f0580b0fe","f369c83b-24ab-a65b-76e6-6dd33d755c9e","e5e14e48-2a39-ed1e-4aea-cdeb3bf30dc4","1a73d46c-9f0a-fc0e-cfa6-885523333e42","dedba926-9311-d91b-bd6d-a761fcbea106","1c7a5142-a1c9-982a-a107-0adf0a6388a6","c806a2a7-9b3e-10eb-7998-29dab77e8778","a35d19ee-f97f-b590-b661-7886cc4f2138","0da60000-d571-6b75-6a74-55a6f56fb793","483e6ac3-3083-6890-3fc0-e0bbbc30aa40","c25b44a9-bede-d01c-5c6e-eea7575ed07f","71dc9f3b-5ea3-b106-f8e1-ba09fc814366"]},{"name":"Cube","origin":[8,8,8],"color":0,"uuid":"cfc0a6b3-0847-57a8-137b-6c8d736062d6","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["c8687a5b-8dcc-051c-8e8d-4b3277618abe","90fc4a76-0d24-8589-3c5d-6b64d3ba3e79","c5f581c8-a7aa-44e6-2283-c53e3c7af0f6","67b95bac-18ee-c5e5-c00e-2be649c28b95","67da9ab2-6a9b-78f5-7b09-683eda891891","4f38ba4e-74bc-5520-9b14-939c24974ec8","b73f3bce-3ae0-69d4-c93c-7e326d451ea2","ab5069ab-9399-54bb-1f0f-80ffd20b4580","541cfab2-cfff-edc3-0932-9dc899ba84fe","e64f513a-0129-3533-6b02-1410370764b6"]},"fe3fefb3-6a1e-4720-e97b-9d321b1bda7a","782472f8-b6f3-a7ec-46e4-b1921d718256"],"textures":[{"path":"C:\\Users\\Luli\\IdeaProjects\\DeepMobLearning-Refabricated\\base\\src\\main\\resources\\assets\\dml-refabricated\\textures\\block\\palette.png","name":"palette.png","folder":"block","namespace":"dml-refabricated","id":"0","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":true,"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":"42f1fe9e-e681-90e8-c349-f6cd0b49a1f1","relative_path":"../../../../../../../../../base/src/main/resources/assets/dml-refabricated/textures/block/palette.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAD9JREFUOE9jZPlz5H/cHWuG9ZZCDO/fv2dkIBEwHnN3/282aS8Di/ofkjWD7CJLE7IjRw0YDcTRhATJERTnBQBW9Q0ROEtxgQAAAABJRU5ErkJggg=="}],"display":{"thirdperson_righthand":{"rotation":[67,45.5,0],"translation":[0,2.5,-0.5],"scale":[0.3,0.3,0.3]},"thirdperson_lefthand":{"rotation":[67,45.5,0],"translation":[0,2.5,-0.5],"scale":[0.3,0.3,0.3]},"firstperson_righthand":{"rotation":[5,60,0],"translation":[0,0.5,0.25],"scale":[0.5,0.5,0.5]},"firstperson_lefthand":{"rotation":[5,60,0],"translation":[0,0.5,0.25],"scale":[0.5,0.5,0.5]},"ground":{"translation":[0,2,0],"scale":[0.3,0.3,0.3]},"gui":{"rotation":[30,50,0],"scale":[0.6,0.6,0.6]}}} \ No newline at end of file