DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

Browse Source
This commit is contained in:
DBotThePony 2022-09-12 10:46:58 +07:00
commit 6975485d2a
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt
View File

@ -35,6 +35,12 @@ fun addComplexBlockStates(provider: MatteryBlockStateProvider) {
with(provider.getMultipartBuilder(MBlocks.PATTERN_STORAGE)) { with(provider.getMultipartBuilder(MBlocks.PATTERN_STORAGE)) {
for (facing in RotatableMatteryBlock.FACING.possibleValues) { for (facing in RotatableMatteryBlock.FACING.possibleValues) {
part()
.modelFile(provider.models().getExistingFile(ResourceLocation(MOD_ID, "block/pattern_storage")))
.rotationY(facing.toYRotBlockstate())
.addModel()
.condition(RotatableMatteryBlock.FACING, facing)
for (i in 0 .. 7) { for (i in 0 .. 7) {
part() part()
.modelFile(provider.models().getExistingFile(ResourceLocation(MOD_ID, "block/pattern/model$i"))) .modelFile(provider.models().getExistingFile(ResourceLocation(MOD_ID, "block/pattern/model$i")))
@ -43,12 +49,6 @@ fun addComplexBlockStates(provider: MatteryBlockStateProvider) {
.condition(RotatableMatteryBlock.FACING, facing) .condition(RotatableMatteryBlock.FACING, facing)
.condition(PatternStorageBlock.PATTERN_STORAGE_DISKS_PROPS[i], true) .condition(PatternStorageBlock.PATTERN_STORAGE_DISKS_PROPS[i], true)
} }
part()
.modelFile(provider.models().getExistingFile(ResourceLocation(MOD_ID, "block/pattern_storage")))
.rotationY(facing.toYRotBlockstate())
.addModel()
.condition(RotatableMatteryBlock.FACING, facing)
} }
} }

11
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
View File

@ -42,12 +42,16 @@ fun addItemModels(provider: MatteryItemModelProvider) {
provider.generated(MItems.PILL_HEAL) provider.generated(MItems.PILL_HEAL)
provider.generated(MItems.NUTRIENT_PASTE) provider.generated(MItems.NUTRIENT_PASTE)
for (item in MItems.EXOSUIT_INVENTORY_UPGRADES) { for (item in MItems.EXOSUIT_INVENTORY_UPGRADES_CRAFTABLE) {
provider.generated(item, ResourceLocation(DataGen.MOD_ID, "item/exosuit_inventory_upgrade"))
}
for (item in MItems.EXOSUIT_INVENTORY_UPGRADES_UNCRAFTABLE) {
provider.KOT(item) provider.KOT(item)
} }
provider.KOT(MItems.EXOSUIT_INVENTORY_UPGRADE_CREATIVE) provider.generated(MItems.EXOSUIT_INVENTORY_UPGRADE_CREATIVE)
provider.KOT(MItems.EXOSUIT_CRAFTING_UPGRADE) provider.generated(MItems.EXOSUIT_CRAFTING_UPGRADE)
provider.KOT(MItems.EXOSUIT_INVENTORY_UPGRADE_BIG) provider.KOT(MItems.EXOSUIT_INVENTORY_UPGRADE_BIG)
provider.KOT(MItems.EXOSUIT_INVENTORY_UPGRADE_HUGE) provider.KOT(MItems.EXOSUIT_INVENTORY_UPGRADE_HUGE)
@ -72,6 +76,7 @@ fun addItemModels(provider: MatteryItemModelProvider) {
provider.generated(MItems.QUANTUM_BATTERY_CREATIVE) provider.generated(MItems.QUANTUM_BATTERY_CREATIVE)
provider.generated(MItems.PATTERN_DRIVE_CREATIVE) provider.generated(MItems.PATTERN_DRIVE_CREATIVE)
provider.KOT(MItems.PATTERN_DRIVE_CREATIVE2)
provider.generated(MItems.MATTER_DUST) provider.generated(MItems.MATTER_DUST)

4
src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java
View File

@ -89,7 +89,9 @@ public class BlockShapes {
new SimpleCuboid(0d, 0.125d, 0.625d, 1d, 0.3125d, 0.75d), new SimpleCuboid(0d, 0.125d, 0.625d, 1d, 0.3125d, 0.75d),
new SimpleCuboid(0d, 0.125d, 0d, 1d, 0.1875d, 0.0625d), new SimpleCuboid(0d, 0.125d, 0d, 1d, 0.1875d, 0.0625d),
new SimpleCuboid(0d, 0.875d, 0d, 1d, 0.9375d, 0.0625d), new SimpleCuboid(0d, 0.875d, 0d, 1d, 0.9375d, 0.0625d),
new SimpleCuboid(0d, 0.875d, 0.75d, 1d, 1d, 1d) new SimpleCuboid(0d, 0.875d, 0.75d, 1d, 1d, 1d),
new SimpleCuboid(0.125d, 0.125d, 0.90625d, 0.875d, 0.875d, 0.96875d),
new SimpleCuboid(0.125d, 0.95d, 0.4375d, 0.875d, 0.9875d, 0.75d)
); );
public static final BlockShape MATTER_REPLICATOR = new BlockShape( public static final BlockShape MATTER_REPLICATOR = new BlockShape(