Skip to content

Commit

Permalink
Installed Sonar Analyzer
Browse files Browse the repository at this point in the history
  • Loading branch information
@rudahee
rudahee committed Jul 1, 2024
1 parent 2e03163 commit d688368
Show file tree
Hide file tree
Showing 29 changed files with 1,042 additions and 757 deletions.
26 changes: 13 additions & 13 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,25 +149,25 @@ dependencies {
// that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
// The userdev artifact is a special name and will get all sorts of transformations applied to it.

minecraft 'net.minecraftforge:forge:1.19.4-45.2.10'
minecraft 'net.minecraftforge:forge:1.19.4-45.2.10'

implementation fg.deobf("software.bernie.geckolib:geckolib-forge-1.19.4:4.2")
implementation("com.eliotlash.mclib:mclib:20")
implementation fg.deobf("software.bernie.geckolib:geckolib-forge-1.19.4:4.2")
implementation("com.eliotlash.mclib:mclib:20")

runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.4-5.1.5.4")
compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.4-5.1.5.4:api")
runtimeOnly fg.deobf("top.theillusivec4.caelus:caelus-forge:1.19.4-3.0.0.10")
compileOnly fg.deobf("top.theillusivec4.caelus:caelus-forge:1.19.4-3.0.0.10:api")

compileOnly fg.deobf("mezz.jei:jei-1" +
".19.4-common-api:13.1.0.9")
compileOnly fg.deobf("mezz.jei:jei-1.19.4-forge-api:13.1.0.9")
runtimeOnly fg.deobf("mezz.jei:jei-1.19.4-forge:13.1.0.9")
runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.4-5.1.5.4")
compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.4-5.1.5.4:api")
runtimeOnly fg.deobf("top.theillusivec4.caelus:caelus-forge:1.19.4-3.0.0.10")
compileOnly fg.deobf("top.theillusivec4.caelus:caelus-forge:1.19.4-3.0.0.10:api")

compileOnly fg.deobf("mezz.jei:jei-1.19.4-common-api:13.1.0.9")
compileOnly fg.deobf("mezz.jei:jei-1.19.4-forge-api:13.1.0.9")
runtimeOnly fg.deobf("mezz.jei:jei-1.19.4-forge:13.1.0.9")

compileOnly fg.deobf("com.klikli_dev:modonomicon:1.19.4-1.33.1")
runtimeOnly fg.deobf("com.klikli_dev:modonomicon:1.19.4-1.33.1")


compileOnly 'org.projectlombok:lombok:1.18.34'
annotationProcessor 'org.projectlombok:lombok:1.18.34'
}

jar {
Expand Down
99 changes: 63 additions & 36 deletions src/main/java/net/rudahee/metallics_arts/MetallicsArts.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.rudahee.metallics_arts;

import lombok.extern.log4j.Log4j2;
import net.minecraft.client.gui.screens.MenuScreens;
import net.minecraft.client.renderer.Sheets;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
Expand Down Expand Up @@ -35,32 +36,29 @@
import net.rudahee.metallics_arts.data.providers.ModInvestedPlayerDataProvider;
import net.rudahee.metallics_arts.data.providers.ModPaintingProvider;
import net.rudahee.metallics_arts.modules.custom_block_entities.crucible_furnace.CrucibleFurnaceScreen;
import net.rudahee.metallics_arts.modules.custom_block_entities.hemalurgy_altar_block.front.HemalurgyAltarFrontScreen;
import net.rudahee.metallics_arts.modules.custom_block_entities.hemalurgy_altar_block.back.HemalurgyAltarBackScreen;
import net.rudahee.metallics_arts.modules.custom_block_entities.hemalurgy_altar_block.front.HemalurgyAltarFrontScreen;
import net.rudahee.metallics_arts.modules.custom_blocks.sings.WoodTypeMetal;
import net.rudahee.metallics_arts.modules.custom_entities.villagers.ModVillager;
import net.rudahee.metallics_arts.modules.custom_items.metal_minds.render.CuriosLayerDefinitions;
import net.rudahee.metallics_arts.modules.custom_items.metal_minds.render.MetalMindModel;
import net.rudahee.metallics_arts.modules.custom_items.metal_minds.render.MetalMindRendered;
import net.rudahee.metallics_arts.modules.effects.ModEffects;
import net.rudahee.metallics_arts.modules.logic.client.ClientEventHandler;
import net.rudahee.metallics_arts.modules.logic.client.custom_guis.overlays.MetalsOverlay;
import net.rudahee.metallics_arts.modules.custom_entities.villagers.ModVillager;
import net.rudahee.metallics_arts.setup.Registration;
import net.rudahee.metallics_arts.setup.network.ModNetwork;
import net.rudahee.metallics_arts.setup.registries.*;

import net.rudahee.metallics_arts.setup.tabs.ModCreativeTabsEvents;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import top.theillusivec4.curios.api.CuriosApi;
import top.theillusivec4.curios.api.SlotTypeMessage;
import top.theillusivec4.curios.api.SlotTypePreset;
import top.theillusivec4.curios.api.client.CuriosRendererRegistry;

import java.util.function.Supplier;
import java.util.stream.Collectors;

// The value here should match an entry in the META-INF/mods.toml file
@Log4j2
@Mod(MetallicsArts.MOD_ID)
public class MetallicsArts {
// Mod id
Expand All @@ -69,64 +67,102 @@ public class MetallicsArts {
public static final String VERSION = "1.6.8";

// Directly reference a log4j logger.
public static final Logger LOGGER = LogManager.getLogger();

public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MOD_ID);

public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);

public MetallicsArts() {
log.info("""
======================================================
Starting Registration for Metallics Arts version {}
======================================================
""", VERSION);
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();

//In our main, we register all our objects.

log.info("Starting Register: Blocks");
BLOCKS.register(modEventBus);
log.info("Completed Register: Blocks");


log.info("Starting Register: Items");
ITEMS.register(modEventBus);
log.info("Completed Register: Items");

log.debug("prueba");
log.warn("log de que algo va mal pero no crashea");
log.error("log de que el error crashea");
log.info("log de que algo va bien y quieres informar");

Registration.register();

log.info("Starting Listeners: Client, Setup, queueIMC, processIMC, GUIs");
modEventBus.addListener(this::clientInit);
// Register the setup method for modloading
modEventBus.addListener(this::setup);
// Register the enqueueIMC method for modloading
modEventBus.addListener(this::enqueueIMC);
// Register the processIMC method for modloading
modEventBus.addListener(this::processIMC);

modEventBus.addListener(this::onGuOverlayEvent);
log.info("Completed Some Listeners");

ModEffects.register(modEventBus);

DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
log.info("Starting Listener: ClientKeys Shortcuts");
modEventBus.addListener(ModKeyRegister::initKeys);
log.info("Completed Listener: ClientKeys Shortcuts");

});

