Skip to content

Commit

Permalink
fix creative tab
Browse files Browse the repository at this point in the history
  • Loading branch information
nthxny committed Jul 8, 2023
1 parent e13c776 commit ec3a5ac
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 11 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ org.gradle.daemon = false

# build dependency versions
github_project = viceversagames/BalancedFlight
mod_version = 2.0.3
mod_version = 2.0.4
forgegradle_version = 6.+
mixingradle_version = 0.7-SNAPSHOT
cursegradle_version = 1.4.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.20.1 2023-07-05T21:28:08.7023133 Balanced Flights's Crafting Recipes
// 1.20.1 2023-07-07T21:35:22.1887183 Balanced Flights's Crafting Recipes
e47e55e393ce719ebf6c921b6ab7c9c4cae08ef5 data/balancedflight/recipes/sequenced_assembly/flight_anchor.json
1bab666553a37bdf33c810df83275ecd9b26442b data/create/recipes/mechanical_crafting/ascended_flight_ring.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 1.20.1 2023-07-05T21:28:08.7043103 Registrate Provider for balancedflight [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
// 1.20.1 2023-07-07T21:35:22.1902232 Registrate Provider for balancedflight [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
a02991b88a4798278a91d7f0c49fabcaac0cc6f8 assets/balancedflight/blockstates/flight_anchor.json
ade0ec53d1a0ca3748dffffabf3b108af70de270 assets/balancedflight/lang/en_ud.json
e59ca3e7dde2e80fb24d74b27972e61877bd3420 assets/balancedflight/lang/en_us.json
cd8c02ffa98d705b0f7b3d7d5dd6d797941430ca assets/balancedflight/lang/en_ud.json
208aa9b6a266d87d4bae0bb9980cc31d16ce7153 assets/balancedflight/lang/en_us.json
1d2f81614ad984795c354891a34a3320c150ec65 assets/balancedflight/models/block/flight_anchor.json
e4755f4ed9a7eb52653c19f8ecc948f40d83ee41 assets/balancedflight/models/item/ascended_flight_ring.json
c6659a55eedf7e1aa5107b03bc983838c8966f8b assets/balancedflight/models/item/flight_anchor.json
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"block.balancedflight.flight_anchor": "ɹoɥɔuⱯ ʇɥbıןℲ",
"curios.identifier.flight_ring": "buıᴚ ʇɥbıןℲ",
"item.balancedflight.ascended_flight_ring": "buıᴚ ʇɥbıןℲ pǝpuǝɔsⱯ",
"itemGroup.create.base": "ʇɥbıןℲ pǝɔuɐןɐᗺ :ǝʇɐǝɹƆ",
"itemGroup.balancedflight.base": "ʇɥbıןℲ pǝɔuɐןɐᗺ :ǝʇɐǝɹƆ",
"tooltip.balancedflight.ascended_flight_ring": "˙ǝɹǝɥʍʎuɐ ʇɥbıןɟ sʍoןןɐ ʇı 'ʇǝʎ puɐ 'buıɹ uǝpןob ǝsuǝp ʎןqıpǝɹɔuı uⱯ",
"tooltip.balancedflight.flight_anchor": "˙pןɹoʍɹǝʌo ǝɥʇ uı sʞɹoʍ ʎןuO ˙snıpɐɹ ʞɔoןq ϛᄅ ɐ uı ʇɥbıןɟ sʍoןןⱯ"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"block.balancedflight.flight_anchor": "Flight Anchor",
"curios.identifier.flight_ring": "Flight Ring",
"item.balancedflight.ascended_flight_ring": "Ascended Flight Ring",
"itemGroup.create.base": "Create: Balanced Flight",
"itemGroup.balancedflight.base": "Create: Balanced Flight",
"tooltip.balancedflight.ascended_flight_ring": "An incredibly dense golden ring, and yet, it allows flight anywhere.",
"tooltip.balancedflight.flight_anchor": "Allows flight in a 25 block radius. Only works in the overworld."
}
24 changes: 22 additions & 2 deletions src/main/java/com/vice/balancedflight/AllCreativeTabs.java
Original file line number Diff line number Diff line change
@@ -1,23 +1,43 @@
package com.vice.balancedflight;

