Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.19.2 Release Prep #1818

Merged
merged 5 commits into from
Dec 19, 2023
Merged

1.19.2 Release Prep #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70cdb74
perf: remove unnecessary frame block shape recalc
MrTJP Dec 19, 2023
88c7937
internal: drop PublicNBTIngredient class
MrTJP Dec 11, 2023
55ca9d7
refactor: drop use of ObjectHolder annotation
MrTJP Dec 11, 2023
ffb1728
internal: use ModelRegistryHelper for part models
MrTJP Dec 14, 2023
1835997
refactor: use pattern vars and enhanced switch
MrTJP Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions core/src/main/java/mrtjp/projectred/core/BundledSignalsLib.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ public static void registerBundledTileInteraction(IBundledTileInteraction intera
return ((IBundledTile) tile).getBundledSignal(side ^ 1);
}

if (tile instanceof TileMultipart) {
TileMultipart tmp = (TileMultipart) tile;
if (tile instanceof TileMultipart tmp) {
byte[] signal = null;

// Source signal from all 4 perpendicular faces
Expand Down
17 changes: 9 additions & 8 deletions core/src/main/java/mrtjp/projectred/core/ProjectRedCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@ public class ProjectRedCore {
public static final Logger LOGGER = LogManager.getLogger(MOD_ID);

public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MOD_ID);
public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MOD_ID);
public static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, MOD_ID);
public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MOD_ID);
public static final DeferredRegister<MenuType<?>> MENU_TYPES = DeferredRegister.create(ForgeRegistries.CONTAINERS, MOD_ID);
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
public static final DeferredRegister<RecipeSerializer<?>> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, MOD_ID);
public static final DeferredRegister<MultipartType<?>> PARTS = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID);
public static final DeferredRegister<MultipartType<?>> PART_TYPES = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID);

public static final SimpleCreativeTab CORE_CREATIVE_TAB = new SimpleCreativeTab(MOD_ID, () -> new ItemStack(CoreReferences.RED_ALLOY_INGOT_ITEM));
public static final SimpleCreativeTab CORE_CREATIVE_TAB = new SimpleCreativeTab(MOD_ID, () -> new ItemStack(CoreItems.RED_ALLOY_INGOT_ITEM.get()));

static {
CoreBlocks.register();
CoreItems.register();
CoreContainers.register();
CoreMenus.register();
CoreParts.register();
}

Expand All @@ -61,9 +61,9 @@ public ProjectRedCore() {

BLOCKS.register(modEventBus);
ITEMS.register(modEventBus);
BLOCK_ENTITIES.register(modEventBus);
CONTAINERS.register(modEventBus);
PARTS.register(modEventBus);
BLOCK_ENTITY_TYPES.register(modEventBus);
MENU_TYPES.register(modEventBus);
PART_TYPES.register(modEventBus);
}