log.info("Starting Listener: Player Data");
// Register the doClientStuff method for modloading
modEventBus.addListener(InvestedPlayerCapabilityRegister::register);
modEventBus.addListener(this::doClientStuff);
log.info("Completed Listener: Player Data");

log.info("Starting Register: Entities");
ModEntityTypesRegister.register(modEventBus);
ModLivingEntityRegister.register(modEventBus);
ModBlockEntitiesRegister.register(modEventBus);
ModMenuRegister.register(modEventBus);
ModVillager.register(modEventBus);
log.info("Completed Register: Entities");

log.info("Starting Register: Menus");
ModMenuRegister.register(modEventBus);
log.info("Completed Register: Menus");

log.info("Starting Register: Sounds");
ModSoundsRegister.register(modEventBus);
log.info("Completed Register: Sounds");

log.info("Starting Listener: Creative Tabs");
modEventBus.addListener(ModCreativeTabsEvents::addToMetallicsArtsTab);
modEventBus.addListener(ModCreativeTabsEvents::addToMetallicsArtsDecorationTab);
modEventBus.addListener(ModCreativeTabsEvents::addToCombatTab);
modEventBus.addListener(ModCreativeTabsEvents::addToMetallicsArtsEntityTab);
log.info("Completed Listener: Creative Tabs");

modEventBus.addListener(this::registerLayers);

//Register for the paintings
log.info("Starting Register: Paintings & Banners");
ModPaintingProvider.register(modEventBus);

ModBannersRegister.register();
log.info("Completed Register: Paintings & Banners");


// Register ourselves for server and other game events we are interested in
log.info("Adding mod to Minecraft's EventBus");
MinecraftForge.EVENT_BUS.register(this);


log.info("Completed addition to EventBus");

log.info("""
=========================================
Completed Registration for Metallics Arts
=========================================
""");
}


Expand All @@ -135,38 +171,33 @@ public void attachCapabilitiesEntity(final AttachCapabilitiesEvent<Entity> event
if (event.getObject() instanceof Player) {
event.addCapability(InvestedPlayerCapabilityRegister.IDENTIFIER, new ModInvestedPlayerDataProvider());
}


}

private void setup(final FMLCommonSetupEvent event)
{
// some preinit code
LOGGER.info("Starting Metallics Arts Setup.");
log.info("Creating packets");
ModNetwork.registerPackets();
ModEventsRegister.register(event);

log.info("Adding wood types");
Sheets.addWoodType(WoodTypeMetal.IRON_TYPE);
Sheets.addWoodType(WoodTypeMetal.GOLD_TYPE);
Sheets.addWoodType(WoodTypeMetal.COPPER_TYPE);
Sheets.addWoodType(WoodTypeMetal.ALUMINUM_TYPE);

// TODO event.enqueueWork(ModVillager::registerPOIs);

}

private void doClientStuff(final FMLClientSetupEvent event) {
CustomPoses.initializePoses();



event.enqueueWork(() -> {

});
}

private void enqueueIMC(final InterModEnqueueEvent event)
{
log.info("Creating Curios Slots");
InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE,
() -> new SlotTypeMessage.Builder("metalmind_slot")
.priority(1)
Expand All @@ -179,33 +210,31 @@ private void enqueueIMC(final InterModEnqueueEvent event)

}

