Merge pull request #39 from 1whohears/1.19.2-dev

1.19.2 dev v0.8.5

build.gradle

@@ -18,7 +18,7 @@ apply plugin: 'maven-publish'
 
 group = 'com.onewhohears.dscombat'
 archivesBaseName = 'dscombat-1.19.2'
-version = '0.8.4'
+version = '0.8.5'
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 

models/cfm56/cfm56.bbmodel

@@ -1 +1 @@
-{"meta":{"format_version":"4.5","model_format":"modded_entity","box_uv":true},"name":"cfm56","model_identifier":"cfm56","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,"from":[-5,-1,0],"to":[5,0,10],"autouv":0,"color":0,"origin":[0,0,0],"uv_offset":[0,11],"faces":{"north":{"uv":[10,21,20,22],"texture":0},"east":{"uv":[0,21,10,22],"texture":0},"south":{"uv":[30,21,40,22],"texture":0},"west":{"uv":[20,21,30,22],"texture":0},"up":{"uv":[20,21,10,11],"texture":0},"down":{"uv":[30,11,20,21],"texture":0}},"type":"cube","uuid":"e3744018-9951-4416-518c-b35175aca663"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[-6,-11,0],"to":[-5,-1,10],"autouv":0,"color":0,"origin":[0,0,0],"uv_offset":[22,22],"faces":{"north":{"uv":[32,32,33,42],"texture":0},"east":{"uv":[22,32,32,42],"texture":0},"south":{"uv":[43,32,44,42],"texture":0},"west":{"uv":[33,32,43,42],"texture":0},"up":{"uv":[33,32,32,22],"texture":0},"down":{"uv":[34,22,33,32],"texture":0}},"type":"cube","uuid":"9d088a5f-62e1-b865-e123-20063f9b19d6"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[-5,-12,0],"to":[5,-11,10],"autouv":0,"color":0,"origin":[0,-11,0],"faces":{"north":{"uv":[10,10,20,11],"texture":0},"east":{"uv":[0,10,10,11],"texture":0},"south":{"uv":[30,10,40,11],"texture":0},"west":{"uv":[20,10,30,11],"texture":0},"up":{"uv":[20,10,10,0],"texture":0},"down":{"uv":[30,0,20,10],"texture":0}},"type":"cube","uuid":"1892abff-5209-2d39-88ed-982f63690bb7"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[5,-11,0],"to":[6,-1,10],"autouv":0,"color":0,"origin":[0,0,0],"uv_offset":[0,22],"faces":{"north":{"uv":[10,32,11,42],"texture":0},"east":{"uv":[0,32,10,42],"texture":0},"south":{"uv":[21,32,22,42],"texture":0},"west":{"uv":[11,32,21,42],"texture":0},"up":{"uv":[11,32,10,22],"texture":0},"down":{"uv":[12,22,11,32],"texture":0}},"type":"cube","uuid":"30ff45aa-5ba4-eb14-012c-4879ccf7141b"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[-5,-2,-6],"to":[5,-1,0],"autouv":0,"color":0,"origin":[0,-1,-6],"uv_offset":[30,11],"faces":{"north":{"uv":[36,17,46,18],"texture":0},"east":{"uv":[30,17,36,18],"texture":0},"south":{"uv":[52,17,62,18],"texture":0},"west":{"uv":[46,17,52,18],"texture":0},"up":{"uv":[46,17,36,11],"texture":0},"down":{"uv":[56,11,46,17],"texture":0}},"type":"cube","uuid":"f038bda1-d62d-f10a-96db-793bef4160fe"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[4,-10,-6],"to":[5,-2,0],"autouv":0,"color":0,"origin":[-1,1,-6],"uv_offset":[22,42],"faces":{"north":{"uv":[28,48,29,56],"texture":0},"east":{"uv":[22,48,28,56],"texture":0},"south":{"uv":[35,48,36,56],"texture":0},"west":{"uv":[29,48,35,56],"texture":0},"up":{"uv":[29,48,28,42],"texture":0},"down":{"uv":[30,42,29,48],"texture":0}},"type":"cube","uuid":"a2ac5ee0-8190-8059-5820-ec1d0f3ca8fa"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[-5,-11,-6],"to":[5,-10,0],"autouv":0,"color":0,"origin":[0,-10,-6],"uv_offset":[30,0],"faces":{"north":{"uv":[36,6,46,7],"texture":0},"east":{"uv":[30,6,36,7],"texture":0},"south":{"uv":[52,6,62,7],"texture":0},"west":{"uv":[46,6,52,7],"texture":0},"up":{"uv":[46,6,36,0],"texture":0},"down":{"uv":[56,0,46,6],"texture":0}},"type":"cube","uuid":"48d1d782-768b-071b-fea4-c29b5d5d43a9"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[-5,-10,-6],"to":[-4,-2,0],"autouv":0,"color":0,"origin":[-10,1,-6],"uv_offset":[38,36],"faces":{"north":{"uv":[44,42,45,50],"texture":0},"east":{"uv":[38,42,44,50],"texture":0},"south":{"uv":[51,42,52,50],"texture":0},"west":{"uv":[45,42,51,50],"texture":0},"up":{"uv":[45,42,44,36],"texture":0},"down":{"uv":[46,36,45,42],"texture":0}},"type":"cube","uuid":"c56252ed-8ed1-a9e4-e720-f663cd3fae33"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[-4,-10,-10],"to":[4,-2,-6],"autouv":0,"color":0,"origin":[-10,1,-6],"uv_offset":[36,18],"faces":{"north":{"uv":[40,22,48,30],"texture":0},"east":{"uv":[36,22,40,30],"texture":0},"south":{"uv":[52,22,60,30],"texture":0},"west":{"uv":[48,22,52,30],"texture":0},"up":{"uv":[48,22,40,18],"texture":0},"down":{"uv":[56,18,48,22],"texture":0}},"type":"cube","uuid":"9638986d-cb1c-461a-1af6-3683dd2e066c"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"from":[-5,-11,4],"to":[5,-1,5],"autouv":0,"color":0,"origin":[-10,1,-6],"uv_offset":[0,42],"faces":{"north":{"uv":[1,43,11,53],"texture":0},"east":{"uv":[0,43,1,53],"texture":0},"south":{"uv":[12,43,22,53],"texture":0},"west":{"uv":[11,43,12,53],"texture":0},"up":{"uv":[11,43,1,42],"texture":0},"down":{"uv":[21,42,11,43],"texture":0}},"type":"cube","uuid":"e85d691f-ecaa-30ca-6d46-9704b748293f"}],"outliner":[{"name":"body","origin":[0,0,0],"color":0,"uuid":"b8692adc-5dec-c145-be32-d31e8861ecb4","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["e3744018-9951-4416-518c-b35175aca663","9d088a5f-62e1-b865-e123-20063f9b19d6","1892abff-5209-2d39-88ed-982f63690bb7","30ff45aa-5ba4-eb14-012c-4879ccf7141b","f038bda1-d62d-f10a-96db-793bef4160fe","a2ac5ee0-8190-8059-5820-ec1d0f3ca8fa","48d1d782-768b-071b-fea4-c29b5d5d43a9","c56252ed-8ed1-a9e4-e720-f663cd3fae33","9638986d-cb1c-461a-1af6-3683dd2e066c","e85d691f-ecaa-30ca-6d46-9704b748293f"]}],"textures":[{"path":"C:\\Users\\1whoh\\Files\\Creative\\Minecrap\\Mod_Develope\\DiamondStarCombat\\src\\main\\resources\\assets\\dscombat\\textures\\entities\\cfm56.png","name":"cfm56.png","folder":"block","namespace":"","id":"0","particle":false,"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":"1dbc4d18-8b0b-e7e5-5119-62998cb2a86f","relative_path":"../../../src/main/resources/assets/dscombat/textures/entities/cfm56.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAuBJREFUeF7tms9LG0EUx1+CIJpEU/FUKiq21NKKvbSlFDy0F/8HMRVLCv4dPeRPEAwtbaT/Qy/2UmhR6UFIodBiD/4ieDBCNbY9pGxwZHeS3flOdjab7D4vwezLezOfee87b5ZJEPi3+HypDppCZuvv3iYgQxejDxsfofHMP3vqGQceBAMAM2Ahl4MWVrUyKiddmwEMgDOAS0BVvoE+19UW47tApzTAFEUGgJJE+4CeywAxMXTgKDA3u/elkpYLvx2jKpjxElAFFM/dJmaqwUHHwQBQUujKoCnecxnAAMDjJ2cAqPKxL4Ggtt3AWuFOaYAsymhcNzFXAYG3QXQgfjWAAUgE0BbcLQNUnWSi21thtE9pGwAaQIBSEUX9CTvZryg1tJSEHyGqqpqXxwdrQNgARo4qNLp3QPVkko6mJuj3taxjLoEDECujS1iVEbLfVhmQrRzTnc+b1Pf3X8Pdn8EB+jb3hM6GM1fuIw1g6usOXf+562D5a/Ye7U/figeAyZ0y3fj+wwFg9/4MHdy+GQ8Aqeop3f30hfrPa40J14YyVJ57TBepVDwAWLNMn1RpdO+Q6skEHY+P0XkmHR8RVAmp9TwyIohM1qQN3Ad0ahs0OTnEl1YrrNudIQNAjsX2uKY7UQagcxjiDABfdyGpLx9ivH7DJWADzxrg83JV03GYNeDy8pPudqRT5162unG5BLgE/F2wbPuVmKmU9+vH6/V8O2+r4LOAGPiDh48cV1SX8y/pTXGtaV7bW5vavhE4XQHAPmkZgPg/0gCslRITdYMReQACgvVplYCcCbEAYIcg1+9K/kU0NWC1+LrlPX1ZCF8VCq6a1o5aC2ddIYJiMHYdEKUgnkUeQCvxs38XFABkq9Sx0a5Tqw9w2/rsu0OkAciEWzVDkQWAppdpsULj6tpplwAagAF43Cv0sw2iC4DaBZYB6ADCtmMAYa9A2PE5A8JegbDjcwaEvQJhx499BvwHks9XX8pjrlwAAAAASUVORK5CYII="}]}
+{"meta":{"format_version":"4.5","model_format":"modded_entity","box_uv":true},"name":"cfm56","model_identifier":"cfm56","modded_entity_version":"1.17","modded_entity_flip_y":true,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":64,"height":64},"elements":[{"name":"cube","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-5,-1,0],"to":[5,0,10],"autouv":0,"color":0,"origin":[0,0,0],"uv_offset":[0,11],"faces":{"north":{"uv":[10,21,20,22],"texture":0},"east":{"uv":[0,21,10,22],"texture":0},"south":{"uv":[30,21,40,22],"texture":0},"west":{"uv":[20,21,30,22],"texture":0},"up":{"uv":[20,21,10,11],"texture":0},"down":{"uv":[30,11,20,21],"texture":0}},"type":"cube","uuid":"e3744018-9951-4416-518c-b35175aca663"},{"name":"cube1","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-6,-11,0],"to":[-5,-1,10],"autouv":0,"color":0,"origin":[0,0,0],"uv_offset":[22,22],"faces":{"north":{"uv":[32,32,33,42],"texture":0},"east":{"uv":[22,32,32,42],"texture":0},"south":{"uv":[43,32,44,42],"texture":0},"west":{"uv":[33,32,43,42],"texture":0},"up":{"uv":[33,32,32,22],"texture":0},"down":{"uv":[34,22,33,32],"texture":0}},"type":"cube","uuid":"9d088a5f-62e1-b865-e123-20063f9b19d6"},{"name":"cube2","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-5,-12,0],"to":[5,-11,10],"autouv":0,"color":0,"origin":[0,-11,0],"faces":{"north":{"uv":[10,10,20,11],"texture":0},"east":{"uv":[0,10,10,11],"texture":0},"south":{"uv":[30,10,40,11],"texture":0},"west":{"uv":[20,10,30,11],"texture":0},"up":{"uv":[20,10,10,0],"texture":0},"down":{"uv":[30,0,20,10],"texture":0}},"type":"cube","uuid":"1892abff-5209-2d39-88ed-982f63690bb7"},{"name":"cube3","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[5,-11,0],"to":[6,-1,10],"autouv":0,"color":0,"origin":[0,0,0],"uv_offset":[0,22],"faces":{"north":{"uv":[10,32,11,42],"texture":0},"east":{"uv":[0,32,10,42],"texture":0},"south":{"uv":[21,32,22,42],"texture":0},"west":{"uv":[11,32,21,42],"texture":0},"up":{"uv":[11,32,10,22],"texture":0},"down":{"uv":[12,22,11,32],"texture":0}},"type":"cube","uuid":"30ff45aa-5ba4-eb14-012c-4879ccf7141b"},{"name":"cube4","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-5,-2,-6],"to":[5,-1,0],"autouv":0,"color":0,"origin":[0,-1,-6],"uv_offset":[30,11],"faces":{"north":{"uv":[36,17,46,18],"texture":0},"east":{"uv":[30,17,36,18],"texture":0},"south":{"uv":[52,17,62,18],"texture":0},"west":{"uv":[46,17,52,18],"texture":0},"up":{"uv":[46,17,36,11],"texture":0},"down":{"uv":[56,11,46,17],"texture":0}},"type":"cube","uuid":"f038bda1-d62d-f10a-96db-793bef4160fe"},{"name":"cube5","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4,-10,-6],"to":[5,-2,0],"autouv":0,"color":0,"origin":[-1,1,-6],"uv_offset":[22,42],"faces":{"north":{"uv":[28,48,29,56],"texture":0},"east":{"uv":[22,48,28,56],"texture":0},"south":{"uv":[35,48,36,56],"texture":0},"west":{"uv":[29,48,35,56],"texture":0},"up":{"uv":[29,48,28,42],"texture":0},"down":{"uv":[30,42,29,48],"texture":0}},"type":"cube","uuid":"a2ac5ee0-8190-8059-5820-ec1d0f3ca8fa"},{"name":"cube6","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-5,-11,-6],"to":[5,-10,0],"autouv":0,"color":0,"origin":[0,-10,-6],"uv_offset":[30,0],"faces":{"north":{"uv":[36,6,46,7],"texture":0},"east":{"uv":[30,6,36,7],"texture":0},"south":{"uv":[52,6,62,7],"texture":0},"west":{"uv":[46,6,52,7],"texture":0},"up":{"uv":[46,6,36,0],"texture":0},"down":{"uv":[56,0,46,6],"texture":0}},"type":"cube","uuid":"48d1d782-768b-071b-fea4-c29b5d5d43a9"},{"name":"cube7","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-5,-10,-6],"to":[-4,-2,0],"autouv":0,"color":0,"origin":[-10,1,-6],"uv_offset":[38,36],"faces":{"north":{"uv":[44,42,45,50],"texture":0},"east":{"uv":[38,42,44,50],"texture":0},"south":{"uv":[51,42,52,50],"texture":0},"west":{"uv":[45,42,51,50],"texture":0},"up":{"uv":[45,42,44,36],"texture":0},"down":{"uv":[46,36,45,42],"texture":0}},"type":"cube","uuid":"c56252ed-8ed1-a9e4-e720-f663cd3fae33"},{"name":"cube8","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-4,-10,-10],"to":[4,-2,-6],"autouv":0,"color":0,"origin":[-10,1,-6],"uv_offset":[36,18],"faces":{"north":{"uv":[40,22,48,30],"texture":0},"east":{"uv":[36,22,40,30],"texture":0},"south":{"uv":[52,22,60,30],"texture":0},"west":{"uv":[48,22,52,30],"texture":0},"up":{"uv":[48,22,40,18],"texture":0},"down":{"uv":[56,18,48,22],"texture":0}},"type":"cube","uuid":"9638986d-cb1c-461a-1af6-3683dd2e066c"},{"name":"cube9","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-5,-11,4],"to":[5,-1,5],"autouv":0,"color":0,"origin":[-10,1,-6],"uv_offset":[0,42],"faces":{"north":{"uv":[1,43,11,53],"texture":0},"east":{"uv":[0,43,1,53],"texture":0},"south":{"uv":[12,43,22,53],"texture":0},"west":{"uv":[11,43,12,53],"texture":0},"up":{"uv":[11,43,1,42],"texture":0},"down":{"uv":[21,42,11,43],"texture":0}},"type":"cube","uuid":"e85d691f-ecaa-30ca-6d46-9704b748293f"}],"outliner":[{"name":"body","origin":[0,0,0],"rotation":[0,0,-180],"color":0,"uuid":"b8692adc-5dec-c145-be32-d31e8861ecb4","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["e3744018-9951-4416-518c-b35175aca663","9d088a5f-62e1-b865-e123-20063f9b19d6","1892abff-5209-2d39-88ed-982f63690bb7","30ff45aa-5ba4-eb14-012c-4879ccf7141b","f038bda1-d62d-f10a-96db-793bef4160fe","a2ac5ee0-8190-8059-5820-ec1d0f3ca8fa","48d1d782-768b-071b-fea4-c29b5d5d43a9","c56252ed-8ed1-a9e4-e720-f663cd3fae33","9638986d-cb1c-461a-1af6-3683dd2e066c","e85d691f-ecaa-30ca-6d46-9704b748293f"]}],"textures":[{"path":"D:\\1whoh\\Files2\\Code\\eclipse-projects\\discord_bots\\DiamondStarCombat\\src\\main\\resources\\assets\\dscombat\\textures\\entities\\cfm56.png","name":"cfm56.png","folder":"block","namespace":"","id":"0","particle":false,"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":"1dbc4d18-8b0b-e7e5-5119-62998cb2a86f","relative_path":"../../../src/main/resources/assets/dscombat/textures/entities/cfm56.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAuBJREFUeF7tms9LG0EUx1+CIJpEU/FUKiq21NKKvbSlFDy0F/8HMRVLCv4dPeRPEAwtbaT/Qy/2UmhR6UFIodBiD/4ieDBCNbY9pGxwZHeS3flOdjab7D4vwezLezOfee87b5ZJEPi3+HypDppCZuvv3iYgQxejDxsfofHMP3vqGQceBAMAM2Ahl4MWVrUyKiddmwEMgDOAS0BVvoE+19UW47tApzTAFEUGgJJE+4CeywAxMXTgKDA3u/elkpYLvx2jKpjxElAFFM/dJmaqwUHHwQBQUujKoCnecxnAAMDjJ2cAqPKxL4Ggtt3AWuFOaYAsymhcNzFXAYG3QXQgfjWAAUgE0BbcLQNUnWSi21thtE9pGwAaQIBSEUX9CTvZryg1tJSEHyGqqpqXxwdrQNgARo4qNLp3QPVkko6mJuj3taxjLoEDECujS1iVEbLfVhmQrRzTnc+b1Pf3X8Pdn8EB+jb3hM6GM1fuIw1g6usOXf+562D5a/Ye7U/figeAyZ0y3fj+wwFg9/4MHdy+GQ8Aqeop3f30hfrPa40J14YyVJ57TBepVDwAWLNMn1RpdO+Q6skEHY+P0XkmHR8RVAmp9TwyIohM1qQN3Ad0ahs0OTnEl1YrrNudIQNAjsX2uKY7UQagcxjiDABfdyGpLx9ivH7DJWADzxrg83JV03GYNeDy8pPudqRT5162unG5BLgE/F2wbPuVmKmU9+vH6/V8O2+r4LOAGPiDh48cV1SX8y/pTXGtaV7bW5vavhE4XQHAPmkZgPg/0gCslRITdYMReQACgvVplYCcCbEAYIcg1+9K/kU0NWC1+LrlPX1ZCF8VCq6a1o5aC2ddIYJiMHYdEKUgnkUeQCvxs38XFABkq9Sx0a5Tqw9w2/rsu0OkAciEWzVDkQWAppdpsULj6tpplwAagAF43Cv0sw2iC4DaBZYB6ADCtmMAYa9A2PE5A8JegbDjcwaEvQJhx499BvwHks9XX8pjrlwAAAAASUVORK5CYII="}]}