fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API compiles

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-27 18:09:44 +02:00
parent ba71a82288
commit 80fbb58d4f
572 changed files with 2995 additions and 3037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java
+3 -3
View File
@@ -17,7 +17,7 @@ import net.minecraft.data.DirectoryCache;
import net.minecraft.data.IDataProvider;
import net.minecraft.data.loot.BlockLootTables;
import net.minecraft.enchantment.Enchantments;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Identifier;
import net.minecraft.world.storage.loot.ConstantRange;
import net.minecraft.world.storage.loot.ItemLootEntry;
import net.minecraft.world.storage.loot.LootEntry;
@@ -62,7 +62,7 @@ public class BlockDropProvider extends BlockLootTables implements IAE2DataProvid
@Override
public void act(@Nonnull DirectoryCache cache) throws IOException {
for (Map.Entry<ResourceLocation, Block> entry : ForgeRegistries.BLOCKS.getEntries()) {
for (Map.Entry<Identifier, Block> entry : ForgeRegistries.BLOCKS.getEntries()) {
LootTable.Builder builder;
if (entry.getKey().getNamespace().equals(AppEng.MOD_ID)) {
builder = overrides.getOrDefault(entry.getValue(), this::defaultBuilder).apply(entry.getValue());
@@ -80,7 +80,7 @@ public class BlockDropProvider extends BlockLootTables implements IAE2DataProvid
return LootTable.builder().addLootPool(pool);
}
private Path getPath(Path root, ResourceLocation id) {
private Path getPath(Path root, Identifier id) {
return root.resolve("data/" + id.getNamespace() + "/loot_tables/blocks/" + id.getPath() + ".json");
}
src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java
+5 -5
View File
@@ -11,7 +11,7 @@ import net.minecraft.data.RecipeProvider;
import net.minecraft.data.ShapedRecipeBuilder;
import net.minecraft.data.SingleItemRecipeBuilder;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Identifier;
import net.minecraftforge.common.crafting.ConditionalRecipe;
import appeng.api.definitions.IBlockDefinition;
@@ -47,11 +47,11 @@ public class SlabStairRecipes extends RecipeProvider implements IAE2DataProvider
ShapedRecipeBuilder.shapedRecipe(slabs.block(), 6).patternLine("###").key('#', inputBlock)
.addCriterion(criterionName(block), hasItem(inputBlock))
.build(consumer, new ResourceLocation(AppEng.MOD_ID, "shaped/slabs/" + block.identifier()));
.build(consumer, new Identifier(AppEng.MOD_ID, "shaped/slabs/" + block.identifier()));
SingleItemRecipeBuilder.stonecuttingRecipe(Ingredient.fromItems(inputBlock), outputBlock, 2)
.addCriterion(criterionName(block), hasItem(inputBlock))
.build(consumer, new ResourceLocation(AppEng.MOD_ID, "block_cutter/slabs/" + slabs.identifier()));
.build(consumer, new Identifier(AppEng.MOD_ID, "block_cutter/slabs/" + slabs.identifier()));
}
private void stairRecipe(Consumer<IFinishedRecipe> consumer, IBlockDefinition block, IBlockDefinition stairs) {
@@ -60,11 +60,11 @@ public class SlabStairRecipes extends RecipeProvider implements IAE2DataProvider
ShapedRecipeBuilder.shapedRecipe(outputBlock, 4).patternLine("# ").patternLine("## ").patternLine("###")
.key('#', inputBlock).addCriterion(criterionName(block), hasItem(inputBlock))
.build(consumer, new ResourceLocation(AppEng.MOD_ID, "shaped/stairs/" + block.identifier()));
.build(consumer, new Identifier(AppEng.MOD_ID, "shaped/stairs/" + block.identifier()));
SingleItemRecipeBuilder.stonecuttingRecipe(Ingredient.fromItems(inputBlock), outputBlock)
.addCriterion(criterionName(block), hasItem(inputBlock))
.build(consumer, new ResourceLocation(AppEng.MOD_ID, "block_cutter/stairs/" + stairs.identifier()));
.build(consumer, new Identifier(AppEng.MOD_ID, "block_cutter/stairs/" + stairs.identifier()));
}