@SuppressWarnings("deprecation")
private void processIMC(final InterModProcessEvent event)
{
// some example code to receive and process InterModComms from other mods
LOGGER.info("Got IMC {}", event.getIMCStream().
map(m->m.getMessageSupplier().get()).
collect(Collectors.toList()));
log.info("Got IMC {}", event.getIMCStream().
map(m->m.getMessageSupplier().get()).toList());
}
// You can use SubscribeEvent and let the Event Bus discover methods to call

@SuppressWarnings("deprecation")
@SubscribeEvent
public void onGuOverlayEvent(final RegisterGuiOverlaysEvent event) {
event.registerBelowAll("invested_overlay", new MetalsOverlay());


ClientEventHandler.onRenderGameOverlay(event);
}

@SubscribeEvent
public void onCommandsRegister(RegisterCommandsEvent event) {
log.info("Adding commands");
ModCommandsRegister.register(event.getDispatcher());
}


public void clientInit(final FMLClientSetupEvent e) {

//ModClientDependencyManagement.start();

log.info("[Client] Registering Client Events");
ModEventsRegister.clientInit(e);
MenuScreens.register(ModMenuRegister.CRUCIBLE_FURNACE_MENU.get(), CrucibleFurnaceScreen::new);
MenuScreens.register(ModMenuRegister.HEMALURGY_ALTAR_FRONT_MENU.get(), HemalurgyAltarFrontScreen::new);
Expand Down Expand Up @@ -240,14 +269,12 @@ public static <T extends Block> RegistryObject<T> registerBlock(String name, Sup

RegistryObject<T> blockRegistered = registerBlockNoItem(name, blockSupplier);
ITEMS.register(name, () -> (new BlockItem(blockRegistered.get(), new Item.Properties().stacksTo(64))));
//ITEMS.register(name, () -> (new BlockItem(blockRegistered.get(), new Item.Properties().tab(MA_TAB).stacksTo(64))));
return blockRegistered;

}

public static <T extends Block> RegistryObject<T> registerBlockDecoration(String name, Supplier<T> blockSupplier) {
RegistryObject<T> blockRegistered = registerBlockNoItem(name, blockSupplier);
//ITEMS.register(name, () -> (new BlockItem(blockRegistered.get(), new Item.Properties().tab(MA_TAB_DECORATION).stacksTo(64))));
ITEMS.register(name, () -> (new BlockItem(blockRegistered.get(), new Item.Properties().stacksTo(64))));
return blockRegistered;
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/net/rudahee/metallics_arts/data/player/data/InvestedPlayerData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@ public void addAllFeruchemic() {
*/
@Override
public void removeAllomanticPower(MetalTagEnum metal) {
System.out.println("InvestedPlayerData: Removing allomantic power: " + metal);
Stream.of(player.getLegs(), player.getHead(), player.getBack(), player.getArms(), player.getChest())
.forEach(bodyPart -> bodyPart.removeSpikeBySpikeEntity(new SpikeEntity(metal, TypeOfSpikeEnum.ALLOMANTIC)));
}
Expand All @@ -591,6 +592,7 @@ public void removeAllAllomanticPower() {
*/
@Override
public void removeFeruchemicPower(MetalTagEnum metal) {
System.out.println("InvestedPlayerData: Removing feruchemic power: " + metal);
Stream.of(player.getLegs(), player.getHead(), player.getBack(), player.getArms(), player.getChest())
.forEach(bodyPart -> bodyPart.removeSpikeBySpikeEntity(new SpikeEntity(metal, TypeOfSpikeEnum.FERUCHEMIC)));
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/rudahee/metallics_arts/data/providers/ModLootTableProvider.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.rudahee.metallics_arts.data.providers;

import lombok.extern.log4j.Log4j2;
import net.minecraft.advancements.critereon.EnchantmentPredicate;
import net.minecraft.advancements.critereon.ItemPredicate;
import net.minecraft.advancements.critereon.MinMaxBounds;
Expand Down Expand Up @@ -31,10 +32,11 @@

import java.util.function.BiConsumer;

@Log4j2
public class ModLootTableProvider implements LootTableSubProvider {
// Useful boilerplate from McJtyLib
protected static void addSimpleBlock(BiConsumer<ResourceLocation, LootTable.Builder> writer, String name, Block block) {
MetallicsArts.LOGGER.debug("Creating Loot Table for block " + ForgeRegistries.BLOCKS.getKey(block));
log.debug("Creating Loot Table for block " + ForgeRegistries.BLOCKS.getKey(block));
LootPool.Builder builder = LootPool.lootPool().name(name).setRolls(ConstantValue.exactly(1)).add(LootItem.lootTableItem(block));

writer.accept(new ResourceLocation(MetallicsArts.MOD_ID, "blocks/" + name), LootTable.lootTable().withPool(builder));
Expand Down
Loading

0 comments on commit d688368

Please sign in to comment.