Compare commits
	
		
			No commits in common. "73acc066f250631b5278f9e991e698ff90a8fd28" and "9f2fb2158f329642d0e809eee8e6e3bbae68a071" have entirely different histories.
		
	
	
		
			73acc066f2
			...
			9f2fb2158f
		
	
		
| @ -38,7 +38,7 @@ mod_name=Enhanced Explosives | |||||||
| # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. | # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. | ||||||
| mod_license=All Rights Reserved | mod_license=All Rights Reserved | ||||||
| # The mod version. See https://semver.org/ | # The mod version. See https://semver.org/ | ||||||
| mod_version=0.9.7 | mod_version=0.9.4 | ||||||
| # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. | # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. | ||||||
| # This should match the base package used for the mod sources. | # This should match the base package used for the mod sources. | ||||||
| # See https://maven.apache.org/guides/mini/guide-naming-conventions.html | # See https://maven.apache.org/guides/mini/guide-naming-conventions.html | ||||||
|  | |||||||
| @ -29,10 +29,7 @@ public class ModBlockStateProvider extends BlockStateProvider { | |||||||
|         sideTopBottom(blocks.TNT_ENDER); |         sideTopBottom(blocks.TNT_ENDER); | ||||||
|         sideTopBottom(blocks.TNT_CLAYMORE); |         sideTopBottom(blocks.TNT_CLAYMORE); | ||||||
|         sideTopBottom(blocks.TNT_HOMING); |         sideTopBottom(blocks.TNT_HOMING); | ||||||
|         SideTop(blocks.TNT_BLACK_HOLE); |         blockWithItem(blocks.TNT_BLACK_HOLE); | ||||||
|         clusterTNT(blocks.TNT_CLUSTER_2); |  | ||||||
|         clusterTNT(blocks.TNT_CLUSTER_4); |  | ||||||
|         clusterTNT(blocks.TNT_CLUSTER_8); |  | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     private void blockWithItem(RegistryObject<Block> blockRegistryObject) { |     private void blockWithItem(RegistryObject<Block> blockRegistryObject) { | ||||||
| @ -71,13 +68,6 @@ public class ModBlockStateProvider extends BlockStateProvider { | |||||||
|         simpleBlockItem(block, model); |         simpleBlockItem(block, model); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     public void clusterTNT(RegistryObject<Block> blockRegistryObject) { |  | ||||||
|         Block block = blockRegistryObject.get(); |  | ||||||
|         ModelFile model = models().cubeBottomTop(name(block), extend(blockTexture(block), "_side"), extend(blockTexture(Blocks.TNT), "_bottom"), extend(blockTexture(Blocks.TNT), "_top")); |  | ||||||
|         this.getVariantBuilder(block).forAllStates(blockState -> ConfiguredModel.builder().modelFile(model).build()); |  | ||||||
|         simpleBlockItem(block, model); |  | ||||||
|     } |  | ||||||
| 
 |  | ||||||
|     public ModelFile northEastTopBottom(Block block) { |     public ModelFile northEastTopBottom(Block block) { | ||||||
|         return models().cube(name(block), extend(blockTexture(block), "_bottom"), extend(blockTexture(block), "_top"), extend(blockTexture(block), "_nw"),  extend(blockTexture(block), "_se"),  extend(blockTexture(block), "_se"),  extend(blockTexture(block), "_nw")).texture("particle", extend(blockTexture(block), "_se")); |         return models().cube(name(block), extend(blockTexture(block), "_bottom"), extend(blockTexture(block), "_top"), extend(blockTexture(block), "_nw"),  extend(blockTexture(block), "_se"),  extend(blockTexture(block), "_se"),  extend(blockTexture(block), "_nw")).texture("particle", extend(blockTexture(block), "_se")); | ||||||
|     } |     } | ||||||
| @ -87,6 +77,6 @@ public class ModBlockStateProvider extends BlockStateProvider { | |||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     public ModelFile topSide(Block block) { |     public ModelFile topSide(Block block) { | ||||||
|         return models().cubeColumn(name(block), extend(blockTexture(block), "_side"), extend(blockTexture(block), "_top")); |         return models().cubeColumn(name(block), extend(blockTexture(block), ""), extend(blockTexture(block), "_top")); | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @ -43,11 +43,11 @@ public class selectivePrimedTNT extends basePrimedTNT { | |||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     public String getBlock() { |     public String getBlock() { | ||||||
|         return renderBlock().toString(); |         return level().getBlockState(new BlockPos((int) getX(), (int) getY() - 1, (int) getZ())).getBlock().toString(); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     @Override |     @Override | ||||||
|     public Block renderBlock() { |     public Block renderBlock() { | ||||||
|         return level().getBlockState(new BlockPos((int) Math.floor(getX()), (int) Math.floor(getY()) - 1, (int) Math.floor(getZ()))).getBlock(); |         return level().getBlockState(new BlockPos((int) getX(), (int) getY() - 1, (int) getZ())).getBlock(); | ||||||
|     } |     } | ||||||
|  } |  } | ||||||
|  | |||||||
| Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB | 
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 26 KiB | 
| @ -1,7 +0,0 @@ | |||||||
| { |  | ||||||
|   "animation": { |  | ||||||
|     "frametime": 1, |  | ||||||
|     "interpolate": true, |  | ||||||
|     "frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59] |  | ||||||
|   } |  | ||||||
| } |  | ||||||
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 438 B | 
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 446 B | 
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 387 B | 
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user