import com.simibubi.create.AllCreativeModeTabs;
import com.simibubi.create.Create;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.RegistryObject;

import java.util.Iterator;

@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
public class AllCreativeTabs
{
private static final DeferredRegister<CreativeModeTab> TAB_REGISTER =
DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Create.ID);
DeferredRegister.create(Registries.CREATIVE_MODE_TAB, BalancedFlight.MODID);

public static final RegistryObject<CreativeModeTab> CREATIVE_TAB = TAB_REGISTER.register("base",
() -> CreativeModeTab.builder()
.title(Component.literal("Create: Balanced Flight"))
.title(Component.translatable("itemGroup.balancedflight.base"))
.withTabsBefore(CreativeModeTabs.SPAWN_EGGS)
.icon(AllBlocks.FLIGHT_ANCHOR::asStack)
.displayItems(((pParameters, pOutput) -> {
for (var item : BalancedFlight.registrate().getAll(Registries.ITEM))
pOutput.accept(new ItemStack(item.get()));

for (var block : BalancedFlight.registrate().getAll(Registries.BLOCK))
pOutput.accept(new ItemStack(block.get()));
}))
.build());

public static void register(IEventBus modEventBus) {
TAB_REGISTER.register(modEventBus);
}
}
3 changes: 2 additions & 1 deletion src/main/java/com/vice/balancedflight/AllItems.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.vice.balancedflight;

import com.simibubi.create.AllCreativeModeTabs;
import com.tterrag.registrate.util.entry.ItemEntry;
import com.tterrag.registrate.util.entry.RegistryEntry;
import com.vice.balancedflight.content.angelRing.FlightRing;
import net.minecraft.world.item.Item;
Expand All @@ -9,7 +10,7 @@ public class AllItems
{
static { BalancedFlight.registrate().useCreativeTab(AllCreativeModeTabs.MAIN_TAB); }

public static final RegistryEntry<? extends Item> ASCENDED_FLIGHT_RING = FlightRing.ASCENDED;
public static final ItemEntry<? extends Item> ASCENDED_FLIGHT_RING = FlightRing.ASCENDED;

public static void init() {}
}
2 changes: 2 additions & 0 deletions src/main/java/com/vice/balancedflight/BalancedFlight.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.vice.balancedflight;

import com.simibubi.create.AllCreativeModeTabs;
import com.simibubi.create.Create;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.foundation.item.ItemDescription;
Expand Down Expand Up @@ -49,6 +50,7 @@ public BalancedFlight() {
AllBlockEntities.init();
AllItems.init();
AllLangMessages.init();
AllCreativeTabs.register(modEventBus);

modEventBus.addListener(EventPriority.LOWEST, BalancedFlight::gatherData);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.vice.balancedflight.content.angelRing;

import com.tterrag.registrate.util.entry.ItemEntry;
import com.tterrag.registrate.util.entry.RegistryEntry;
import com.vice.balancedflight.AllCreativeTabs;
import com.vice.balancedflight.BalancedFlight;
Expand Down Expand Up @@ -27,7 +28,7 @@ public class FlightRing extends Item {

public FlightRing(Item.Properties props) { super(props); }

public static final RegistryEntry<? extends Item> ASCENDED = BalancedFlight.registrate()
public static final ItemEntry<? extends Item> ASCENDED = BalancedFlight.registrate()
.item("ascended_flight_ring", FlightRing::new)
.initialProperties(() -> new Item.Properties().stacksTo(1))
.register();
Expand Down

0 comments on commit ec3a5ac

Please sign in to comment.