diff --git a/common/src/main/java/net/cmr/jurassicrevived/compat/FossilCleanerRecipeCategory.java b/common/src/main/java/net/cmr/jurassicrevived/compat/FossilCleanerRecipeCategory.java index 319a54e..382103b 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/compat/FossilCleanerRecipeCategory.java +++ b/common/src/main/java/net/cmr/jurassicrevived/compat/FossilCleanerRecipeCategory.java @@ -80,42 +80,60 @@ public class FossilCleanerRecipeCategory implements IRecipeCategory 0) { - guiGraphics.blit(WHITE_BUBBLES_TEXTURE, 73, 37, 0, 0, progFilled, 16, 29, 12); - } + FluidStack water = FluidStack.create(Fluids.WATER, 250); + fluidRenderer.render(guiGraphics, 7, 8, water); - int requiredFE = 2000; - int capacityFE = 64000; - int filled = (int)(barH * (requiredFE / (float)capacityFE)); - // Render red fill similar to EnergyDisplayTooltipArea - guiGraphics.fillGradient(barX, barY + (barH - filled), barX + barW, barY + barH, 0xffb51500, 0xff600b00); + int tankX = 7; + int tankY = 8; + int tankW = fluidRenderer.getWidth(); + int tankH = fluidRenderer.getHeight(); + int mx = (int) mouseX; + int my = (int) mouseY; + if (mx >= tankX && mx < tankX + tankW && my >= tankY && my < tankY + tankH) { + guiGraphics.renderTooltip( + Minecraft.getInstance().font, + fluidRenderer.getTooltip(water, Minecraft.getInstance().options.advancedItemTooltips ? net.minecraft.world.item.TooltipFlag.Default.ADVANCED : net.minecraft.world.item.TooltipFlag.Default.NORMAL), + java.util.Optional.empty(), + mx, + my + ); + } - // Tooltip "2000 / 64000 FE" on hover over the energy area - int mx = (int) mouseX; - int my = (int) mouseY; - if (mx >= barX && mx < barX + barW && my >= barY && my < barY + barH) { - List tips = List.of(Component.literal("2000 / 64000 FE")); - guiGraphics.renderTooltip(Minecraft.getInstance().font, tips, java.util.Optional.empty(), mx, my); - } - } - } + guiGraphics.blit(BUBBLES_TEXTURE, 73, 37, 0, 0, 29, 12, 29, 12); + if (JRConfigManager.get().requirePower) { + guiGraphics.blit(POWER_BAR_TEXTURE, 159, 10, 0, 0, 10, 66, 10, 66); + // Fill amount for JEI: show total required energy (2000 FE) relative to 64000 FE capacity + // Our simple fill is purely visual for JEI, not tied to any BE + int barX = 160; + int barY = 11; + int barW = 8; + int barH = 64; + + int maxTicks = 200; + long now = System.currentTimeMillis(); + int progress = (int)((now / 50L) % maxTicks); // ~20 TPS + int arrowPixels = 29; + int progFilled = progress * arrowPixels / maxTicks; + if (progFilled > 0) { + guiGraphics.blit(WHITE_BUBBLES_TEXTURE, 73, 37, 0, 0, progFilled, 12, 29, 12); + } + + int requiredFE = 2000; + int capacityFE = 64000; + int filled = (int)(barH * (requiredFE / (float)capacityFE)); + // Render red fill similar to EnergyDisplayTooltipArea + guiGraphics.fillGradient(barX, barY + (barH - filled), barX + barW, barY + barH, 0xffb51500, 0xff600b00); + + // Tooltip "2000 / 64000 FE" on hover over the energy area + if (mx >= barX && mx < barX + barW && my >= barY && my < barY + barH) { + List tips = List.of(Component.literal("2000 / 64000 FE")); + guiGraphics.renderTooltip(Minecraft.getInstance().font, tips, java.util.Optional.empty(), mx, my); + } + } + } @Override public @Nullable IDrawable getIcon() { @@ -123,51 +141,46 @@ public class FossilCleanerRecipeCategory implements IRecipeCategory { + tooltip.add(Component.translatable("jurassicrevived.tooltip.accepts_any_water_container")); + }); - // Water container acceptance list at (57, 61), discovered dynamically - var waterItems = builder.addSlot(RecipeIngredientRole.INPUT, 7, 61).addItemStacks(WATER_CONTAINERS_CACHE); - waterItems.addRichTooltipCallback((view, tooltip) -> { - tooltip.add(Component.translatable("jurassicrevived.tooltip.accepts_any_water_container")); - }); + // Output list: all fossils from the tag, tooltip shows per-item weight from the recipe + var level = Minecraft.getInstance().level; + if (level != null) { + var itemRegistry = level.registryAccess().registryOrThrow(Registries.ITEM); + var fossilsTagOpt = itemRegistry.getTag(ModTags.Items.FOSSILS); + List fossilOutputs = fossilsTagOpt.map(holderSet -> + holderSet.stream() + .map(h -> new ItemStack(h.value(), Math.max(1, recipe.output().getCount()))) + .collect(Collectors.toList()) + ).orElse(List.of()); - // Output list: all fossils from the tag, tooltip shows per-item weight from the recipe - var level = Minecraft.getInstance().level; - if (level != null) { - var itemRegistry = level.registryAccess().registryOrThrow(Registries.ITEM); - var fossilsTagOpt = itemRegistry.getTag(ModTags.Items.FOSSILS); - List fossilOutputs = fossilsTagOpt.map(holderSet -> - holderSet.stream() - .map(h -> new ItemStack(h.value(), Math.max(1, recipe.output().getCount()))) - .collect(Collectors.toList()) - ).orElse(List.of()); + // Hide zero-weight fossils + fossilOutputs = fossilOutputs.stream() + .filter(stack -> recipe.getWeightFor(stack.getItem()) > 0) + .collect(Collectors.toList()); - // Hide zero-weight fossils - fossilOutputs = fossilOutputs.stream() - .filter(stack -> recipe.getWeightFor(stack.getItem()) > 0) - .collect(Collectors.toList()); + var slot = builder.addSlot(RecipeIngredientRole.OUTPUT, 103, 35).addItemStacks(fossilOutputs); + slot.addRichTooltipCallback((view, tooltip) -> { + var opt = view.getDisplayedItemStack(); + if (opt.isPresent()) { + int weight = recipe.getWeightFor(opt.get().getItem()); + //tooltip.add(Component.literal("Weight: " + weight)); + } + }); + return; + } - var slot = builder.addSlot(RecipeIngredientRole.OUTPUT, 103, 35).addItemStacks(fossilOutputs); - slot.addRichTooltipCallback((view, tooltip) -> { - var opt = view.getDisplayedItemStack(); - if (opt.isPresent()) { - int weight = recipe.getWeightFor(opt.get().getItem()); - //tooltip.add(Component.literal("Weight: " + weight)); - } - }); - return; - } - - builder.addSlot(RecipeIngredientRole.OUTPUT, 103, 35).addItemStack(recipe.output()); - } + builder.addSlot(RecipeIngredientRole.OUTPUT, 103, 35).addItemStack(recipe.output()); + } private static List buildWaterContainersList() { var list = new ArrayList(); diff --git a/common/src/main/java/net/cmr/jurassicrevived/compat/JEIJRPlugin.java b/common/src/main/java/net/cmr/jurassicrevived/compat/JEIJRPlugin.java index 4c77636..fb5a01f 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/compat/JEIJRPlugin.java +++ b/common/src/main/java/net/cmr/jurassicrevived/compat/JEIJRPlugin.java @@ -25,6 +25,7 @@ public class JEIJRPlugin implements IModPlugin { @Override public ResourceLocation getPluginUid() { + Constants.LOG.info("Registering Jurassic Revived JEI plugin"); return Constants.rl("jei_plugin"); } @@ -32,6 +33,7 @@ public class JEIJRPlugin implements IModPlugin { @Override public void onRuntimeAvailable(IJeiRuntime jeiRuntime) { + Constants.LOG.info("Jurassic Revived JEI runtime available"); INGREDIENT_MANAGER = jeiRuntime.getIngredientManager(); } @@ -41,6 +43,7 @@ public class JEIJRPlugin implements IModPlugin { @Override public void registerCategories(IRecipeCategoryRegistration registration) { + Constants.LOG.info("Registering Jurassic Revived JEI recipe categories"); registration.addRecipeCategories(new DNAExtractorRecipeCategory(registration.getJeiHelpers().getGuiHelper())); registration.addRecipeCategories(new DNAAnalyzerRecipeCategory(registration.getJeiHelpers().getGuiHelper())); registration.addRecipeCategories(new FossilGrinderRecipeCategory(registration.getJeiHelpers().getGuiHelper())); @@ -185,7 +188,7 @@ public class JEIJRPlugin implements IModPlugin { ModMenuTypes.EMBRYONIC_MACHINE_MENU.get(), EmbryonicMachineRecipeCategory.EMBRYONIC_MACHINE_RECIPE_RECIPE_TYPE, 36, // The index of the FIRST recipe input slot in your Menu (slot 36) - 2, // The NUMBER of recipe input slots (slots 36, 37) + 3, // The NUMBER of recipe input slots (slots 36, 37, 38) 0, // The index where the player inventory slots START (slot 0) 36 // The NUMBER of player inventory slots to check (slots 0-35) ); diff --git a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModRecipeProvider.java b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModRecipeProvider.java index ca97ea3..e9dbe5c 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModRecipeProvider.java +++ b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModRecipeProvider.java @@ -16,7 +16,6 @@ public class ModRecipeProvider { public interface RecipeHelper { void buildShaped(RecipeCategory category, ItemLike result, int count, String[] patterns, Object... keys); - void buildShapeless(RecipeCategory category, ItemLike result, int count, ItemLike... ingredients); void buildShapeless(RecipeCategory category, ItemLike result, int count, String name, ItemLike... ingredients); void buildSmelting(List ingredients, RecipeCategory category, ItemLike result, float experience, int cookingTime, String group); void buildBlasting(List ingredients, RecipeCategory category, ItemLike result, float experience, int cookingTime, String group); @@ -199,7 +198,155 @@ public class ModRecipeProvider { helper.fossilCleaning(ModBlocks.STONE_FOSSIL.get(), ModItems.APATOSAURUS_SKULL_FOSSIL.get(), 1); helper.fossilCleaning(ModBlocks.DEEPSLATE_FOSSIL.get(), ModItems.VELOCIRAPTOR_SKULL_FOSSIL.get(), 1); - helper.dnaHybridizing(ModItems.INDOMINUS_REX_DNA.get(), 1, ModItems.FROG_DNA.get(), + helper.fossilGrinding(ModItems.ALBERTOSAURUS_SKULL_FOSSIL.get(), ModItems.ALBERTOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.APATOSAURUS_SKULL_FOSSIL.get(), ModItems.APATOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.BRACHIOSAURUS_SKULL_FOSSIL.get(), ModItems.BRACHIOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.CERATOSAURUS_SKULL_FOSSIL.get(), ModItems.CERATOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.COMPSOGNATHUS_SKULL_FOSSIL.get(), ModItems.COMPSOGNATHUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.DILOPHOSAURUS_SKULL_FOSSIL.get(), ModItems.DILOPHOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.DIPLODOCUS_SKULL_FOSSIL.get(), ModItems.DIPLODOCUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.GALLIMIMUS_SKULL_FOSSIL.get(), ModItems.GALLIMIMUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.OURANOSAURUS_SKULL_FOSSIL.get(), ModItems.OURANOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.PARASAUROLOPHUS_SKULL_FOSSIL.get(), ModItems.PARASAUROLOPHUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.SPINOSAURUS_SKULL_FOSSIL.get(), ModItems.SPINOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.TRICERATOPS_SKULL_FOSSIL.get(), ModItems.TRICERATOPS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.TYRANNOSAURUS_REX_SKULL_FOSSIL.get(), ModItems.TYRANNOSAURUS_REX_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.VELOCIRAPTOR_SKULL_FOSSIL.get(), ModItems.VELOCIRAPTOR_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.BARYONYX_SKULL_FOSSIL.get(), ModItems.BARYONYX_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.CARNOTAURUS_SKULL_FOSSIL.get(), ModItems.CARNOTAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.CONCAVENATOR_SKULL_FOSSIL.get(), ModItems.CONCAVENATOR_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.DEINONYCHUS_SKULL_FOSSIL.get(), ModItems.DEINONYCHUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.EDMONTOSAURUS_SKULL_FOSSIL.get(), ModItems.EDMONTOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.GIGANOTOSAURUS_SKULL_FOSSIL.get(), ModItems.GIGANOTOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.GUANLONG_SKULL_FOSSIL.get(), ModItems.GUANLONG_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.HERRERASAURUS_SKULL_FOSSIL.get(), ModItems.HERRERASAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.MAJUNGASAURUS_SKULL_FOSSIL.get(), ModItems.MAJUNGASAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.PROCOMPSOGNATHUS_SKULL_FOSSIL.get(), ModItems.PROCOMPSOGNATHUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.PROTOCERATOPS_SKULL_FOSSIL.get(), ModItems.PROTOCERATOPS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.RUGOPS_SKULL_FOSSIL.get(), ModItems.RUGOPS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.SHANTUNGOSAURUS_SKULL_FOSSIL.get(), ModItems.SHANTUNGOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.STEGOSAURUS_SKULL_FOSSIL.get(), ModItems.STEGOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.STYRACOSAURUS_SKULL_FOSSIL.get(), ModItems.STYRACOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.THERIZINOSAURUS_SKULL_FOSSIL.get(), ModItems.THERIZINOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.ALLOSAURUS_SKULL_FOSSIL.get(), ModItems.ALLOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.ALVAREZSAURUS_SKULL_FOSSIL.get(), ModItems.ALVAREZSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.ANKYLOSAURUS_SKULL_FOSSIL.get(), ModItems.ANKYLOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.ARAMBOURGIANIA_SKULL_FOSSIL.get(), ModItems.ARAMBOURGIANIA_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.CARCHARODONTOSAURUS_SKULL_FOSSIL.get(), ModItems.CARCHARODONTOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.CEARADACTYLUS_SKULL_FOSSIL.get(), ModItems.CEARADACTYLUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.CHASMOSAURUS_SKULL_FOSSIL.get(), ModItems.CHASMOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.COELOPHYSIS_SKULL_FOSSIL.get(), ModItems.COELOPHYSIS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.COELURUS_SKULL_FOSSIL.get(), ModItems.COELURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.CORYTHOSAURUS_SKULL_FOSSIL.get(), ModItems.CORYTHOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.DIMORPHODON_SKULL_FOSSIL.get(), ModItems.DIMORPHODON_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.DRYOSAURUS_SKULL_FOSSIL.get(), ModItems.DRYOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.GEOSTERNBERGIA_SKULL_FOSSIL.get(), ModItems.GEOSTERNBERGIA_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.GUIDRACO_SKULL_FOSSIL.get(), ModItems.GUIDRACO_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.HADROSAURUS_SKULL_FOSSIL.get(), ModItems.HADROSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.HYPSILOPHODON_SKULL_FOSSIL.get(), ModItems.HYPSILOPHODON_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.INOSTRANCEVIA_SKULL_FOSSIL.get(), ModItems.INOSTRANCEVIA_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.LAMBEOSAURUS_SKULL_FOSSIL.get(), ModItems.LAMBEOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.LUDODACTYLUS_SKULL_FOSSIL.get(), ModItems.LUDODACTYLUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.MAMENCHISAURUS_SKULL_FOSSIL.get(), ModItems.MAMENCHISAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.METRIACANTHOSAURUS_SKULL_FOSSIL.get(), ModItems.METRIACANTHOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.MOGANOPTERUS_SKULL_FOSSIL.get(), ModItems.MOGANOPTERUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.NYCTOSAURUS_SKULL_FOSSIL.get(), ModItems.NYCTOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.ORNITHOLESTES_SKULL_FOSSIL.get(), ModItems.ORNITHOLESTES_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.ORNITHOMIMUS_SKULL_FOSSIL.get(), ModItems.ORNITHOMIMUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.OVIRAPTOR_SKULL_FOSSIL.get(), ModItems.OVIRAPTOR_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.PACHYCEPHALOSAURUS_SKULL_FOSSIL.get(), ModItems.PACHYCEPHALOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.PROCERATOSAURUS_SKULL_FOSSIL.get(), ModItems.PROCERATOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.PTERANODON_SKULL_FOSSIL.get(), ModItems.PTERANODON_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.PTERODAUSTRO_SKULL_FOSSIL.get(), ModItems.PTERODAUSTRO_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.QUETZALCOATLUS_SKULL_FOSSIL.get(), ModItems.QUETZALCOATLUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.RAJASAURUS_SKULL_FOSSIL.get(), ModItems.RAJASAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.SEGISAURUS_SKULL_FOSSIL.get(), ModItems.SEGISAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.TAPEJARA_SKULL_FOSSIL.get(), ModItems.TAPEJARA_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.TITANOSAURUS_SKULL_FOSSIL.get(), ModItems.TITANOSAURUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.TROODON_SKULL_FOSSIL.get(), ModItems.TROODON_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.TROPEOGNATHUS_SKULL_FOSSIL.get(), ModItems.TROPEOGNATHUS_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.TUPUXUARA_SKULL_FOSSIL.get(), ModItems.TUPUXUARA_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.UTAHRAPTOR_SKULL_FOSSIL.get(), ModItems.UTAHRAPTOR_TISSUE.get(), 1); + helper.fossilGrinding(ModItems.ZHENYUANOPTERUS_SKULL_FOSSIL.get(), ModItems.ZHENYUANOPTERUS_TISSUE.get(), 1); + + helper.skullToTissue(ModItems.FRESH_ALBERTOSAURUS_SKULL.get(), ModItems.ALBERTOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_APATOSAURUS_SKULL.get(), ModItems.APATOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_BRACHIOSAURUS_SKULL.get(), ModItems.BRACHIOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_CERATOSAURUS_SKULL.get(), ModItems.CERATOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_COMPSOGNATHUS_SKULL.get(), ModItems.COMPSOGNATHUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_DILOPHOSAURUS_SKULL.get(), ModItems.DILOPHOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_DIPLODOCUS_SKULL.get(), ModItems.DIPLODOCUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_GALLIMIMUS_SKULL.get(), ModItems.GALLIMIMUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_INDOMINUS_REX_SKULL.get(), ModItems.INDOMINUS_REX_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_OURANOSAURUS_SKULL.get(), ModItems.OURANOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_PARASAUROLOPHUS_SKULL.get(), ModItems.PARASAUROLOPHUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_SPINOSAURUS_SKULL.get(), ModItems.SPINOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_TRICERATOPS_SKULL.get(), ModItems.TRICERATOPS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_TYRANNOSAURUS_REX_SKULL.get(), ModItems.TYRANNOSAURUS_REX_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_VELOCIRAPTOR_SKULL.get(), ModItems.VELOCIRAPTOR_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_BARYONYX_SKULL.get(), ModItems.BARYONYX_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_CARNOTAURUS_SKULL.get(), ModItems.CARNOTAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_CONCAVENATOR_SKULL.get(), ModItems.CONCAVENATOR_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_DEINONYCHUS_SKULL.get(), ModItems.DEINONYCHUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_EDMONTOSAURUS_SKULL.get(), ModItems.EDMONTOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_GIGANOTOSAURUS_SKULL.get(), ModItems.GIGANOTOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_GUANLONG_SKULL.get(), ModItems.GUANLONG_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_HERRERASAURUS_SKULL.get(), ModItems.HERRERASAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_MAJUNGASAURUS_SKULL.get(), ModItems.MAJUNGASAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_PROCOMPSOGNATHUS_SKULL.get(), ModItems.PROCOMPSOGNATHUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_PROTOCERATOPS_SKULL.get(), ModItems.PROTOCERATOPS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_RUGOPS_SKULL.get(), ModItems.RUGOPS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_SHANTUNGOSAURUS_SKULL.get(), ModItems.SHANTUNGOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_STEGOSAURUS_SKULL.get(), ModItems.STEGOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_STYRACOSAURUS_SKULL.get(), ModItems.STYRACOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_THERIZINOSAURUS_SKULL.get(), ModItems.THERIZINOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_DISTORTUS_REX_SKULL.get(), ModItems.DISTORTUS_REX_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_ALLOSAURUS_SKULL.get(), ModItems.ALLOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_ALVAREZSAURUS_SKULL.get(), ModItems.ALVAREZSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_ANKYLOSAURUS_SKULL.get(), ModItems.ANKYLOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_ARAMBOURGIANIA_SKULL.get(), ModItems.ARAMBOURGIANIA_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_CARCHARODONTOSAURUS_SKULL.get(), ModItems.CARCHARODONTOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_CEARADACTYLUS_SKULL.get(), ModItems.CEARADACTYLUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_CHASMOSAURUS_SKULL.get(), ModItems.CHASMOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_COELOPHYSIS_SKULL.get(), ModItems.COELOPHYSIS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_COELURUS_SKULL.get(), ModItems.COELURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_CORYTHOSAURUS_SKULL.get(), ModItems.CORYTHOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_DIMORPHODON_SKULL.get(), ModItems.DIMORPHODON_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_DRYOSAURUS_SKULL.get(), ModItems.DRYOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_GEOSTERNBERGIA_SKULL.get(), ModItems.GEOSTERNBERGIA_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_GUIDRACO_SKULL.get(), ModItems.GUIDRACO_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_HADROSAURUS_SKULL.get(), ModItems.HADROSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_HYPSILOPHODON_SKULL.get(), ModItems.HYPSILOPHODON_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_INDORAPTOR_SKULL.get(), ModItems.INDORAPTOR_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_INOSTRANCEVIA_SKULL.get(), ModItems.INOSTRANCEVIA_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_LAMBEOSAURUS_SKULL.get(), ModItems.LAMBEOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_LUDODACTYLUS_SKULL.get(), ModItems.LUDODACTYLUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_MAMENCHISAURUS_SKULL.get(), ModItems.MAMENCHISAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_METRIACANTHOSAURUS_SKULL.get(), ModItems.METRIACANTHOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_MOGANOPTERUS_SKULL.get(), ModItems.MOGANOPTERUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_NYCTOSAURUS_SKULL.get(), ModItems.NYCTOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_ORNITHOLESTES_SKULL.get(), ModItems.ORNITHOLESTES_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_ORNITHOMIMUS_SKULL.get(), ModItems.ORNITHOMIMUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_OVIRAPTOR_SKULL.get(), ModItems.OVIRAPTOR_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_PACHYCEPHALOSAURUS_SKULL.get(), ModItems.PACHYCEPHALOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_PROCERATOSAURUS_SKULL.get(), ModItems.PROCERATOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_PTERANODON_SKULL.get(), ModItems.PTERANODON_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_PTERODAUSTRO_SKULL.get(), ModItems.PTERODAUSTRO_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_QUETZALCOATLUS_SKULL.get(), ModItems.QUETZALCOATLUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_RAJASAURUS_SKULL.get(), ModItems.RAJASAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_SEGISAURUS_SKULL.get(), ModItems.SEGISAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_TAPEJARA_SKULL.get(), ModItems.TAPEJARA_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_TITANOSAURUS_SKULL.get(), ModItems.TITANOSAURUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_TROODON_SKULL.get(), ModItems.TROODON_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_TROPEOGNATHUS_SKULL.get(), ModItems.TROPEOGNATHUS_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_TUPUXUARA_SKULL.get(), ModItems.TUPUXUARA_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_UTAHRAPTOR_SKULL.get(), ModItems.UTAHRAPTOR_TISSUE.get(), 1); + helper.skullToTissue(ModItems.FRESH_ZHENYUANOPTERUS_SKULL.get(), ModItems.ZHENYUANOPTERUS_TISSUE.get(), 1); + + helper.dnaAnalyzing(ModItems.TEST_TUBE.get(), ModItems.FROG_MATERIAL.get(), ModItems.FROG_DNA.get(), 1); + + + helper.dnaHybridizing(ModItems.INDOMINUS_REX_DNA.get(), 1, ModItems.FROG_DNA.get(), ModItems.TYRANNOSAURUS_REX_DNA.get(), ModItems.VELOCIRAPTOR_DNA.get(), ModItems.CARNOTAURUS_DNA.get(), @@ -291,6 +438,154 @@ public class ModRecipeProvider { helper.embryonicMachine(ModItems.SYRINGE.get(), ModItems.UTAHRAPTOR_DNA.get(), ModItems.FROG_DNA.get(), ModItems.UTAHRAPTOR_SYRINGE.get(), 1); helper.embryonicMachine(ModItems.SYRINGE.get(), ModItems.ZHENYUANOPTERUS_DNA.get(), ModItems.FROG_DNA.get(), ModItems.ZHENYUANOPTERUS_SYRINGE.get(), 1); - helper.amberRandomDNA(ModItems.TEST_TUBE.get(), ModItems.MOSQUITO_IN_AMBER.get(), ModItems.FROG_DNA.get(), 1); + helper.embryoCalcification(ModItems.ALBERTOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.ALBERTOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.APATOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.APATOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.BRACHIOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.BRACHIOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.CERATOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.CERATOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.COMPSOGNATHUS_SYRINGE.get(), Items.EGG, ModBlocks.COMPSOGNATHUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.DILOPHOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.DILOPHOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.DIPLODOCUS_SYRINGE.get(), Items.EGG, ModBlocks.DIPLODOCUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.GALLIMIMUS_SYRINGE.get(), Items.EGG, ModBlocks.GALLIMIMUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.INDOMINUS_REX_SYRINGE.get(), Items.EGG, ModBlocks.INDOMINUS_REX_EGG.get(), 1); + helper.embryoCalcification(ModItems.OURANOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.OURANOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.PARASAUROLOPHUS_SYRINGE.get(), Items.EGG, ModBlocks.PARASAUROLOPHUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.SPINOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.SPINOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.TRICERATOPS_SYRINGE.get(), Items.EGG, ModBlocks.TRICERATOPS_EGG.get(), 1); + helper.embryoCalcification(ModItems.TYRANNOSAURUS_REX_SYRINGE.get(), Items.EGG, ModBlocks.TYRANNOSAURUS_REX_EGG.get(), 1); + helper.embryoCalcification(ModItems.VELOCIRAPTOR_SYRINGE.get(), Items.EGG, ModBlocks.VELOCIRAPTOR_EGG.get(), 1); + helper.embryoCalcification(ModItems.BARYONYX_SYRINGE.get(), Items.EGG, ModBlocks.BARYONYX_EGG.get(), 1); + helper.embryoCalcification(ModItems.CARNOTAURUS_SYRINGE.get(), Items.EGG, ModBlocks.CARNOTAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.CONCAVENATOR_SYRINGE.get(), Items.EGG, ModBlocks.CONCAVENATOR_EGG.get(), 1); + helper.embryoCalcification(ModItems.DEINONYCHUS_SYRINGE.get(), Items.EGG, ModBlocks.DEINONYCHUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.EDMONTOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.EDMONTOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.GIGANOTOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.GIGANOTOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.GUANLONG_SYRINGE.get(), Items.EGG, ModBlocks.GUANLONG_EGG.get(), 1); + helper.embryoCalcification(ModItems.HERRERASAURUS_SYRINGE.get(), Items.EGG, ModBlocks.HERRERASAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.MAJUNGASAURUS_SYRINGE.get(), Items.EGG, ModBlocks.MAJUNGASAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.PROCOMPSOGNATHUS_SYRINGE.get(), Items.EGG, ModBlocks.PROCOMPSOGNATHUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.PROTOCERATOPS_SYRINGE.get(), Items.EGG, ModBlocks.PROTOCERATOPS_EGG.get(), 1); + helper.embryoCalcification(ModItems.RUGOPS_SYRINGE.get(), Items.EGG, ModBlocks.RUGOPS_EGG.get(), 1); + helper.embryoCalcification(ModItems.SHANTUNGOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.SHANTUNGOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.STEGOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.STEGOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.STYRACOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.STYRACOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.THERIZINOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.THERIZINOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.DISTORTUS_REX_SYRINGE.get(), Items.EGG, ModBlocks.DISTORTUS_REX_EGG.get(), 1); + helper.embryoCalcification(ModItems.ALLOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.ALLOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.ALVAREZSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.ALVAREZSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.ANKYLOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.ANKYLOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.ARAMBOURGIANIA_SYRINGE.get(), Items.EGG, ModBlocks.ARAMBOURGIANIA_EGG.get(), 1); + helper.embryoCalcification(ModItems.CARCHARODONTOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.CARCHARODONTOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.CEARADACTYLUS_SYRINGE.get(), Items.EGG, ModBlocks.CEARADACTYLUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.CHASMOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.CHASMOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.COELOPHYSIS_SYRINGE.get(), Items.EGG, ModBlocks.COELOPHYSIS_EGG.get(), 1); + helper.embryoCalcification(ModItems.COELURUS_SYRINGE.get(), Items.EGG, ModBlocks.COELURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.CORYTHOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.CORYTHOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.DIMORPHODON_SYRINGE.get(), Items.EGG, ModBlocks.DIMORPHODON_EGG.get(), 1); + helper.embryoCalcification(ModItems.DRYOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.DRYOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.GEOSTERNBERGIA_SYRINGE.get(), Items.EGG, ModBlocks.GEOSTERNBERGIA_EGG.get(), 1); + helper.embryoCalcification(ModItems.GUIDRACO_SYRINGE.get(), Items.EGG, ModBlocks.GUIDRACO_EGG.get(), 1); + helper.embryoCalcification(ModItems.HADROSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.HADROSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.HYPSILOPHODON_SYRINGE.get(), Items.EGG, ModBlocks.HYPSILOPHODON_EGG.get(), 1); + helper.embryoCalcification(ModItems.INDORAPTOR_SYRINGE.get(), Items.EGG, ModBlocks.INDORAPTOR_EGG.get(), 1); + helper.embryoCalcification(ModItems.INOSTRANCEVIA_SYRINGE.get(), Items.EGG, ModBlocks.INOSTRANCEVIA_EGG.get(), 1); + helper.embryoCalcification(ModItems.LAMBEOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.LAMBEOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.LUDODACTYLUS_SYRINGE.get(), Items.EGG, ModBlocks.LUDODACTYLUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.MAMENCHISAURUS_SYRINGE.get(), Items.EGG, ModBlocks.MAMENCHISAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.METRIACANTHOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.METRIACANTHOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.MOGANOPTERUS_SYRINGE.get(), Items.EGG, ModBlocks.MOGANOPTERUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.NYCTOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.NYCTOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.ORNITHOLESTES_SYRINGE.get(), Items.EGG, ModBlocks.ORNITHOLESTES_EGG.get(), 1); + helper.embryoCalcification(ModItems.ORNITHOMIMUS_SYRINGE.get(), Items.EGG, ModBlocks.ORNITHOMIMUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.OVIRAPTOR_SYRINGE.get(), Items.EGG, ModBlocks.OVIRAPTOR_EGG.get(), 1); + helper.embryoCalcification(ModItems.PACHYCEPHALOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.PACHYCEPHALOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.PROCERATOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.PROCERATOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.PTERANODON_SYRINGE.get(), Items.EGG, ModBlocks.PTERANODON_EGG.get(), 1); + helper.embryoCalcification(ModItems.PTERODAUSTRO_SYRINGE.get(), Items.EGG, ModBlocks.PTERODAUSTRO_EGG.get(), 1); + helper.embryoCalcification(ModItems.QUETZALCOATLUS_SYRINGE.get(), Items.EGG, ModBlocks.QUETZALCOATLUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.RAJASAURUS_SYRINGE.get(), Items.EGG, ModBlocks.RAJASAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.SEGISAURUS_SYRINGE.get(), Items.EGG, ModBlocks.SEGISAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.TAPEJARA_SYRINGE.get(), Items.EGG, ModBlocks.TAPEJARA_EGG.get(), 1); + helper.embryoCalcification(ModItems.TITANOSAURUS_SYRINGE.get(), Items.EGG, ModBlocks.TITANOSAURUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.TROODON_SYRINGE.get(), Items.EGG, ModBlocks.TROODON_EGG.get(), 1); + helper.embryoCalcification(ModItems.TROPEOGNATHUS_SYRINGE.get(), Items.EGG, ModBlocks.TROPEOGNATHUS_EGG.get(), 1); + helper.embryoCalcification(ModItems.TUPUXUARA_SYRINGE.get(), Items.EGG, ModBlocks.TUPUXUARA_EGG.get(), 1); + helper.embryoCalcification(ModItems.UTAHRAPTOR_SYRINGE.get(), Items.EGG, ModBlocks.UTAHRAPTOR_EGG.get(), 1); + helper.embryoCalcification(ModItems.ZHENYUANOPTERUS_SYRINGE.get(), Items.EGG, ModBlocks.ZHENYUANOPTERUS_EGG.get(), 1); + + helper.incubating(ModBlocks.APATOSAURUS_EGG.get(), ModBlocks.INCUBATED_APATOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.ALBERTOSAURUS_EGG.get(), ModBlocks.INCUBATED_ALBERTOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.BRACHIOSAURUS_EGG.get(), ModBlocks.INCUBATED_BRACHIOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.CERATOSAURUS_EGG.get(), ModBlocks.INCUBATED_CERATOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.COMPSOGNATHUS_EGG.get(), ModBlocks.INCUBATED_COMPSOGNATHUS_EGG.get(), 1); + helper.incubating(ModBlocks.DILOPHOSAURUS_EGG.get(), ModBlocks.INCUBATED_DILOPHOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.DIPLODOCUS_EGG.get(), ModBlocks.INCUBATED_DIPLODOCUS_EGG.get(), 1); + helper.incubating(ModBlocks.PARASAUROLOPHUS_EGG.get(), ModBlocks.INCUBATED_PARASAUROLOPHUS_EGG.get(), 1); + helper.incubating(ModBlocks.SPINOSAURUS_EGG.get(), ModBlocks.INCUBATED_SPINOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.OURANOSAURUS_EGG.get(), ModBlocks.INCUBATED_OURANOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.GALLIMIMUS_EGG.get(), ModBlocks.INCUBATED_GALLIMIMUS_EGG.get(), 1); + helper.incubating(ModBlocks.INDOMINUS_REX_EGG.get(), ModBlocks.INCUBATED_INDOMINUS_REX_EGG.get(), 1); + helper.incubating(ModBlocks.VELOCIRAPTOR_EGG.get(), ModBlocks.INCUBATED_VELOCIRAPTOR_EGG.get(), 1); + helper.incubating(ModBlocks.TYRANNOSAURUS_REX_EGG.get(), ModBlocks.INCUBATED_TYRANNOSAURUS_REX_EGG.get(), 1); + helper.incubating(ModBlocks.TRICERATOPS_EGG.get(), ModBlocks.INCUBATED_TRICERATOPS_EGG.get(), 1); + helper.incubating(ModBlocks.BARYONYX_EGG.get(), ModBlocks.INCUBATED_BARYONYX_EGG.get(), 1); + helper.incubating(ModBlocks.CARNOTAURUS_EGG.get(), ModBlocks.INCUBATED_CARNOTAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.CONCAVENATOR_EGG.get(), ModBlocks.INCUBATED_CONCAVENATOR_EGG.get(), 1); + helper.incubating(ModBlocks.DEINONYCHUS_EGG.get(), ModBlocks.INCUBATED_DEINONYCHUS_EGG.get(), 1); + helper.incubating(ModBlocks.EDMONTOSAURUS_EGG.get(), ModBlocks.INCUBATED_EDMONTOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.GIGANOTOSAURUS_EGG.get(), ModBlocks.INCUBATED_GIGANOTOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.GUANLONG_EGG.get(), ModBlocks.INCUBATED_GUANLONG_EGG.get(), 1); + helper.incubating(ModBlocks.HERRERASAURUS_EGG.get(), ModBlocks.INCUBATED_HERRERASAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.MAJUNGASAURUS_EGG.get(), ModBlocks.INCUBATED_MAJUNGASAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.PROCOMPSOGNATHUS_EGG.get(), ModBlocks.INCUBATED_PROCOMPSOGNATHUS_EGG.get(), 1); + helper.incubating(ModBlocks.PROTOCERATOPS_EGG.get(), ModBlocks.INCUBATED_PROTOCERATOPS_EGG.get(), 1); + helper.incubating(ModBlocks.RUGOPS_EGG.get(), ModBlocks.INCUBATED_RUGOPS_EGG.get(), 1); + helper.incubating(ModBlocks.SHANTUNGOSAURUS_EGG.get(), ModBlocks.INCUBATED_SHANTUNGOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.STEGOSAURUS_EGG.get(), ModBlocks.INCUBATED_STEGOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.STYRACOSAURUS_EGG.get(), ModBlocks.INCUBATED_STYRACOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.THERIZINOSAURUS_EGG.get(), ModBlocks.INCUBATED_THERIZINOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.DISTORTUS_REX_EGG.get(), ModBlocks.INCUBATED_DISTORTUS_REX_EGG.get(), 1); + helper.incubating(ModBlocks.ALLOSAURUS_EGG.get(), ModBlocks.INCUBATED_ALLOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.ALVAREZSAURUS_EGG.get(), ModBlocks.INCUBATED_ALVAREZSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.ANKYLOSAURUS_EGG.get(), ModBlocks.INCUBATED_ANKYLOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.ARAMBOURGIANIA_EGG.get(), ModBlocks.INCUBATED_ARAMBOURGIANIA_EGG.get(), 1); + helper.incubating(ModBlocks.CARCHARODONTOSAURUS_EGG.get(), ModBlocks.INCUBATED_CARCHARODONTOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.CEARADACTYLUS_EGG.get(), ModBlocks.INCUBATED_CEARADACTYLUS_EGG.get(), 1); + helper.incubating(ModBlocks.CHASMOSAURUS_EGG.get(), ModBlocks.INCUBATED_CHASMOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.COELOPHYSIS_EGG.get(), ModBlocks.INCUBATED_COELOPHYSIS_EGG.get(), 1); + helper.incubating(ModBlocks.COELURUS_EGG.get(), ModBlocks.INCUBATED_COELURUS_EGG.get(), 1); + helper.incubating(ModBlocks.CORYTHOSAURUS_EGG.get(), ModBlocks.INCUBATED_CORYTHOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.DIMORPHODON_EGG.get(), ModBlocks.INCUBATED_DIMORPHODON_EGG.get(), 1); + helper.incubating(ModBlocks.DRYOSAURUS_EGG.get(), ModBlocks.INCUBATED_DRYOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.GEOSTERNBERGIA_EGG.get(), ModBlocks.INCUBATED_GEOSTERNBERGIA_EGG.get(), 1); + helper.incubating(ModBlocks.GUIDRACO_EGG.get(), ModBlocks.INCUBATED_GUIDRACO_EGG.get(), 1); + helper.incubating(ModBlocks.HADROSAURUS_EGG.get(), ModBlocks.INCUBATED_HADROSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.HYPSILOPHODON_EGG.get(), ModBlocks.INCUBATED_HYPSILOPHODON_EGG.get(), 1); + helper.incubating(ModBlocks.INDORAPTOR_EGG.get(), ModBlocks.INCUBATED_INDORAPTOR_EGG.get(), 1); + helper.incubating(ModBlocks.INOSTRANCEVIA_EGG.get(), ModBlocks.INCUBATED_INOSTRANCEVIA_EGG.get(), 1); + helper.incubating(ModBlocks.LAMBEOSAURUS_EGG.get(), ModBlocks.INCUBATED_LAMBEOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.LUDODACTYLUS_EGG.get(), ModBlocks.INCUBATED_LUDODACTYLUS_EGG.get(), 1); + helper.incubating(ModBlocks.MAMENCHISAURUS_EGG.get(), ModBlocks.INCUBATED_MAMENCHISAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.METRIACANTHOSAURUS_EGG.get(), ModBlocks.INCUBATED_METRIACANTHOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.MOGANOPTERUS_EGG.get(), ModBlocks.INCUBATED_MOGANOPTERUS_EGG.get(), 1); + helper.incubating(ModBlocks.NYCTOSAURUS_EGG.get(), ModBlocks.INCUBATED_NYCTOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.ORNITHOLESTES_EGG.get(), ModBlocks.INCUBATED_ORNITHOLESTES_EGG.get(), 1); + helper.incubating(ModBlocks.ORNITHOMIMUS_EGG.get(), ModBlocks.INCUBATED_ORNITHOMIMUS_EGG.get(), 1); + helper.incubating(ModBlocks.OVIRAPTOR_EGG.get(), ModBlocks.INCUBATED_OVIRAPTOR_EGG.get(), 1); + helper.incubating(ModBlocks.PACHYCEPHALOSAURUS_EGG.get(), ModBlocks.INCUBATED_PACHYCEPHALOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.PROCERATOSAURUS_EGG.get(), ModBlocks.INCUBATED_PROCERATOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.PTERANODON_EGG.get(), ModBlocks.INCUBATED_PTERANODON_EGG.get(), 1); + helper.incubating(ModBlocks.PTERODAUSTRO_EGG.get(), ModBlocks.INCUBATED_PTERODAUSTRO_EGG.get(), 1); + helper.incubating(ModBlocks.QUETZALCOATLUS_EGG.get(), ModBlocks.INCUBATED_QUETZALCOATLUS_EGG.get(), 1); + helper.incubating(ModBlocks.RAJASAURUS_EGG.get(), ModBlocks.INCUBATED_RAJASAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.SEGISAURUS_EGG.get(), ModBlocks.INCUBATED_SEGISAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.TAPEJARA_EGG.get(), ModBlocks.INCUBATED_TAPEJARA_EGG.get(), 1); + helper.incubating(ModBlocks.TITANOSAURUS_EGG.get(), ModBlocks.INCUBATED_TITANOSAURUS_EGG.get(), 1); + helper.incubating(ModBlocks.TROODON_EGG.get(), ModBlocks.INCUBATED_TROODON_EGG.get(), 1); + helper.incubating(ModBlocks.TROPEOGNATHUS_EGG.get(), ModBlocks.INCUBATED_TROPEOGNATHUS_EGG.get(), 1); + helper.incubating(ModBlocks.TUPUXUARA_EGG.get(), ModBlocks.INCUBATED_TUPUXUARA_EGG.get(), 1); + helper.incubating(ModBlocks.UTAHRAPTOR_EGG.get(), ModBlocks.INCUBATED_UTAHRAPTOR_EGG.get(), 1); + helper.incubating(ModBlocks.ZHENYUANOPTERUS_EGG.get(), ModBlocks.INCUBATED_ZHENYUANOPTERUS_EGG.get(), 1); + + helper.amberRandomDNA(ModItems.TEST_TUBE.get(), ModItems.MOSQUITO_IN_AMBER.get(), ModItems.FROG_DNA.get(), 1); } } diff --git a/common/src/main/java/net/cmr/jurassicrevived/recipe/DNAAnalyzerRecipe.java b/common/src/main/java/net/cmr/jurassicrevived/recipe/DNAAnalyzerRecipe.java index f8b5dc7..07aee90 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/recipe/DNAAnalyzerRecipe.java +++ b/common/src/main/java/net/cmr/jurassicrevived/recipe/DNAAnalyzerRecipe.java @@ -34,6 +34,11 @@ public record DNAAnalyzerRecipe( java.util.Map weights ) implements Recipe { + @Override + public NonNullList getIngredients() { + return inputs; + } + @Override public boolean matches(DNAAnalyzerRecipeInput input, Level level) { if (level.isClientSide) return false; diff --git a/common/src/main/java/net/cmr/jurassicrevived/recipe/DNAExtractorRecipe.java b/common/src/main/java/net/cmr/jurassicrevived/recipe/DNAExtractorRecipe.java index 619cb5d..7a1b549 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/recipe/DNAExtractorRecipe.java +++ b/common/src/main/java/net/cmr/jurassicrevived/recipe/DNAExtractorRecipe.java @@ -37,6 +37,11 @@ public record DNAExtractorRecipe( java.util.Map weights ) implements Recipe { + @Override + public NonNullList getIngredients() { + return inputs; + } + @Override public boolean matches(DNAExtractorRecipeInput input, Level level) { if (level.isClientSide) return false; diff --git a/common/src/main/java/net/cmr/jurassicrevived/recipe/DNAHybridizerRecipe.java b/common/src/main/java/net/cmr/jurassicrevived/recipe/DNAHybridizerRecipe.java index dca2223..3989230 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/recipe/DNAHybridizerRecipe.java +++ b/common/src/main/java/net/cmr/jurassicrevived/recipe/DNAHybridizerRecipe.java @@ -30,6 +30,11 @@ import net.minecraft.core.RegistryAccess; public record DNAHybridizerRecipe(NonNullList inputs, ItemStack output) implements Recipe { + @Override + public NonNullList getIngredients() { + return inputs; + } + @Override public boolean matches(DNAHybridizerRecipeInput recipeInput, Level level) { if (level.isClientSide) return false; diff --git a/common/src/main/java/net/cmr/jurassicrevived/recipe/EmbryoCalcificationMachineRecipe.java b/common/src/main/java/net/cmr/jurassicrevived/recipe/EmbryoCalcificationMachineRecipe.java index 177fae5..1deb17a 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/recipe/EmbryoCalcificationMachineRecipe.java +++ b/common/src/main/java/net/cmr/jurassicrevived/recipe/EmbryoCalcificationMachineRecipe.java @@ -28,6 +28,11 @@ import net.minecraft.core.RegistryAccess; public record EmbryoCalcificationMachineRecipe(NonNullList inputs, ItemStack output) implements Recipe { + @Override + public NonNullList getIngredients() { + return inputs; + } + @Override public boolean matches(EmbryoCalcificationMachineRecipeInput recipeInput, Level level) { if (level.isClientSide) return false; diff --git a/common/src/main/java/net/cmr/jurassicrevived/recipe/FossilCleanerRecipe.java b/common/src/main/java/net/cmr/jurassicrevived/recipe/FossilCleanerRecipe.java index 6bea462..2ed9179 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/recipe/FossilCleanerRecipe.java +++ b/common/src/main/java/net/cmr/jurassicrevived/recipe/FossilCleanerRecipe.java @@ -52,6 +52,8 @@ public class FossilCleanerRecipe implements Recipe { } //?} + + @Override public boolean matches(@NotNull FossilCleanerRecipeInput input, Level level) { if (level.isClientSide()) return false; diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/albertosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/albertosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/allosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/allosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/alvarezsaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/alvarezsaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/amber_ore.png b/common/src/main/resources/assets/jurassicrevived/textures/block/amber_ore.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/ankylosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/ankylosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/apatosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/apatosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/arambourgiania_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/arambourgiania_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/baryonyx_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/baryonyx_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/bench.png b/common/src/main/resources/assets/jurassicrevived/textures/block/bench.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/brachiosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/brachiosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/carcharodontosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/carcharodontosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/carnotaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/carnotaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/cat_plushie.png b/common/src/main/resources/assets/jurassicrevived/textures/block/cat_plushie.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/cearadactylus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/cearadactylus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/ceratosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/ceratosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/charred_terracotta.png b/common/src/main/resources/assets/jurassicrevived/textures/block/charred_terracotta.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/chasmosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/chasmosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/chiseled_gypsum_stone.png b/common/src/main/resources/assets/jurassicrevived/textures/block/chiseled_gypsum_stone.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/chiseled_reinforced_stone.png b/common/src/main/resources/assets/jurassicrevived/textures/block/chiseled_reinforced_stone.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/coelophysis_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/coelophysis_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/coelurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/coelurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/compsognathus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/compsognathus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/concavenator_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/concavenator_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/corythosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/corythosaurus_egg.png old mode 100755 new mode 100644 index 2c57cf2..fecb435 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/block/corythosaurus_egg.png and b/common/src/main/resources/assets/jurassicrevived/textures/block/corythosaurus_egg.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/deepslate_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/block/deepslate_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/deepslate_ice_shard_ore.png b/common/src/main/resources/assets/jurassicrevived/textures/block/deepslate_ice_shard_ore.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/deinonychus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/deinonychus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/dilophosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/dilophosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/dimorphodon_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/dimorphodon_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/diplodocus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/diplodocus_egg.png old mode 100755 new mode 100644 index 9e4dba0..5ea6348 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/block/diplodocus_egg.png and b/common/src/main/resources/assets/jurassicrevived/textures/block/diplodocus_egg.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/distortus_rex_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/distortus_rex_egg.png old mode 100755 new mode 100644 index fa9df89..df7fcc3 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/block/distortus_rex_egg.png and b/common/src/main/resources/assets/jurassicrevived/textures/block/distortus_rex_egg.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/dna_analyzer.png b/common/src/main/resources/assets/jurassicrevived/textures/block/dna_analyzer.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/dna_extractor.png b/common/src/main/resources/assets/jurassicrevived/textures/block/dna_extractor.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/dna_hybridizer.png b/common/src/main/resources/assets/jurassicrevived/textures/block/dna_hybridizer.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/dryosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/dryosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/edmontosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/edmontosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/embryo_calcification_machine.png b/common/src/main/resources/assets/jurassicrevived/textures/block/embryo_calcification_machine.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/embryonic_machine.png b/common/src/main/resources/assets/jurassicrevived/textures/block/embryonic_machine.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/fence_light.png b/common/src/main/resources/assets/jurassicrevived/textures/block/fence_light.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/fluid_pipe.png b/common/src/main/resources/assets/jurassicrevived/textures/block/fluid_pipe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/fluid_pipe_connector.png b/common/src/main/resources/assets/jurassicrevived/textures/block/fluid_pipe_connector.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/fluid_pipe_interchange.png b/common/src/main/resources/assets/jurassicrevived/textures/block/fluid_pipe_interchange.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/fossil_cleaner.png b/common/src/main/resources/assets/jurassicrevived/textures/block/fossil_cleaner.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/fossil_grinder.png b/common/src/main/resources/assets/jurassicrevived/textures/block/fossil_grinder.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/gallimimus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/gallimimus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/generator.png b/common/src/main/resources/assets/jurassicrevived/textures/block/generator.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/geosternbergia_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/geosternbergia_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/giganotosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/giganotosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/guanlong_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/guanlong_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/guidraco_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/guidraco_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/gypsum_cobblestone.png b/common/src/main/resources/assets/jurassicrevived/textures/block/gypsum_cobblestone.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/gypsum_stone.png b/common/src/main/resources/assets/jurassicrevived/textures/block/gypsum_stone.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/gypsum_stone_bricks.png b/common/src/main/resources/assets/jurassicrevived/textures/block/gypsum_stone_bricks.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/hadrosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/hadrosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/herrerasaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/herrerasaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/horsetail_fern.png b/common/src/main/resources/assets/jurassicrevived/textures/block/horsetail_fern.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/hypsilophodon_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/hypsilophodon_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_albertosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_albertosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_allosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_allosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_alvarezsaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_alvarezsaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_ankylosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_ankylosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_apatosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_apatosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_arambourgiania_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_arambourgiania_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_baryonyx_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_baryonyx_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_brachiosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_brachiosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_carcharodontosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_carcharodontosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_carnotaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_carnotaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_cearadactylus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_cearadactylus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_ceratosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_ceratosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_chasmosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_chasmosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_coelophysis_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_coelophysis_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_coelurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_coelurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_compsognathus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_compsognathus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_concavenator_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_concavenator_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_corythosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_corythosaurus_egg.png old mode 100755 new mode 100644 index a7e7f1b..526897e Binary files a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_corythosaurus_egg.png and b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_corythosaurus_egg.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_deinonychus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_deinonychus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_dilophosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_dilophosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_dimorphodon_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_dimorphodon_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_diplodocus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_diplodocus_egg.png old mode 100755 new mode 100644 index 81ddf09..f658903 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_diplodocus_egg.png and b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_diplodocus_egg.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_distortus_rex_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_distortus_rex_egg.png old mode 100755 new mode 100644 index 91757e7..f6fa333 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_distortus_rex_egg.png and b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_distortus_rex_egg.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_dryosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_dryosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_edmontosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_edmontosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_gallimimus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_gallimimus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_geosternbergia_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_geosternbergia_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_giganotosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_giganotosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_guanlong_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_guanlong_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_guidraco_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_guidraco_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_hadrosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_hadrosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_herrerasaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_herrerasaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_hypsilophodon_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_hypsilophodon_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_indominus_rex_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_indominus_rex_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_indoraptor_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_indoraptor_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_inostrancevia_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_inostrancevia_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_lambeosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_lambeosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_ludodactylus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_ludodactylus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_majungasaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_majungasaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_mamenchisaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_mamenchisaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_metriacanthosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_metriacanthosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_moganopterus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_moganopterus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_nyctosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_nyctosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_ornitholestes_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_ornitholestes_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_ornithomimus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_ornithomimus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_ouranosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_ouranosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_oviraptor_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_oviraptor_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_pachycephalosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_pachycephalosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_parasaurolophus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_parasaurolophus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_proceratosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_proceratosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_procompsognathus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_procompsognathus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_protoceratops_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_protoceratops_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_pteranodon_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_pteranodon_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_pterodaustro_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_pterodaustro_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_quetzalcoatlus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_quetzalcoatlus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_rajasaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_rajasaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_rugops_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_rugops_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_segisaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_segisaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_shantungosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_shantungosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_spinosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_spinosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_stegosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_stegosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_styracosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_styracosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_tapejara_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_tapejara_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_therizinosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_therizinosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_titanosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_titanosaurus_egg.png old mode 100755 new mode 100644 index fe298dc..8e9fa37 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_titanosaurus_egg.png and b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_titanosaurus_egg.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_triceratops_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_triceratops_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_troodon_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_troodon_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_tropeognathus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_tropeognathus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_tupuxuara_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_tupuxuara_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_tyrannosaurus_rex_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_tyrannosaurus_rex_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_utahraptor_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_utahraptor_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_velociraptor_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_velociraptor_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_zhenyuanopterus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubated_zhenyuanopterus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/incubator.png b/common/src/main/resources/assets/jurassicrevived/textures/block/incubator.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/indominus_rex_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/indominus_rex_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/indoraptor_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/indoraptor_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/inostrancevia_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/inostrancevia_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/iron_crate.png b/common/src/main/resources/assets/jurassicrevived/textures/block/iron_crate.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/item_pipe.png b/common/src/main/resources/assets/jurassicrevived/textures/block/item_pipe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/item_pipe_connector.png b/common/src/main/resources/assets/jurassicrevived/textures/block/item_pipe_connector.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/item_pipe_interchange.png b/common/src/main/resources/assets/jurassicrevived/textures/block/item_pipe_interchange.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/lambeosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/lambeosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/light_post.png b/common/src/main/resources/assets/jurassicrevived/textures/block/light_post.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/low_security_fence_pole.png b/common/src/main/resources/assets/jurassicrevived/textures/block/low_security_fence_pole.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/low_security_fence_pole_diag_part.png b/common/src/main/resources/assets/jurassicrevived/textures/block/low_security_fence_pole_diag_part.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/low_security_fence_pole_part.png b/common/src/main/resources/assets/jurassicrevived/textures/block/low_security_fence_pole_part.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/low_security_fence_wire.png b/common/src/main/resources/assets/jurassicrevived/textures/block/low_security_fence_wire.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/low_security_fence_wire_diag_part.png b/common/src/main/resources/assets/jurassicrevived/textures/block/low_security_fence_wire_diag_part.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/low_security_fence_wire_part.png b/common/src/main/resources/assets/jurassicrevived/textures/block/low_security_fence_wire_part.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/ludodactylus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/ludodactylus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/majungasaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/majungasaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/mamenchisaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/mamenchisaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/medium_security_fence_pole.png b/common/src/main/resources/assets/jurassicrevived/textures/block/medium_security_fence_pole.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/medium_security_fence_pole_diag_part.png b/common/src/main/resources/assets/jurassicrevived/textures/block/medium_security_fence_pole_diag_part.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/medium_security_fence_pole_part.png b/common/src/main/resources/assets/jurassicrevived/textures/block/medium_security_fence_pole_part.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/medium_security_fence_wire.png b/common/src/main/resources/assets/jurassicrevived/textures/block/medium_security_fence_wire.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/medium_security_fence_wire_diag_part.png b/common/src/main/resources/assets/jurassicrevived/textures/block/medium_security_fence_wire_diag_part.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/medium_security_fence_wire_part.png b/common/src/main/resources/assets/jurassicrevived/textures/block/medium_security_fence_wire_part.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/metriacanthosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/metriacanthosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/moganopterus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/moganopterus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/nyctosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/nyctosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/onychiopsis.png b/common/src/main/resources/assets/jurassicrevived/textures/block/onychiopsis.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/ornitholestes_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/ornitholestes_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/ornithomimus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/ornithomimus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/ouranosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/ouranosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/oviraptor_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/oviraptor_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/pachycephalosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/pachycephalosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/parasaurolophus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/parasaurolophus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/power_cell.png b/common/src/main/resources/assets/jurassicrevived/textures/block/power_cell.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/power_pipe.png b/common/src/main/resources/assets/jurassicrevived/textures/block/power_pipe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/power_pipe_connector.png b/common/src/main/resources/assets/jurassicrevived/textures/block/power_pipe_connector.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/power_pipe_interchange.png b/common/src/main/resources/assets/jurassicrevived/textures/block/power_pipe_interchange.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/proceratosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/proceratosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/procompsognathus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/procompsognathus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/protoceratops_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/protoceratops_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/pteranodon_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/pteranodon_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/pterodaustro_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/pterodaustro_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/quetzalcoatlus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/quetzalcoatlus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/rajasaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/rajasaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/reinforced_stone.png b/common/src/main/resources/assets/jurassicrevived/textures/block/reinforced_stone.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/reinforced_stone_bricks.png b/common/src/main/resources/assets/jurassicrevived/textures/block/reinforced_stone_bricks.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/royal_fern.png b/common/src/main/resources/assets/jurassicrevived/textures/block/royal_fern.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/rugops_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/rugops_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/segisaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/segisaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/shantungosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/shantungosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/smooth_gypsum_stone.png b/common/src/main/resources/assets/jurassicrevived/textures/block/smooth_gypsum_stone.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/spinosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/spinosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/stegosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/stegosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/stone_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/block/stone_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/styracosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/styracosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/tank.png b/common/src/main/resources/assets/jurassicrevived/textures/block/tank.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/tapejara_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/tapejara_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/therizinosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/therizinosaurus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/titanosaurus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/titanosaurus_egg.png old mode 100755 new mode 100644 index 6974fc3..f179f75 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/block/titanosaurus_egg.png and b/common/src/main/resources/assets/jurassicrevived/textures/block/titanosaurus_egg.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/trash_can.png b/common/src/main/resources/assets/jurassicrevived/textures/block/trash_can.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/triceratops_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/triceratops_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/troodon_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/troodon_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/tropeognathus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/tropeognathus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/tupuxuara_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/tupuxuara_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/tyrannosaurus_rex_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/tyrannosaurus_rex_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/utahraptor_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/utahraptor_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/velociraptor_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/velociraptor_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/water.png b/common/src/main/resources/assets/jurassicrevived/textures/block/water.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/water.png.mcmeta b/common/src/main/resources/assets/jurassicrevived/textures/block/water.png.mcmeta old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/western_sword_fern.png b/common/src/main/resources/assets/jurassicrevived/textures/block/western_sword_fern.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/white_dna_analyzer.png b/common/src/main/resources/assets/jurassicrevived/textures/block/white_dna_analyzer.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/white_dna_extractor.png b/common/src/main/resources/assets/jurassicrevived/textures/block/white_dna_extractor.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/white_dna_hybridizer.png b/common/src/main/resources/assets/jurassicrevived/textures/block/white_dna_hybridizer.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/white_embryo_calcification_machine.png b/common/src/main/resources/assets/jurassicrevived/textures/block/white_embryo_calcification_machine.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/white_embryonic_machine.png b/common/src/main/resources/assets/jurassicrevived/textures/block/white_embryonic_machine.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/white_fossil_cleaner.png b/common/src/main/resources/assets/jurassicrevived/textures/block/white_fossil_cleaner.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/white_fossil_grinder.png b/common/src/main/resources/assets/jurassicrevived/textures/block/white_fossil_grinder.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/white_generator.png b/common/src/main/resources/assets/jurassicrevived/textures/block/white_generator.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/white_incubator.png b/common/src/main/resources/assets/jurassicrevived/textures/block/white_incubator.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/wood_crate.png b/common/src/main/resources/assets/jurassicrevived/textures/block/wood_crate.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/zhenyuanopterus_egg.png b/common/src/main/resources/assets/jurassicrevived/textures/block/zhenyuanopterus_egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/albertosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/albertosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/albertosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/albertosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/allosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/allosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/allosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/allosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/alvarezsaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/alvarezsaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/alvarezsaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/alvarezsaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/ankylosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/ankylosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/ankylosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/ankylosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/apatosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/apatosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/apatosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/apatosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/arambourgiania.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/arambourgiania.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/arambourgiania_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/arambourgiania_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/baryonyx.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/baryonyx.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/baryonyx_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/baryonyx_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/brachiosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/brachiosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/brachiosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/brachiosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/carcharodontosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/carcharodontosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/carcharodontosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/carcharodontosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/carnotaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/carnotaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/carnotaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/carnotaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/cearadactylus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/cearadactylus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/cearadactylus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/cearadactylus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/ceratosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/ceratosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/ceratosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/ceratosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/chasmosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/chasmosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/chasmosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/chasmosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/chickenosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/chickenosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/chickenosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/chickenosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/coelophysis.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/coelophysis.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/coelophysis_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/coelophysis_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/coelurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/coelurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/coelurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/coelurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/compsognathus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/compsognathus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/compsognathus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/compsognathus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/concavenator.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/concavenator.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/concavenator_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/concavenator_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/corythosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/corythosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/corythosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/corythosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/deinonychus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/deinonychus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/deinonychus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/deinonychus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/dilophosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/dilophosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/dilophosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/dilophosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/dimorphodon.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/dimorphodon.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/dimorphodon_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/dimorphodon_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/diplodocus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/diplodocus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/diplodocus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/diplodocus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/distortus_rex.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/distortus_rex.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/distortus_rex_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/distortus_rex_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/dryosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/dryosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/dryosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/dryosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/edmontosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/edmontosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/edmontosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/edmontosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/fduck.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/fduck.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/fduck_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/fduck_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/gallimimus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/gallimimus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/gallimimus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/gallimimus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/geosternbergia.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/geosternbergia.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/geosternbergia_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/geosternbergia_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/giganotosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/giganotosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/giganotosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/giganotosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/guanlong.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/guanlong.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/guanlong_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/guanlong_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/guidraco.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/guidraco.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/guidraco_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/guidraco_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/hadrosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/hadrosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/hadrosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/hadrosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/herrerasaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/herrerasaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/herrerasaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/herrerasaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/hypsilophodon.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/hypsilophodon.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/hypsilophodon_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/hypsilophodon_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/indominus_rex.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/indominus_rex.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/indominus_rex_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/indominus_rex_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/indoraptor.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/indoraptor.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/indoraptor_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/indoraptor_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/inostrancevia.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/inostrancevia.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/inostrancevia_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/inostrancevia_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/lambeosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/lambeosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/lambeosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/lambeosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/ludodactylus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/ludodactylus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/ludodactylus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/ludodactylus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/majungasaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/majungasaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/majungasaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/majungasaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/mamenchisaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/mamenchisaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/mamenchisaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/mamenchisaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/metriacanthosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/metriacanthosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/metriacanthosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/metriacanthosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/moganopterus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/moganopterus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/moganopterus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/moganopterus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/nyctosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/nyctosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/nyctosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/nyctosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/ornitholestes.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/ornitholestes.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/ornitholestes_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/ornitholestes_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/ornithomimus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/ornithomimus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/ornithomimus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/ornithomimus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/ouranosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/ouranosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/ouranosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/ouranosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/oviraptor.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/oviraptor.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/oviraptor_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/oviraptor_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/pachycephalosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/pachycephalosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/pachycephalosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/pachycephalosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/parasaurolophus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/parasaurolophus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/parasaurolophus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/parasaurolophus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/proceratosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/proceratosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/proceratosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/proceratosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/procompsognathus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/procompsognathus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/procompsognathus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/procompsognathus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/protoceratops.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/protoceratops.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/protoceratops_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/protoceratops_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/pteranodon.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/pteranodon.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/pteranodon_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/pteranodon_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/pterodaustro.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/pterodaustro.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/pterodaustro_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/pterodaustro_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/quetzalcoatlus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/quetzalcoatlus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/quetzalcoatlus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/quetzalcoatlus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/rajasaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/rajasaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/rajasaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/rajasaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/rugops.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/rugops.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/rugops_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/rugops_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/segisaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/segisaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/segisaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/segisaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/shantungosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/shantungosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/shantungosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/shantungosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/spinosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/spinosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/spinosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/spinosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/stegosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/stegosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/stegosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/stegosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/styracosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/styracosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/styracosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/styracosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/tapejara.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/tapejara.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/tapejara_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/tapejara_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/therizinosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/therizinosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/therizinosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/therizinosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/titanosaurus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/titanosaurus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/titanosaurus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/titanosaurus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/triceratops.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/triceratops.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/triceratops_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/triceratops_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/troodon.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/troodon.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/troodon_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/troodon_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/tropeognathus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/tropeognathus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/tropeognathus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/tropeognathus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/tupuxuara.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/tupuxuara.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/tupuxuara_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/tupuxuara_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/tyrannosaurus_rex.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/tyrannosaurus_rex.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/tyrannosaurus_rex_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/tyrannosaurus_rex_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/utahraptor.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/utahraptor.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/utahraptor_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/utahraptor_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/velociraptor.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/velociraptor.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/velociraptor_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/velociraptor_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/zhenyuanopterus.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/zhenyuanopterus.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/entity/zhenyuanopterus_female.png b/common/src/main/resources/assets/jurassicrevived/textures/entity/zhenyuanopterus_female.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/crate/iron_crate_gui.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/crate/iron_crate_gui.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/crate/wood_crate_gui.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/crate/wood_crate_gui.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/dna_analyzer/dna_analyzer_gui.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/dna_analyzer/dna_analyzer_gui.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/dna_extractor/amber.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/dna_extractor/amber.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/dna_extractor/dna_extractor_gui.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/dna_extractor/dna_extractor_gui.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/dna_hybridizer/dna_hybridizer_gui.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/dna_hybridizer/dna_hybridizer_gui.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/embryo_calcification_machine/embryo_calcification_machine_gui.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/embryo_calcification_machine/embryo_calcification_machine_gui.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/embryonic_machine/embryonic_machine_gui.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/embryonic_machine/embryonic_machine_gui.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/fossil_cleaner/fossil_cleaner_gui.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/fossil_cleaner/fossil_cleaner_gui.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/fossil_grinder/fossil_grinder_gui.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/fossil_grinder/fossil_grinder_gui.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generator/generator_gui.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generator/generator_gui.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/arrow.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/arrow.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/bubbles.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/bubbles.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/cutting_blades.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/cutting_blades.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/dna.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/dna.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/egg.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/egg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/lantern.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/lantern.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/power_bar.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/power_bar.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/skull.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/syringe_bar.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/syringe_bar.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/syringe_bar_reversed.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/syringe_bar_reversed.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/syringe_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/syringe_dna.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/test_tube.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/test_tube.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/white_arrow.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/white_arrow.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/white_bubbles.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/white_bubbles.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/white_syringe_bar.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/white_syringe_bar.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/white_syringe_bar_reversed.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/generic/white_syringe_bar_reversed.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/incubator/incubator_gui.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/incubator/incubator_gui.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/gui/tank/tank_gui.png b/common/src/main/resources/assets/jurassicrevived/textures/gui/tank/tank_gui.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/albertosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/albertosaurus_dna.png old mode 100755 new mode 100644 index 888cba6..3eeb105 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/albertosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/albertosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/albertosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/albertosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/albertosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/albertosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/albertosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/albertosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/allosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/allosaurus_dna.png old mode 100755 new mode 100644 index 53d29d1..c01b0df Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/allosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/allosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/allosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/allosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/allosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/allosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/allosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/allosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/alvarezsaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/alvarezsaurus_dna.png old mode 100755 new mode 100644 index f8152b5..c6d651d Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/alvarezsaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/alvarezsaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/alvarezsaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/alvarezsaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/alvarezsaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/alvarezsaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/alvarezsaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/alvarezsaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ankylosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ankylosaurus_dna.png old mode 100755 new mode 100644 index 1284329..386669c Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/ankylosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/ankylosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ankylosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ankylosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ankylosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ankylosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ankylosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ankylosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/apatosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/apatosaurus_dna.png old mode 100755 new mode 100644 index 464c86e..3ef6c3e Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/apatosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/apatosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/apatosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/apatosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/apatosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/apatosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/apatosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/apatosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/arambourgiania_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/arambourgiania_dna.png old mode 100755 new mode 100644 index 9bba004..36c9904 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/arambourgiania_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/arambourgiania_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/arambourgiania_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/arambourgiania_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/arambourgiania_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/arambourgiania_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/arambourgiania_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/arambourgiania_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/banana_nut_cookie.png b/common/src/main/resources/assets/jurassicrevived/textures/item/banana_nut_cookie.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/baryonyx_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/baryonyx_dna.png old mode 100755 new mode 100644 index 7bf1fa3..8c50001 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/baryonyx_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/baryonyx_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/baryonyx_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/baryonyx_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/baryonyx_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/baryonyx_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/baryonyx_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/baryonyx_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/brachiosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/brachiosaurus_dna.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/brachiosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/brachiosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/brachiosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/brachiosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/brachiosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/brachiosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/cable.png b/common/src/main/resources/assets/jurassicrevived/textures/item/cable.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/carcharodontosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/carcharodontosaurus_dna.png old mode 100755 new mode 100644 index 62423de..f691519 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/carcharodontosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/carcharodontosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/carcharodontosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/carcharodontosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/carcharodontosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/carcharodontosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/carcharodontosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/carcharodontosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/carnotaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/carnotaurus_dna.png old mode 100755 new mode 100644 index b432b3e..cb1c403 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/carnotaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/carnotaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/carnotaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/carnotaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/carnotaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/carnotaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/carnotaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/carnotaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/cearadactylus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/cearadactylus_dna.png old mode 100755 new mode 100644 index 40d51d5..5d08b9a Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/cearadactylus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/cearadactylus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/cearadactylus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/cearadactylus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/cearadactylus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/cearadactylus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/cearadactylus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/cearadactylus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ceratosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ceratosaurus_dna.png old mode 100755 new mode 100644 index ad05dc6..00c71fd Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/ceratosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/ceratosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ceratosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ceratosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ceratosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ceratosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ceratosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ceratosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/chasmosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/chasmosaurus_dna.png old mode 100755 new mode 100644 index 812b7a8..d913ea4 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/chasmosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/chasmosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/chasmosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/chasmosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/chasmosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/chasmosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/chasmosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/chasmosaurus_tissue.png old mode 100755 new mode 100644 index 651da10..e600ddd Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/chasmosaurus_tissue.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/chasmosaurus_tissue.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/coelophysis_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/coelophysis_dna.png old mode 100755 new mode 100644 index e59721e..6076629 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/coelophysis_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/coelophysis_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/coelophysis_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/coelophysis_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/coelophysis_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/coelophysis_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/coelophysis_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/coelophysis_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/coelurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/coelurus_dna.png old mode 100755 new mode 100644 index 1d8481b..145d2a0 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/coelurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/coelurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/coelurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/coelurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/coelurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/coelurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/coelurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/coelurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/compsognathus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/compsognathus_dna.png old mode 100755 new mode 100644 index c4e00e2..b74a270 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/compsognathus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/compsognathus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/compsognathus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/compsognathus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/compsognathus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/compsognathus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/compsognathus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/compsognathus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/concavenator_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/concavenator_dna.png old mode 100755 new mode 100644 index b89a55d..fd9de04 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/concavenator_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/concavenator_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/concavenator_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/concavenator_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/concavenator_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/concavenator_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/concavenator_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/concavenator_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_dna.png old mode 100755 new mode 100644 index efd0088..4e8ccce Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_syringe.png old mode 100755 new mode 100644 index 009b55a..b3b57c0 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_syringe.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_syringe.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_tissue.png old mode 100755 new mode 100644 index 11240a6..34b07ea Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_tissue.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/corythosaurus_tissue.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/crushed_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/crushed_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/cutting_blades.png b/common/src/main/resources/assets/jurassicrevived/textures/item/cutting_blades.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/deinonychus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/deinonychus_dna.png old mode 100755 new mode 100644 index cfbe43f..a3be13b Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/deinonychus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/deinonychus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/deinonychus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/deinonychus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/deinonychus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/deinonychus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/deinonychus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/deinonychus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/dilophosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/dilophosaurus_dna.png old mode 100755 new mode 100644 index 1a89d49..374db2d Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/dilophosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/dilophosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/dilophosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/dilophosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/dilophosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/dilophosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/dilophosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/dilophosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/dimorphodon_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/dimorphodon_dna.png old mode 100755 new mode 100644 index b891377..891c389 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/dimorphodon_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/dimorphodon_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/dimorphodon_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/dimorphodon_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/dimorphodon_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/dimorphodon_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/dimorphodon_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/dimorphodon_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_dna.png old mode 100755 new mode 100644 index 7e5bec2..08b85b7 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_syringe.png old mode 100755 new mode 100644 index 6266aab..46e7e8a Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_syringe.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_syringe.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_tissue.png old mode 100755 new mode 100644 index b7bec26..799d231 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_tissue.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/diplodocus_tissue.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/distortus_rex_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/distortus_rex_dna.png old mode 100755 new mode 100644 index f567e4f..69f7166 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/distortus_rex_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/distortus_rex_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/distortus_rex_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/distortus_rex_syringe.png old mode 100755 new mode 100644 index dff1f00..899d17d Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/distortus_rex_syringe.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/distortus_rex_syringe.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/distortus_rex_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/distortus_rex_tissue.png old mode 100755 new mode 100644 index 0dd8e6c..a7e3aa3 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/distortus_rex_tissue.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/distortus_rex_tissue.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/dryosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/dryosaurus_dna.png old mode 100755 new mode 100644 index a4290db..476e89c Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/dryosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/dryosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/dryosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/dryosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/dryosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/dryosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/dryosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/dryosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/edmontosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/edmontosaurus_dna.png old mode 100755 new mode 100644 index 1e78b4f..758f1a8 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/edmontosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/edmontosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/edmontosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/edmontosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/edmontosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/edmontosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/edmontosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/edmontosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_albertosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_albertosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_allosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_allosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_alvarezsaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_alvarezsaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_ankylosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_ankylosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_apatosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_apatosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_arambourgiania_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_arambourgiania_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_baryonyx_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_baryonyx_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_brachiosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_brachiosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_carcharodontosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_carcharodontosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_carnotaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_carnotaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_cearadactylus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_cearadactylus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_ceratosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_ceratosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_chasmosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_chasmosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_coelophysis_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_coelophysis_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_coelurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_coelurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_compsognathus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_compsognathus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_concavenator_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_concavenator_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_corythosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_corythosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_deinonychus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_deinonychus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_dilophosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_dilophosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_dimorphodon_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_dimorphodon_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_diplodocus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_diplodocus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_distortus_rex_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_distortus_rex_skull.png old mode 100755 new mode 100644 index 2e1defe..c6eb880 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_distortus_rex_skull.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_distortus_rex_skull.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_dryosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_dryosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_edmontosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_edmontosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_gallimimus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_gallimimus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_geosternbergia_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_geosternbergia_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_giganotosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_giganotosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_guanlong_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_guanlong_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_guidraco_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_guidraco_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_hadrosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_hadrosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_herrerasaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_herrerasaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_hypsilophodon_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_hypsilophodon_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_indominus_rex_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_indominus_rex_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_indoraptor_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_indoraptor_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_inostrancevia_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_inostrancevia_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_lambeosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_lambeosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_ludodactylus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_ludodactylus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_majungasaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_majungasaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_mamenchisaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_mamenchisaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_metriacanthosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_metriacanthosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_moganopterus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_moganopterus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_nyctosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_nyctosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_ornitholestes_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_ornitholestes_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_ornithomimus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_ornithomimus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_ouranosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_ouranosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_oviraptor_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_oviraptor_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_pachycephalosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_pachycephalosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_parasaurolophus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_parasaurolophus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_proceratosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_proceratosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_procompsognathus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_procompsognathus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_protoceratops_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_protoceratops_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_pteranodon_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_pteranodon_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_pterodaustro_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_pterodaustro_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_quetzalcoatlus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_quetzalcoatlus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_rajasaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_rajasaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_rugops_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_rugops_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_segisaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_segisaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_shantungosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_shantungosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_spinosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_spinosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_stegosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_stegosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_styracosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_styracosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_tapejara_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_tapejara_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_therizinosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_therizinosaurus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_titanosaurus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_titanosaurus_skull.png old mode 100755 new mode 100644 index c216fe1..743be94 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_titanosaurus_skull.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_titanosaurus_skull.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_triceratops_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_triceratops_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_troodon_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_troodon_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_tropeognathus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_tropeognathus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_tupuxuara_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_tupuxuara_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_tyrannosaurus_rex_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_tyrannosaurus_rex_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_utahraptor_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_utahraptor_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_velociraptor_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_velociraptor_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_zhenyuanopterus_skull.png b/common/src/main/resources/assets/jurassicrevived/textures/item/fresh_zhenyuanopterus_skull.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/frog_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/frog_dna.png old mode 100755 new mode 100644 index aa92a3a..2eb78c6 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/frog_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/frog_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/frog_material.png b/common/src/main/resources/assets/jurassicrevived/textures/item/frog_material.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/frozen_leech.png b/common/src/main/resources/assets/jurassicrevived/textures/item/frozen_leech.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/gallimimus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/gallimimus_dna.png old mode 100755 new mode 100644 index d9a5dea..9037fe0 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/gallimimus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/gallimimus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/gallimimus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/gallimimus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/gallimimus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/gallimimus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/gallimimus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/gallimimus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/geosternbergia_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/geosternbergia_dna.png old mode 100755 new mode 100644 index 43372a2..e328ff0 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/geosternbergia_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/geosternbergia_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/geosternbergia_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/geosternbergia_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/geosternbergia_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/geosternbergia_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/geosternbergia_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/geosternbergia_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/giganotosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/giganotosaurus_dna.png old mode 100755 new mode 100644 index 8685ab4..0372c7e Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/giganotosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/giganotosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/giganotosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/giganotosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/giganotosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/giganotosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/giganotosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/giganotosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/guanlong_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/guanlong_dna.png old mode 100755 new mode 100644 index 96a9581..ac15bf6 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/guanlong_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/guanlong_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/guanlong_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/guanlong_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/guanlong_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/guanlong_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/guanlong_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/guanlong_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/guidraco_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/guidraco_dna.png old mode 100755 new mode 100644 index 7867d4a..0db9fa9 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/guidraco_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/guidraco_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/guidraco_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/guidraco_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/guidraco_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/guidraco_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/guidraco_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/guidraco_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/hadrosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/hadrosaurus_dna.png old mode 100755 new mode 100644 index 7e8a428..a289f71 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/hadrosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/hadrosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/hadrosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/hadrosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/hadrosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/hadrosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/hadrosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/hadrosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/herrerasaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/herrerasaurus_dna.png old mode 100755 new mode 100644 index 9523b43..b148c9f Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/herrerasaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/herrerasaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/herrerasaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/herrerasaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/herrerasaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/herrerasaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/herrerasaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/herrerasaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/hypsilophodon_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/hypsilophodon_dna.png old mode 100755 new mode 100644 index 3ea4223..0fcc992 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/hypsilophodon_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/hypsilophodon_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/hypsilophodon_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/hypsilophodon_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/hypsilophodon_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/hypsilophodon_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/hypsilophodon_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/hypsilophodon_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/indominus_rex_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/indominus_rex_dna.png old mode 100755 new mode 100644 index 1d43473..5037571 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/indominus_rex_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/indominus_rex_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/indominus_rex_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/indominus_rex_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/indominus_rex_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/indominus_rex_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/indoraptor_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/indoraptor_dna.png old mode 100755 new mode 100644 index 07f679c..02cee04 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/indoraptor_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/indoraptor_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/indoraptor_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/indoraptor_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/indoraptor_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/indoraptor_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/inostrancevia_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/inostrancevia_dna.png old mode 100755 new mode 100644 index 6cb6e67..2ca166a Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/inostrancevia_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/inostrancevia_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/inostrancevia_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/inostrancevia_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/inostrancevia_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/inostrancevia_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/inostrancevia_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/inostrancevia_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/lambeosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/lambeosaurus_dna.png old mode 100755 new mode 100644 index f0f59be..d3fb0be Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/lambeosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/lambeosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/lambeosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/lambeosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/lambeosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/lambeosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/lambeosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/lambeosaurus_tissue.png old mode 100755 new mode 100644 index 8b3488d..a2360e5 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/lambeosaurus_tissue.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/lambeosaurus_tissue.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/low_security_fence_pole.png b/common/src/main/resources/assets/jurassicrevived/textures/item/low_security_fence_pole.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/low_security_fence_wire.png b/common/src/main/resources/assets/jurassicrevived/textures/item/low_security_fence_wire.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ludodactylus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ludodactylus_dna.png old mode 100755 new mode 100644 index 5d6ad58..3745e74 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/ludodactylus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/ludodactylus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ludodactylus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ludodactylus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ludodactylus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ludodactylus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ludodactylus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ludodactylus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/mac_n_cheese.png b/common/src/main/resources/assets/jurassicrevived/textures/item/mac_n_cheese.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/majungasaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/majungasaurus_dna.png old mode 100755 new mode 100644 index 278f431..fa3e4b1 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/majungasaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/majungasaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/majungasaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/majungasaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/majungasaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/majungasaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/majungasaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/majungasaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/mamenchisaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/mamenchisaurus_dna.png old mode 100755 new mode 100644 index 69fd353..6700cae Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/mamenchisaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/mamenchisaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/mamenchisaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/mamenchisaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/mamenchisaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/mamenchisaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/mamenchisaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/mamenchisaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/medium_security_fence_pole.png b/common/src/main/resources/assets/jurassicrevived/textures/item/medium_security_fence_pole.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/medium_security_fence_wire.png b/common/src/main/resources/assets/jurassicrevived/textures/item/medium_security_fence_wire.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/metriacanthosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/metriacanthosaurus_dna.png old mode 100755 new mode 100644 index c4cd688..52afcde Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/metriacanthosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/metriacanthosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/metriacanthosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/metriacanthosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/metriacanthosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/metriacanthosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/metriacanthosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/metriacanthosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/moganopterus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/moganopterus_dna.png old mode 100755 new mode 100644 index 010470f..4d7157a Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/moganopterus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/moganopterus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/moganopterus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/moganopterus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/moganopterus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/moganopterus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/moganopterus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/moganopterus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/mosquito_in_amber.png b/common/src/main/resources/assets/jurassicrevived/textures/item/mosquito_in_amber.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/nyctosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/nyctosaurus_dna.png old mode 100755 new mode 100644 index 7143f2e..49333a5 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/nyctosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/nyctosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/nyctosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/nyctosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/nyctosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/nyctosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/nyctosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/nyctosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ornitholestes_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ornitholestes_dna.png old mode 100755 new mode 100644 index 3dcdf16..2cd7275 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/ornitholestes_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/ornitholestes_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ornitholestes_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ornitholestes_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ornitholestes_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ornitholestes_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ornitholestes_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ornitholestes_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ornithomimus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ornithomimus_dna.png old mode 100755 new mode 100644 index 5a6c0f2..ed8807e Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/ornithomimus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/ornithomimus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ornithomimus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ornithomimus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ornithomimus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ornithomimus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ornithomimus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ornithomimus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ouranosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ouranosaurus_dna.png old mode 100755 new mode 100644 index 7f8bb44..04ced28 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/ouranosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/ouranosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ouranosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ouranosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ouranosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ouranosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/ouranosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/ouranosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/oviraptor_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/oviraptor_dna.png old mode 100755 new mode 100644 index a36c21f..e0b2a5b Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/oviraptor_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/oviraptor_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/oviraptor_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/oviraptor_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/oviraptor_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/oviraptor_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/oviraptor_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/oviraptor_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/pachycephalosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/pachycephalosaurus_dna.png old mode 100755 new mode 100644 index fa548f7..3594d4f Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/pachycephalosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/pachycephalosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/pachycephalosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/pachycephalosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/pachycephalosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/pachycephalosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/pachycephalosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/pachycephalosaurus_tissue.png old mode 100755 new mode 100644 index ecfcb3c..5835728 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/pachycephalosaurus_tissue.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/pachycephalosaurus_tissue.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/parasaurolophus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/parasaurolophus_dna.png old mode 100755 new mode 100644 index 3f606fa..6005179 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/parasaurolophus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/parasaurolophus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/parasaurolophus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/parasaurolophus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/parasaurolophus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/parasaurolophus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/parasaurolophus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/parasaurolophus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/proceratosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/proceratosaurus_dna.png old mode 100755 new mode 100644 index 4d7f721..9f1515c Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/proceratosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/proceratosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/proceratosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/proceratosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/proceratosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/proceratosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/proceratosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/proceratosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/processor.png b/common/src/main/resources/assets/jurassicrevived/textures/item/processor.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/procompsognathus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/procompsognathus_dna.png old mode 100755 new mode 100644 index 3ac097f..9c98cce Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/procompsognathus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/procompsognathus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/procompsognathus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/procompsognathus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/procompsognathus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/procompsognathus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/procompsognathus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/procompsognathus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/protoceratops_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/protoceratops_dna.png old mode 100755 new mode 100644 index 0d15298..7258504 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/protoceratops_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/protoceratops_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/protoceratops_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/protoceratops_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/protoceratops_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/protoceratops_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/protoceratops_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/protoceratops_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/pteranodon_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/pteranodon_dna.png old mode 100755 new mode 100644 index 2cd0159..02ba9ee Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/pteranodon_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/pteranodon_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/pteranodon_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/pteranodon_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/pteranodon_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/pteranodon_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/pteranodon_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/pteranodon_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/pterodaustro_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/pterodaustro_dna.png old mode 100755 new mode 100644 index b7fcc69..ba4dcb6 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/pterodaustro_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/pterodaustro_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/pterodaustro_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/pterodaustro_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/pterodaustro_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/pterodaustro_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/pterodaustro_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/pterodaustro_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/quetzalcoatlus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/quetzalcoatlus_dna.png old mode 100755 new mode 100644 index 4d68537..407c78b Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/quetzalcoatlus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/quetzalcoatlus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/quetzalcoatlus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/quetzalcoatlus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/quetzalcoatlus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/quetzalcoatlus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/quetzalcoatlus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/quetzalcoatlus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/rajasaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/rajasaurus_dna.png old mode 100755 new mode 100644 index 62fa1ef..ca3b3e5 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/rajasaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/rajasaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/rajasaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/rajasaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/rajasaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/rajasaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/rajasaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/rajasaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/rugops_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/rugops_dna.png old mode 100755 new mode 100644 index 1a621f0..b27005a Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/rugops_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/rugops_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/rugops_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/rugops_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/rugops_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/rugops_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/rugops_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/rugops_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/screen.png b/common/src/main/resources/assets/jurassicrevived/textures/item/screen.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/segisaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/segisaurus_dna.png old mode 100755 new mode 100644 index a5bf4cc..37cd1e9 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/segisaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/segisaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/segisaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/segisaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/segisaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/segisaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/segisaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/segisaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/shantungosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/shantungosaurus_dna.png old mode 100755 new mode 100644 index 197666b..b5dc7a1 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/shantungosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/shantungosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/shantungosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/shantungosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/shantungosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/shantungosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/shantungosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/shantungosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/spinosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/spinosaurus_dna.png old mode 100755 new mode 100644 index f14f2a5..75c619c Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/spinosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/spinosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/spinosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/spinosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/spinosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/spinosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/spinosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/spinosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/stegosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/stegosaurus_dna.png old mode 100755 new mode 100644 index 31762ca..f0e0e52 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/stegosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/stegosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/stegosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/stegosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/stegosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/stegosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/stegosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/stegosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/styracosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/styracosaurus_dna.png old mode 100755 new mode 100644 index 471d86b..2676e5a Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/styracosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/styracosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/styracosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/styracosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/styracosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/styracosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/styracosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/styracosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tapejara_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tapejara_dna.png old mode 100755 new mode 100644 index c96cfc8..fc1f64b Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/tapejara_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/tapejara_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tapejara_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tapejara_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tapejara_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tapejara_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tapejara_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tapejara_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/test_tube.png b/common/src/main/resources/assets/jurassicrevived/textures/item/test_tube.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/therizinosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/therizinosaurus_dna.png old mode 100755 new mode 100644 index 129cb15..fba0814 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/therizinosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/therizinosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/therizinosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/therizinosaurus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/therizinosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/therizinosaurus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/therizinosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/therizinosaurus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tire.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tire.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_dna.png old mode 100755 new mode 100644 index 30d84f4..8fd48e4 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_skull_fossil.png old mode 100755 new mode 100644 index 1443867..9a31c65 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_skull_fossil.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_skull_fossil.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_syringe.png old mode 100755 new mode 100644 index 38c7a20..2ef824b Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_syringe.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_syringe.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_tissue.png old mode 100755 new mode 100644 index c0ee1c2..6bbafaa Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_tissue.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/titanosaurus_tissue.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/triceratops_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/triceratops_dna.png old mode 100755 new mode 100644 index d7cb38f..a3247f0 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/triceratops_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/triceratops_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/triceratops_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/triceratops_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/triceratops_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/triceratops_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/triceratops_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/triceratops_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/troodon_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/troodon_dna.png old mode 100755 new mode 100644 index a3fe9ba..06252e1 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/troodon_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/troodon_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/troodon_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/troodon_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/troodon_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/troodon_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/troodon_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/troodon_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tropeognathus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tropeognathus_dna.png old mode 100755 new mode 100644 index 0660ea6..c32f21c Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/tropeognathus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/tropeognathus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tropeognathus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tropeognathus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tropeognathus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tropeognathus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tropeognathus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tropeognathus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tupuxuara_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tupuxuara_dna.png old mode 100755 new mode 100644 index 685d808..be67598 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/tupuxuara_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/tupuxuara_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tupuxuara_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tupuxuara_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tupuxuara_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tupuxuara_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tupuxuara_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tupuxuara_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tyrannosaurus_rex_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tyrannosaurus_rex_dna.png old mode 100755 new mode 100644 index e5f3f6b..fe1a76f Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/tyrannosaurus_rex_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/tyrannosaurus_rex_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tyrannosaurus_rex_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tyrannosaurus_rex_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tyrannosaurus_rex_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tyrannosaurus_rex_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/tyrannosaurus_rex_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/tyrannosaurus_rex_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/utahraptor_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/utahraptor_dna.png old mode 100755 new mode 100644 index de3443e..8abb55c Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/utahraptor_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/utahraptor_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/utahraptor_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/utahraptor_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/utahraptor_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/utahraptor_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/utahraptor_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/utahraptor_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/velociraptor_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/velociraptor_dna.png old mode 100755 new mode 100644 index 26f751c..dc7bbf4 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/velociraptor_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/velociraptor_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/velociraptor_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/velociraptor_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/velociraptor_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/velociraptor_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/velociraptor_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/velociraptor_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/walnut_pumpkin_pie.png b/common/src/main/resources/assets/jurassicrevived/textures/item/walnut_pumpkin_pie.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/wrench.png b/common/src/main/resources/assets/jurassicrevived/textures/item/wrench.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/zhenyuanopterus_dna.png b/common/src/main/resources/assets/jurassicrevived/textures/item/zhenyuanopterus_dna.png old mode 100755 new mode 100644 index c5c086e..838ba47 Binary files a/common/src/main/resources/assets/jurassicrevived/textures/item/zhenyuanopterus_dna.png and b/common/src/main/resources/assets/jurassicrevived/textures/item/zhenyuanopterus_dna.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/zhenyuanopterus_skull_fossil.png b/common/src/main/resources/assets/jurassicrevived/textures/item/zhenyuanopterus_skull_fossil.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/zhenyuanopterus_syringe.png b/common/src/main/resources/assets/jurassicrevived/textures/item/zhenyuanopterus_syringe.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/item/zhenyuanopterus_tissue.png b/common/src/main/resources/assets/jurassicrevived/textures/item/zhenyuanopterus_tissue.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/painting/chic.png b/common/src/main/resources/assets/jurassicrevived/textures/painting/chic.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/painting/lonely_tree.png b/common/src/main/resources/assets/jurassicrevived/textures/painting/lonely_tree.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/painting/meg.png b/common/src/main/resources/assets/jurassicrevived/textures/painting/meg.png old mode 100755 new mode 100644 diff --git a/common/src/main/resources/assets/jurassicrevived/textures/painting/seeing_eye.png b/common/src/main/resources/assets/jurassicrevived/textures/painting/seeing_eye.png old mode 100755 new mode 100644 diff --git a/fabricmc/src/main/java/net/cmr/jurassicrevived/JRModClient.java b/fabricmc/src/main/java/net/cmr/jurassicrevived/JRModClient.java index 5881c87..19536dc 100755 --- a/fabricmc/src/main/java/net/cmr/jurassicrevived/JRModClient.java +++ b/fabricmc/src/main/java/net/cmr/jurassicrevived/JRModClient.java @@ -13,5 +13,10 @@ public class JRModClient implements ClientModInitializer { CommonClientClass.init(); BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.TANK.get(), RenderType.translucent()); + BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.INCUBATOR.get(), RenderType.translucent()); + BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.DNA_EXTRACTOR.get(), RenderType.translucent()); + BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.FOSSIL_GRINDER.get(), RenderType.translucent()); + BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.FOSSIL_CLEANER.get(), RenderType.translucent()); + BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.DNA_HYBRIDIZER.get(), RenderType.translucent()); } } diff --git a/fabricmc/src/main/java/net/cmr/jurassicrevived/datagen/FabricRecipeProvider.java b/fabricmc/src/main/java/net/cmr/jurassicrevived/datagen/FabricRecipeProvider.java index 5f7f942..032d610 100644 --- a/fabricmc/src/main/java/net/cmr/jurassicrevived/datagen/FabricRecipeProvider.java +++ b/fabricmc/src/main/java/net/cmr/jurassicrevived/datagen/FabricRecipeProvider.java @@ -74,16 +74,6 @@ public class FabricRecipeProvider extends net.fabricmc.fabric.api.datagen.v1.pro builder.save(output); } - @Override - public void buildShapeless(RecipeCategory category, ItemLike result, int count, ItemLike... ingredients) { - ShapelessRecipeBuilder builder = ShapelessRecipeBuilder.shapeless(category, result, count); - for (ItemLike ingredient : ingredients) { - builder.requires(ingredient); - } - builder.unlockedBy("has_item", has(result)); - builder.save(output); - } - @Override public void buildShapeless(RecipeCategory category, ItemLike result, int count, String name, ItemLike... ingredients) { ShapelessRecipeBuilder builder = ShapelessRecipeBuilder.shapeless(category, result, count); diff --git a/fabricmc/src/main/java/net/cmr/jurassicrevived/platform/FabricEnergyWrapper.java b/fabricmc/src/main/java/net/cmr/jurassicrevived/platform/FabricEnergyWrapper.java index 033e791..ba81fe0 100755 --- a/fabricmc/src/main/java/net/cmr/jurassicrevived/platform/FabricEnergyWrapper.java +++ b/fabricmc/src/main/java/net/cmr/jurassicrevived/platform/FabricEnergyWrapper.java @@ -1,6 +1,7 @@ package net.cmr.jurassicrevived.platform; import net.cmr.jurassicrevived.block.entity.energy.ModEnergyStorage; +import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; import team.reborn.energy.api.EnergyStorage; @@ -13,12 +14,30 @@ public class FabricEnergyWrapper implements EnergyStorage { @Override public long insert(long maxAmount, TransactionContext transaction) { - return storage.receiveEnergy((int) maxAmount, true); + int accepted = storage.receiveEnergy((int) Math.min(Integer.MAX_VALUE, maxAmount), true); + if (accepted <= 0) { + return 0; + } + + try (Transaction nested = transaction.openNested()) { + int inserted = storage.receiveEnergy(accepted, false); + nested.commit(); + return inserted; + } } @Override public long extract(long maxAmount, TransactionContext transaction) { - return storage.extractEnergy((int) maxAmount, true); + int extracted = storage.extractEnergy((int) Math.min(Integer.MAX_VALUE, maxAmount), true); + if (extracted <= 0) { + return 0; + } + + try (Transaction nested = transaction.openNested()) { + int removed = storage.extractEnergy(extracted, false); + nested.commit(); + return removed; + } } @Override diff --git a/fabricmc/src/main/resources/fabric.mod.json b/fabricmc/src/main/resources/fabric.mod.json index 6045425..7c7cafa 100755 --- a/fabricmc/src/main/resources/fabric.mod.json +++ b/fabricmc/src/main/resources/fabric.mod.json @@ -30,6 +30,9 @@ "jade": [ "net.cmr.jurassicrevived.compat.MachineJadePlugin", "net.cmr.jurassicrevived.compat.EggJadePlugin" + ], + "jei_mod_plugin": [ + "net.cmr.jurassicrevived.compat.JEIJRPlugin" ] }, "mixins": [ diff --git a/neoforge/src/main/java/net/cmr/jurassicrevived/datagen/NeoForgeRecipeProvider.java b/neoforge/src/main/java/net/cmr/jurassicrevived/datagen/NeoForgeRecipeProvider.java index 10952a2..c21c5a7 100755 --- a/neoforge/src/main/java/net/cmr/jurassicrevived/datagen/NeoForgeRecipeProvider.java +++ b/neoforge/src/main/java/net/cmr/jurassicrevived/datagen/NeoForgeRecipeProvider.java @@ -54,16 +54,6 @@ public class NeoForgeRecipeProvider extends RecipeProvider implements ModRecipeP builder.save(output); } - @Override - public void buildShapeless(RecipeCategory category, ItemLike result, int count, ItemLike... ingredients) { - ShapelessRecipeBuilder builder = ShapelessRecipeBuilder.shapeless(category, result, count); - for (ItemLike ingredient : ingredients) { - builder.requires(ingredient); - } - builder.unlockedBy("has_item", has(result)); - builder.save(output); - } - @Override public void buildShapeless(RecipeCategory category, ItemLike result, int count, String name, ItemLike... ingredients) { ShapelessRecipeBuilder builder = ShapelessRecipeBuilder.shapeless(category, result, count);