Undo rebar fix but remove rod tag.
- Also add publicly visible getTimer method and a new getRecipeCompletion method to VatBlockEntity for machines to read.
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
// 1.20.1 2025-06-27T21:41:45.5674261 Registrate Provider for tfmg [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
|
// 1.20.1 2025-06-28T21:43:05.723232 Registrate Provider for tfmg [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
|
||||||
ff5a5721633b83465ab501cbdfdc579a0f20e938 assets/tfmg/blockstates/accumulator.json
|
ff5a5721633b83465ab501cbdfdc579a0f20e938 assets/tfmg/blockstates/accumulator.json
|
||||||
e982a263b6af75821042107fdeff7bd809436d08 assets/tfmg/blockstates/air_intake.json
|
e982a263b6af75821042107fdeff7bd809436d08 assets/tfmg/blockstates/air_intake.json
|
||||||
e7f63aadfc892e337d9f87b5e50af8b1c7e4103f assets/tfmg/blockstates/aluminum_bars.json
|
e7f63aadfc892e337d9f87b5e50af8b1c7e4103f assets/tfmg/blockstates/aluminum_bars.json
|
||||||
@@ -1710,7 +1710,6 @@ bcd97e4d08daef6f60e6e0239222009540dac177 data/forge/tags/items/plates/steel.json
|
|||||||
3f7807c4bc7aece02066f3dc5e0f436a0d5fa078 data/forge/tags/items/raw_materials/lead.json
|
3f7807c4bc7aece02066f3dc5e0f436a0d5fa078 data/forge/tags/items/raw_materials/lead.json
|
||||||
808564cbcb70936b3da0a2a1bfa063752a0688d3 data/forge/tags/items/raw_materials/lithium.json
|
808564cbcb70936b3da0a2a1bfa063752a0688d3 data/forge/tags/items/raw_materials/lithium.json
|
||||||
88f3d6f99c74dabb2491637c6b2ba766a1f662f1 data/forge/tags/items/raw_materials/nickel.json
|
88f3d6f99c74dabb2491637c6b2ba766a1f662f1 data/forge/tags/items/raw_materials/nickel.json
|
||||||
9e63c1b017f9b54bb1e81f6c34cc8ac4cb810ac1 data/forge/tags/items/rods/steel.json
|
|
||||||
a2029f4d5ac94eb5514d525fa8296d78e65d338f data/forge/tags/items/storage_blocks.json
|
a2029f4d5ac94eb5514d525fa8296d78e65d338f data/forge/tags/items/storage_blocks.json
|
||||||
5f36040d029001793eb338e1a8c5d95b9abcc9b3 data/forge/tags/items/storage_blocks/aluminum.json
|
5f36040d029001793eb338e1a8c5d95b9abcc9b3 data/forge/tags/items/storage_blocks/aluminum.json
|
||||||
7c5615c56bb169570a061f052ebb1f5115760c16 data/forge/tags/items/storage_blocks/cast_iron.json
|
7c5615c56bb169570a061f052ebb1f5115760c16 data/forge/tags/items/storage_blocks/cast_iron.json
|
||||||
@@ -2584,7 +2583,7 @@ e913ce01ae0e3c5cee5bcdb857848a76da7a9348 data/tfmg/recipes/purple_rebar_concrete
|
|||||||
3dfb0b20b9cabf0d236d3525a5ffeebd6ee24501 data/tfmg/recipes/rebar_concrete_slab_from_rebar_concrete_stonecutting.json
|
3dfb0b20b9cabf0d236d3525a5ffeebd6ee24501 data/tfmg/recipes/rebar_concrete_slab_from_rebar_concrete_stonecutting.json
|
||||||
bc0be1a251af7bbd69e489091f0ad12f9525ecb1 data/tfmg/recipes/rebar_concrete_stairs_from_rebar_concrete_stonecutting.json
|
bc0be1a251af7bbd69e489091f0ad12f9525ecb1 data/tfmg/recipes/rebar_concrete_stairs_from_rebar_concrete_stonecutting.json
|
||||||
8c3e6974d35f3c4096c3ef658b6535fdaecbd79c data/tfmg/recipes/rebar_concrete_wall_from_rebar_concrete_stonecutting.json
|
8c3e6974d35f3c4096c3ef658b6535fdaecbd79c data/tfmg/recipes/rebar_concrete_wall_from_rebar_concrete_stonecutting.json
|
||||||
0f59181ae0d6d5d4715517be8809e174f5d2d011 data/tfmg/recipes/rebar_from_ingots_steel_stonecutting.json
|
a70047790bcdc5e0cb15565a76557eead9e31685 data/tfmg/recipes/rebar_from_ingots_steel_stonecutting.json
|
||||||
a56a4d134f1b4719e3e08d8de8b663e4bb6b4649 data/tfmg/recipes/red_caution_block_from_ingots_aluminum_stonecutting.json
|
a56a4d134f1b4719e3e08d8de8b663e4bb6b4649 data/tfmg/recipes/red_caution_block_from_ingots_aluminum_stonecutting.json
|
||||||
fcec2523663d5d5bf1bf8e207163b6a36b6327ff data/tfmg/recipes/red_concrete_slab_from_red_concrete_stonecutting.json
|
fcec2523663d5d5bf1bf8e207163b6a36b6327ff data/tfmg/recipes/red_concrete_slab_from_red_concrete_stonecutting.json
|
||||||
f9369c7d975175a8f6869fef5533008b5a1e8e2b data/tfmg/recipes/red_concrete_stairs_from_red_concrete_stonecutting.json
|
f9369c7d975175a8f6869fef5533008b5a1e8e2b data/tfmg/recipes/red_concrete_stairs_from_red_concrete_stonecutting.json
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"values": [
|
|
||||||
"tfmg:rebar"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"type": "minecraft:stonecutting",
|
"type": "minecraft:stonecutting",
|
||||||
"count": 2,
|
"count": 4,
|
||||||
"ingredient": {
|
"ingredient": {
|
||||||
"tag": "forge:ingots/steel"
|
"tag": "forge:ingots/steel"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import com.simibubi.create.foundation.item.SmartInventory;
|
|||||||
import com.simibubi.create.foundation.recipe.RecipeFinder;
|
import com.simibubi.create.foundation.recipe.RecipeFinder;
|
||||||
import com.simibubi.create.foundation.utility.CreateLang;
|
import com.simibubi.create.foundation.utility.CreateLang;
|
||||||
import com.simibubi.create.infrastructure.config.AllConfigs;
|
import com.simibubi.create.infrastructure.config.AllConfigs;
|
||||||
|
import io.netty.util.internal.MathUtil;
|
||||||
import net.createmod.catnip.animation.LerpedFloat;
|
import net.createmod.catnip.animation.LerpedFloat;
|
||||||
import net.createmod.catnip.lang.LangBuilder;
|
import net.createmod.catnip.lang.LangBuilder;
|
||||||
import net.createmod.catnip.theme.Color;
|
import net.createmod.catnip.theme.Color;
|
||||||
@@ -30,6 +31,7 @@ import net.minecraft.core.Direction;
|
|||||||
import net.minecraft.nbt.CompoundTag;
|
import net.minecraft.nbt.CompoundTag;
|
||||||
import net.minecraft.nbt.NbtUtils;
|
import net.minecraft.nbt.NbtUtils;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.util.Mth;
|
||||||
import net.minecraft.world.item.Item;
|
import net.minecraft.world.item.Item;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraft.world.item.crafting.Ingredient;
|
import net.minecraft.world.item.crafting.Ingredient;
|
||||||
@@ -54,6 +56,7 @@ import net.minecraftforge.network.PacketDistributor;
|
|||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import javax.annotation.Nonnull;
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
@@ -856,6 +859,11 @@ public class VatBlockEntity extends SmartBlockEntity implements IHaveGoggleInfor
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void addMachineTooltip(String operationId, List<Component> tooltip) {
|
||||||
|
CreateLang.translate("goggles.vat."+operationId.replace(":","."))
|
||||||
|
.forGoggles(tooltip);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
|
public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
|
||||||
|
|
||||||
@@ -872,8 +880,7 @@ public class VatBlockEntity extends SmartBlockEntity implements IHaveGoggleInfor
|
|||||||
.style(ChatFormatting.GRAY)
|
.style(ChatFormatting.GRAY)
|
||||||
.forGoggles(tooltip);
|
.forGoggles(tooltip);
|
||||||
for (String operation : machines)
|
for (String operation : machines)
|
||||||
CreateLang.translate("goggles.vat."+operation.replace(":","."))
|
addMachineTooltip(operation, tooltip);
|
||||||
.forGoggles(tooltip);
|
|
||||||
|
|
||||||
|
|
||||||
CreateLang.translate("goggles.vat.heat_status")
|
CreateLang.translate("goggles.vat.heat_status")
|
||||||
@@ -1158,6 +1165,15 @@ public class VatBlockEntity extends SmartBlockEntity implements IHaveGoggleInfor
|
|||||||
return width;
|
return width;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getTimer() {
|
||||||
|
return timer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getRecipeCompletion() {
|
||||||
|
if (recipe == null) return 0.0f;
|
||||||
|
return (float) timer / recipe.getProcessingDuration();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setWidth(int width) {
|
public void setWidth(int width) {
|
||||||
this.width = width;
|
this.width = width;
|
||||||
|
|||||||
@@ -94,8 +94,7 @@ public class TFMGItems {
|
|||||||
|
|
||||||
public static final ItemEntry<Item>
|
public static final ItemEntry<Item>
|
||||||
REBAR = REGISTRATE.item("rebar", Item::new)
|
REBAR = REGISTRATE.item("rebar", Item::new)
|
||||||
.tag(AllTags.forgeItemTag("rods/steel"))
|
.recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/steel")), RecipeCategory.BUILDING_BLOCKS, c::get, 4))
|
||||||
.recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/steel")), RecipeCategory.BUILDING_BLOCKS, c::get, 2))
|
|
||||||
.register(),
|
.register(),
|
||||||
SYNTHETIC_STRING = REGISTRATE.item("synthetic_string", Item::new)
|
SYNTHETIC_STRING = REGISTRATE.item("synthetic_string", Item::new)
|
||||||
.tag(Tags.Items.STRING, AllTags.forgeItemTag("string"))
|
.tag(Tags.Items.STRING, AllTags.forgeItemTag("string"))
|
||||||
|
|||||||
Reference in New Issue
Block a user