First Machine Age's Mods (Combined repo.)
| Revision | 64c1ed3a57098d42b6fc148b9b1e79c6824df761 (tree) |
|---|---|
| Zeit | 2020-10-09 05:58:06 |
| Autor |  melchior <melchior@user...> |
| Commiter | melchior |
PR0.1.3 Fix for bloom bug
AnvilMetalRecovery/AnvilMetalRecovery.csproj (diff) AnvilMetalRecovery/BlockEntities/MetalRecovery_BlockEntityAnvil.cs (diff) AnvilMetalRecovery/modinfo.json (diff)| @@ -31,6 +31,12 @@ | ||
| 31 | 31 | <ErrorReport>prompt</ErrorReport> |
| 32 | 32 | <WarningLevel>4</WarningLevel> |
| 33 | 33 | <ConsolePause>false</ConsolePause> |
| 34 | + <CustomCommands> | |
| 35 | + <CustomCommands> | |
| 36 | + <Command type="AfterBuild" command="7z -tzip a ${ProjectName}_${ProjectConfig}.zip" workingdir="${TargetDir}" /> | |
| 37 | + <Command type="AfterClean" command="rm -f *.zip" workingdir="${TargetDir}" /> | |
| 38 | + </CustomCommands> | |
| 39 | + </CustomCommands> | |
| 34 | 40 | </PropertyGroup> |
| 35 | 41 | <ItemGroup> |
| 36 | 42 | <Reference Include="System" /> |
| @@ -40,7 +40,7 @@ namespace AnvilMetalRecovery | ||
| 40 | 40 | |
| 41 | 41 | public override void OnSplit(Vec3i voxelPos) |
| 42 | 42 | { |
| 43 | - if (Voxels[voxelPos.X, voxelPos.Y, voxelPos.Z] == ( byte )EnumVoxelMaterial.Metal) { | |
| 43 | + if (!this.IsIronBloom && Voxels[voxelPos.X, voxelPos.Y, voxelPos.Z] == ( byte )EnumVoxelMaterial.Metal) { | |
| 44 | 44 | #if DEBUG |
| 45 | 45 | Logger.VerboseDebug("Split some {0} @{1}, Total:{2}", this.BaseMaterial.Collectible.LastCodePart( ), voxelPos, SplitCount); |
| 46 | 46 | #endif |
| @@ -48,7 +48,6 @@ namespace AnvilMetalRecovery | ||
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | base.OnSplit(voxelPos); |
| 51 | - | |
| 52 | 51 | } |
| 53 | 52 | |
| 54 | 53 | //Would be great if this returned a bool! |
| @@ -75,6 +74,8 @@ namespace AnvilMetalRecovery | ||
| 75 | 74 | #endif |
| 76 | 75 | |
| 77 | 76 | Item metalShavingsItem = Api.World.GetItem(MetalShavingsCode.WithPathAppendix("-" + this.BaseMaterial.Collectible.LastCodePart( ))); |
| 77 | + | |
| 78 | + if (metalShavingsItem == null) return; | |
| 78 | 79 | ItemStack metalShavingsStack = new ItemStack(metalShavingsItem, metalShavings); |
| 79 | 80 | |
| 80 | 81 | if (byPlayer != null) { |
| @@ -83,8 +84,6 @@ namespace AnvilMetalRecovery | ||
| 83 | 84 | } |
| 84 | 85 | } |
| 85 | 86 | } |
| 86 | - | |
| 87 | - | |
| 88 | 87 | } |
| 89 | 88 | } |
| 90 | 89 | } |
| \ No newline at end of file |
| @@ -1,12 +1,12 @@ | ||
| 1 | 1 | { |
| 2 | 2 | "type": "code", |
| 3 | - "name": "Metal Recovery & More", | |
| 4 | - "description" : "Get back lost scrap and smithing discards, and more.", | |
| 3 | + "name": "Anvil Metal Recovery", | |
| 4 | + "description" : "Get back lost scrap and smithing discards.", | |
| 5 | 5 | "authors": ["Melchior"], |
| 6 | 6 | "ModID":"metalrecovery", |
| 7 | - "version": "0.1.2", | |
| 7 | + "version": "0.1.3", | |
| 8 | 8 | "dependencies": { |
| 9 | - "game": "1.12.11", | |
| 9 | + "game": "1.13.0", | |
| 10 | 10 | "survival": "" |
| 11 | 11 | }, |
| 12 | 12 | "website": "http://nowebsite.nope" |
Fork