private void commonSetup(final FMLCommonSetupEvent event) {
Expand All @@ -75,6 +75,7 @@ private void commonSetup(final FMLCommonSetupEvent event) {

// Load compatibility modules
if (Configurator.compat_CCBundledCable) {
//noinspection Convert2MethodRef
OptionalMod.of("computercraft").ifPresent(mod -> ComputerCraftCompatibility.init(mod));
}
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/mrtjp/projectred/core/block/ElectrotineGeneratorBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mrtjp.projectred.core.block;

import codechicken.lib.vec.Rotation;
import mrtjp.projectred.core.init.CoreReferences;
import mrtjp.projectred.core.init.CoreBlocks;
import mrtjp.projectred.core.tile.ElectrotineGeneratorTile;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.context.BlockPlaceContext;
Expand All @@ -27,7 +27,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {

@Override
protected BlockEntityType<?> getBlockEntityType() {
return CoreReferences.ELECTROTINE_GENERATOR_TILE;
return CoreBlocks.ELECTROTINE_GENERATOR_TILE.get();
}

@Nullable
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/mrtjp/projectred/core/data/CoreBlockStateModelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import javax.annotation.Nonnull;

import static mrtjp.projectred.core.ProjectRedCore.MOD_ID;
import static mrtjp.projectred.core.init.CoreReferences.ELECTROTINE_GENERATOR_BLOCK;
import static mrtjp.projectred.core.init.CoreBlocks.ELECTROTINE_GENERATOR_BLOCK;

@SuppressWarnings("DataFlowIssue")
public class CoreBlockStateModelProvider extends BlockStateProvider {
Expand All @@ -29,7 +29,7 @@ public String getName() {

@Override
protected void registerStatesAndModels() {
quadStateFrontFacedPoweredMachineModel(ELECTROTINE_GENERATOR_BLOCK);
quadStateFrontFacedPoweredMachineModel(ELECTROTINE_GENERATOR_BLOCK.get());
}

private void quadStateFrontFacedPoweredMachineModel(Block block) {
Expand Down
5 changes: 2 additions & 3 deletions core/src/main/java/mrtjp/projectred/core/data/CoreBlockTagsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
import org.jetbrains.annotations.Nullable;

import static mrtjp.projectred.core.ProjectRedCore.MOD_ID;

import static mrtjp.projectred.core.init.CoreReferences.*;
import static mrtjp.projectred.core.init.CoreBlocks.ELECTROTINE_GENERATOR_BLOCK;

public class CoreBlockTagsProvider extends BlockTagsProvider {

Expand All @@ -25,7 +24,7 @@ public String getName() {
protected void addTags() {

tag(BlockTags.MINEABLE_WITH_PICKAXE)
.add(ELECTROTINE_GENERATOR_BLOCK);
.add(ELECTROTINE_GENERATOR_BLOCK.get());

}
}
5 changes: 3 additions & 2 deletions core/src/main/java/mrtjp/projectred/core/data/CoreItemModelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
import net.minecraftforge.common.data.ExistingFileHelper;

import static mrtjp.projectred.core.ProjectRedCore.MOD_ID;
import static mrtjp.projectred.core.init.CoreReferences.*;
import static mrtjp.projectred.core.init.CoreBlocks.ELECTROTINE_GENERATOR_BLOCK;
import static mrtjp.projectred.core.init.CoreItems.*;

public class CoreItemModelProvider extends ItemModelProvider {

Expand All @@ -20,7 +21,7 @@ public String getName() {

@Override
protected void registerModels() {
simpleItemBlock(ELECTROTINE_GENERATOR_BLOCK);
simpleItemBlock(ELECTROTINE_GENERATOR_BLOCK.get());

generated(PLATE_ITEM);
generated(CONDUCTIVE_PLATE_ITEM);
Expand Down
46 changes: 23 additions & 23 deletions core/src/main/java/mrtjp/projectred/core/data/CoreItemTagsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import javax.annotation.Nullable;

import static mrtjp.projectred.core.ProjectRedCore.MOD_ID;
import static mrtjp.projectred.core.init.CoreReferences.*;
import static mrtjp.projectred.core.init.CoreItems.*;
import static mrtjp.projectred.core.init.CoreTags.*;

public class CoreItemTagsProvider extends ItemTagsProvider {
Expand Down Expand Up @@ -38,28 +38,28 @@ protected void addTags() {
tag(Tags.Items.DUSTS)
.addTag(ELECTROTINE_DUST_TAG);

tag(RED_ALLOY_INGOT_TAG).add(RED_ALLOY_INGOT_ITEM);
tag(ELECTROTINE_ALLOY_INGOT_TAG).add(ELECTROTINE_ALLOY_INGOT_ITEM);
tag(RUBY_GEM_TAG).add(RUBY_ITEM);
tag(SAPPHIRE_GEM_TAG).add(SAPPHIRE_ITEM);
tag(PERIDOT_GEM_TAG).add(PERIDOT_ITEM);
tag(ELECTROTINE_DUST_TAG).add(ELECTROTINE_DUST_ITEM);
tag(RED_ALLOY_INGOT_TAG).add(RED_ALLOY_INGOT_ITEM.get());
tag(ELECTROTINE_ALLOY_INGOT_TAG).add(ELECTROTINE_ALLOY_INGOT_ITEM.get());
tag(RUBY_GEM_TAG).add(RUBY_ITEM.get());
tag(SAPPHIRE_GEM_TAG).add(SAPPHIRE_ITEM.get());
tag(PERIDOT_GEM_TAG).add(PERIDOT_ITEM.get());
tag(ELECTROTINE_DUST_TAG).add(ELECTROTINE_DUST_ITEM.get());
tag(ILLUMAR_TAG)
.add(WHITE_ILLUMAR_ITEM)
.add(ORANGE_ILLUMAR_ITEM)
.add(MAGENTA_ILLUMAR_ITEM)
.add(LIGHT_BLUE_ILLUMAR_ITEM)
.add(YELLOW_ILLUMAR_ITEM)
.add(LIME_ILLUMAR_ITEM)
.add(PINK_ILLUMAR_ITEM)
.add(GRAY_ILLUMAR_ITEM)
.add(LIGHT_GRAY_ILLUMAR_ITEM)
.add(CYAN_ILLUMAR_ITEM)
.add(PURPLE_ILLUMAR_ITEM)
.add(BLUE_ILLUMAR_ITEM)
.add(BROWN_ILLUMAR_ITEM)
.add(GREEN_ILLUMAR_ITEM)
.add(RED_ILLUMAR_ITEM)
.add(BLACK_ILLUMAR_ITEM);
.add(WHITE_ILLUMAR_ITEM.get())
.add(ORANGE_ILLUMAR_ITEM.get())
.add(MAGENTA_ILLUMAR_ITEM.get())
.add(LIGHT_BLUE_ILLUMAR_ITEM.get())
.add(YELLOW_ILLUMAR_ITEM.get())
.add(LIME_ILLUMAR_ITEM.get())
.add(PINK_ILLUMAR_ITEM.get())
.add(GRAY_ILLUMAR_ITEM.get())
.add(LIGHT_GRAY_ILLUMAR_ITEM.get())
.add(CYAN_ILLUMAR_ITEM.get())
.add(PURPLE_ILLUMAR_ITEM.get())
.add(BLUE_ILLUMAR_ITEM.get())
.add(BROWN_ILLUMAR_ITEM.get())
.add(GREEN_ILLUMAR_ITEM.get())
.add(RED_ILLUMAR_ITEM.get())
.add(BLACK_ILLUMAR_ITEM.get());
}
}
109 changes: 55 additions & 54 deletions core/src/main/java/mrtjp/projectred/core/data/CoreLanguageProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
import net.minecraftforge.common.data.LanguageProvider;

import static mrtjp.projectred.core.ProjectRedCore.MOD_ID;
import static mrtjp.projectred.core.init.CoreReferences.*;
import static mrtjp.projectred.core.init.CoreBlocks.ELECTROTINE_GENERATOR_BLOCK;
import static mrtjp.projectred.core.init.CoreItems.*;

public class CoreLanguageProvider extends LanguageProvider {

Expand All @@ -24,60 +25,60 @@ protected void addTranslations() {
add("itemGroup." + MOD_ID, "Project Red: Core");

// Blocks
add(ELECTROTINE_GENERATOR_BLOCK, "Electrotine Generator");
add(ELECTROTINE_GENERATOR_BLOCK.get(), "Electrotine Generator");

// Items
add(PLATE_ITEM, "Circuit Plate");
add(CONDUCTIVE_PLATE_ITEM, "Conductive Plate");
add(WIRED_PLATE_ITEM, "Wired Plate");
add(BUNDLED_PLATE_ITEM, "Bundled Plate");
add(PLATFORMED_PLATE_ITEM, "Platformed Plate");
add(ANODE_ITEM, "Anode");
add(CATHODE_ITEM, "Cathode");
add(POINTER_ITEM, "Pointer");
add(SILICON_CHIP_ITEM, "Silicon Chip");
add(ENERGIZED_SILICON_CHIP_ITEM, "Energized Silicon Chip");
add(RED_ALLOY_INGOT_ITEM, "Red Alloy Ingot");
add(ELECTROTINE_ALLOY_INGOT_ITEM, "Electrotine Alloy Ingot");
add(ELECTROTINE_DUST_ITEM, "Electrotine Dust");
add(RUBY_ITEM, "Ruby");
add(SAPPHIRE_ITEM, "Sapphire");
add(PERIDOT_ITEM, "Peridot");
add(SAND_COAL_COMP_ITEM, "Sand Coal Compound");
add(RED_IRON_COMP_ITEM, "Red Iron Compound");
add(ELECTROTINE_IRON_COMP_ITEM, "Electrotine Iron Compound");
add(SILICON_BOULE_ITEM, "Silicon Boule");
add(SILICON_ITEM, "Silicon");
add(RED_SILICON_COMP_ITEM, "Red Silicon Compound");
add(GLOW_SILICON_COMP_ITEM, "Glowing Silicon Compound");
add(ELECTROTINE_SILICON_COMP_ITEM, "Electrotine Silicon Compound");
add(INFUSED_SILICON_ITEM, "Infused Silicon");
add(ENERGIZED_SILICON_ITEM, "Energized Silicon");
add(ELECTROTINE_SILICON_ITEM, "Electrotine Silicon");
add(COPPER_COIL_ITEM, "Copper Coil");
add(IRON_COIL_ITEM, "Iron Coil");
add(GOLD_COIL_ITEM, "Gold Coil");
add(MOTOR_ITEM, "Motor");
add(WOVEN_CLOTH_ITEM, "Woven Cloth");
add(SAIL_ITEM, "Sail");
add(WHITE_ILLUMAR_ITEM, "White Illumar");
add(ORANGE_ILLUMAR_ITEM, "Orange Illumar");
add(MAGENTA_ILLUMAR_ITEM, "Magenta Illumar");
add(LIGHT_BLUE_ILLUMAR_ITEM, "Light Blue Illumar");
add(YELLOW_ILLUMAR_ITEM, "Yellow Illumar");
add(LIME_ILLUMAR_ITEM, "Lime Illumar");
add(PINK_ILLUMAR_ITEM, "Pink Illumar");
add(GRAY_ILLUMAR_ITEM, "Gray Illumar");
add(LIGHT_GRAY_ILLUMAR_ITEM, "Light Gray Illumar");
add(CYAN_ILLUMAR_ITEM, "Cyan Illumar");
add(PURPLE_ILLUMAR_ITEM, "Purple Illumar");
add(BLUE_ILLUMAR_ITEM, "Blue Illumar");
add(BROWN_ILLUMAR_ITEM, "Brown Illumar");
add(GREEN_ILLUMAR_ITEM, "Green Illumar");
add(RED_ILLUMAR_ITEM, "Red Illumar");
add(BLACK_ILLUMAR_ITEM, "Black Illumar");
add(DRAW_PLATE_ITEM, "Draw Plate");
add(SCREWDRIVER_ITEM, "Screwdriver");
add(MULTIMETER_ITEM, "Multimeter");
add(PLATE_ITEM.get(), "Circuit Plate");
add(CONDUCTIVE_PLATE_ITEM.get(), "Conductive Plate");
add(WIRED_PLATE_ITEM.get(), "Wired Plate");
add(BUNDLED_PLATE_ITEM.get(), "Bundled Plate");
add(PLATFORMED_PLATE_ITEM.get(), "Platformed Plate");
add(ANODE_ITEM.get(), "Anode");
add(CATHODE_ITEM.get(), "Cathode");
add(POINTER_ITEM.get(), "Pointer");
add(SILICON_CHIP_ITEM.get(), "Silicon Chip");
add(ENERGIZED_SILICON_CHIP_ITEM.get(), "Energized Silicon Chip");
add(RED_ALLOY_INGOT_ITEM.get(), "Red Alloy Ingot");
add(ELECTROTINE_ALLOY_INGOT_ITEM.get(), "Electrotine Alloy Ingot");
add(ELECTROTINE_DUST_ITEM.get(), "Electrotine Dust");
add(RUBY_ITEM.get(), "Ruby");
add(SAPPHIRE_ITEM.get(), "Sapphire");
add(PERIDOT_ITEM.get(), "Peridot");
add(SAND_COAL_COMP_ITEM.get(), "Sand Coal Compound");
add(RED_IRON_COMP_ITEM.get(), "Red Iron Compound");
add(ELECTROTINE_IRON_COMP_ITEM.get(), "Electrotine Iron Compound");
add(SILICON_BOULE_ITEM.get(), "Silicon Boule");
add(SILICON_ITEM.get(), "Silicon");
add(RED_SILICON_COMP_ITEM.get(), "Red Silicon Compound");
add(GLOW_SILICON_COMP_ITEM.get(), "Glowing Silicon Compound");
add(ELECTROTINE_SILICON_COMP_ITEM.get(), "Electrotine Silicon Compound");
add(INFUSED_SILICON_ITEM.get(), "Infused Silicon");
add(ENERGIZED_SILICON_ITEM.get(), "Energized Silicon");
add(ELECTROTINE_SILICON_ITEM.get(), "Electrotine Silicon");
add(COPPER_COIL_ITEM.get(), "Copper Coil");
add(IRON_COIL_ITEM.get(), "Iron Coil");
add(GOLD_COIL_ITEM.get(), "Gold Coil");
add(MOTOR_ITEM.get(), "Motor");
add(WOVEN_CLOTH_ITEM.get(), "Woven Cloth");
add(SAIL_ITEM.get(), "Sail");
add(WHITE_ILLUMAR_ITEM.get(), "White Illumar");
add(ORANGE_ILLUMAR_ITEM.get(), "Orange Illumar");
add(MAGENTA_ILLUMAR_ITEM.get(), "Magenta Illumar");
add(LIGHT_BLUE_ILLUMAR_ITEM.get(), "Light Blue Illumar");
add(YELLOW_ILLUMAR_ITEM.get(), "Yellow Illumar");
add(LIME_ILLUMAR_ITEM.get(), "Lime Illumar");
add(PINK_ILLUMAR_ITEM.get(), "Pink Illumar");
add(GRAY_ILLUMAR_ITEM.get(), "Gray Illumar");
add(LIGHT_GRAY_ILLUMAR_ITEM.get(), "Light Gray Illumar");
add(CYAN_ILLUMAR_ITEM.get(), "Cyan Illumar");
add(PURPLE_ILLUMAR_ITEM.get(), "Purple Illumar");
add(BLUE_ILLUMAR_ITEM.get(), "Blue Illumar");
add(BROWN_ILLUMAR_ITEM.get(), "Brown Illumar");
add(GREEN_ILLUMAR_ITEM.get(), "Green Illumar");
add(RED_ILLUMAR_ITEM.get(), "Red Illumar");
add(BLACK_ILLUMAR_ITEM.get(), "Black Illumar");
add(DRAW_PLATE_ITEM.get(), "Draw Plate");
add(SCREWDRIVER_ITEM.get(), "Screwdriver");
add(MULTIMETER_ITEM.get(), "Multimeter");
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/mrtjp/projectred/core/data/CoreLootTableProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import codechicken.lib.datagen.LootTableProvider;
import net.minecraft.data.DataGenerator;

import static mrtjp.projectred.core.init.CoreReferences.ELECTROTINE_GENERATOR_BLOCK;
import static mrtjp.projectred.core.init.CoreBlocks.ELECTROTINE_GENERATOR_BLOCK;

public class CoreLootTableProvider extends LootTableProvider.BlockLootProvider {

Expand All @@ -18,6 +18,6 @@ public String getName() {

@Override
protected void registerTables() {
register(ELECTROTINE_GENERATOR_BLOCK, singleItem(ELECTROTINE_GENERATOR_BLOCK));
register(ELECTROTINE_GENERATOR_BLOCK.get(), singleItem(ELECTROTINE_GENERATOR_BLOCK.get()));
}
}
Loading
Loading