anygatecloud/minecraft-data-generator
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some things

Browse Source
This commit is contained in:
u9g
2022-05-10 15:36:16 -04:00
parent 37be2b216e
commit c03cdaf289
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java
+9 -6
View File
@@ -4,6 +4,7 @@ import com.google.common.base.CaseFormat;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import dev.u9g.minecraftdatagenerator.util.DGU; import dev.u9g.minecraftdatagenerator.util.DGU;
import net.minecraft.block.AirBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@@ -139,18 +140,22 @@ public class BlocksDataGenerator implements IDataGenerator {
BlockState defaultState = block.getDefaultState(); BlockState defaultState = block.getDefaultState();
Identifier registryKey = blockRegistry.getKey(block).orElseThrow().getValue(); Identifier registryKey = blockRegistry.getKey(block).orElseThrow().getValue();
String localizationKey = block.getTranslationKey(); String localizationKey = block.getTranslationKey();
List<Item> effectiveTools = getItemsEffectiveForBlock(defaultState);
blockDesc.addProperty("id", blockRegistry.getRawId(block)); blockDesc.addProperty("id", blockRegistry.getRawId(block));
blockDesc.addProperty("name", registryKey.getPath()); blockDesc.addProperty("name", registryKey.getPath());
// if (Objects.equals(registryKey.getPath(), "red_candle_cake")) {
// System.out.println();
// }
blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); blockDesc.addProperty("displayName", DGU.translateText(localizationKey));
blockDesc.addProperty("hardness", block.getHardness()); blockDesc.addProperty("hardness", block.getHardness());
blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("resistance", block.getBlastResistance());
blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); blockDesc.addProperty("stackSize", block.asItem().getMaxCount());
blockDesc.addProperty("diggable", block.getHardness() != -1.0f); blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock));
// JsonObject effTools = new JsonObject();
// effectiveTools.forEach(item -> effTools.addProperty(
// String.valueOf(Registry.ITEM.getRawId(item)), // key
// item.getMiningSpeedMultiplier(item.getDefaultStack(), defaultState) // value
// ));
// blockDesc.add("effectiveTools", effTools);
blockDesc.addProperty("material", findMatchingBlockMaterial(defaultState, materials)); blockDesc.addProperty("material", findMatchingBlockMaterial(defaultState, materials));
blockDesc.addProperty("transparent", !defaultState.isOpaque()); blockDesc.addProperty("transparent", !defaultState.isOpaque());
@@ -167,8 +172,6 @@ public class BlocksDataGenerator implements IDataGenerator {
} }
blockDesc.add("states", stateProperties); blockDesc.add("states", stateProperties);
List<Item> effectiveTools = getItemsEffectiveForBlock(defaultState);
//Only add harvest tools if tool is required for harvesting this block //Only add harvest tools if tool is required for harvesting this block
if (defaultState.isToolRequired()) { if (defaultState.isToolRequired()) {
JsonObject effectiveToolsObject = new JsonObject(); JsonObject effectiveToolsObject = new JsonObject();